diff --git a/bld/configure b/bld/configure index 74da5d389f..86c6c4e65b 100755 --- 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 index 3dfd7dbf5b..462570da4a 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -2548,7 +2548,7 @@ 1.62D0 0.90D0 1.00D0 -1.5D0 +0.75D0 1.10D0 1.2D0 0.60D0 diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml index d8668677e5..84a3b2c314 100644 --- a/bld/namelist_files/use_cases/1850_cam_lt.xml +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -14,7 +14,7 @@ 'Q:H2O->UBC_FILE' -atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.185001-201412_c230509cdf5.nc +atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.1849-2014_c240604.nc CYCLICAL 1850 diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 383a59eb5a..941bfc6331 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -34,14 +34,6 @@ - - - - - - - - @@ -940,9 +932,16 @@ + + + + + + + + - @@ -1378,9 +1377,9 @@ - + - + @@ -1771,13 +1770,13 @@ - + - + - + @@ -1789,15 +1788,6 @@ - - - - - - - - - @@ -2758,16 +2748,6 @@ - - - - - - - - - - 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 deleted file mode 100644 index d3fa399380..0000000000 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/shell_commands +++ /dev/null @@ -1,3 +0,0 @@ -./xmlchange ROF_NCPL=\$ATM_NCPL -./xmlchange RUN_STARTDATE=0001-12-14 -./xmlchange CAM_CONFIG_OPTS="-phys cam7 -microphys mg2 -chem ghg_mam4 -nlev 32" 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 deleted file mode 100644 index 1e5bc2fa49..0000000000 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/user_nl_cam +++ /dev/null @@ -1,9 +0,0 @@ -mfilt=1,1,1,1,1,1,1,1,1,1 -ndens=1,1,1,1,1,1,1,1,1,1 -nhtfrq=-24,-24,-24,-24,-24,-24,-24,-24,-24,-24 -tracer_cnst_specifier = 'O3','OH','NO3','HO2','HALONS' -flbc_cycle_yr=1850 -phys_grid_ctem_nfreq=-6 -phys_grid_ctem_zm_nbas=16 -phys_grid_ctem_za_nlat=15 -fincl2 = 'THphys','VTHzm','WTHzm','UVzm','UWzm','Uzm','Vzm','Wzm','THzm' diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/shell_commands new file mode 100644 index 0000000000..0ed4cccb0b --- /dev/null +++ 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 new file mode 100644 index 0000000000..77424c653b --- /dev/null +++ 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/outfrq1d_14dec_ghg_cam7/user_nl_clm b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/user_nl_clm similarity index 98% rename from cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/user_nl_clm rename to cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/user_nl_clm index 5634334558..0d83b5367b 100644 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/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 index 23dac55242..af4c5c8878 100644 --- 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 index 2a29da2630..8294c223f2 100644 --- 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