From e2f1d52c4fc5165f58de6e7eb295f71f28e662e4 Mon Sep 17 00:00:00 2001 From: ignis Date: Tue, 15 Jul 2014 21:30:22 +0900 Subject: [PATCH] write_vel_max now takes arguments instead of access to m_fdm_calc --- io_write_4.f90 | 13 +++++++++++++ m_fdm_calc.f90 | 2 +- write_stats.f90 | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/io_write_4.f90 b/io_write_4.f90 index f17c8bc..ba3a5c7 100644 --- a/io_write_4.f90 +++ b/io_write_4.f90 @@ -57,6 +57,19 @@ subroutine io_write_4 tmp4(1:nx,1:ny,1:nz) = wrk(1:nx,1:ny,1:nz,3) call gather_tmp4 (w_) + if (myid.eq.master) then + umax = maxval(u_(1:nx,1:ny,1:nz_all)) + umin = minval(u_(1:nx,1:ny,1:nz_all)) + vmax = maxval(v_(1:nx,1:ny,1:nz_all)) + vmin = minval(v_(1:nx,1:ny,1:nz_all)) + wmax = maxval(w_(1:nx,1:ny,1:nz_all)) + wmin = minval(w_(1:nx,1:ny,1:nz_all)) + + call write_vel_max ( umax,vmax,wmax,umin,vmin,wmin ) + + endif + + ! scalars if (int_scalars) then do n = 1,n_scalars diff --git a/m_fdm_calc.f90 b/m_fdm_calc.f90 index a5518a8..e1d7ab5 100644 --- a/m_fdm_calc.f90 +++ b/m_fdm_calc.f90 @@ -307,7 +307,7 @@ module m_fdm_calc write(*,*) '==========================================================' write(*,*) - call write_vel_max + call write_vel_max ( umax,vmax,wmax,umin,vmin,wmin ) return diff --git a/write_stats.f90 b/write_stats.f90 index 26b1a02..283f4f4 100644 --- a/write_stats.f90 +++ b/write_stats.f90 @@ -88,10 +88,10 @@ subroutine write_model_spectrum enddo end subroutine write_model_spectrum -subroutine write_vel_max +subroutine write_vel_max (umax,vmax,wmax,umin,vmin,wmin) use m_parameters - use m_fdm_calc implicit none + real*8 :: umax,vmax,wmax,umin,vmin,wmin write(tp_max_min_uvw,'(f12.6,6e18.8)')time,umax,vmax,wmax,umin,vmin,wmin end subroutine write_vel_max