ctsm5.4.041: b4b-dev merge 2026-05-21 by samsrabin · Pull Request #4040 · ESCOMP/CTSM

samsrabin · 2026-05-21T18:08:43Z

Description of changes

Regular biweekly b4b-dev merge.

Update ChangeLog and ChangeSum.
aux_clm testing as expected.

…s.rst for mksurfdata_esmf

slevis resolved conflicts: doc/source/users_guide/using-clm-tools/what-are-the-clm-tools.rst

slevis resolved conflicts: doc/source/users_guide/using-clm-tools/creating-surface-datasets.rst

Added detailed information on the impact of drought on isoprene emissions, including mathematical formulations and references to recent studies.

This updates the description of the BVOC emissions model with the new drought impact and high-latitude isoprene emissions factors.

Describes new drought impact and high-latitude isoprene emissions parameterization

Added new references related for BVOC drought impact and high-latitude isoprene emissions

slevis resolved conflicts: doc/source/users_guide/using-clm-tools/creating-input-for-surface-dataset-generation.rst

…tools User's Guide: Delete "Building the CLM tools*" sections.

I've included a disclaimer about that page being out of date. I've also mentioned that this link should be updated once the CDEPS page is; see ESCOMP#3225.

Fix broken documentation links

Update clm6 paramfiles and add new paramfile for hillslope hydrology PR ESCOMP#4029 Issue ESCOMP#3659 Changes answers more than roundoff for clm6 cases.

slevis-lmwg

Approving preemptively BUT @samsrabin PLEASE SEE MY COMMENT in case it's important.

(cherry picked from commit e7e9e5f)

(cherry picked from commit cd74892)

(cherry picked from commit 512665b)

(cherry picked from commit c9216c7)

There's something weird about ctsm5.4.039 that prevented it from coming in when I merged master to b4b-dev-merge-20260521.

samsrabin · 2026-05-21T22:50:30Z

Izumi aux_clm testing is done and showed no answer changes. However, there were some unexpected namelist differences.

In SMS_D_Ld3.f10_f10_mg37.I2000Clm60Bgc.izumi_nag.clm-HillslopeD:

2026-05-21 14:05:37: NLCOMP
Comparison failed between '/scratch/cluster/samrabin/tests_0521-140441iz/SMS_D_Ld3.f10_f10_mg37.I2000Clm60Bgc.izumi_nag.clm-HillslopeD.GC.0521-140441iz_nag/CaseDocs/nuopc.runconfig' with '/fs/cgd/csm/ccsm_baselines/ctsm5.4.040/SMS_D_Ld3.f10_f10_mg37.I2000Clm60Bgc.izumi_nag.clm-HillslopeD/CaseDocs/nuopc.runconfig'
DRIVER_attributes->PELAYOUT_attributes->ALLCOMP_attributes->MED_attributes->CLOCK_attributes->ATM_attributes->ICE_attributes->GLC_attributes->LND_attributes->OCN_attributes->ROF_attributes->WAV_attributes->MED_modelio:
 - pio_typename : netcdf
 + pio_typename : pnetcdf
DRIVER_attributes->PELAYOUT_attributes->ALLCOMP_attributes->MED_attributes->CLOCK_attributes->ATM_attributes->ICE_attributes->GLC_attributes->LND_attributes->OCN_attributes->ROF_attributes->WAV_attributes->MED_modelio->ATM_modelio:
 - pio_typename : netcdf
 + pio_typename : pnetcdf
DRIVER_attributes->PELAYOUT_attributes->ALLCOMP_attributes->MED_attributes->CLOCK_attributes->ATM_attributes->ICE_attributes->GLC_attributes->LND_attributes->OCN_attributes->ROF_attributes->WAV_attributes->MED_modelio->ATM_modelio->LND_modelio:
 - pio_typename : netcdf
 + pio_typename : pnetcdf
DRIVER_attributes->PELAYOUT_attributes->ALLCOMP_attributes->MED_attributes->CLOCK_attributes->ATM_attributes->ICE_attributes->GLC_attributes->LND_attributes->OCN_attributes->ROF_attributes->WAV_attributes->MED_modelio->ATM_modelio->LND_modelio->ICE_modelio:
 - pio_typename : netcdf
 + pio_typename : pnetcdf
