merge to head of development

.gitmodules

@@ -20,7 +20,7 @@
 [submodule "ncar-physics"]
         path          = src/physics/ncar_ccpp
 	url           = https://github.com/ESCOMP/atmospheric_physics
-	fxtag         = d46bb55e233e8f16b4e7a7b5a90352e99c7a5d72
+	fxtag         = 0ecfcc155ac0387ef9db3304611c6f3ef055ac1d
         fxrequired    = AlwaysRequired
         fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 [submodule "ccs_config"]

cime_config/config_archive.xml

@@ -0,0 +1,27 @@
+<components version="2.0">
+
+  <comp_archive_spec compname="cam" compclass="atm">
+    <rest_file_extension>r</rest_file_extension>
+    <rest_file_extension>rh\d*</rest_file_extension>
+    <rest_file_extension>rs</rest_file_extension>
+    <hist_file_extension>h\d*.*\.nc$</hist_file_extension>
+    <hist_file_extension>i\..*\.nc$</hist_file_extension>
+    <hist_file_extension>e</hist_file_extension>
+    <rest_history_varname>nhfil</rest_history_varname>
+    <rpointer>
+      <rpointer_file>rpointer.atm$NINST_STRING</rpointer_file>
+      <rpointer_content>$CASE.cam$NINST_STRING.r.$DATENAME.nc </rpointer_content>
+    </rpointer>
+    <test_file_names>
+      <tfile disposition="copy">rpointer.atm</tfile>
+      <tfile disposition="copy">rpointer.atm_9999</tfile>
+      <tfile disposition="copy">casename.cam.r.1976-01-01-00000.nc</tfile>
+      <tfile disposition="copy">casename.cam.rh4.1976-01-01-00000.nc</tfile>
+      <tfile disposition="move">casename.cam.h0.1976-01-01-00000.nc</tfile>
+      <tfile disposition="ignore">casename.cam.h0.1976-01-01-00000.nc.base</tfile>
+      <tfile disposition="move">casename.cam_0002.e.postassim.1976-01-01-00000.nc</tfile>
+      <tfile disposition="move">casename.cam_0002.e.preassim.1976-01-01-00000.nc</tfile>
+      <tfile disposition="move">casename.cam.i.1976-01-01-00000.nc</tfile>
+    </test_file_names>
+  </comp_archive_spec>
+</components>

cime_config/config_component.xml

@@ -8,6 +8,7 @@
       CAM
     ===============
    -->
+    <desc atm="CAM70[%1PCT][%4xCO2][%CCTS][%CFIRE][%CVBSX][%PORT][%RCO2][%SCAM][%SDYN][%WCCM][%WCMD][%WCSC][%WCTS][%WXIE]">CAM cam7 physics:</desc>
     <desc atm="CAM60[%1PCT][%4xCO2][%CCTS][%CFIRE][%CVBSX][%PORT][%RCO2][%SCAM][%SDYN][%WCCM][%WCMD][%WCSC][%WCTS][%WXIE]">CAM cam6 physics:</desc>
     <desc atm="CAM50[%CCTS][%CLB][%PORT][%RCO2][%SCAM][%SDYN][%WCSC][%WCTS]"              >CAM cam5 physics:</desc>
     <desc atm="CAM40[%PORT][%RCO2][%SCAM][%SDYN][%TMOZ][%WXIE][%WXIED][%WCMD]"                   >CAM cam4 physics:</desc>
@@ -120,6 +121,7 @@
     <valid_values></valid_values>
     <default_value></default_value>
     <values match="last" modifier='additive'>
+      <value compset="_CAM70">--physics-suites cam7</value>
 <!--      <value compset="_CAM40">-phys cam4</value>
       <value compset="_CAM50">-phys cam5</value>
       <value compset="_CAM60">-phys cam6</value> -->

cime_config/config_compsets.xml

@@ -104,6 +104,11 @@
   <!-- CAM tested compsets -->
   <!-- ****************************** -->
 
+  <compset>
+    <alias>FCAM7</alias>
+    <lname>2000_CAM70_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>F2010climo</alias>
     <lname>2010_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>

cime_config/config_pes.xml

@@ -72,6 +72,43 @@
       </pes>
     </mach>
   </grid>
