diff --git a/.gitmodules b/.gitmodules index ba5ec2cfe3..6f2f1c2f0f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,8 +13,8 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CARMA_base.git [submodule "pumas"] - path = src/physics/pumas - url = https://github.com/ESCOMP/PUMAS + path = src/physics/pumas + url = https://github.com/ESCOMP/PUMAS fxrequired = AlwaysRequired fxtag = pumas_cam-release_v1.38 fxDONOTUSEurl = https://github.com/ESCOMP/PUMAS @@ -116,21 +116,21 @@ [submodule "cism"] path = components/cism url = https://github.com/ESCOMP/CISM-wrapper -fxtag = cismwrap_2_2_005 +fxtag = cismwrap_2_2_006 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper [submodule "rtm"] path = components/rtm url = https://github.com/ESCOMP/RTM -fxtag = rtm1_0_84 +fxtag = rtm1_0_86 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/RTM [submodule "mosart"] path = components/mosart url = https://github.com/ESCOMP/MOSART -fxtag = mosart1.1.07 +fxtag = mosart1.1.08 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/MOSART @@ -144,28 +144,28 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute [submodule "ccs_config"] path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git -fxtag = ccs_config_cesm1.0.39 +fxtag = ccs_config_cesm1.0.40 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git [submodule "cime"] path = cime url = https://github.com/ESMCI/cime -fxtag = cime6.1.72 +fxtag = cime6.1.93 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git -fxtag = cmeps1.0.39 +fxtag = cmeps1.0.47 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git [submodule "cdeps"] path = components/cdeps url = https://github.com/ESCOMP/CDEPS.git -fxtag = cdeps1.0.69 +fxtag = cdeps1.0.73 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git @@ -179,7 +179,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share [submodule "parallelio"] path = libraries/parallelio url = https://github.com/NCAR/ParallelIO -fxtag = pio2_6_3 +fxtag = pio2_6_4 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/NCAR/ParallelIO @@ -193,14 +193,14 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE [submodule "clm"] path = components/clm url = https://github.com/ESCOMP/CTSM -fxtag = ctsm5.3.017 +fxtag = ctsm5.3.029 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CTSM [submodule "fms"] path = libraries/FMS url = https://github.com/ESCOMP/FMS_interface -fxtag = fi_240828 +fxtag = fi_250411 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface diff --git a/ccs_config b/ccs_config index 2df4bbd68b..3886cfe3d5 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 2df4bbd68b2398a8fdc9be101ee42f90a671d3f3 +Subproject commit 3886cfe3d5f2b630fb98d5d133576b656ab46fac diff --git a/cime b/cime index 71d2b71216..5f6a6a8334 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit 71d2b71216cc39abfb8224cc55861bd6424c95f9 +Subproject commit 5f6a6a8334dc1b168e47add97daa983fa8ade49f diff --git a/cime_config/config_archive.xml b/cime_config/config_archive.xml index 0a6a139ecd..5f8059da1f 100644 --- a/cime_config/config_archive.xml +++ b/cime_config/config_archive.xml @@ -9,12 +9,14 @@ e nhfil - rpointer.atm$NINST_STRING + rpointer.cam$NINST_STRING.$DATENAME $CASE.cam$NINST_STRING.r.$DATENAME.nc - rpointer.atm - rpointer.atm_9999 + rpointer.cam.1976-01-01-00000 + rpointer.cam_9999.1976-01-01-00000 + rpointer.cam.1976-02-01-00000 + rpointer.cam_9999.1976-01-02-00000 casename.cam.r.1976-01-01-00000.nc casename.cam.rh4.1976-01-01-00000.nc casename.cam.h0.1976-01-01-00000.nc diff --git a/components/cdeps b/components/cdeps index 3f37963f69..9e57b278de 160000 --- a/components/cdeps +++ b/components/cdeps @@ -1 +1 @@ -Subproject commit 3f37963f69f71379d7017772b5d058d73d3857d6 +Subproject commit 9e57b278de18cf69351bc693fe1988143e859fa7 diff --git a/components/cism b/components/cism index 41843ef8fe..0a4e6cfe88 160000 --- a/components/cism +++ b/components/cism @@ -1 +1 @@ -Subproject commit 41843ef8fed91fcf60e2ea217c4f6f2ee5133c5d +Subproject commit 0a4e6cfe8828cd28cdab06f83a7c1eb464c1ca8c diff --git a/components/clm b/components/clm index 203db121c0..be65fad30a 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 203db121c01b593324078ecb55d7535e45723989 +Subproject commit be65fad30a741fc594bca9e1221ffe987e7bf271 diff --git a/components/cmeps b/components/cmeps index 189b02e2b3..dfe357ec28 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit 189b02e2b36b9a5a064150179721de45af3bbacf +Subproject commit dfe357ec28da465b1d0e435594c6bd6700ce62f3 diff --git a/components/mosart b/components/mosart index 330574fbd8..00a87c9084 160000 --- a/components/mosart +++ b/components/mosart @@ -1 +1 @@ -Subproject commit 330574fbd8a4810b7a168175690cbf7e1a7f6dab +Subproject commit 00a87c9084af1af0d2b14d14e3d432f6808681f9 diff --git a/components/rtm b/components/rtm index 6899b55816..26e96f500b 160000 --- a/components/rtm +++ b/components/rtm @@ -1 +1 @@ -Subproject commit 6899b55816ee4d9b7cf983d74ba2997b97a13c4d +Subproject commit 26e96f500b9500b32a870db20eed6b1bd37587ea diff --git a/doc/ChangeLog b/doc/ChangeLog index 3d945667a3..2381ecdeb7 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,115 @@ + +=============================================================== + +Tag name: cam6_4_089 +Originator(s): cacraig, jedwards +Date: April 28, 2025 +One-line Summary: Update externals to match alpha06f and bring in timestamped rpointer files +Github PR URL: https://github.com/ESCOMP/CAM/pull/1303 + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + Fix incorrect archiving of rpointer files: https://github.com/ESCOMP/CAM/issues/1293 + Update to handle timestamped rpointer files: https://github.com/ESCOMP/CAM/pull/1294 + +Describe any changes made to build system: N/A + +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: perverwhee + +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 cime_config/config_archive.xml + - Changes for rpointer files + +M .gitmodules +M ccs_config +M cime +M components/cdeps +M components/cism +M components/clm +M components/cmeps +M components/mosart +M components/rtm +M libraries/FMS +M libraries/parallelio + - Update externals to match alpha06f + +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. + +ALL TESTS had namelist (NLFAIL and NLCOMP) changes + - had changes to the variable model_version in nuopc.runconfig + +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) + SMS_Lh12.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq3h (Overall: DIFF) + - pre-existing failures due to HEMCO not having reproducible results (issues #1018 and #856) + + SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL) + - pre-existing failure due to build-namelist error requiring CLM/CTSM external update + + ERP_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERP_Ld3.ne16pg3_ne16pg3_mg17.FHISTC_WAt1ma.derecho_intel.cam-reduced_hist1d (Overall: DIFF) details: + ERP_Ld3.ne30pg3_ne30pg3_mt232.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF) details: + ERP_Lh12.f19_f19_mg17.FW4madSD.derecho_intel.cam-outfrq3h (Overall: DIFF) details: + ERP_Ln9.C96_C96_mg17.F2000climo.derecho_intel.cam-outfrq9s_mg3 (Overall: DIFF) details: + ERP_Ln9.f09_f09_mg17.F1850.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERP_Ln9.f09_f09_mg17.F2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERP_Ln9.f09_f09_mg17.F2010climo.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERP_Ln9.f09_f09_mg17.FHIST_BDRD.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERP_Ln9.f19_f19_mg17.FWsc1850.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERP_Ln9.ne30pg3_ne30pg3_mg17.FCnudged.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERP_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WAma.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERS_D_Ln9.mpasa480_mpasa480.F2000climo.derecho_intel.cam-outfrq9s_mpasa480_pertlim (Overall: DIFF) details: + ERS_Ln9.f09_f09_mg17.FX2000.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERS_Ln9.f19_f19_mg17.FXSD.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERS_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERS_Ln9_P288x1.mpasa120_mpasa120.F2000climo.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details: + SMS_C2_D_Ln9.ne16pg3_ne16pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday (Overall: DIFF) details: + SMS_D_Ln9.f09_f09_mg17.FCvbsxHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + SMS_D_Ln9.f09_f09_mg17.FSD.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s_waccm_ma_mam4 (Overall: DIFF) details: + SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mt232.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF) details: + SMS_Ld1.f09_f09_mg17.FW2000climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details: + SMS_Ld1.ne30pg3_ne30pg3_mg17.FC2010climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details: + SMS_Ln9.f09_f09_mg17.F2010climo.derecho_intel.cam-nudging (Overall: DIFF) details: + SMS_Ln9.f09_f09_mg17.FW1850.derecho_intel.cam-reduced_hist3s (Overall: DIFF) details: + SMS_Ln9.f19_f19_mg17.F2000climo.derecho_intel.cam-silhs (Overall: DIFF) details: + SMS_Ln9.f19_f19_mg17.FHIST.derecho_intel.cam-outfrq9s_nochem (Overall: DIFF) details: + SMS_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s_rrtmgp (Overall: DIFF) details: + - answer changes due to updated externals + +derecho/nvhpc/aux_cam: + ERS_Ln9.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: DIFF) details: + - answer changes due to updated externals + +izumi/nag/aux_cam: all BFB + +izumi/gnu/aux_cam: + ERP_D_Ln9.ne3pg3_ne3pg3_mg37.FHISTC_LTso.izumi_gnu.cam-outfrq9s (Overall: DIFF) details: + ERR_D_Ln9.ne3pg3_ne3pg3_mg37.FHISTC_LTso.izumi_gnu.cam-outfrq9s (Overall: DIFF) details: + ERS_Ln9_P24x1.mpasa480_mpasa480.F2000climo.izumi_gnu.cam-outfrq9s_mpasa480 (Overall: DIFF) details: + SMS_P48x1_D_Ln9.f19_f19_mg17.FW4madSD.izumi_gnu.cam-outfrq9s (Overall: DIFF) details: + - answer changes due to updated externals + + +=============================================================== =============================================================== Tag name: cam6_4_088 diff --git a/libraries/FMS b/libraries/FMS index 2ababb52d7..1aa662acd0 160000 --- a/libraries/FMS +++ b/libraries/FMS @@ -1 +1 @@ -Subproject commit 2ababb52d7f25113d547a03d88ee1c78b14137ec +Subproject commit 1aa662acd094b53d157973782dd442f46e30ee48 diff --git a/libraries/parallelio b/libraries/parallelio index 6539ef05ae..a844617662 160000 --- a/libraries/parallelio +++ b/libraries/parallelio @@ -1 +1 @@ -Subproject commit 6539ef05ae7584ec570a56fdab9f7dfb336c2b80 +Subproject commit a844617662cbb2b1a6445bd7560f9095ccefd180