DRIVER_attributes->PELAYOUT_attributes->ALLCOMP_attributes->MED_attributes->CLOCK_attributes->ATM_attributes->ICE_attributes->GLC_attributes->LND_attributes->OCN_attributes->ROF_attributes->WAV_attributes->MED_modelio->ATM_modelio->LND_modelio->ICE_modelio->OCN_modelio:
 - pio_typename : netcdf
 + pio_typename : pnetcdf
DRIVER_attributes->PELAYOUT_attributes->ALLCOMP_attributes->MED_attributes->CLOCK_attributes->ATM_attributes->ICE_attributes->GLC_attributes->LND_attributes->OCN_attributes->ROF_attributes->WAV_attributes->MED_modelio->ATM_modelio->LND_modelio->ICE_modelio->OCN_modelio->ROF_modelio:
 - pio_typename : netcdf
 + pio_typename : pnetcdf
DRIVER_attributes->PELAYOUT_attributes->ALLCOMP_attributes->MED_attributes->CLOCK_attributes->ATM_attributes->ICE_attributes->GLC_attributes->LND_attributes->OCN_attributes->ROF_attributes->WAV_attributes->MED_modelio->ATM_modelio->LND_modelio->ICE_modelio->OCN_modelio->ROF_modelio->GLC_modelio:
 - pio_typename : netcdf
 + pio_typename : pnetcdf
DRIVER_attributes->PELAYOUT_attributes->ALLCOMP_attributes->MED_attributes->CLOCK_attributes->ATM_attributes->ICE_attributes->GLC_attributes->LND_attributes->OCN_attributes->ROF_attributes->WAV_attributes->MED_modelio->ATM_modelio->LND_modelio->ICE_modelio->OCN_modelio->ROF_modelio->GLC_modelio->WAV_modelio:
 - pio_typename : netcdf
 + pio_typename : pnetcdf

In SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.izumi_nag.mizuroute-default (I think these are just that the new version doesn't have the comment line, but I don't know why that would be the case):

2026-05-21 14:05:37: NLCOMP
Comparison failed between '/scratch/cluster/samrabin/tests_0521-140441iz/SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.izumi_nag.mizuroute-default.GC.0521-140441iz_nag/CaseDocs/mizuRoute.control' with '/fs/cgd/csm/ccsm_baselines/ctsm5.4.040/SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.izumi_nag.mizuroute-default/CaseDocs/mizuRoute.control'
Inequivalent lines <case_name>                  SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.izumi_nag.mizuroute-default.GC.0518-150814iz_nag                                                      !  name of simulation != <case_name>                  SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.izumi_nag.mizuroute-default.GC.0521-140441iz_nag                                                        !  name of simulation
  NORMALIZED: <case_name>                  SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.izumi_nag.mizuroute-default.ACTION.TESTID                                                      !  name of simulation != <case_name>                  SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.izumi_nag.mizuroute-default.ACTION.TESTID                                                        !  name of simulation
Inequivalent lines <route_opt>                  5                                                                                                                                                  !  option for routing schemes (only one-option allowed) 1->IRF, 2->KWT, 3-> KW, 4->MC, 5->DW != <route_opt>                  5                                                                                                                                                    !  option for routing schemes (only one-option allowed) 1->IRF, 2->KWT, 3-> KW, 4->MC, 5->DW
  NORMALIZED: <route_opt>                  5                                                                                                                                                  !  option for routing schemes (only one-option allowed) 1->IRF, 2->KWT, 3-> KW, 4->MC, 5->DW != <route_opt>                  5                                                                                                                                                    !  option for routing schemes (only one-option allowed) 1->IRF, 2->KWT, 3-> KW, 4->MC, 5->DW