+  <grid name="a%ne3np4">
+    <mach name="any">
+      <pes pesize="any" compset="any">
+        <comment>none</comment>
+        <ntasks>
+          <ntasks_atm>24</ntasks_atm>
+          <ntasks_lnd>24</ntasks_lnd>
+          <ntasks_rof>24</ntasks_rof>
+          <ntasks_ice>24</ntasks_ice>
+          <ntasks_ocn>24</ntasks_ocn>
+          <ntasks_glc>24</ntasks_glc>
+          <ntasks_wav>24</ntasks_wav>
+          <ntasks_cpl>24</ntasks_cpl>
+        </ntasks>
+        <nthrds>
+          <nthrds_atm>1</nthrds_atm>
+          <nthrds_lnd>1</nthrds_lnd>
+          <nthrds_rof>1</nthrds_rof>
+          <nthrds_ice>1</nthrds_ice>
+          <nthrds_ocn>1</nthrds_ocn>
+          <nthrds_glc>1</nthrds_glc>
+          <nthrds_wav>1</nthrds_wav>
+          <nthrds_cpl>1</nthrds_cpl>
+        </nthrds>
+        <rootpe>
+          <rootpe_atm>0</rootpe_atm>
+          <rootpe_lnd>0</rootpe_lnd>
+          <rootpe_rof>0</rootpe_rof>
+          <rootpe_ice>0</rootpe_ice>
+          <rootpe_ocn>0</rootpe_ocn>
+          <rootpe_glc>0</rootpe_glc>
+          <rootpe_wav>0</rootpe_wav>
+          <rootpe_cpl>0</rootpe_cpl>
+        </rootpe>
+      </pes>
+    </mach>
+  </grid>
   <grid name="a%ne30" >
     <mach name="any">
       <pes pesize="any" compset="any">

cime_config/namelist_definition_cam.xml

@@ -104,6 +104,15 @@
       <value hgrid="8x16" ic_ymd="10101" nlev="26">${DIN_LOC_ROOT}/atm/cam/inic/gaus/cami_0000-01-01_8x16_L26_c030228.nc</value>
       <value hgrid="8x16" ic_ymd="901" nlev="26">${DIN_LOC_ROOT}/atm/cam/inic/gaus/cami_0000-09-01_8x16_L26_c030918.nc</value>
       <value hgrid="8x16" ic_ymd="10101" nlev="30">${DIN_LOC_ROOT}/atm/cam/inic/gaus/cami_0000-01-01_8x16_L30_c090102.nc</value>
+      <value dyn="se" hgrid="ne3np4" nlev="93" chem="trop_strat_mam5_ts4">${DIN_LOC_ROOT}/atm/cam/inic/se/FCts4MTHIST_ne3pg3_spinup02.cam.i.1980-01-01_c240702.nc</value>
+      <value dyn="se" hgrid="ne3np4" ic_ymd="10101" nlev="32">${DIN_LOC_ROOT}/atm/cam/inic/se/cam6_QPC6_topo_ne3pg3_mg37_L32_01-01-31_c221214.nc</value>
+      <value dyn="se" hgrid="ne3np4" ic_ymd="901"   nlev="32">${DIN_LOC_ROOT}/atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-09-01-00000.nc</value>
+      <value dyn="se" hgrid="ne3np4" ic_ymd="10101" nlev="30">${DIN_LOC_ROOT}/atm/cam/inic/se/cami_0000-01-01_ne3np4_L30_c120315.nc</value>
+      <value dyn="se" hgrid="ne3np4" ic_ymd="901"   nlev="30">${DIN_LOC_ROOT}/atm/cam/inic/se/cami_0000-01-01_ne3np4_L30_c120315.nc</value>
+      <value dyn="se" hgrid="ne3np4" ic_ymd="10101" nlev="26">${DIN_LOC_ROOT}/atm/cam/inic/se/cami_0000-01-01_ne3np4_L26_c120525.nc</value>
+      <value dyn="se" hgrid="ne3np4" ic_ymd="901"   nlev="26">${DIN_LOC_ROOT}/atm/cam/inic/se/cami_0000-01-01_ne3np4_L26_c120525.nc</value>
+      <value dyn="se" hgrid="ne3np4" ic_ymd="10101" nlev="58">${DIN_LOC_ROOT}/atm/cam/inic/se/cam6_QPC6_topo_ne3pg3_mg37_L58_01-01-31_c221214.nc</value>
+      <value dyn="se" hgrid="ne3np4" ic_ymd="10101" nlev="93">${DIN_LOC_ROOT}/atm/cam/inic/se/cam6_FMTHIST_ne3pg3_mg37_L93_79-02-01_c240517.nc</value>
       <value dyn="se" hgrid="ne5np4" ic_ymd="10101" nlev="30">${DIN_LOC_ROOT}/atm/cam/inic/homme/cami-mam3_0000-01_ne5np4_L30.140707.nc</value>
       <value dyn="se" hgrid="ne16np4" ic_ymd="10101" nlev="26">${DIN_LOC_ROOT}/atm/cam/inic/se/ape_topo_cam4_ne16np4_L26_c171020.nc</value>
       <value dyn="se" hgrid="ne16np4" ic_ymd="10101" nlev="30">${DIN_LOC_ROOT}/atm/cam/inic/se/ape_topo_cam4_ne16np4_L30_c171020.nc</value>
