Merge pull request ESMCI#398 from ckoven/hist_mfilt_fix

Allow first history tape to have other than one time point per file.
pesieber · Jun 1, 2018 · 07cdf9f · 07cdf9f
2 parents 3373a9f + 870f5dc
commit 07cdf9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/main/controlMod.F90 b/src/main/controlMod.F90
@@ -323,9 +323,7 @@ subroutine control_init( )
        ! History and restart files
 
        do i = 1, max_tapes
-          if (hist_nhtfrq(i) == 0) then
-             hist_mfilt(i) = 1
-          else if (hist_nhtfrq(i) < 0) then
+          if (hist_nhtfrq(i) < 0) then
              hist_nhtfrq(i) = nint(-hist_nhtfrq(i)*SHR_CONST_CDAY/(24._r8*dtime))
           endif
        end do

diff --git a/src/main/histFileMod.F90 b/src/main/histFileMod.F90
@@ -65,7 +65,7 @@ module histFileMod
   integer, public :: &
        hist_ndens(max_tapes) = 2         ! namelist: output density of netcdf history files
   integer, public :: &
-       hist_mfilt(max_tapes) = 30        ! namelist: number of time samples per tape
+       hist_mfilt(max_tapes) = (/ 1, (30, ni=2, max_tapes)/)        ! namelist: number of time samples per tape
   logical, public :: &
        hist_dov2xy(max_tapes) = (/.true.,(.true.,ni=2,max_tapes)/) ! namelist: true=> do grid averaging
   integer, public :: &