Merge pull request #1178 from brian-eaton/cam7def

brian-eaton · web-flow · commit db75458f1cc0 · 2024-10-25T11:49:06.000-04:00
cam6_4_043: Make RRTMGP default radiation in CAM7
diff --git a/bld/configure b/bld/configure
@@ -1074,9 +1074,12 @@ my $rad_pkg = 'none';
 if ($phys_pkg =~ m/cam4|spcam_sam1mom/) {
     $rad_pkg = 'camrt';
 }
-elsif ($phys_pkg =~ m/cam5|cam6|cam7|spcam_m2005/) {
+elsif ($phys_pkg =~ m/cam5|cam6|spcam_m2005/) {
     $rad_pkg = 'rrtmg';
 }
+elsif ($phys_pkg =~ m/cam7/) {
+    $rad_pkg = 'rrtmgp';
+}
 # Allow the user to override the default via the commandline.
 my $use_rrtmgp_gpu = 0;
 if (defined $opts{'rad'}) {
diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml
@@ -2548,7 +2548,7 @@
 <seasalt_emis_scale ver="mam7"                                           >1.62D0</seasalt_emis_scale>
 <seasalt_emis_scale ver="strat"                                          >0.90D0</seasalt_emis_scale>
 <seasalt_emis_scale ver="strat" clubb_sgs="1"                            >1.00D0</seasalt_emis_scale>
-<seasalt_emis_scale ver="strat" clubb_sgs="1" phys="cam7"                >1.5D0</seasalt_emis_scale>
+<seasalt_emis_scale ver="strat" clubb_sgs="1" phys="cam7"                >0.75D0</seasalt_emis_scale>
 <seasalt_emis_scale ver="strat" clubb_sgs="1" hgrid="1.9x2.5" phys="cam6">1.10D0</seasalt_emis_scale>
 <seasalt_emis_scale ver="strat" spcam_clubb_sgs="1"                      >1.2D0</seasalt_emis_scale>
 <seasalt_emis_scale ver="strat" clubb_sgs="1" silhs="1"                  >0.60D0</seasalt_emis_scale>
diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml
@@ -14,7 +14,7 @@
 
 <!-- Low top upper boundary conditions -->
 <ubc_specifier>'Q:H2O->UBC_FILE'</ubc_specifier>
-<ubc_file_path>atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.185001-201412_c230509cdf5.nc</ubc_file_path>
+<ubc_file_path>atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.1849-2014_c240604.nc</ubc_file_path>
 <ubc_file_input_type>CYCLICAL</ubc_file_input_type>
 <ubc_file_cycle_yr>1850</ubc_file_cycle_yr>
 
diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml
@@ -34,14 +34,6 @@
       <option name="wallclock">00:10:00</option>
     </options>
   </test>
-  <test compset="F2000climo" grid="f10_f10_mg37" name="SMS_Lm13" testmods="cam/outfrq1m" supported="false">
-    <machines>
-      <machine name="derecho" compiler="intel" category="aux_cam"/>
-    </machines>
-    <options>
-       <option name="wallclock">03:00:00</option>
-    </options>
-  </test>
   <test compset="F2000climo" grid="f09_f09_mg17" name="PFS">
     <machines>
       <machine name="derecho" compiler="gnu" category="prebeta"/>
@@ -940,9 +932,16 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
+  <test compset="QPWmaC6" grid="f45_f45_mg37" name="ERP_Ln9_P24x2" testmods="cam/outfrq9s_mee_fluxes" supported="false">
+    <machines>
+      <machine name="izumi" compiler="gnu" category="aux_cam"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+    </options>
+  </test>
   <test compset="QPWmaC6" grid="f45_f45_mg37" name="ERP_Ln9_P24x3" testmods="cam/outfrq9s_mee_fluxes" supported="false">
     <machines>
-      <machine name="derecho" compiler="intel" category="aux_cam"/>
       <machine name="derecho" compiler="intel" category="waccm"/>
     </machines>
     <options>
@@ -1378,9 +1377,9 @@
     </options>
   </test>
 
-  <test compset="F2000climo" grid="mpasa480_mpasa480" name="ERS_Ln9_P36x1" testmods="cam/outfrq9s_mpasa480">
+  <test compset="F2000climo" grid="mpasa480_mpasa480" name="ERS_Ln9_P24x1" testmods="cam/outfrq9s_mpasa480">
     <machines>
-      <machine name="derecho" compiler="intel" category="aux_cam"/>
+      <machine name="izumi" compiler="gnu" category="aux_cam"/>
     </machines>
     <options>
       <option name="wallclock">00:45:00</option>
@@ -1771,13 +1770,13 @@
       <option name="comment">CAM7 low top ~40 km</option>
     </options>
   </test>
-  <test compset="FLTHIST" grid="ne30pg3_ne30pg3_mg17" name="ERP_D_Ln9" testmods="cam/outfrq9s_rrtmgp">
+  <test compset="FLTHIST" grid="ne3pg3_ne3pg3_mg37" name="ERP_D_Ln9" testmods="cam/outfrq9s">
     <machines>
-      <machine name="derecho" compiler="intel" category="aux_cam"/>
+      <machine name="izumi" compiler="gnu" category="aux_cam"/>
     </machines>
     <options>
       <option name="wallclock">00:30:00</option>
-      <option name="comment">CAM7 low top ~40 km w/ RRTMGP</option>
+      <option name="comment">CAM7 low top ~40 km</option>
     </options>
   </test>
   <test compset="FMTHIST" grid="ne30pg3_ne30pg3_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s">
@@ -1789,15 +1788,6 @@
       <option name="comment">CAM7 mid top ~80 km</option>
     </options>
   </test>
-  <test compset="FMTHIST" grid="ne30pg3_ne30pg3_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s_rrtmgp">
-    <machines>
-      <machine name="derecho" compiler="intel" category="prealpha"/>
-    </machines>
-    <options>
-      <option name="wallclock">00:20:00</option>
-      <option name="comment">CAM7 mid top ~80 km w/ RRTMGP</option>
-    </options>
-  </test>
   <test compset="FMTHIST" grid="ne30pg3_ne30pg3_mg17" name="ERP_D_Ln9" testmods="cam/outfrq9s">
     <machines>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -2758,16 +2748,6 @@
       <option name="wallclock">00:10:00</option>
     </options>
   </test>
-  <test compset="F1850" grid="f10_f10_mg37" name="ERS_Ld3" testmods="cam/outfrq1d_14dec_ghg_cam7">
-    <machines>
-      <machine name="derecho" compiler="intel" category="aux_cam"/>
-      <machine name="derecho" compiler="intel" category="ghg_cam"/>
-    </machines>
-    <options>
-      <option name="wallclock">00:10:00</option>
-      <option name="comment">Checks that exact restarts occur when crossing the December 16th date boundary with WACCM-SC chemistry in low top configuration</option>
-    </options>
-  </test>
   <test compset="FWsc2000climo" grid="f10_f10_mg37" name="ERP_Ld3" testmods="cam/outfrq1d_14dec">
     <machines>
       <machine name="derecho" compiler="intel" category="waccm"/>
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/shell_commands
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/user_nl_cam
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/shell_commands
@@ -0,0 +1,4 @@
+./xmlchange ROF_NCPL=\$ATM_NCPL
+./xmlchange GLC_NCPL=\$ATM_NCPL
+./xmlchange RUN_STARTDATE="1999-12-31"
+./xmlchange START_TOD="82800"
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/user_nl_cam
@@ -0,0 +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_eoy/user_nl_clm b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/user_nl_clm
@@ -21,7 +21,7 @@
 ! Set maxpatch_glcmec    with GLC_NEC                            option
 ! Set glc_do_dynglacier  with GLC_TWO_WAY_COUPLING               env variable
 !----------------------------------------------------------------------------------
-hist_nhtfrq = -24
+hist_nhtfrq = 9
 hist_mfilt  = 1
 hist_ndens  = 1
 
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/shell_commands
@@ -3,6 +3,6 @@
 ./xmlchange ROOTPE='0'
 ./xmlchange ROF_NCPL=`./xmlquery --value ATM_NCPL`
 ./xmlchange GLC_NCPL=`./xmlquery --value ATM_NCPL`
-./xmlchange CAM_CONFIG_OPTS=' -microphys mg3' --append
+./xmlchange CAM_CONFIG_OPTS=' -microphys mg3 -rad rrtmg' --append
 ./xmlchange TIMER_DETAIL='6'
 ./xmlchange TIMER_LEVEL='999'
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,5 +1,137 @@
 ===============================================================
 
+Tag name: cam6_4_043
+Originator(s): eaton
+Date: 25 Oct 2024
+One-line Summary: Make RRTMGP default radiation in CAM7
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1178
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+
+. Issue #1143 - turn RRTMGP on by default for CAM7 + some namelist defaults
+
+. Remove some tests that added rrtmgp to the cam7 configuration.  Not
+  needed since rrtmgp is now the default in cam7.
+
+. Remove test of old cam7 development configuration (32 levels) which is no
+  longer needed.
+
+. Remove 13 month F2000climo test.  This was originally created to make
+  sure we didn't make changes that hurt the performance of our production
+  configuration for CMIP6 simulations.  This is no longer needed.
+
+. Issue #1154 - Create at least one CAM7 regression test on izumi
+  - add ERP_D_Ln9.ne3pg3_ne3pg3_mg37.FLTHIST.izumi_gnu.cam-outfrq9s
+
+
+Describe any changes made to build system: none
+
+Describe any changes made to the namelist:
+
+. change default value of seasalt_emis_scale to 0.75 for cam7 (both lt and mt)
+  This is a cam7 tuning mod from issue #1143
+
+. update ubc_file_path for cam7 (lt only) to 
+  atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.1849-2014_c240604.nc
+
+List any changes to the defaults for the boundary datasets:
+
+. update ubc_file_path for cam7 (lt only) to 
+  atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.1849-2014_c240604.nc
+
+Describe any substantial timing or memory changes: none
+
+Code reviewed by: cacraig, peverwhee, sjsprecious
+
+List all files eliminated:
+
+cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/*
+. test removed
+
+List all files added and what they do:
+
+cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/*
+. mods for a test like outfrq9s, but add RUN_STARTDATE="1999-12-31" and
+  START_TOD="82800" so that the run goes over the end of year boundary.
+
+List all existing files that have been modified, and describe the changes:
+
+bld/configure
+. set default radiation package for cam7 to rrtmgp
+
+bld/namelist_files/namelist_defaults_cam.xml
+. change default value of seasalt_emis_scale to 0.75 for cam7 (both lt and mt)
+  This is a cam7 tuning mod from issue #1143
+
+bld/namelist_files/use_cases/1850_cam_lt.xml
+. update ubc_file_path to 
+  atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.1849-2014_c240604.nc
+
+cime_config/testdefs/testlist_cam.xml
+. These tests which added rrtmgp to cam7 are no longer needed.
+  ERP_D_Ln9.ne30pg3_ne30pg3_mg17.FLTHIST.*_*.cam-outfrq9s_rrtmgp
+  SMS_D_Ln9.ne30pg3_ne30pg3_mg17.FMTHIST.*_*.cam-outfrq9s_rrtmgp
+. Remove old cam7 configuration test which is no longer needed
+  ERS_Ld3.f10_f10_mg37.F1850.izumi_gnu.cam-outfrq1d_14dec_ghg_cam7
+. Move these low resolution tests from derecho to izumi
+  ERP_Ln9_P24x2.f45_f45_mg37.QPWmaC6.izumi_gnu.cam-outfrq9s_mee_fluxes
+  ERS_Ln9_P24x1.mpasa480_mpasa480.F2000climo.izumi_gnu.cam-outfrq9s_mpasa480
+. Add this low resolution CAM7-LT test to izumi
+  ERP_D_Ln9.ne3pg3_ne3pg3_mg37.FLTHIST.izumi_gnu.cam-outfrq9s
+. Remove 13 month cam6 test which is no longer needed.
+  SMS_Lm13.f10_f10_mg37.F2000climo.derecho_intel.cam-outfrq1m
+
+cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/shell_commands
+. add '-rad rrtmg' to CAM_CONFIG_OPTS.  This test is using a non-standard
+  configuration of cam7, and this override is needed since the default
+  radiation scheme for cam7 has changed to rrtmgp.
+
+
+If there were any failures reported from running test_driver.sh on any test
+platform, and checkin with these failures has been OK'd by the gatekeeper,
+then copy the lines from the td.*.status files for the failed tests to the
+appropriate machine below.  All failed tests must be justified.
+
+derecho/intel/aux_cam:
+
+ERP_D_Ln9.ne30pg3_ne30pg3_mg17.FLTHIST.derecho_intel.cam-outfrq9s (Overall: DIFF)
+ERP_Ld3.ne30pg3_ne30pg3_mg17.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF)
+SMS_D_Ln9.ne30pg3_ne30pg3_mg17.FMTHIST.derecho_intel.cam-outfrq9s (Overall: DIFF)
+SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mg17.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF)
+- expected diffs due to changes in cam7 configuration/tuning
+
+ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
+- pre-existing failure due to HEMCO not having reproducible results issues #1018 and #856
+
+SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie (Overall: FAIL)
+SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL)
+- pre-existing failures due to build-namelist error requiring CLM/CTSM external update.
+
+derecho/nvhpc/aux_cam:
+
+ERS_Ln9_G4-a100-openacc.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_mg3_default (Overall: DIFF)
+- expected diff due to changing seasalt_emis_scale for cam7
+
+izumi/nag/aux_cam:
+
+DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details:
+ - pre-existing failure -- issue #670
+
+izumi/gnu/aux_cam:
+
+ERP_D_Ln9.ne3pg3_ne3pg3_mg37.FLTHIST.izumi_gnu.cam-outfrq9s (Overall: DIFF) details:
+ERP_Ln9_P24x2.f45_f45_mg37.QPWmaC6.izumi_gnu.cam-outfrq9s_mee_fluxes (Overall: DIFF) details:
+ERS_Ln9_P24x1.mpasa480_mpasa480.F2000climo.izumi_gnu.cam-outfrq9s_mpasa480 (Overall: DIFF) details:
+- new tests are missing baselines
+
+CAM tag used for the baseline comparison tests if different than previous
+tag:
+
+Summarize any changes to answers: BFB except for cam7 configurations.
+
+===============================================================
+===============================================================
+
 Tag name: cam6_4_042
 Originator(s): pel, nusbaume
 Date: Oct 9, 2024

Original file line number	Diff line number	Diff line change
`@@ -1074,9 +1074,12 @@ my $rad_pkg = 'none';`
`1074`	`1074`	`if ($phys_pkg =~ m/cam4\|spcam_sam1mom/) {`
`1075`	`1075`	`$rad_pkg = 'camrt';`
`1076`	`1076`	`}`
`1077`		`-elsif ($phys_pkg =~ m/cam5\|cam6\|cam7\|spcam_m2005/) {`
	`1077`	`+elsif ($phys_pkg =~ m/cam5\|cam6\|spcam_m2005/) {`
`1078`	`1078`	`$rad_pkg = 'rrtmg';`
`1079`	`1079`	`}`
	`1080`	`+elsif ($phys_pkg =~ m/cam7/) {`
	`1081`	`+ $rad_pkg = 'rrtmgp';`
	`1082`	`+}`
`1080`	`1083`	`# Allow the user to override the default via the commandline.`
`1081`	`1084`	`my $use_rrtmgp_gpu = 0;`
`1082`	`1085`	`if (defined $opts{'rad'}) {`