@@ -208,6 +217,7 @@
       <value hgrid="2.5x3.33">${DIN_LOC_ROOT}/atm/cam/topo/USGS-gtopo30_2.5x3.33_remap_c100204.nc</value>
       <value hgrid="4x5">${DIN_LOC_ROOT}/atm/cam/topo/USGS-gtopo30_4x5_remap_c050520.nc</value>
       <value hgrid="10x15">${DIN_LOC_ROOT}/atm/cam/topo/fv_10x15_nc0540_Nsw042_Nrs008_Co060_Fi001_20171220.nc</value>
+      <value hgrid="ne3np4">${DIN_LOC_ROOT}/atm/cam/topo/se/ne3np4_gmted2010_modis_bedmachine_nc0540_Laplace1000_noleak_20230717.nc</value>
       <value hgrid="ne5np4">${DIN_LOC_ROOT}/atm/cam/topo/se/ne5np4_nc3000_Co360_Fi001_MulG_PF_nullRR_Nsw064_20170515.nc</value>
       <value hgrid="ne16np4">${DIN_LOC_ROOT}/atm/cam/topo/se/ne16np4_nc3000_Co120_Fi001_PF_nullRR_Nsw084_20171012.nc</value>
       <value hgrid="ne30np4">${DIN_LOC_ROOT}/atm/cam/topo/se/ne30np4_nc3000_Co060_Fi001_PF_nullRR_Nsw042_20171020.nc</value>
@@ -219,6 +229,7 @@
       <value hgrid="ne60np4" npg="2">${DIN_LOC_ROOT}/atm/cam/topo/se/ne60pg2_nc3000_Co030_Fi001_PF_nullRR_Nsw021_20171014.nc</value>
       <value hgrid="ne120np4" npg="2">${DIN_LOC_ROOT}/atm/cam/topo/se/ne120pg2_nc3000_Co015_Fi001_PF_nullRR_Nsw010_20171012.nc</value>
       <value hgrid="ne240np4" npg="2">${DIN_LOC_ROOT}/atm/cam/topo/se/ne240pg2_nc3000_Co008_Fi001_PF_nullRR_Nsw005_20171014.nc</value>
+      <value hgrid="ne3np4" npg="3">${DIN_LOC_ROOT}/atm/cam/topo/se/ne3pg3_gmted2010_modis_bedmachine_nc0540_Laplace1000_noleak_20230209.nc</value>
       <value hgrid="ne5np4" npg="3">${DIN_LOC_ROOT}/atm/cam/topo/se/ne5pg3_nc3000_Co360_Fi001_MulG_PF_nullRR_Nsw064_20170516.nc</value>
       <value hgrid="ne16np4" npg="3">${DIN_LOC_ROOT}/atm/cam/topo/se/ne16pg3_nc3000_Co120_Fi001_PF_nullRR_Nsw084_20171012.nc</value>
       <value hgrid="ne30np4" npg="3">${DIN_LOC_ROOT}/atm/cam/topo/se/ne30pg3_nc3000_Co060_Fi001_PF_nullRR_Nsw042_20171014.nc</value>
@@ -252,6 +263,18 @@
       <value>UNSET_PATH</value>
     </values>
   </entry>
+  <entry id="ncdata_check_err">
+    <type>logical</type>
+    <category>initial_conditions</category>
+    <group>physics_nl</group>
+    <desc>
+      Flag to determine whether to endrun if the ncdata check fails.
+      Default: FALSE
+    </desc>
+    <values>
+      <value>.false.</value>
+    </values>
+  </entry>
   <entry id="min_difference">
     <type>real</type>
     <category>diagnostics</category>

cime_config/testdefs/testlist_cam.xml

@@ -7,56 +7,98 @@
 
 
   <!-- Derecho physics tests -->