Inequivalent lines <doesBasinRoute>             1                                                                                                                                                  !  basin routing options   0-> no, 1->IRF, otherwise error != <doesBasinRoute>             1                                                                                                                                                    !  basin routing options   0-> no, 1->IRF, otherwise error
  NORMALIZED: <doesBasinRoute>             1                                                                                                                                                  !  basin routing options   0-> no, 1->IRF, otherwise error != <doesBasinRoute>             1                                                                                                                                                    !  basin routing options   0-> no, 1->IRF, otherwise error
Inequivalent lines <hw_drain_point>             2                                                                                                                                                  !  how lateral flow is put into a headwater reach 1-> top of headwater, 2-> bottom of headwater != <hw_drain_point>             2                                                                                                                                                    !  how lateral flow is put into a headwater reach 1-> top of headwater, 2-> bottom of headwater
  NORMALIZED: <hw_drain_point>             2                                                                                                                                                  !  how lateral flow is put into a headwater reach 1-> top of headwater, 2-> bottom of headwater != <hw_drain_point>             2                                                                                                                                                    !  how lateral flow is put into a headwater reach 1-> top of headwater, 2-> bottom of headwater
Inequivalent lines <fname_state_in>             empty                                                                                                                                              !  input restart netCDF name. remove for run without any particular initial channel states != <fname_state_in>             empty                                                                                                                                                !  input restart netCDF name. remove for run without any particular initial channel states
  NORMALIZED: <fname_state_in>             empty                                                                                                                                              !  input restart netCDF name. remove for run without any particular initial channel states != <fname_state_in>             empty                                                                                                                                                !  input restart netCDF name. remove for run without any particular initial channel states
Inequivalent lines <newFileFrequency>           daily                                                                                                                                              !  frequency for new output files (daily, monthly, yearly, single) != <newFileFrequency>           daily                                                                                                                                                !  frequency for new output files (daily, monthly, yearly, single)
  NORMALIZED: <newFileFrequency>           daily                                                                                                                                              !  frequency for new output files (daily, monthly, yearly, single) != <newFileFrequency>           daily                                                                                                                                                !  frequency for new output files (daily, monthly, yearly, single)
Inequivalent lines <outputFrequency>            daily                                                                                                                                              !  time frequency used for temporal aggregation of output variables - numeric or daily, monthyly, or yearly != <outputFrequency>            daily                                                                                                                                                !  time frequency used for temporal aggregation of output variables - numeric or daily, monthyly, or yearly
  NORMALIZED: <outputFrequency>            daily                                                                                                                                              !  time frequency used for temporal aggregation of output variables - numeric or daily, monthyly, or yearly != <outputFrequency>            daily                                                                                                                                                !  time frequency used for temporal aggregation of output variables - numeric or daily, monthyly, or yearly
Inequivalent lines <dt_qsim>                    86400.0                                                                                                                                            !  simulation time interval [sec] != <dt_qsim>                    86400.0                                                                                                                                              !  simulation time interval [sec]
  NORMALIZED: <dt_qsim>                    86400.0                                                                                                                                            !  simulation time interval [sec] != <dt_qsim>                    86400.0                                                                                                                                              !  simulation time interval [sec]
Inequivalent lines <continue_run>               False                                                                                                                                              !  logical; T-> append output in existing history files. F-> write output in new history file != <continue_run>               False                                                                                                                                                !  logical; T-> append output in existing history files. F-> write output in new history file
  NORMALIZED: <continue_run>               False                                                                                                                                              !  logical; T-> append output in existing history files. F-> write output in new history file != <continue_run>               False                                                                                                                                                !  logical; T-> append output in existing history files. F-> write output in new history file
Inequivalent lines <debug>                      F                                                                                                                                                  !  debug verbosity level; T -> extra log output. F-> normal log output != <debug>                      F                                                                                                                                                    !  debug verbosity level; T -> extra log output. F-> normal log output
  NORMALIZED: <debug>                      F                                                                                                                                                  !  debug verbosity level; T -> extra log output. F-> normal log output != <debug>                      F                                                                                                                                                    !  debug verbosity level; T -> extra log output. F-> normal log output
