diff --git a/m_fdm_calc.f90 b/m_fdm_calc.f90 index b12a2c0..c08e88b 100644 --- a/m_fdm_calc.f90 +++ b/m_fdm_calc.f90 @@ -11,7 +11,7 @@ module m_fdm_calc real*8, dimension(:,:,:,:), allocatable :: y1,y2,yf real*8 :: in_yr,out_yr,refwr,minf - integer :: fullsavenum,svfx,svfy + integer :: fullsavenum !,svfx,svfy integer :: fdmcyc,fdmsavecount real*8 :: fdmtime,fdmdt real*8 :: sumc,oldsumc,time_int,sum_wrate @@ -81,21 +81,6 @@ module m_fdm_calc refwr=pre*1.*exp(-ac/(1.+bc*c_ref)) ! Kwon - if(svf.eq.0) then - spx=1 - spy=1 - svfx=nx !nx - svfy=ny !ny - else - svfx=0 - svfy=0 - do i=2,nx,spx - svfx=svfx+1 ! # of points in x-dir. in 3D_field.dat - enddo - do i=2,ny,spy - svfy=svfy+1 ! # of points in y-dir. in 3D_field.dat - enddo - endif !FDM normal start================================== diff --git a/m_parameters.f90 b/m_parameters.f90 index 3d6a1c6..6cf8a1d 100644 --- a/m_parameters.f90 +++ b/m_parameters.f90 @@ -109,12 +109,12 @@ module m_parameters !!---------------------------------------------------------------------- ! FDM variables - integer :: svf,swadtv,restartnum + integer :: swadtv,restartnum integer :: inx1,inx2,yrsw real*8 :: ac,bc,c_cut,c_ref,min_wr,prof_wr,hx,hy,diff,pre real*8 :: dt_fullsave,dt_fdmsave,t_fullsave,t_fdmsave real*8 :: fdmcfl,startad,dummyu_,schmidt - real*8 :: tar_lo + real*8 :: bgn_save ! files for statistics integer, parameter :: tp_stat = 690 @@ -276,7 +276,7 @@ contains write(out,'(a30,3x,3i5)') 'spx,spy,spz',spx,spy,spz read(in,*,ERR=9000,END=9000) fdm_sw - write(out,'(a30,3x,i5)') 'WRITE_FDM= ',fdm_sw + write(out,'(a30,3x,i5)') 'fdm_sw= ',fdm_sw read(in,*) write(out,"(70('-'))") @@ -320,7 +320,7 @@ contains write(out,"(70('-'))") ITMAX=int(TMAX/dt) - write(out,'(a30,3x,i5)') 'ITMAX =',ITMAX + write(out,'(a30,3x,i8)') 'ITMAX =',ITMAX call flush(out) @@ -513,8 +513,8 @@ contains read(in,*) - read(in,*,ERR=9000,END=9000) svf - write(out,'(a30,3x,i5)') 'svf =',svf + read(in,*,ERR=9000,END=9000) bgn_save + write(out,'(a30,3x,f8.2)') 'bgn_save =',bgn_save read(in,*,ERR=9000,END=9000) swadtv write(out,'(a30,3x,i5)') 'swadtv =',swadtv @@ -580,8 +580,6 @@ contains read(in,*,ERR=9000,END=9000) fdmcfl write(out,'(a30,3x,e20.10)') 'FDM_CFL =',fdmcfl - read(in,*,ERR=9000,END=9000) tar_lo - write(out,'(a30,3x,e20.10)') 'tar_lo =',tar_lo ! initialize ---------------------- t_fdmsave=dt_fdmsave diff --git a/main.f90 b/main.f90 index 3e91d3b..b2be667 100644 --- a/main.f90 +++ b/main.f90 @@ -208,7 +208,7 @@ program x_code call gather_4 if (myid.eq.master) then !write itime, savenum pair - call fdm_restart_write + if(TIME.ge.bgn_save) call fdm_restart_write write (restart_pair, *) file_ext, fullsavenum-1 call write_tp_field end if