-  <test compset="FPHYStest" grid="ne3pg3_ne3pg3_mg37" name="SMS_Ln2" testmods="cam/outfrq_kessler_derecho_nooutput/">
+  <test compset="FPHYStest" grid="ne3pg3_ne3pg3_mg37" name="SMS_Ln2" testmods="cam/outfrq_kessler_derecho">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_sima"/>
       <machine name="derecho" compiler="gnu" category="aux_sima"/>
     </machines>
     <options>
       <option name="wallclock">00:10:00</option>
-      <option name="comment">Intel build test for Kessler physics</option>
+      <option name="comment">Test for Kessler physics</option>
     </options>
   </test>
-  <test compset="FPHYStest" grid="ne3pg3_ne3pg3_mg37" name="SMS_Ln2" testmods="cam/outfrq_held_suarez_derecho_nooutput/">
+  <test compset="FPHYStest" grid="ne3pg3_ne3pg3_mg37" name="SMS_Ln2" testmods="cam/outfrq_held_suarez_derecho">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_sima"/>
       <machine name="derecho" compiler="gnu" category="aux_sima"/>
     </machines>
     <options>
       <option name="wallclock">00:10:00</option>
-      <option name="comment">GNU build test for Held-Suarez physics</option>
+      <option name="comment">Test for Held-Suarez physics</option>
     </options>
   </test>
-  <test compset="FPHYStest" grid="ne3pg3_ne3pg3_mg37" name="SMS_Ln2" testmods="cam/outfrq_tj2016_derecho_nooutput/">
+  <test compset="FPHYStest" grid="ne3pg3_ne3pg3_mg37" name="SMS_Ln2" testmods="cam/outfrq_tj2016_before_coupler_derecho">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_sima"/>
       <machine name="derecho" compiler="gnu" category="aux_sima"/>
     </machines>
     <options>
       <option name="wallclock">00:10:00</option>
-      <option name="comment">GNU build test for Moist Held-Suarez physics</option>
+      <option name="comment">Test for Moist Held-Suarez (TJ2016) physics (physics_before_coupler group)</option>
+    </options>
+  </test>
+  <test compset="FPHYStest" grid="ne3pg3_ne3pg3_mg37" name="SMS_Ln2" testmods="cam/outfrq_tj2016_after_coupler_derecho">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_sima"/>
+      <machine name="derecho" compiler="gnu" category="aux_sima"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:10:00</option>
+      <option name="comment">Test for Moist Held-Suarez (TJ2016) physics (physics_after_coupler group)</option>
     </options>
   </test>
 
   <!-- Derecho dycore tests -->
-  <test compset="FKESSLER" grid="mpasa480_mpasa480" name="SMS_Ln2" testmods="cam/outfrq_kessler_mpas_derecho_nooutput/">
+  <test compset="FKESSLER" grid="mpasa480_mpasa480" name="SMS_Ln9" testmods="cam/outfrq_kessler_mpas_derecho">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_sima"/>
       <machine name="derecho" compiler="gnu" category="aux_sima"/>
     </machines>
     <options>
       <option name="wallclock">00:10:00</option>
-      <option name="comment">GNU build test for MPAS dycore (with Kessler physics)</option>
+      <option name="comment">Test for MPAS dycore (with Kessler physics)</option>
     </options>
   </test>
-  <test compset="FKESSLER" grid="ne3pg3_ne3pg3_mg37" name="SMS_Ln2" testmods="cam/outfrq_kessler_se_cslam_derecho_nooutput/">
+  <test compset="FKESSLER" grid="ne5pg3_ne5pg3_mg37" name="SMS_Ln9" testmods="cam/outfrq_se_cslam">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_sima"/>
+      <machine name="derecho" compiler="gnu" category="aux_sima"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:10:00</option>
+      <option name="comment">Test for SE-CSLAM dycore (with Kessler physics)</option>
+    </options>
+  </test>
+  <test compset="FHS94" grid="ne5pg3_ne5pg3_mg37" name="SMS_Ln9" testmods="cam/outfrq_se_cslam">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_sima"/>
+      <machine name="derecho" compiler="gnu" category="aux_sima"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:10:00</option>
+      <option name="comment">Test for SE-CSLAM dycore (with Held-Suarez physics)</option>
+    </options>
+  </test>
+  <test compset="FTJ16" grid="ne5pg3_ne5pg3_mg37" name="SMS_Ln9" testmods="cam/outfrq_se_cslam">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_sima"/>
+      <machine name="derecho" compiler="gnu" category="aux_sima"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:10:00</option>
+      <option name="comment">Test for SE-CSLAM dycore (with TJ2016 [moist Held-Suarez] physics)</option>
+    </options>
+  </test>
+
+  <!-- CAM7 physics tests -->
+  <test compset="FCAM7" grid="ne5pg3_ne5pg3_mg37" name="SMS_Ln9" testmods="cam/outfrq_se_cslam_analy_ic">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_sima"/>
       <machine name="derecho" compiler="gnu" category="aux_sima"/>
     </machines>
     <options>
       <option name="wallclock">00:10:00</option>
