diff --git a/.gitmodules b/.gitmodules index 88d8acb0b3..7c81a4c5dd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,7 +68,7 @@ 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.75 +fxtag = ccs_config_cesm1.0.77 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index ef694ea4bf..b04bbf36ef 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -623,10 +623,10 @@ attributes from the config_cache.xml file (with keys converted to upper-case). -lnd/clm2/paramdata/ctsm60_params.c260204.no_nan_fill.nc -ctsm60-cam70_params.c260204.nc -lnd/clm2/paramdata/clm50_params.c250311.no_nan_fill.nc -lnd/clm2/paramdata/clm45_params.c250311.no_nan_fill.nc +lnd/clm2/paramdata/ctsm60_params.c260303.nc +lnd/clm2/paramdata/ctsm60-cam70_params.c260305.nc +lnd/clm2/paramdata/clm50_params.c260305.nc +lnd/clm2/paramdata/clm45_params.c260305.nc diff --git a/ccs_config b/ccs_config index e5833b40b4..7020eb9a16 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit e5833b40b47f54f9203474c6c3e01b656e92c25f +Subproject commit 7020eb9a16a2c1cde7b7fbb588e08dbb7b1ce85c diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index cc4f7d2be2..f92065363f 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -36,31 +36,6 @@ - - - FAIL - #2784 - - - - - FAIL - #2784 - - - - - FAIL - #2784 - - - - - FAIL - #2784 - - - @@ -88,46 +63,23 @@ #3454 - - - FAIL - #2787 - The issue shows how to fix it. - - - - - FAIL - #2787 - The issue shows how to fix it. - - - - - FAIL - #2787 - The issue shows how to fix it. - - - - + + FAIL - #3654 - This is a problem with the nn mapalgo method in streams with ESMF prior to 8.9.0 + #2619 + This failure relates to the following REP failure. - - + FAIL - #3654 - This is a problem with the nn mapalgo method in streams with ESMF prior to 8.9.0 + #2619 + This failure relates to the following REP failure. - - - + + FAIL #2619 This failure relates to the following REP failure. @@ -148,87 +100,89 @@ - - + + FAIL - #2542 + #3182 - + FAIL - #1733 + #3788 - + + FAIL - #3182 + #3798 + Divide by zero happens when ch4finundatedmapalgo==bilinear with intel/2025.3.2, but passes for nn,consf,consd - - + FAIL - #2867 + #3798 + Divide by zero happens when ch4finundatedmapalgo==bilinear with intel/2025.3.2, but passes for nn,consf,consd - - + FAIL - #3788 + #3798 + Divide by zero happens when ch4finundatedmapalgo==bilinear with intel/2025.3.2, but passes for nn,consf,consd - - - - - + + FAIL - #3660 - Restart issues with default "inactive" fields added to history by hist_all_fields. + #3798 + Divide by zero happens when ch4finundatedmapalgo==bilinear with intel/2025.3.2, but passes for nn,consf,consd - - - - + FAIL - #2653 + #3798 + Divide by zero happens when ch4finundatedmapalgo==bilinear with intel/2025.3.2, but passes for nn,consf,consd - + FAIL - FATES#1216 + #2261 - - + + + + FAIL - #2321 + #3660 + Restart issues with default "inactive" fields added to history by hist_all_fields. - - + + @@ -252,20 +206,6 @@ - - - FAIL - #2810 - - - - - - FAIL - #2810 - - - FAIL @@ -280,7 +220,6 @@ - FAIL @@ -288,7 +227,6 @@ - FAIL diff --git a/doc/ChangeLog b/doc/ChangeLog index f17fcc1a54..6bba845d1c 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,110 @@ =============================================================== +Tag name: ctsm5.4.024 +Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326) +Date: Wed Mar 11 11:46:22 PM MDT 2026 +One-line Summary: Update derecho_intel again and some fixes for it + +Purpose and description of changes +---------------------------------- + +Update to ccs_config1.0.77 with derecho_intel updates to intel/2024.3.2. And a two line fix to a continuation line in +the middle of a string, so that it will build. +Note, there are several mpi-serial Bgc cases that now fail on derecho_intel see details below. + +Also update the parameter files to ones that have some new fields on it that will be moved from namelist to the parameter +file in a future b4b-dev PR. + +Improve the logging about the ch4finundation stream. Some of this seemed to be important in order to be able to change +ch4finundationmapalo away from bilinear. + +Remove a bunch of tests in the expected fail files that have been working now. Add a few more newly failing tests. + +Significant changes to scientifically-supported configurations +-------------------------------------------------------------- + +Does this tag change answers significantly for any of the following physics configurations? +(Details of any changes will be given in the "Answer changes" section below.) + + [Put an [X] in the box for any configuration with significant answer changes.] + +[ ] clm6_0 + +[ ] clm5_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + + +Bugs fixed +---------- + +List of CTSM issues fixed (include CTSM Issue # and description) [one per line]: + Fixes #3791 - one line change needed for intel/2025.3.2 + Fixes #3795 - Update to ccs_config_cesm1.0.77 + +Notes of particular relevance for users +--------------------------------------- + +Caveats for users (e.g., need to interpolate initial conditions): + + Some mpi-serial cases for single point cases with a Bgc compset fail because of a divide by zero in the ch4finundation mapping. + It fails with ch4finundatedmapalgo==bilinear but works if set to "nn" (see https://github.com/ESCOMP/CTSM/issues/3798) + +Changes to the parameter file (output of tools/param_utils/compare_paramfiles): + + ./tools/param_utils/compare_paramfiles $CSMDATA/lnd/clm2/paramdata/ctsm60_params.c260204.no_nan_fill.nc $CSMDATA/lnd/clm2/paramdata/ctsm60_params.c260303.nc + File 0: /glade/campaign/cesm/cesmdata/inputdata/lnd/clm2/paramdata/ctsm60_params.c260204.no_nan_fill.nc + File 1: /glade/campaign/cesm/cesmdata/inputdata/lnd/clm2/paramdata/ctsm60_params.c260303.nc + + Variable(s) present in File 1 but not File 0: + baseflow_scalar + precip_repartition_glc_all_rain_t + precip_repartition_glc_all_snow_t + precip_repartition_nonglc_all_rain_t + precip_repartition_nonglc_all_snow_t + +Notes of particular relevance for developers: +--------------------------------------------- + There are now more problems with the CN-Matrix threaded tests (see https://github.com/ESCOMP/CTSM/issues/2619) + +Testing summary: regular +---------------- + + [PASS means all tests PASS; OK means tests PASS other than expected fails.] + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- OK + izumi ------- OK + +If the tag used for baseline comparisons was NOT the previous tag, note that here: + + +Answer changes +-------------- + +Changes answers relative to baseline: no bit-for-bit -- except the compiler update means derecho_intel changes answers + + Summarize any changes to answers, i.e., + - what code configurations: All + - what platforms/compilers: derecho_intel + - nature of change: should be roundoff (but haven't verified) + + 73 of the 280 passing tests on derecho_intel show different answers + +Other details +------------- + +List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): + ccs_config to ccs_config_cesm1.0.77 + +Pull Requests that document the changes (include PR ids): +(https://github.com/ESCOMP/ctsm/pull) + #3796 -- Hot fix with updated derecho_intel and changes needed for it + +=============================================================== +=============================================================== Tag name: ctsm5.4.023 Originator(s): samrabin Date: Tue Mar 10 07:44:59 PM MDT 2026 diff --git a/doc/ChangeSum b/doc/ChangeSum index a35a4f7517..506976b9b8 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.4.024 erik 03/11/2026 Update derecho_intel again and a few fixes for it ctsm5.4.023 samrabin 03/10/2026 Replace more netCDFs with NaN issues ctsm5.4.022 erik 03/04/2026 Change to using the ifx compiler and some more fixes related to it ctsm5.4.021 erik 02/20/2026 Bring b4b-dev to master diff --git a/src/cpl/share_esmf/ch4FInundatedStreamType.F90 b/src/cpl/share_esmf/ch4FInundatedStreamType.F90 index eeda0f4a00..901f54b31f 100644 --- a/src/cpl/share_esmf/ch4FInundatedStreamType.F90 +++ b/src/cpl/share_esmf/ch4FInundatedStreamType.F90 @@ -352,6 +352,7 @@ subroutine ReadNML(this, bounds, NLFilename) ! Read ch4finundated namelist if (masterproc) then + write(iulog,*) 'Reading ', namelist_name, ' namelist from file: ', trim(NLFilename) open( newunit=nu_nml, file=trim(NLFilename), status='old', iostat=nml_error ) call shr_nl_find_group_name(nu_nml, namelist_name, status=nml_error) if (nml_error == 0) then @@ -372,9 +373,9 @@ subroutine ReadNML(this, bounds, NLFilename) if (masterproc) then write(iulog,*) ' ' write(iulog,*) namelist_name, ' stream settings:' - write(iulog,*) ' stream_fldFileName_ch4finundated = ',stream_fldFileName_ch4finundated - write(iulog,*) ' stream_meshfile_ch4finundated = ',stream_meshfile_ch4finundated - write(iulog,*) ' ch4finundatedmapalgo = ',ch4finundatedmapalgo + write(iulog,*) ' stream_fldFileName_ch4finundated = ',trim(stream_fldFileName_ch4finundated) + write(iulog,*) ' stream_meshfile_ch4finundated = ',trim(stream_meshfile_ch4finundated) + write(iulog,*) ' ch4finundatedmapalgo = ',trim(ch4finundatedmapalgo) endif this%stream_fldFileName_ch4finundated = stream_fldFileName_ch4finundated this%stream_meshfile_ch4finundated = stream_meshfile_ch4finundated diff --git a/src/dyn_subgrid/dynSubgridControlMod.F90 b/src/dyn_subgrid/dynSubgridControlMod.F90 index 4cabcc168a..c9a6b77824 100644 --- a/src/dyn_subgrid/dynSubgridControlMod.F90 +++ b/src/dyn_subgrid/dynSubgridControlMod.F90 @@ -291,8 +291,8 @@ subroutine check_namelist_consistency dyn_subgrid_control_inst%do_transient_lakes .or. & dyn_subgrid_control_inst%do_transient_urban) then if (collapse_urban) then - write(iulog,*) 'ERROR: do_transient_pfts, do_transient_crops, do_transient_lakes and& - do_transient_urban are incompatible with collapse_urban = .true.' + write(iulog,*) 'ERROR: do_transient_pfts, do_transient_crops, do_transient_lakes and ' // & + 'do_transient_urban are incompatible with collapse_urban = .true.' call endrun(msg=errMsg(sourcefile, __LINE__)) end if if (n_dom_pfts > 0 .or. n_dom_landunits > 0 &