Inequivalent lines <ancil_dir>                  /fs/cgd/csm/inputdata/rof/mizuRoute/ancillary_data/                                                                                                !  directory containing ancillary data (river network data) != <ancil_dir>                  /fs/cgd/csm/inputdata/rof/mizuRoute/ancillary_data/                                                                                                  !  directory containing ancillary data (river network data)
  NORMALIZED:                                                                                                 !  directory containing ancillary data (river network data) !=                                                                                                   !  directory containing ancillary data (river network data)
Inequivalent lines <output_dir>                 ./                                                                                                                                                 !  directory containing output data != <output_dir>                 ./                                                                                                                                                   !  directory containing output data
  NORMALIZED:                                                                                                                                                  !  directory containing output data !=                                                                                                                                                    !  directory containing output data
Inequivalent lines <fname_ntopOld>              ntopo_HDMAmz_5x5_amazon_cdf5_c20200730.nc                                                                                                          !  netCDF name for River Network != <fname_ntopOld>              ntopo_HDMAmz_5x5_amazon_cdf5_c20200730.nc                                                                                                            !  netCDF name for River Network
  NORMALIZED: <fname_ntopOld>              ntopo_HDMAmz_5x5_amazon_cdf5_c20200730.nc                                                                                                          !  netCDF name for River Network != <fname_ntopOld>              ntopo_HDMAmz_5x5_amazon_cdf5_c20200730.nc                                                                                                            !  netCDF name for River Network
Inequivalent lines <dname_sseg>                 seg                                                                                                                                                !  dimension name of the stream segments != <dname_sseg>                 seg                                                                                                                                                  !  dimension name of the stream segments
  NORMALIZED: <dname_sseg>                 seg                                                                                                                                                !  dimension name of the stream segments != <dname_sseg>                 seg                                                                                                                                                  !  dimension name of the stream segments
Inequivalent lines <dname_nhru>                 hru                                                                                                                                                !  dimension name of the HRUs != <dname_nhru>                 hru                                                                                                                                                  !  dimension name of the HRUs
  NORMALIZED: <dname_nhru>                 hru                                                                                                                                                !  dimension name of the HRUs != <dname_nhru>                 hru                                                                                                                                                  !  dimension name of the HRUs
Inequivalent lines <fname_ntopNew>              UPDATED_NTOPO_NC                                                                                                                                   !  netCDF name for augmented River Network != <fname_ntopNew>              UPDATED_NTOPO_NC                                                                                                                                     !  netCDF name for augmented River Network
  NORMALIZED: <fname_ntopNew>              UPDATED_NTOPO_NC                                                                                                                                   !  netCDF name for augmented River Network != <fname_ntopNew>              UPDATED_NTOPO_NC                                                                                                                                     !  netCDF name for augmented River Network
Inequivalent lines <varname_area>               Basin_Area                                                                                                                                         !  name of variable holding hru area != <varname_area>               Basin_Area                                                                                                                                           !  name of variable holding hru area
  NORMALIZED: <varname_area>               Basin_Area                                                                                                                                         !  name of variable holding hru area != <varname_area>               Basin_Area                                                                                                                                           !  name of variable holding hru area
Inequivalent lines <varname_length>             Length                                                                                                                                             !  name of variable holding segment length != <varname_length>             Length                                                                                                                                               !  name of variable holding segment length
  NORMALIZED: <varname_length>             Length                                                                                                                                             !  name of variable holding segment length != <varname_length>             Length                                                                                                                                               !  name of variable holding segment length
Inequivalent lines <varname_slope>              Slope                                                                                                                                              !  name of variable holding segment slope != <varname_slope>              Slope                                                                                                                                                !  name of variable holding segment slope
  NORMALIZED: <varname_slope>              Slope                                                                                                                                              !  name of variable holding segment slope != <varname_slope>              Slope                                                                                                                                                !  name of variable holding segment slope
Inequivalent lines <varname_HRUid>              hruid                                                                                                                                              !  name of variable holding HRU id != <varname_HRUid>              hruid                                                                                                                                                !  name of variable holding HRU id
  NORMALIZED: <varname_HRUid>              hruid                                                                                                                                              !  name of variable holding HRU id != <varname_HRUid>              hruid                                                                                                                                                !  name of variable holding HRU id
