From 4c16c5ce37ce644a1bdecf7cb3116cdb68c62427 Mon Sep 17 00:00:00 2001 From: ckoven Date: Tue, 29 May 2018 11:12:30 -0600 Subject: [PATCH 1/2] applied changes in ctsm github issue #85 to fix mfilt error --- src/main/controlMod.F90 | 4 +--- src/main/histFileMod.F90 | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/controlMod.F90 b/src/main/controlMod.F90 index 3cbae8ed680..5e4378ae2ca 100644 --- 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 index fea351a17dd..de3c5614468 100644 --- 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 :: & From 870f5dcdec816637f05b61e21e3cd1a6c08bd000 Mon Sep 17 00:00:00 2001 From: ckoven Date: Tue, 29 May 2018 11:49:34 -0600 Subject: [PATCH 2/2] compile-time bugfix on prior --- src/main/histFileMod.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/histFileMod.F90 b/src/main/histFileMod.F90 index de3c5614468..8899917c5f8 100644 --- 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) = (/ 1, (30, ni=2, max_tapes/) ! 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 :: &