From 1371a56cce9d8a249009c4be2cee42abe01b13e5 Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Mon, 30 Sep 2024 11:44:26 -0600 Subject: [PATCH 1/5] Update paths to use new atmos_phys 'schemes' directory. --- .gitmodules | 6 +++--- bld/configure | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index ffb20365f1..5a46246e11 100644 --- a/.gitmodules +++ b/.gitmodules @@ -35,10 +35,10 @@ [submodule "atmos_phys"] path = src/atmos_phys - url = https://github.com/ESCOMP/atmospheric_physics - fxtag = atmos_phys0_05_000 + url = https://github.com/nusbaume/atmospheric_physics + fxtag = fbef341 fxrequired = AlwaysRequired - fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics + fxDONOTUSEurl = https://github.com/nusbaume/atmospheric_physics [submodule "fv3"] path = src/dynamics/fv3 diff --git a/bld/configure b/bld/configure index 5168b0402c..366b6c42c4 100755 --- a/bld/configure +++ b/bld/configure @@ -2191,9 +2191,9 @@ sub write_filepath if ($simple_phys) { print $fh "$camsrcdir/src/physics/simple\n"; - print $fh "$camsrcdir/src/atmos_phys/kessler\n"; - print $fh "$camsrcdir/src/atmos_phys/held_suarez\n"; - print $fh "$camsrcdir/src/atmos_phys/tj2016\n"; + print $fh "$camsrcdir/src/atmos_phys/schemes/kessler\n"; + print $fh "$camsrcdir/src/atmos_phys/schemes/held_suarez\n"; + print $fh "$camsrcdir/src/atmos_phys/schemes/tj2016\n"; } # Weak scaling fix. This has to come before physics/cam and before dycores @@ -2332,9 +2332,9 @@ sub write_filepath print $fh "$camsrcdir/src/physics/cam\n"; #Add the CCPP'ized subdirectories - print $fh "$camsrcdir/src/atmos_phys/tropopause_find\n"; - print $fh "$camsrcdir/src/atmos_phys/zhang_mcfarlane\n"; - print $fh "$camsrcdir/src/atmos_phys/dry_adiabatic_adjust\n"; + print $fh "$camsrcdir/src/atmos_phys/schemes/tropopause_find\n"; + print $fh "$camsrcdir/src/atmos_phys/schemes/zhang_mcfarlane\n"; + print $fh "$camsrcdir/src/atmos_phys/schemes/dry_adiabatic_adjust\n"; # Dynamics package and test utilities print $fh "$camsrcdir/src/dynamics/$dyn\n"; @@ -2360,7 +2360,7 @@ sub write_filepath print $fh "$camsrcdir/src/control\n"; print $fh "$camsrcdir/src/utils\n"; print $fh "$camsrcdir/src/utils/cam_ccpp\n"; - print $fh "$camsrcdir/src/atmos_phys/utilities\n"; + print $fh "$camsrcdir/src/atmos_phys/schemes/utilities\n"; $fh->close; From 7a5b414c9faf04ea4df4ea0fe58254df5da51872 Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Mon, 30 Sep 2024 15:29:20 -0600 Subject: [PATCH 2/5] Fix atmos_phys gitmodules path. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 5a46246e11..1afec3519a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -38,7 +38,7 @@ url = https://github.com/nusbaume/atmospheric_physics fxtag = fbef341 fxrequired = AlwaysRequired - fxDONOTUSEurl = https://github.com/nusbaume/atmospheric_physics + fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics [submodule "fv3"] path = src/dynamics/fv3 From a28f4f5ab778d6509ec924088bf60b44b48f6e8a Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Wed, 2 Oct 2024 15:24:44 -0600 Subject: [PATCH 3/5] Update ChangeLog. --- doc/ChangeLog | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/atmos_phys | 2 +- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 4cc0bfd27c..17fd3feb71 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,58 @@ +=============================================================== + +Tag name: +Originator(s): nusbaume +Date: Oct 2, 2024 +One-line Summary: Bring in re-organized atmospheric_physics repo +Github PR URL: https://github.com/ESCOMP/CAM/pull/1160 + +Purpose of changes (include the issue number and title text for each relevant +GitHub issue): + +Fixes #1156 -> Modify CAM build system to handle re-organized +atmospheric_physics repo + +Describe any changes made to build system: + +Updated the 'configure' script to use the new atmospheric_physics directory +locations + +Describe any changes made to the namelist: N/A + +List any changes to the defaults for the boundary datasets: N/A + +Describe any substantial timing or memory changes: N/A + +Code reviewed by: + +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 .gitmodules + - Update the atmos_phys external + +M bld/configure + - Update atmos_phys paths to correctly point to new source code locations + +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: ALL PASS + +Summarize any changes to answers: bit-for-bit + +=============================================================== + Tag name: cam6_4_037 Originator(s): jimmielin Date: Sep 30, 2024 diff --git a/src/atmos_phys b/src/atmos_phys index 93a1dbf9c4..fbef3417a8 160000 --- a/src/atmos_phys +++ b/src/atmos_phys @@ -1 +1 @@ -Subproject commit 93a1dbf9c47ccedb8d8a48eba640e48ab2048774 +Subproject commit fbef3417a8eeb641a5ee19cca65d607223388ea1 From a3b6e3202137784a4eb8617408ef9a7764f2a323 Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Thu, 3 Oct 2024 14:38:53 -0600 Subject: [PATCH 4/5] Make changes as requested during code review. --- .gitmodules | 4 ++-- bld/configure | 3 +-- src/atmos_phys | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1afec3519a..31ffc7e88e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -35,8 +35,8 @@ [submodule "atmos_phys"] path = src/atmos_phys - url = https://github.com/nusbaume/atmospheric_physics - fxtag = fbef341 + url = https://github.com/ESCOMP/atmospheric_physics + fxtag = atmos_phys0_05_001 fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics diff --git a/bld/configure b/bld/configure index 366b6c42c4..c5b2f5c3c3 100755 --- a/bld/configure +++ b/bld/configure @@ -2335,6 +2335,7 @@ sub write_filepath print $fh "$camsrcdir/src/atmos_phys/schemes/tropopause_find\n"; print $fh "$camsrcdir/src/atmos_phys/schemes/zhang_mcfarlane\n"; print $fh "$camsrcdir/src/atmos_phys/schemes/dry_adiabatic_adjust\n"; + print $fh "$camsrcdir/src/atmos_phys/schemes/utilities\n"; # Dynamics package and test utilities print $fh "$camsrcdir/src/dynamics/$dyn\n"; @@ -2360,8 +2361,6 @@ sub write_filepath print $fh "$camsrcdir/src/control\n"; print $fh "$camsrcdir/src/utils\n"; print $fh "$camsrcdir/src/utils/cam_ccpp\n"; - print $fh "$camsrcdir/src/atmos_phys/schemes/utilities\n"; - $fh->close; } diff --git a/src/atmos_phys b/src/atmos_phys index fbef3417a8..f8ce60bf40 160000 --- a/src/atmos_phys +++ b/src/atmos_phys @@ -1 +1 @@ -Subproject commit fbef3417a8eeb641a5ee19cca65d607223388ea1 +Subproject commit f8ce60bf40f800623f8eb3065021ec5dfa9e6b45 From 3888b0235fd2b16aeab118f2cfb24c47d0ca0919 Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Mon, 14 Oct 2024 21:24:20 -0600 Subject: [PATCH 5/5] Finalize ChangeLog. --- doc/ChangeLog | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index ce3834456b..ca3a39c57d 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -43,10 +43,28 @@ appropriate machine below. All failed tests must be justified. derecho/intel/aux_cam: -derecho/nvhpc/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 + +ERP_Ln9_P24x3.f45_f45_mg37.QPWmaC6.derecho_intel.cam-outfrq9s_mee_fluxes (Overall: PEND) +ERS_Ld3.f10_f10_mg37.F1850.derecho_intel.cam-outfrq1d_14dec_ghg_cam7 (Overall: PEND) +ERS_Ln9_P36x1.mpasa480_mpasa480.F2000climo.derecho_intel.cam-outfrq9s_mpasa480 (Overall: PEND) +SMS_Lm13.f10_f10_mg37.F2000climo.derecho_intel.cam-outfrq1m (Overall: PEND) +- Running into resource limits due to being switched to run in the 'develop' queue rather than 'main' +- Should be fixed in future CIME/ccs_config update. + +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: PEND) +- build-namelist error requiring CLM/CTSM external update. + +derecho/nvhpc/aux_cam: ALL PASS izumi/nag/aux_cam: +DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) +- pre-existing failure - issue #670 + izumi/gnu/aux_cam: ALL PASS Summarize any changes to answers: bit-for-bit