Inequivalent lines <varname_hruSegId>           hru_seg_id                                                                                                                                         !  name of variable holding the stream segment below each HRU != <varname_hruSegId>           hru_seg_id                                                                                                                                           !  name of variable holding the stream segment below each HRU
  NORMALIZED: <varname_hruSegId>           hru_seg_id                                                                                                                                         !  name of variable holding the stream segment below each HRU != <varname_hruSegId>           hru_seg_id                                                                                                                                           !  name of variable holding the stream segment below each HRU
Inequivalent lines <varname_segId>              seg_id                                                                                                                                             !  name of variable holding the ID of each stream segment != <varname_segId>              seg_id                                                                                                                                               !  name of variable holding the ID of each stream segment
  NORMALIZED: <varname_segId>              seg_id                                                                                                                                             !  name of variable holding the ID of each stream segment != <varname_segId>              seg_id                                                                                                                                               !  name of variable holding the ID of each stream segment
Inequivalent lines <varname_downSegId>          Tosegment                                                                                                                                          !  name of variable holding the ID of the next downstream segment != <varname_downSegId>          Tosegment                                                                                                                                            !  name of variable holding the ID of the next downstream segment
  NORMALIZED: <varname_downSegId>          Tosegment                                                                                                                                          !  name of variable holding the ID of the next downstream segment != <varname_downSegId>          Tosegment                                                                                                                                            !  name of variable holding the ID of the next downstream segment
Inequivalent lines <varname_pfafCode>           PFAF                                                                                                                                               !  name of variable holding the pfafstetter code != <varname_pfafCode>           PFAF                                                                                                                                                 !  name of variable holding the pfafstetter code
  NORMALIZED: <varname_pfafCode>           PFAF                                                                                                                                               !  name of variable holding the pfafstetter code != <varname_pfafCode>           PFAF                                                                                                                                                 !  name of variable holding the pfafstetter code
Inequivalent lines <varname_D03_MaxStorage>     S_max                                                                                                                                              !  Maximum lake volume (for Doll 2003 parametrisation) != <varname_D03_MaxStorage>     S_max                                                                                                                                                !  Maximum lake volume (for Doll 2003 parametrisation)
  NORMALIZED: <varname_D03_MaxStorage>     S_max                                                                                                                                              !  Maximum lake volume (for Doll 2003 parametrisation) != <varname_D03_MaxStorage>     S_max                                                                                                                                                !  Maximum lake volume (for Doll 2003 parametrisation)
Inequivalent lines <varname_D03_Coefficient>    Coeff                                                                                                                                              !  name of varibale holding the coefficnet of stage-discharge relatioship for lake != <varname_D03_Coefficient>    Coeff                                                                                                                                                !  name of varibale holding the coefficnet of stage-discharge relatioship for lake
  NORMALIZED: <varname_D03_Coefficient>    Coeff                                                                                                                                              !  name of varibale holding the coefficnet of stage-discharge relatioship for lake != <varname_D03_Coefficient>    Coeff                                                                                                                                                !  name of varibale holding the coefficnet of stage-discharge relatioship for lake
Inequivalent lines <varname_D03_Power>          power                                                                                                                                              !  name of varibale holding the coefficnet of stage-discharge relatioship for lake != <varname_D03_Power>          power                                                                                                                                                !  name of varibale holding the coefficnet of stage-discharge relatioship for lake
  NORMALIZED: <varname_D03_Power>          power                                                                                                                                              !  name of varibale holding the coefficnet of stage-discharge relatioship for lake != <varname_D03_Power>          power                                                                                                                                                !  name of varibale holding the coefficnet of stage-discharge relatioship for lake
Inequivalent lines <varname_D03_S0>             S_0                                                                                                                                                !  Maximum lake volume (for Doll 2003 parametrisation) != <varname_D03_S0>             S_0                                                                                                                                                  !  Maximum lake volume (for Doll 2003 parametrisation)
  NORMALIZED: <varname_D03_S0>             S_0                                                                                                                                                !  Maximum lake volume (for Doll 2003 parametrisation) != <varname_D03_S0>             S_0                                                                                                                                                  !  Maximum lake volume (for Doll 2003 parametrisation)
