From de302e6e535752059cdee637074c00e5a2d9fef5 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Fri, 7 Feb 2025 14:38:05 -0700 Subject: [PATCH 1/4] Update namelist settings --- bld/namelist_files/namelist_defaults_cam.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index e4ee34e115..d0c27f677b 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -2164,7 +2164,7 @@ 0.1 0.5 4.2 - 4.25 + 4.5 0.0 1.0 0.1 @@ -2528,7 +2528,7 @@ 0.55D0 0.22D0 0.70D0 -1.30D0 +2.30D0 0.8D0 0.8D0 0.8D0 @@ -2563,7 +2563,7 @@ 0.9D0 -Zender_2003 +Leung_2023 atm @@ -2572,7 +2572,7 @@ 1.62D0 0.90D0 1.00D0 -0.75D0 +1.50D0 1.10D0 1.2D0 0.60D0 From a1b5274f6fa8f600aad45db77a150f8a6c37aa07 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Fri, 7 Feb 2025 15:24:03 -0700 Subject: [PATCH 2/4] Address review comments --- bld/namelist_files/namelist_defaults_cam.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index d0c27f677b..8ab86672a1 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -2529,6 +2529,7 @@ 0.22D0 0.70D0 2.30D0 +2.30D0 0.8D0 0.8D0 0.8D0 @@ -2563,7 +2564,8 @@ 0.9D0 -Leung_2023 + Zender_2003 + Leung_2023 atm From 2f2d047a2efdbe928e49467ca5053d4772f9e05a Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Fri, 7 Feb 2025 15:58:48 -0700 Subject: [PATCH 3/4] Change all dust_emis_fact which are cam7 to new default --- bld/namelist_files/namelist_defaults_cam.xml | 38 ++++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 8ab86672a1..c7239134ba 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -2516,13 +2516,13 @@ 0.45D0 0.45D0 0.35D0 -1.30D0 +2.30D0 0.30D0 -0.30D0 +2.30D0 0.45D0 -0.45D0 +2.30D0 0.45D0 -0.45D0 +2.30D0 0.45D0 0.55D0 @@ -2531,37 +2531,37 @@ 2.30D0 2.30D0 0.8D0 -0.8D0 +2.30D0 0.8D0 -0.8D0 +2.30D0 0.8D0 -0.8D0 +2.30D0 0.8D0 -0.8D0 +2.30D0 0.8D0 -0.8D0 +2.30D0 0.8D0 -0.8D0 +2.30D0 0.8D0 -0.8D0 +2.30D0 0.8D0 -0.8D0 +2.30D0 0.8D0 -0.8D0 +2.30D0 0.8D0 -0.8D0 +2.30D0 0.70D0 -0.70D0 +2.300D0 0.13D0 0.26D0 -0.26D0 +2.30D0 0.7D0 -0.7D0 +2.30D0 0.24D0 -0.24D0 +2.30D0 0.9D0 -0.9D0 +2.30D0 Zender_2003 From 0a7aac56098847710b15165cfc73dd54cd7a642b Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Sun, 9 Feb 2025 21:35:02 -0700 Subject: [PATCH 4/4] Update ChangeLog for cam6_4_063 --- doc/ChangeLog | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index b7ccd3b6e8..570d28ad94 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,6 +1,73 @@ =============================================================== +Tag name: cam6_4_063 +Originator(s): cacraig, PeterHjortLauritzen +Date: Feb 9, 2025 +One-line Summary: Update namelist settings for beta06 +Github PR URL: https://github.com/ESCOMP/CAM/pull/1252 + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + - Namelist changes for CAM7: https://github.com/ESCOMP/CAM/issues/1251 + - Need new dust-related namelist settings on by default: https://github.com/ESCOMP/CAM/1249 + +Describe any changes made to build system: N/A + +Describe any changes made to the namelist: + - Change namelist settings for seasalt_emis_scale, clubb_c8, dust_emis_method and dust_emis_fact + +List any changes to the defaults for the boundary datasets: N/A + +Describe any substantial timing or memory changes: N/A + +Code reviewed by: PeterHjortLauritzen, adamrher, ekluzek + +List all files eliminated: N/A + +List all files added and what they do: N/A + +List all existing files that have been modified, and describe the changes: +M bld/namelist_files/namelist_defaults_cam.xml + - Change namelist settings for seasalt_emis_scale, clubb_c8, dust_emis_method and dust_emis_fact + +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_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) + SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF) + - 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 + + ERP_D_Ln9.ne30pg3_ne30pg3_mg17.FLTHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPLT.derecho_intel.cam-outfrq3s_cosp (Overall: DIFF) details: + ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPMT.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERP_Ld3.ne30pg3_ne30pg3_mg17.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF) details: + SMS_D_Ln9.ne30pg3_ne30pg3_mg17.FMTHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mg17.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF) details: + - All CAM7 runs will have answer changes (NLCOMP differences for these runs as well) + +derecho/nvhpc/aux_cam: + ERS_Ln9.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: FAIL) + - pre-existing failure -- issue #1220 + +izumi/nag/aux_cam: All BFB + +izumi/gnu/aux_cam: + ERP_D_Ln9.ne3pg3_ne3pg3_mg37.FLTHIST.izumi_gnu.cam-outfrq9s (Overall: DIFF) details: + ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPLT.izumi_gnu.cam-outfrq9s (Overall: DIFF) details: + ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPMT.izumi_gnu.cam-outfrq9s (Overall: DIFF) details: + - All CAM7 runs will have answer changes (NLCOMP differences for these runs as well) + +=============================================================== + +=============================================================== + Tag name: cam6_4_062 Originator(s): juliob, cacraig, PeterHjortLauritzen Date: Feb 7, 2025