Merge b4bdev 20260219#3777
Merged
Merged
Conversation
Requires cime6.1.137
The CMakeLists.txt declares PIO libraries as STATIC IMPORTED but then points to shared library files (.so). This is an internal inconsistency that can cause build failures when using externally-built shared PIO libraries. Fix: Change STATIC IMPORTED to SHARED IMPORTED for pioc and piof targets since they reference .so files. Tested on: HiPerGator (UF HPC) with GCC 14.2.0, OpenMPI 5.0.7, shared PIO 2.6.6 at /blue/gerber/earth_models/shared/parallelio/bld/
This brings the parameter file in line with what I used for my AGU 2025 simulations.
grnfill:
Values differ:
[pft 61 (rice)] 0.4000000059604645 → 0.6
[pft 62 (irrigated_rice)] 0.4000000059604645 → 0.6
lfemerg:
Values differ:
[pft 61 (rice)] 0.009999999776482582 → 0.05
[pft 62 (irrigated_rice)] 0.009999999776482582 → 0.05
…remove dwat_temp as it's unused
The CMakeLists.txt declares PIO libraries as STATIC IMPORTED but then points to shared library files (.so). This is an internal inconsistency that can cause build failures when using externally-built shared PIO libraries. Fix: Change STATIC IMPORTED to SHARED IMPORTED for pioc and piof targets since they reference .so files. Tested on: HiPerGator (UF HPC) with GCC 14.2.0, OpenMPI 5.0.7, shared PIO 2.6.6 at /blue/gerber/earth_models/shared/parallelio/bld/
Merge b4b-dev to master
Merge ctsm5.4.016 into b4b-dev
Tech Note: Distinguish between time step and iteration level in vegetation longwave and fluxes
ifx apparently doesn't do short-circuit evaluation, so SMS_D_Ld1.ne30pg3_t232.I1850Clm50BgcSpinup.derecho_intel.clm-cplhist was crashing with floating invalid when using the ifx compiler (via ccs_config_cesm1.0.75). Resolves ESCOMP#3763
Changed FillValue from NaN to non-Nan with: ncatted -a _FillValue,p_ac_MD,o,d,1.e38 /glade/campaign/cesm/cesmdata/inputdata/lnd/clm2/urbandata/CTSM52_urbantv_Li_2024_0.9x1.25_simyr1849-2106_c20260217.nc ncatted -a _FillValue,p_ac_HD,o,d,1.e38 /glade/campaign/cesm/cesmdata/inputdata/lnd/clm2/urbandata/CTSM52_urbantv_Li_2024_0.9x1.25_simyr1849-2106_c20260217.nc ncatted -a _FillValue,p_ac_TBD,o,d,1.e38 /glade/campaign/cesm/cesmdata/inputdata/lnd/clm2/urbandata/CTSM52_urbantv_Li_2024_0.9x1.25_simyr1849-2106_c20260217.nc Partially addresses ESCOMP#3764
…rugh/CTSM into fix/mksurfdata-cmake-shared-pio
…-shared-pio Fix mksurfdata CMakeLists.txt: use SHARED for .so PIO libraries
Conflicts: src/CMakeLists.txt
Use a CMake function provided by CIME Ran unit tester again and it all works.
Comment from review
Conflicts: cime_config/config_archive.xml
…test Use pytest instead of unittest in run_ctsm_py_tests
Added code to make st-archive handle DART files
Fixes for ifx
Address C-cycle + fire biases in CESM3 runs by updating nml defaults - New defaults for lnd_tuning_mode="clm6_0_cam7.0" defo_fire_precip_thresh_bet = 1.4d00 rh_hgh = 80.0d00 - New default paramfiles for clm6: /glade/work/linnia/CLM6-PPE/ctsm6_cal/paramfiles/ctsm60_params.c260204.nc for lnd_tuning_mode="clm6_0_cam7.0": /glade/u/home/slevis/paramfiles/iss3725_forFang/ctsm60_params.c260204.cesm3-01.nc The latter got renamed to ctsm60-cam70_params.c260204.nc and it increases pft-specific values of "rswf_max" and "rswf_min" - New default finidat for ne30 and 1850 /glade/derecho/scratch/wwieder/archive/ctsm5.4.015_BGCcrop_ne30_144_pSASU/rest/0181-01-01-00000/ctsm5.4.015_BGCcrop_ne30_144_pSASU.clm2.r.0181-01-01-00000.nc All new files got moved to /inputdata and got rimported. Issue ESCOMP#3725 PR ESCOMP#3756 Changes answers relative to baseline in Clm6 cases: - Nature of change: larger than roundoff due to changes in defaults - LMWG_dev issue number(s): NCAR/LMWG_dev#141 NCAR/LMWG_dev#143
…tests, so bring running it back in, so 'make all' now runs all of the tests
ekluzek
approved these changes
Feb 21, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
#3765 Fixes for ifx, from Bill Sacks
#3084 Added code to make st-archive handle DART files, from Kevin Raeder
#3761 Use pytest instead of unittest in run_ctsm_py_tests, from Sam Rabin
#3582 Use a CMake function provided by CIME, from Bill Sacks
#3700 Fix mksurfdata CMakeLists.txt: use SHARED for .so PIO libraries, from Cooper DeVane-Prugh
#3220 Tech Note: Distinguish between time step and iteration level in vegetation longwave and fluxes, from Keith Oleson
Specific notes
Contributors other than yourself, if any:
CTSM Issues Fixed (include github issue #):
Resolves #3762 by Bill Sacks
Resolves #3763 by Bill Sacks
Resolves #3774 by Erik Kluzek
Resolves #3082 by Kevin Raeder
Resolves #3616 by Sam Rabin
Resolves #3035 by Keith Oleson
Are answers expected to change (and if so in what way)?
No.
Any User Interface Changes (namelist or namelist defaults changes)? Yes
New Prigent and urbantv streams files with NaN's removed by Bill Sacks
Does this create a need to change or add documentation? Did you do so? No other than update made
Testing performed, if any:
@slevis-lmwg working in local directory
/glade/work/slevis/git/b4b-devHanding over to Erik at step 7 in https://github.com/ESCOMP/CTSM/wiki/b4b%E2%80%90dev-branch-procedures