Inequivalent lines <varname_islake>             lake                                                                                                                                               !  name of variable holding the islake flage (1=lake, 0=reach) != <varname_islake>             lake                                                                                                                                                 !  name of variable holding the islake flage (1=lake, 0=reach)
  NORMALIZED: <varname_islake>             lake                                                                                                                                               !  name of variable holding the islake flage (1=lake, 0=reach) != <varname_islake>             lake                                                                                                                                                 !  name of variable holding the islake flage (1=lake, 0=reach)
Inequivalent lines <varname_lakeModelType>      lake_type                                                                                                                                          !  name of varibale holding lake type (0=endo, 1=Doll, 2=Hanasaki, 3=HYPE) != <varname_lakeModelType>      lake_type                                                                                                                                            !  name of varibale holding lake type (0=endo, 1=Doll, 2=Hanasaki, 3=HYPE)
  NORMALIZED: <varname_lakeModelType>      lake_type                                                                                                                                          !  name of varibale holding lake type (0=endo, 1=Doll, 2=Hanasaki, 3=HYPE) != <varname_lakeModelType>      lake_type                                                                                                                                            !  name of varibale holding lake type (0=endo, 1=Doll, 2=Hanasaki, 3=HYPE)
Inequivalent lines <param_nml>                  mizuRoute_in                                                                                                                                       !  Namelist name containing spatially constant parameter values != <param_nml>                  mizuRoute_in                                                                                                                                         !  Namelist name containing spatially constant parameter values
  NORMALIZED: <param_nml>                  mizuRoute_in                                                                                                                                       !  Namelist name containing spatially constant parameter values != <param_nml>                  mizuRoute_in                                                                                                                                         !  Namelist name containing spatially constant parameter values
Inequivalent lines <outputNameOption>           generic                                                                                                                                            !  'generic': routing method dependet output does not include routing schem name != <outputNameOption>           generic                                                                                                                                              !  'generic': routing method dependet output does not include routing schem name
  NORMALIZED: <outputNameOption>           generic                                                                                                                                            !  'generic': routing method dependet output does not include routing schem name != <outputNameOption>           generic                                                                                                                                              !  'generic': routing method dependet output does not include routing schem name
Inequivalent lines <KWTvolume>                  T                                                                                                                                                  !  kinematic wave tracking volume at the end of time step at reach [L3] != <KWTvolume>                  T                                                                                                                                                    !  kinematic wave tracking volume at the end of time step at reach [L3]
  NORMALIZED: <KWTvolume>                  T                                                                                                                                                  !  kinematic wave tracking volume at the end of time step at reach [L3] != <KWTvolume>                  T                                                                                                                                                    !  kinematic wave tracking volume at the end of time step at reach [L3]
Inequivalent lines <IRFvolume>                  T                                                                                                                                                  !  impulse response function volume at the end of time step at reach [L3] != <IRFvolume>                  T                                                                                                                                                    !  impulse response function volume at the end of time step at reach [L3]
  NORMALIZED: <IRFvolume>                  T                                                                                                                                                  !  impulse response function volume at the end of time step at reach [L3] != <IRFvolume>                  T                                                                                                                                                    !  impulse response function volume at the end of time step at reach [L3]
Inequivalent lines <KWvolume>                   T                                                                                                                                                  !  Euler kinematic wave volume at the end of time step at reach [L3] != <KWvolume>                   T                                                                                                                                                    !  Euler kinematic wave volume at the end of time step at reach [L3]
  NORMALIZED: <KWvolume>                   T                                                                                                                                                  !  Euler kinematic wave volume at the end of time step at reach [L3] != <KWvolume>                   T                                                                                                                                                    !  Euler kinematic wave volume at the end of time step at reach [L3]
