Merge b4bdev 20251002

cime_config/testdefs/ExpectedTestFails.xml

@@ -403,6 +403,12 @@
       <issue>#3383</issue>
     </phase>
   </test>
+  <test name="ERI_Ld41.f10_f10_mg37.I2000Clm60BgcCrop.derecho_gnu.clm-default">
+    <phase name="COMPARE_base_hybrid">
+     <status>FAIL</status>
+     <issue>#3494</issue>
+    </phase>
+  </test>
 
   <test name="ERI_D_Ld9.f45_f45_mg37.I2000Clm60FatesSpCruRsGs.derecho_gnu.clm-FatesColdSatPhenCamLndTuningMode">
     <phase name="COMPARE_base_rest">

cime_config/testdefs/testlist_clm.xml

@@ -4698,5 +4698,15 @@
     </options>
   </test>
 
+  <test name="ERI_Ld41" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/default">
+    <machines>
+      <machine name="derecho" compiler="gnu" category="aux_clm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:30:00</option>
+      <option name="comment"> Placeholder failing test for mosart hybrid history issue which appears for tests longer than Ld33</option>
+    </options>
+  </test>
+
 
 </testlist>

doc/ChangeLog

@@ -1,4 +1,71 @@
 ===============================================================
+Tag name: ctsm5.3.078
+Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
+Date: Thu 02 Oct 2025 05:19:57 PM MDT
+One-line Summary: Merge b4b-dev to master
+
+Purpose and description of changes
+----------------------------------
+
+ PR #3516 by Matvey: Add failing test as reminder for mosart history issue
+ PR #3511 by Erik: Decompinit timer updates
+
+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 #3494 ERI_Ld90 tests fail with mosart.h0a having diffs
+Fixes #3387 Bring in more timers for initialization
+Some work in #3448 Improve design and error checking in decompMod and decomInitMod
+Fixes #3508 Add decompMod_clean method
+Fixes #3509 Internal subroutines for decompInit_lnd
+
+Notes of particular relevance for developers:
+---------------------------------------------
+Changes to tests or testing:
+ New failing test added as reminder for mosart history issue
+
+Testing summary:
+----------------
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  build-namelist tests (if CLMBuildNamelist.pm has changed):
+
+    derecho - OK
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: No
+
+Other details
+-------------
+Pull Requests that document the changes (include PR ids):
+ https://github.com/ESCOMP/ctsm/pull/3517
+
+===============================================================
+===============================================================
 Tag name: ctsm5.3.077
 Originator(s): rgknox (Ryan Knox,LAWRENCE BERKELEY NATIONAL LABORATORY)
 Date: Thu 02 Oct 2025 09:39:48 AM MDT

doc/ChangeSum

@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+       ctsm5.3.078   slevis 10/02/2025 Merge b4b-dev to master
        ctsm5.3.077   rgknox 10/02/2025 Adjustment of timestep albedo filtering with FATES
        ctsm5.3.076     erik 09/24/2025 Merge b4b-dev to master
        ctsm5.3.075   slevis 09/10/2025 Change default glcmec_downscale_longwave from true to false for clm6

src/cpl/nuopc/lnd_comp_nuopc.F90

@@ -409,6 +409,9 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
     character(len=*),parameter :: subname=trim(modName)//':(InitializeRealize) '
     !-------------------------------------------------------------------------------
 
