From 2ea3531754de29f337bed4ac0116c514b9606035 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Mon, 29 Jul 2024 15:01:59 -0400 Subject: [PATCH 1/2] fix #1087 and #1103 --- bld/configure | 4 ++ bld/namelist_files/namelist_defaults_cam.xml | 2 +- doc/ChangeLog | 58 ++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/bld/configure b/bld/configure index c4be8e3f34..a5bb9da324 100755 --- a/bld/configure +++ b/bld/configure @@ -641,6 +641,10 @@ if ($dyn_pkg eq 'fv3' and $spmd eq 'OFF') { die "configure: FATAL: the fv3 dycore requires at least 6 tasks SPMD must not be switched off.$eol"; } +if ($dyn_pkg eq 'se' and $smp eq 'ON') { + die "CAM configure: ERROR: The SE dycore does not currently work with threading on. $eol"; +} + if ($print>=2) { print "Dynamics package: $dyn_pkg$eol"; } $cfg_ref->set('analytic_ic', (defined $opts{'analytic_ic'}) ? $opts{'analytic_ic'} : 0); diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 42b6500bec..c330ad13a2 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -565,7 +565,7 @@ atm/cam/physprops/mam4_mode4_rrtmg_c130628.nc atm/cam/physprops/mam4_mode1_rrtmg_aeronetdust_sig1.6_dgnh.48_c140304.nc -atm/cam/physprops/mam4_mode3_rrtmg_aeronetdust_sig1.2_dgnl.40_c150219.nc +atm/cam/physprops/mam4_mode3_rrtmg_aeronetdust_sig1.2_dgnl.40_c150219.nc atm/cam/physprops/mam4_mode1_rrtmg_aeronetdust_sig1.6_dgnh.48_c140304.nc atm/cam/physprops/mam4_mode2_rrtmg_aitkendust_c141106.nc diff --git a/doc/ChangeLog b/doc/ChangeLog index 745825d004..a7e01084ad 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,63 @@ =============================================================== +Tag name: +Originator(s): eaton +Date: +One-line Summary: miscellaneous fixes +Github PR URL: + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + +Fixes for: +Issue #1087 - Prevent users from turning on OpenMP when using the SE dycore +Issue #1103 - Bug with physprops files for mam4_mode3 for RRTMGP + +Describe any changes made to build system: +. add check to configure to fail if SMP is specified with the SE dycore. + +Describe any changes made to the namelist: +. fix attributes in namelist defaults to get the correct physprops file for + mam4_mode3 with RRTMGP + +List any changes to the defaults for the boundary datasets: none + +Describe any substantial timing or memory changes: none + +Code reviewed by: cacraig + +List all files eliminated: none + +List all files added and what they do: none + +List all existing files that have been modified, and describe the changes: + +bld/configure +. If smp is on and the dycore is SE, issue message and exit. + +bld/namelist_files/namelist_defaults_cam.xml +. add missing phys="cam6" attribute so cam7 runs get the correct version of + mam4_mode3_file for 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: + +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: + +=============================================================== +=============================================================== + Tag name: cam6_4_016 Originator(s): brianpm, eaton Date: 25 July 2024 From 5a332002485d4fa7325940d14385a3143080ddc8 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 30 Jul 2024 10:15:23 -0400 Subject: [PATCH 2/2] update ChangeLog --- doc/ChangeLog | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index a7e01084ad..fb2de533c7 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,10 +1,10 @@ =============================================================== -Tag name: +Tag name: cam6_4_017 Originator(s): eaton -Date: +Date: 30 July 2024 One-line Summary: miscellaneous fixes -Github PR URL: +Github PR URL: https://github.com/ESCOMP/CAM/pull/1112 Purpose of changes (include the issue number and title text for each relevant GitHub issue): @@ -13,7 +13,7 @@ Issue #1087 - Prevent users from turning on OpenMP when using the SE dycore Issue #1103 - Bug with physprops files for mam4_mode3 for RRTMGP Describe any changes made to build system: -. add check to configure to fail if SMP is specified with the SE dycore. +. add check in CAM's configure to fail if SMP is specified with the SE dycore. Describe any changes made to the namelist: . fix attributes in namelist defaults to get the correct physprops file for @@ -38,22 +38,37 @@ bld/namelist_files/namelist_defaults_cam.xml . add missing phys="cam6" attribute so cam7 runs get the correct version of mam4_mode3_file for 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_rrtmgp (Overall: DIFF) details: +. diff due to updating the mam4_mode3 physprop file + +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_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s (Overall: PEND) details: +SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: PEND) details: +- pre-existing failures -- need fix in CLM external + +SMS_D_Ln9.T42_T42.FSCAM.derecho_intel.cam-outfrq9s (Overall: FAIL) details: +- pre-existing failure -- need fix in CICE external izumi/nag/aux_cam: -izumi/gnu/aux_cam: +DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details: +- pre-existing failure - issue #670 + +izumi/gnu/aux_cam: All PASS CAM tag used for the baseline comparison tests if different than previous tag: -Summarize any changes to answers: +Summarize any changes to answers: BFB except cam7/rrtmgp configurations +have different answers due to changing the mam4_mode3 physprops file. =============================================================== ===============================================================