Inequivalent lines <MCvolume>                   T                                                                                                                                                  !  muskingum-cunge volume at the end of time step at reach [L3] != <MCvolume>                   T                                                                                                                                                    !  muskingum-cunge volume at the end of time step at reach [L3]
  NORMALIZED: <MCvolume>                   T                                                                                                                                                  !  muskingum-cunge volume at the end of time step at reach [L3] != <MCvolume>                   T                                                                                                                                                    !  muskingum-cunge volume at the end of time step at reach [L3]
Inequivalent lines <DWvolume>                   T                                                                                                                                                  !  diffusive wave volume at the end of time step at reach [L3] != <DWvolume>                   T                                                                                                                                                    !  diffusive wave volume at the end of time step at reach [L3]
  NORMALIZED: <DWvolume>                   T                                                                                                                                                  !  diffusive wave volume at the end of time step at reach [L3] != <DWvolume>                   T                                                                                                                                                    !  diffusive wave volume at the end of time step at reach [L3]
Inequivalent lines <bypass_routing_option>      direct_in_place                                                                                                                                    !  options: direct_in_place, or direct_to_outlet != <bypass_routing_option>      direct_in_place                                                                                                                                      !  options: direct_in_place, or direct_to_outlet
  NORMALIZED: <bypass_routing_option>      direct_in_place                                                                                                                                    !  options: direct_in_place, or direct_to_outlet != <bypass_routing_option>      direct_in_place                                                                                                                                      !  options: direct_in_place, or direct_to_outlet
Inequivalent lines <qgwl_runoff_option>         threshold                                                                                                                                          !  options: all, negative, or threshold != <qgwl_runoff_option>         threshold                                                                                                                                            !  options: all, negative, or threshold
  NORMALIZED: <qgwl_runoff_option>         threshold                                                                                                                                          !  options: all, negative, or threshold != <qgwl_runoff_option>         threshold                                                                                                                                            !  options: all, negative, or threshold

slevis-lmwg · 2026-05-21T23:41:31Z

These NLCOMP diffs seem unlikely to matter.

Also both hillslope and mizuroute are non-standard configurations.

AND the hillslope test I had to rerun when making the 040 baseline, in order to correct the paramfile that it was picking up. I don't know why that would lead to these NLCOMP diffs, but maybe?

samsrabin · 2026-05-22T15:07:08Z

It turns out ctsm5.4.040 has the same NLCOMP diffs against its own baseline, so I'm guessing these are down to changes in Izumi's software during the last upgrade. Derecho tests were as expected.

slevis-lmwg and others added 30 commits December 5, 2023 17:28

Updating doc/source/users_guide/using-clm-tools/what-are-the-clm-tool…

5d97143

…s.rst for mksurfdata_esmf

Draft update documentation for generating fsurdat/landuse files

42098c5

links

4e897a0

fixed more links

4bb088f

Merge remote-tracking branch 'escomp/b4b-dev' into documentation_wk

4aba801

slevis resolved conflicts: doc/source/users_guide/using-clm-tools/what-are-the-clm-tools.rst

Merge branch 'documentation_wk' into doc_mksurfdata_esmf

a3635da

slevis resolved conflicts: doc/source/users_guide/using-clm-tools/creating-surface-datasets.rst

Remove creating-domain-files.rst as not needed with nuopc

3683979

Remove references to creating-domain-files

0f16d7d

Remove reference to mknoocnmap.pl as obsolete

9e00622

Merge branch 'b4b-dev' into doc_mksurfdata_esmf

cf44eb3

Expand drought impact section on isoprene emissions

fc4879c

Added detailed information on the impact of drought on isoprene emissions, including mathematical formulations and references to recent studies.

Merge branch 'b4b-dev' into doc_mksurfdata_esmf

a6fccee

Rm mention of mapping files, replace SCRIP and corresp. tool with mesh

27c3f3e

Add reference to Section 1.9 _how-to-make-mesh

162a793

Remove some figures not in use by the new documentation

547ffe9

Revise BVOC emissions model description

b9a0083

This updates the description of the BVOC emissions model with the new drought impact and high-latitude isoprene emissions factors.

updated BVOC description

c6c2599

Describes new drought impact and high-latitude isoprene emissions parameterization

Add references for BVOC section

