From 1b44f4c8dd27c679251590ba09bc2a0e6c5cb28c Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Thu, 3 Oct 2024 13:55:46 -0400 Subject: [PATCH 01/10] cam7 default radiation changed to rrtmgp --- bld/configure | 5 ++++- bld/namelist_files/namelist_defaults_cam.xml | 2 +- bld/namelist_files/use_cases/1850_cam_lt.xml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bld/configure b/bld/configure index e64e78b6a6..a75bf0a4aa 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 From 282450cc607b2b87b49dd04efddbb002ef53ce9a Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Thu, 17 Oct 2024 11:03:56 -0400 Subject: [PATCH 02/10] remove unneeded tests; update cice external --- .gitmodules | 2 +- cime_config/testdefs/testlist_cam.xml | 18 ----- doc/ChangeLog | 96 +++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 19 deletions(-) diff --git a/.gitmodules b/.gitmodules index 224ee10052..0cdc572730 100644 --- a/.gitmodules +++ b/.gitmodules @@ -186,7 +186,7 @@ fxDONOTUSEurl = https://github.com/NCAR/ParallelIO [submodule "cice"] path = components/cice url = https://github.com/ESCOMP/CESM_CICE -fxtag = cesm_cice6_5_0_12 +fxtag = cesm3_cice6_5_0_8 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 383a59eb5a..d6dff37fbb 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -1771,15 +1771,6 @@ - - - - - - - - - @@ -1789,15 +1780,6 @@ - - - - - - - - - diff --git a/doc/ChangeLog b/doc/ChangeLog index 1528bacc56..dc6e3f73e6 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,101 @@ =============================================================== +Tag name: +Originator(s): eaton +Date: +One-line Summary: Make RRTMGP default radiation in CAM7 +Github PR URL: + +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. + +. Update cice external to cesm3_cice6_5_0_8 to allow building with + python3.12 + + +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) + +. 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: + +Describe any substantial timing or memory changes: + +Code reviewed by: + +List all files eliminated: + +List all files added and what they do: + +List all existing files that have been modified, and describe the changes: + +.gitmodules +. cesm_cice6_5_0_12 -> cesm3_cice6_5_0_8 + +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) + +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 + +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: + +derecho/nvhpc/aux_cam: + +izumi/nag/aux_cam: + +izumi/gnu/aux_cam: + +CAM tag used for the baseline comparison tests if different than previous +tag: + +Summarize any changes to answers, i.e., +- what code configurations: +- what platforms/compilers: +- nature of change (roundoff; larger than roundoff but same climate; new + climate): + +If bitwise differences were observed, how did you show they were no worse +than roundoff? + +If this tag changes climate describe the run(s) done to evaluate the new +climate in enough detail that it(they) could be reproduced, i.e., +- source tag (all code used must be in the repository): +- platform/compilers: +- configure commandline: +- build-namelist command (or complete namelist): +- MSS location of output: + +MSS location of control simulations used to validate new climate: + +URL for AMWG diagnostics output used to validate new climate: + +=============================================================== +=============================================================== + Tag name: cam6_4_041 Originator(s): fvitt Date: 16 Oct 2024 From 6aed8aa5f72ca9d2365d461ec5027397665b440c Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Thu, 17 Oct 2024 11:18:44 -0400 Subject: [PATCH 03/10] update submodule directories --- cime | 2 +- components/cice | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cime b/cime index fcb9c6ec1e..2776043f0d 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit fcb9c6ec1e15f2f33995cf247aef3f8ef9f121eb +Subproject commit 2776043f0d20d2bc1094afeb48e0cc242b0b0407 diff --git a/components/cice b/components/cice index f14ec8339b..4cf6fed360 160000 --- a/components/cice +++ b/components/cice @@ -1 +1 @@ -Subproject commit f14ec8339bc5bc4a7a0664da5e247b5cfda531a1 +Subproject commit 4cf6fed3601b2f1e662e7e8c8a7a751ab2654a26 From 4de55b10f9f2568dc08ac66c7bf1950602e07599 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 22 Oct 2024 10:44:20 -0400 Subject: [PATCH 04/10] testing updates; revert cice external --- .gitmodules | 2 +- cime_config/testdefs/testlist_cam.xml | 40 ++++++++-------- .../outfrq1d_14dec_ghg_cam7/shell_commands | 3 -- .../cam/outfrq1d_14dec_ghg_cam7/user_nl_cam | 9 ---- .../cam/outfrq1d_14dec_ghg_cam7/user_nl_clm | 27 ----------- doc/ChangeLog | 47 +++++++++---------- 6 files changed, 42 insertions(+), 86 deletions(-) delete mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/shell_commands delete mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/user_nl_cam delete mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/user_nl_clm diff --git a/.gitmodules b/.gitmodules index 0cdc572730..224ee10052 100644 --- a/.gitmodules +++ b/.gitmodules @@ -186,7 +186,7 @@ fxDONOTUSEurl = https://github.com/NCAR/ParallelIO [submodule "cice"] path = components/cice url = https://github.com/ESCOMP/CESM_CICE -fxtag = cesm3_cice6_5_0_8 +fxtag = cesm_cice6_5_0_12 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index d6dff37fbb..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,6 +1770,15 @@ + + + + + + + + + @@ -2740,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/outfrq1d_14dec_ghg_cam7/user_nl_clm b/cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/user_nl_clm deleted file mode 100644 index 5634334558..0000000000 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/user_nl_clm +++ /dev/null @@ -1,27 +0,0 @@ -!---------------------------------------------------------------------------------- -! Users should add all user specific namelist changes below in the form of -! namelist_var = new_namelist_value -! -! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options -! are set in the CLM_NAMELIST_OPTS env variable. -! -! EXCEPTIONS: -! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting -! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting -! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting -! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting -! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting -! Set irrigate by the CLM_BLDNML_OPTS -irrig setting -! Set dtime with L_NCPL option -! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options -! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases -! (includes $inst_string for multi-ensemble cases) -! Set glc_grid with CISM_GRID option -! Set glc_smb with GLC_SMB option -! Set maxpatch_glcmec with GLC_NEC option -! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable -!---------------------------------------------------------------------------------- -hist_nhtfrq = -24 -hist_mfilt = 1 -hist_ndens = 1 - diff --git a/doc/ChangeLog b/doc/ChangeLog index dc6e3f73e6..97df8cdfc9 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -13,8 +13,15 @@ Purpose of changes (include the issue number and title text for each relevant Gi . Remove some tests that added rrtmgp to the cam7 configuration. Not needed since rrtmgp is now the default in cam7. -. Update cice external to cesm3_cice6_5_0_8 to allow building with - python3.12 +. 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 @@ -34,13 +41,13 @@ Code reviewed by: List all files eliminated: +cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/* +. test removed + List all files added and what they do: List all existing files that have been modified, and describe the changes: -.gitmodules -. cesm_cice6_5_0_12 -> cesm3_cice6_5_0_8 - bld/configure . set default radiation package for cam7 to rrtmgp @@ -55,6 +62,15 @@ 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 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, @@ -72,26 +88,7 @@ izumi/gnu/aux_cam: CAM tag used for the baseline comparison tests if different than previous tag: -Summarize any changes to answers, i.e., -- what code configurations: -- what platforms/compilers: -- nature of change (roundoff; larger than roundoff but same climate; new - climate): - -If bitwise differences were observed, how did you show they were no worse -than roundoff? - -If this tag changes climate describe the run(s) done to evaluate the new -climate in enough detail that it(they) could be reproduced, i.e., -- source tag (all code used must be in the repository): -- platform/compilers: -- configure commandline: -- build-namelist command (or complete namelist): -- MSS location of output: - -MSS location of control simulations used to validate new climate: - -URL for AMWG diagnostics output used to validate new climate: +Summarize any changes to answers: BFB except for cam7 configurations. =============================================================== =============================================================== From ac96d9c4bd49a4826fda797dc3ac12f8e2aeb07f Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 22 Oct 2024 10:52:55 -0400 Subject: [PATCH 05/10] update submodule directories --- components/cice | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cice b/components/cice index 4cf6fed360..f14ec8339b 160000 --- a/components/cice +++ b/components/cice @@ -1 +1 @@ -Subproject commit 4cf6fed3601b2f1e662e7e8c8a7a751ab2654a26 +Subproject commit f14ec8339bc5bc4a7a0664da5e247b5cfda531a1 From 701fdd11eea4eef05df577d52c42851f1da6115b Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 22 Oct 2024 12:55:54 -0400 Subject: [PATCH 06/10] update ChangeLog --- doc/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 97df8cdfc9..9796fe7a1a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -4,7 +4,7 @@ Tag name: Originator(s): eaton Date: One-line Summary: Make RRTMGP default radiation in CAM7 -Github PR URL: +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): From f783af2e31efa084e95eb3f06d45af365c0fdabb Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Wed, 23 Oct 2024 11:54:28 -0400 Subject: [PATCH 07/10] fix derecho/nvhpc test --- .../testmods_dirs/cam/outfrq9s_mg3_default/shell_commands | 2 +- doc/ChangeLog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 860070da47..fa94ef3cdf 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -72,6 +72,12 @@ cime_config/testdefs/testlist_cam.xml . 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 From 43b5cc03751b3b86f91215e8389a5fdca9e56254 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Wed, 23 Oct 2024 17:31:22 -0400 Subject: [PATCH 08/10] add test mods outfrq9s_eoy --- .../cam/outfrq9s_eoy/shell_commands | 4 +++ .../cam/outfrq9s_eoy/user_nl_cam | 5 ++++ .../cam/outfrq9s_eoy/user_nl_clm | 27 +++++++++++++++++++ doc/ChangeLog | 8 ++++-- 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/shell_commands create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/user_nl_cam create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/user_nl_clm 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/outfrq9s_eoy/user_nl_clm b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/user_nl_clm new file mode 100644 index 0000000000..0d83b5367b --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/user_nl_clm @@ -0,0 +1,27 @@ +!---------------------------------------------------------------------------------- +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! +! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options +! are set in the CLM_NAMELIST_OPTS env variable. +! +! EXCEPTIONS: +! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting +! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting +! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting +! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting +! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting +! Set irrigate by the CLM_BLDNML_OPTS -irrig setting +! Set dtime with L_NCPL option +! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options +! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases +! (includes $inst_string for multi-ensemble cases) +! Set glc_grid with CISM_GRID option +! Set glc_smb with GLC_SMB option +! Set maxpatch_glcmec with GLC_NEC option +! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable +!---------------------------------------------------------------------------------- +hist_nhtfrq = 9 +hist_mfilt = 1 +hist_ndens = 1 + diff --git a/doc/ChangeLog b/doc/ChangeLog index fa94ef3cdf..3a5a198b61 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -21,7 +21,7 @@ Purpose of changes (include the issue number and title text for each relevant Gi 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 + - add ERP_D_Ln9.ne3pg3_ne3pg3_mg37.FLTHIST.izumi_gnu.cam-outfrq9s_eoy Describe any changes made to build system: none @@ -46,6 +46,10 @@ cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/* List all files added and what they do: +cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/* +. new 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 @@ -68,7 +72,7 @@ cime_config/testdefs/testlist_cam.xml 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 + ERP_D_Ln9.ne3pg3_ne3pg3_mg37.FLTHIST.izumi_gnu.cam-outfrq9s_eoy . Remove 13 month cam6 test which is no longer needed. SMS_Lm13.f10_f10_mg37.F2000climo.derecho_intel.cam-outfrq1m From 419e128ca24b6ba0abca5068d9c8013fea50e5f7 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Thu, 24 Oct 2024 12:56:43 -0400 Subject: [PATCH 09/10] update ChangeLog --- doc/ChangeLog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 3a5a198b61..ecf47d6e4f 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -29,6 +29,7 @@ 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 @@ -47,7 +48,7 @@ cime_config/testdefs/testmods_dirs/cam/outfrq1d_14dec_ghg_cam7/* List all files added and what they do: cime_config/testdefs/testmods_dirs/cam/outfrq9s_eoy/* -. new test like outfrq9s, but add RUN_STARTDATE="1999-12-31" and +. 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: @@ -57,6 +58,7 @@ bld/configure 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 @@ -72,7 +74,7 @@ cime_config/testdefs/testlist_cam.xml 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_eoy + 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 From 463cd302e095f229a4fed11ea77fb8a274762fe5 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 25 Oct 2024 11:42:12 -0400 Subject: [PATCH 10/10] update ChangeLog --- doc/ChangeLog | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index ecf47d6e4f..8294c223f2 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,8 +1,8 @@ =============================================================== -Tag name: +Tag name: cam6_4_043 Originator(s): eaton -Date: +Date: 25 Oct 2024 One-line Summary: Make RRTMGP default radiation in CAM7 Github PR URL: https://github.com/ESCOMP/CAM/pull/1178 @@ -21,7 +21,7 @@ Purpose of changes (include the issue number and title text for each relevant Gi 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_eoy + - add ERP_D_Ln9.ne3pg3_ne3pg3_mg37.FLTHIST.izumi_gnu.cam-outfrq9s Describe any changes made to build system: none @@ -36,9 +36,12 @@ Describe any changes made to the namelist: List any changes to the defaults for the boundary datasets: -Describe any substantial timing or memory changes: +. 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 -Code reviewed by: +Describe any substantial timing or memory changes: none + +Code reviewed by: cacraig, peverwhee, sjsprecious List all files eliminated: @@ -91,12 +94,36 @@ 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: