update to cam6_3_141

brian-eaton · Dec 12, 2023 · 5cfacb0 · 5cfacb0
2 parents 3144053 + e64a526
commit 5cfacb0
Show file tree

Hide file tree

Showing 28 changed files with 2,084 additions and 1,271 deletions.
diff --git a/bld/namelist_files/namelist_definition.xml b/bld/namelist_files/namelist_definition.xml
@@ -1882,6 +1882,15 @@ the {{ hilight }}fincl#{{ closehilight }} namelist items.
 Default: FALSE
 </entry>
 
+<entry id="write_nstep0" type="logical"  category="history"
+       group="cam_history_nl" valid_values="" >
+If true then write the nstep==0 time sample to all history files except
+the monthly average file.  This output is primarily useful for development
+and debugging as it captures changes to the model state made during the
+initialization phase of the run.
+Default: FALSE
+</entry>
+
 <entry id="fexcl1" type="char*24(1000)"  category="history"
        group="cam_history_nl" valid_values="" >
 List of fields to exclude from the 1st history file (by default the name

diff --git a/cime_config/SystemTests/sct.py b/cime_config/SystemTests/sct.py
@@ -43,7 +43,7 @@ def _case_two_setup(self):
         append_to_user_nl_files(caseroot = self._get_caseroot(), component = "cam", contents = "MFILT    = 1,7,1,1,1,1")
         append_to_user_nl_files(caseroot = self._get_caseroot(), component = "cam", contents = "nhtfrq   = 1,1,1,1,1,1")
         append_to_user_nl_files(caseroot = self._get_caseroot(), component = "cam", contents = "fincl2='T','Q','TDIFF','QDIFF','LANDFRAC'")
-        append_to_user_nl_files(caseroot = self._get_caseroot(), component = "cam", contents = "iopfile = '../"+case_name+".cam.h1."+RUN_STARTDATE+"-00000.nc'")
+        append_to_user_nl_files(caseroot = self._get_caseroot(), component = "cam", contents = "iopfile = '../"+case_name+".cam.h1i."+RUN_STARTDATE+"-00000.nc'")
         append_to_user_nl_files(caseroot = self._get_caseroot(), component = "cam", contents = "inithist = 'YEARLY'")
         append_to_user_nl_files(caseroot = self._get_caseroot(), component = "cam", contents = "scm_cambfb_mode                = .true.")
         append_to_user_nl_files(caseroot = self._get_caseroot(), component = "cam", contents = "scm_use_obs_uv         = .true.")
@@ -65,7 +65,7 @@ def _component_compare_test(self, suffix1, suffix2,
                                 success_change=False,
                                 ignore_fieldlist_diffs=False):
         with self._test_status:
-            stat,netcdf_filename,err=run_cmd('ls ./run/case2run/*h1*8400.nc ')
+            stat,netcdf_filename,err=run_cmd('ls ./run/case2run/*h1i*8400.nc ')
             stat,DIFFs,err=run_cmd('ncdump -ff -p 9,17 -v QDIFF,TDIFF '+netcdf_filename+' | egrep //\.\*DIFF | sed s/^\ \*// | sed s/^0,/0.0,/ | sed s/^0\;/0.0\;/ | sed s/\[,\;\].\*// |  uniq')
             array_of_DIFFs=DIFFs.split("\n")
             answer=max([abs(float(x)) for x in array_of_DIFFs])

diff --git a/cime_config/testdefs/testmods_dirs/cam/cam4_port/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/cam4_port/user_nl_cam
@@ -13,3 +13,4 @@
  rad_data_output = .false.
  mfilt=100,100
  nhtfrq=-120,73
+ write_nstep0 = .true.
diff --git a/cime_config/testdefs/testmods_dirs/cam/cam4_port5d/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/cam4_port5d/user_nl_cam
@@ -13,6 +13,7 @@
  rad_data_output = .false.
  mfilt=100,100
  nhtfrq=-120,73
+ write_nstep0 = .true.
  ncdata='$DIN_LOC_ROOT/atm/cam/inic/fv/aqua_0006-01-01_1.9x2.5_L26_c161020.nc'
  use_topo_file=.false. 
  atm_dep_flux=.false.
diff --git a/cime_config/testdefs/testmods_dirs/cam/cam5_port_f45/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/cam5_port_f45/user_nl_cam
@@ -13,3 +13,4 @@
  rad_data_output = .false.
  mfilt=100,100
  nhtfrq=-120,73
+ write_nstep0 = .true.
diff --git a/cime_config/testdefs/testmods_dirs/cam/cam5_port_ne30/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/cam5_port_ne30/user_nl_cam
@@ -13,3 +13,4 @@
  rad_data_output = .false.
  mfilt=100,100
  nhtfrq=-120,73
+ write_nstep0 = .true.
diff --git a/cime_config/testdefs/testmods_dirs/cam/cam6_port_f09/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/cam6_port_f09/user_nl_cam
@@ -13,6 +13,7 @@
  rad_data_output = .false.
  mfilt=100,100
  nhtfrq=-120,73
+ write_nstep0 = .true.
 
  prescribed_strataero_3modes = .true.
  prescribed_strataero_cycle_yr          = 1999         

diff --git a/cime_config/testdefs/testmods_dirs/cam/nudging/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/nudging/user_nl_cam
@@ -7,6 +7,7 @@
  fincl3='U','V','T','Q','PS','Nudge_U','Nudge_V','Nudge_T','Nudge_Q','Target_U','Target_V','Target_T','Target_Q'
  nhtfrq=0,-6,1
  mfilt =1,4,48
+ write_nstep0 = .true.
 
  ncdata='$DIN_LOC_ROOT/atm/cam/nudging/ERAI_fv09_BILIN/ERAI_fv09_DART2.cam2.i.2009-01-01-00000.nc'
 /

diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq1d/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq1d/user_nl_cam
@@ -1,3 +1,4 @@
 mfilt=1,1,1,1,1,1
 ndens=1,1,1,1,1,1
 nhtfrq=-24,-24,-24,-24,-24,-24
+write_nstep0 = .true.
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3h/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq3h/user_nl_cam
@@ -1,3 +1,4 @@
 mfilt=1,1,1,1,1,1,1,1,1,1
 ndens=1,1,1,1,1,1,1,1,1,1
 nhtfrq=-3,-3,-3,-3,-3,-3,-3,-3,-3,-3
+write_nstep0 = .true.
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq3s/user_nl_cam
@@ -1,5 +1,6 @@
 mfilt=1,1,1,1,1,1
 ndens=1,1,1,1,1,1
 nhtfrq=3,3,3,3,3,3
+write_nstep0=.true.
 inithist='ENDOFRUN'
 pbuf_global_allocate=.false.
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cospsathist/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cospsathist/user_nl_cam
@@ -1,6 +1,7 @@
  ndens=1,1,1,1,1,1
  nhtfrq=3,3,3,3,-2,3
  mfilt=1,1,1,1,1,1
+ write_nstep0=.true.
  sathist_track_infile='$DIN_LOC_ROOT/atm/cam/sat/satellite_profilelist_20020125_20101030_c110204_noleap.nc'
  sathist_fincl = 'Q','T','PS','U','V','FV'
  fincl3 = 'Q','T','PS','FV','UWzm:I'

diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_diags/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_diags/user_nl_cam
@@ -1,6 +1,7 @@
 mfilt=1,1,1,1,1,1
 ndens=2,2,2,2,2,2
 nhtfrq=3,3,3,3,3,3
+write_nstep0=.true.
 inithist='ENDOFRUN'
 history_amwg=.true.
 history_aerosol=.true.

diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq9s/user_nl_cam
@@ -1,4 +1,5 @@
 mfilt=1,1,1,1,1,1
 ndens=1,1,1,1,1,1
 nhtfrq=9,9,9,9,9,9
+write_nstep0=.true.
 inithist='ENDOFRUN'
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_apmee/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_apmee/user_nl_cam
@@ -1,6 +1,7 @@
 mfilt=1,1,1,1,1,1
 ndens=1,1,1,1,1,1
 nhtfrq=9,9,9,9,9,9
+write_nstep0=.true.
 inithist='ENDOFRUN'
 
 mee_ion_inline=.true.

diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mee_fluxes/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mee_fluxes/user_nl_cam
@@ -1,6 +1,7 @@
 mfilt=1,1,1,1,1,1
 ndens=1,1,1,1,1,1
 nhtfrq=9,9,9,9,9,9
+write_nstep0=.true.
 inithist='ENDOFRUN'
 
 mee_fluxes_filepath='$DIN_LOC_ROOT/atm/waccm/mee/RBSP-ECT_FB_precip_c211124.nc'

diff --git a/cime_config/testdefs/testmods_dirs/cam/reduced_hist1d/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/reduced_hist1d/user_nl_cam
@@ -2,6 +2,7 @@
  mfilt=1,1,1,1,1,1
  ndens=1,1,1,1,1,1
  nhtfrq=-24,-24,-24,-24,-24,-24
+ write_nstep0=.true.
 
  fincl1 = ' '
  fincl2 = ' '

diff --git a/cime_config/testdefs/testmods_dirs/cam/scm_prep/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/scm_prep/user_nl_cam
@@ -2,3 +2,4 @@ NDENS    = 1,1
 MFILT    = 1,10
 nhtfrq   = 0,1
 inithist_all = .true.
+write_nstep0 = .true.
diff --git a/cime_config/testdefs/testmods_dirs/cam/scm_prep_c6/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/scm_prep_c6/user_nl_cam
@@ -2,3 +2,4 @@ NDENS    = 1,1
 MFILT    = 1,10
 nhtfrq   = 0,1
 inithist_all = .true.
+write_nstep0 = .true.
diff --git a/cime_config/testdefs/testmods_dirs/cam/scmarm/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/scmarm/user_nl_cam
@@ -1,3 +1,4 @@
 mfilt=1500
 nhtfrq   = 1
 history_budget=.true.
+write_nstep0 = .true.
diff --git a/cime_config/testdefs/testmods_dirs/cam/silhs/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/silhs/user_nl_cam
@@ -1,5 +1,6 @@
 dtime = 1800
 nhtfrq = 0,-24,-6,-3
+write_nstep0 = .true.
 mfilt = 1,5000,5000
 ndens = 2,2,2,2,2,2
 history_budget = .true.