9e65aab

Added new references related for BVOC drought impact and high-latitude isoprene emissions

Remove mknoocnmap.pl and mkunitymap.ncl

af56462

wrf-tools.rst: replace SCRIP with mesh, rm refs to deprecated scripts

029f1c7

Remove unnecessary references to SCRIP, domain, and mapping files

577d2bc

Remove some references to gen_domain

2c1640b

Merge remote-tracking branch 'escomp/b4b-dev' into doc_mksurfdata_esmf

0855784

slevis resolved conflicts: doc/source/users_guide/using-clm-tools/creating-input-for-surface-dataset-generation.rst

Mostly formatting improvements to wrf-tools.rst

f78930f

Formatting corrections

a364961

Add reference to building-the-clm-tools for gen_domain

94051ad

Remove debugging comment

d680881

first draft

053c2c9

update hillslope hydrology chapter

6084f56

update methane chapter

47b36a2

samsrabin and others added 8 commits May 20, 2026 14:13

User's Guide: Delete "Building the CLM tools*" sections.

5edd182

Merge branch 'b4b-dev' into fix-docs-links

b8ab977

Merge branch 'b4b-dev' into ug-delete-building-clm-tools

9e1bc36

Merge pull request ESCOMP#4036 from samsrabin/ug-delete-building-clm-…

acb50ef

…tools User's Guide: Delete "Building the CLM tools*" sections.

Merge branch 'b4b-dev' into fix-docs-links

14d0675

Point to outdated CDEPS DATM documentation.

b90632c

I've included a disclaimer about that page being out of date. I've also mentioned that this link should be updated once the CDEPS page is; see ESCOMP#3225.

Merge pull request ESCOMP#3223 from adrifoster/fix-docs-links

ce40443

Fix broken documentation links

Merge tag 'ctsm5.4.040' into b4b-dev-merge-20260521

ec75574

Update clm6 paramfiles and add new paramfile for hillslope hydrology PR ESCOMP#4029 Issue ESCOMP#3659 Changes answers more than roundoff for clm6 cases.

samsrabin self-assigned this May 21, 2026

samsrabin added the b4b bit-for-bit label May 21, 2026

slevis-lmwg approved these changes May 21, 2026

View reviewed changes

Comment thread .gitmodules Outdated

mvdebolskiy and others added 6 commits May 21, 2026 13:53

add new fates namelist switch for dbh init when nocomp is on

b660e95

(cherry picked from commit e7e9e5f)

add test for init_dbh

9f65ad8

(cherry picked from commit cd74892)

update fates tag

8c710f5

(cherry picked from commit 512665b)

add bld namelist unit test for new option

12a931b

(cherry picked from commit c9216c7)

Merge cherry-picked changes from ctsm5.4.039 that b4b-dev merge missed.

b9809e8

There's something weird about ctsm5.4.039 that prevented it from coming in when I merged master to b4b-dev-merge-20260521.

Update ChangeLog and ChangeSum.

e52cff8

samsrabin mentioned this pull request May 21, 2026

Race condition with a threaded test with matrix on? #3360

Open

samsrabin merged commit d55e82e into ESCOMP:master May 22, 2026
9 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ctsm5.4.041: b4b-dev merge 2026-05-21#4040

ctsm5.4.041: b4b-dev merge 2026-05-21#4040
samsrabin merged 107 commits into
ESCOMP:masterfrom
samsrabin:b4b-dev-merge-20260521

samsrabin commented May 21, 2026 •

edited

Loading

Uh oh!

slevis-lmwg left a comment

Uh oh!

Uh oh!

samsrabin commented May 21, 2026 •

edited

Loading

Uh oh!

slevis-lmwg commented May 21, 2026

Uh oh!

samsrabin commented May 22, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Conversation

samsrabin commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of changes

Uh oh!

slevis-lmwg left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

samsrabin commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

slevis-lmwg commented May 21, 2026

Uh oh!

samsrabin commented May 22, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

samsrabin commented May 21, 2026 •

edited

Loading

samsrabin commented May 21, 2026 •

edited

Loading