-      <option name="comment">GNU build test for SE-CSLAM dycore (with Kessler physics)</option>
+      <option name="comment">CAM7 test with SE-CSLAM dycore</option>
     </options>
   </test>
 </testlist>

cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho_nooutput/user_nl_cam → cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho/user_nl_cam

@@ -1,4 +1,7 @@
-ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_held_suarez_snapshot_derecho_gnu_before.nc
-ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_held_suarez_snapshot_derecho_gnu_after.nc
+ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_held_suarez_snapshot_derecho_gnu_cam_before_c20240412.nc
+ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_held_suarez_snapshot_derecho_gnu_cam_after_c20240412.nc
 debug_output=0
 pver=30
+hist_add_inst_fields;h2: ZM, T
+hist_output_frequency;h2: 2*nsteps
+hist_write_nstep0;h2: .true.

cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho_nooutput/user_nl_cam → cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho/user_nl_cam

@@ -1,4 +1,9 @@
-ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_kessler_snapshot_derecho_gnu_before.nc
-ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_kessler_snapshot_derecho_gnu_after.nc
+ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_kessler_snapshot_derecho_gnu_before_c20240412.nc
+ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_kessler_snapshot_derecho_gnu_after_c20240412.nc
+ncdata_check_err=.true.
+min_difference=1.0e-15
 debug_output=0
 pver=30
+hist_add_inst_fields;h2: Q, T
+hist_output_frequency;h2: 2*nsteps
+hist_write_nstep0;h2: .true.

cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho/user_nl_cam

@@ -0,0 +1,4 @@
+debug_output=0
+hist_add_inst_fields;h2: Q,T,U,V,PS
+hist_output_frequency;h2: nsteps
+hist_write_nstep0;h2: .true.

cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam/shell_commands

@@ -0,0 +1 @@
+./xmlchange CAM_LINKED_LIBS=" "

cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam/user_nl_cam

@@ -0,0 +1,3 @@
+hist_add_inst_fields;h1: T, Q, U, V, PS
+hist_output_frequency;h1: 1*nsteps
+hist_write_nstep0;h1: .true.

cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam_analy_ic/shell_commands

@@ -0,0 +1,2 @@
+./xmlchange CAM_LINKED_LIBS=" "
+./xmlchange --append CAM_CONFIG_OPTS="--analytic_ic"

cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam_analy_ic/user_nl_cam

@@ -0,0 +1,4 @@
+hist_add_inst_fields;h1: T, Q, U, V, PS
+hist_output_frequency;h1: 1*nsteps
+hist_write_nstep0;h1: .true.
+analytic_ic_type=held_suarez_1994

cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_after_coupler_derecho/shell_commands

@@ -0,0 +1 @@
+ ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites tj2016_sfc_pbl_hs"

cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_after_coupler_derecho/user_nl_cam

@@ -0,0 +1,7 @@
+ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_tj2016_sfc_pbl_hs_ne3pg3mg37_derecho_gnu_before.nc
+ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_tj2016_sfc_pbl_hs_ne3pg3mg37_derecho_gnu_after.nc
+debug_output=0
+pver=30
+hist_add_inst_fields;h2: Q, T
+hist_output_frequency;h2: 2*nsteps
+hist_write_nstep0;h2: .true.

cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho_nooutput/shell_commands → cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_before_coupler_derecho/shell_commands

@@ -1 +1 @@
- ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites tj2016"
+ ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites tj2016_precip"

cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho_nooutput/user_nl_cam → cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_before_coupler_derecho/user_nl_cam

@@ -1,4 +1,8 @@
 ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_tj2016_precip_tend_ne3pg3mg37_derecho_gnu_before.nc
 ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_tj2016_precip_tend_ne3pg3mg37_derecho_gnu_after.nc
+ncdata_check_err=.true.
 debug_output=0
 pver=30
+hist_add_inst_fields;h2: Q, T
+hist_output_frequency;h2: 2*nsteps
+hist_write_nstep0;h2: .true.