+    ! NOTE: Because this is an ESMF called subroutine -- do a timer over it's contents here rather than from the outside calls
+    call t_startf ('lc_lnd_init_realize')
+
     rc = ESMF_SUCCESS
     call ESMF_LogWrite(subname//' called', ESMF_LOGMSG_INFO)
 
@@ -431,6 +434,9 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
     call NUOPC_CompAttributeGet(gcomp, name='single_column_lnd_domainfile', value=single_column_lnd_domainfile, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 
+    ! NOTE: Now start the timer
+    !call t_startf ('lc_lnd_init_realize')
+
     ! TODO: there is a problem retrieving scol_spval from the driver - for now
     ! hard-wire scol_spval - this needs to be fixed
     scol_spval = -999._r8
@@ -481,6 +487,8 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
              end if
           enddo
           deallocate(lfieldnamelist)
+          ! Close the timer for the subroutine
+          call t_stopf ('lc_lnd_init_realize')
           ! *******************
           ! *** RETURN HERE ***
           ! *******************
@@ -629,7 +637,9 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
          hostname_in=hostname, &
          username_in=username)
 
+    call t_startf('clm_init1')
     call initialize1(dtime=dtime_sync)
+    call t_stopf('clm_init1')
 
     ! ---------------------
     ! Create ctsm decomp and domain info
@@ -663,7 +673,9 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
     call ESMF_ClockGet(clock, currTime=currtime, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 
+    call t_startf('clm_init2')
     call initialize2(ni, nj, currtime)
+    call t_stopf('clm_init2')
 
     !--------------------------------
     ! Create land export state
@@ -702,6 +714,7 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
 #endif
 
     call ESMF_LogWrite(subname//' done', ESMF_LOGMSG_INFO)
+    call t_stopf ('lc_lnd_init_realize')
 
   end subroutine InitializeRealize
 
@@ -812,11 +825,9 @@ subroutine ModelAdvance(gcomp, rc)
     ! Unpack import state
     !--------------------------------
 
-    call t_startf ('lc_lnd_import')
     call import_fields( gcomp, bounds, glc_present, rof_prognostic, &
          atm2lnd_inst, glc2lnd_inst, water_inst%wateratm2lndbulk_inst, rc )
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
-    call t_stopf ('lc_lnd_import')
 
     !--------------------------------
     ! Run model
@@ -884,14 +895,12 @@ subroutine ModelAdvance(gcomp, rc)
     ! call ESMF_VMBarrier(vm, rc=rc)
     ! if (ChkErr(rc,__LINE__,u_FILE_u)) return
 
-    call t_startf ('shr_orb_decl')
     ! Note - the orbital inquiries set the values in clm_varorb via the module use statements
     call  clm_orbital_update(clock, iulog, masterproc, eccen, obliqr, lambm0, mvelpp, rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
     calday = get_curr_calday(reuse_day_365_for_day_366=.true.)
     call shr_orb_decl( calday     , eccen, mvelpp, lambm0, obliqr, declin  , eccf )
     call shr_orb_decl( nextsw_cday, eccen, mvelpp, lambm0, obliqr, declinp1, eccf )
-    call t_stopf ('shr_orb_decl')
 
     call t_startf ('ctsm_run')
     ! Restart File - use nexttimestr rather than currtimestr here since that is the time at the end of
@@ -908,19 +917,15 @@ subroutine ModelAdvance(gcomp, rc)
     ! Pack export state
     !--------------------------------
 
-    call t_startf ('lc_lnd_export')
     call export_fields(gcomp, bounds, glc_present, rof_prognostic, &
          water_inst%waterlnd2atmbulk_inst, lnd2atm_inst, lnd2glc_inst, rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
-    call t_stopf ('lc_lnd_export')
 
     !--------------------------------
     ! Advance ctsm time step
     !--------------------------------
 
-    call t_startf ('lc_ctsm2_adv_timestep')
     call advance_timestep()
-    call t_stopf ('lc_ctsm2_adv_timestep')
 
     ! Check that internal clock is in sync with master clock
     ! Note that the driver clock has not been updated yet - so at this point

src/cpl/share_esmf/lnd_set_decomp_and_domain.F90

@@ -20,6 +20,7 @@ module lnd_set_decomp_and_domain
   use spmdMod      , only : masterproc, mpicom
   use clm_varctl   , only : iulog, inst_suffix, FL => fname_len
   use abortutils   , only : endrun
+  use perf_mod     , only : t_startf, t_stopf
 
   implicit none
   private ! except
@@ -87,6 +88,7 @@ subroutine lnd_set_decomp_and_domain_from_readmesh(driver, vm, meshfile_lnd, mes
     real(r8) , pointer     :: dataptr1d(:)
     !-------------------------------------------------------------------------------
 
+    call t_startf('lnd_set_decomp_and_domain_from_readmesh: setup')
     rc = ESMF_SUCCESS
 
     ! Write diag info
@@ -105,7 +107,10 @@ subroutine lnd_set_decomp_and_domain_from_readmesh(driver, vm, meshfile_lnd, mes
     ! Determine global 2d sizes from read of dimensions of surface dataset and allocate global memory
     call lnd_get_global_dims(ni, nj, gsize, isgrid2d)
 
+    call t_stopf('lnd_set_decomp_and_domain_from_readmesh: setup')
+
     ! Read in the land mesh from the file
+    call t_startf('lnd_set_decomp_and_domain_from_readmesh: ESMF mesh')
     mesh_lndinput = ESMF_MeshCreate(filename=trim(meshfile_lnd), fileformat=ESMF_FILEFORMAT_ESMFMESH, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 
@@ -142,9 +147,13 @@ subroutine lnd_set_decomp_and_domain_from_readmesh(driver, vm, meshfile_lnd, mes
     else
        call shr_sys_abort('driver '//trim(driver)//' is not supported, must be lilac or cmeps')
     end if
+    call t_stopf('lnd_set_decomp_and_domain_from_readmesh: ESMF mesh')
+    call t_startf ('lnd_set_decomp_and_domain_from_readmesh: final')
 
     ! Determine lnd decomposition that will be used by ctsm from lndmask_glob
+    call t_startf ('decompInit_lnd')
     call decompInit_lnd(lni=ni, lnj=nj, amask=lndmask_glob)
+    call t_stopf ('decompInit_lnd')
 
     ! Determine ocn decomposition that will be used to create the full mesh
     ! note that the memory for gindex_ocn will be allocated in the following call
@@ -251,6 +260,8 @@ subroutine lnd_set_decomp_and_domain_from_readmesh(driver, vm, meshfile_lnd, mes
     deallocate(gindex_ocn)
     deallocate(gindex_ctsm)
 
+    call t_stopf('lnd_set_decomp_and_domain_from_readmesh: final')
+
   end subroutine lnd_set_decomp_and_domain_from_readmesh
 
   !===============================================================================
@@ -315,7 +326,9 @@ subroutine lnd_set_decomp_and_domain_for_single_column(scol_lon, scol_lat, scol_
     !-------------------------------------------------------------------------------
 
     ! Determine decomp and ldomain
+    call t_startf ('decompInit_lnd')
     call decompInit_lnd(lni=1, lnj=1, amask=(/1/))
+    call t_stopf ('decompInit_lnd')
 
     ! Initialize processor bounds
     call get_proc_bounds(bounds)