Mercurial > hgweb > burst-coupling
changeset 77:79f08d3ffa55
Fixing timing of file writes and related.
| author | Marco van Hulten <marco@hulten.org> |
|---|---|
| date | Fri, 26 Apr 2019 16:38:37 +0200 |
| parents | c8ed926f0017 |
| children | 2c9ca1190ed8 |
| files | hamocc_step.F ini_hamocc.F90 |
| diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hamocc_step.F Fri Apr 26 16:37:56 2019 +0200 +++ b/hamocc_step.F Fri Apr 26 16:38:37 2019 +0200 @@ -27,9 +27,12 @@ c do l=1,nbgc bgcwrt(l) = .false. - if (((diagann_bgc(l).and.nday_of_year.eq.1.or.diagmon_bgc(l) + if ((((diagann_bgc(l).or.diagdec_bgc(l).and.mod(nyear,10)==0.or. + . diagcen_bgc(l).and.mod(nyear,100)==0.or.diagmil_bgc(l).and. + . mod(nyear,1000)==0).and.nday_of_year.eq.1.or.diagmon_bgc(l) . .and.nday.eq.1).and.mod(nstep,nstep_in_day).eq.0).or..not. - . (diagann_bgc(l).or.diagmon_bgc(l)).and. + . (diagann_bgc(l).or.diagmon_bgc(l).or.diagdec_bgc(l).or. + . diagcen_bgc(l).or.diagmil_bgc(l)).and. . mod(nstep+.5,diagfq_bgc(l)).lt.1.) . bgcwrt(l) = .true. enddo @@ -40,8 +43,7 @@ . bgc_dp, bgc_dx, bgc_dy, omask) #endif - ! January 2 to make it work with MICOM clock for a startup run - if ( nday_of_year==2 .and. is_start_of_day ) then + if ( nday_of_year==1 .and. is_start_of_day ) then nyear_global = nyear_global + 1 if (mnproc.eq.1) write(io_stdo_bgc,'(a,i6)') . 'hamocc_step(): nyear_global = ', nyear_global @@ -57,8 +59,7 @@ #ifdef SED_OFFLINE ! accumulate bottom water tracers when in ! the last year of MICOM/HAMOCC simulation - if ( (lsed_wclim .or. lsed_spinup) .and. mod(nyear,maxyear_ocean)==0 - . .and. .not. nyear_global==0 ) then + if ( (lsed_wclim .or. lsed_spinup) .and. mod(nyear,maxyear_ocean)==0 ) then call prepare_clim(nstep) endif #endif