Merge master 20260221#3783
Merged
Merged
Conversation
Update CISM to latest version with answer changes Update the CISM submodule to the latest tag used in cesm3_0_beta0b. This includes cismwrap_2_2_012 and cismwrap_2_2_013, both of which includes answer changes for CISM due to changes in namelist defaults. Add a new test for running both Antarctic and Greenland ice sheets. Add new compsets for CISM with Clm60.
…read internally by CTSM
…on bringing ndep from the ATM model
Merge b4b-dev to master slevis resolved conflicts: doc/ChangeLog doc/ChangeSum
… the general namelist_defaults file
…eded and not getting it from the CPL, update comments around this as well
Merge b4b-dev to master
…is not quite right
ctsm5.4.017: Introduce CRUJRA2024b datm option (Greenland snow hole filled)
…ore starting processing.
…LSE so never gets it from CPL
…e been there, so removing the extra lines that shouldn't have been there
From review Co-authored-by: Samuel Levis <slevis@ucar.edu>
ctsm5.4.018: Quick fix so that we can use Nitrogen Deposition sent from the ATM model
Quick fix so that we can use ndep sent from ATM Add the ndep_inparm namelist to drv_flds_in, so that CTSM can turn on ndep from the ATM model. Also turn on using the ndep from the ATM model for the cam LndTuningMode testmods. And make sure ndep comes from CAM when we are coupled to CAM.
…eaner4 ctsm5.4.019: Fix years used by generate_gdds
Fix years used by generate_gdds
ctsm5.4.020: Update namelist defaults: paramfile, rh_hgh, defo_fire_precip_thresh_bet, initial conditions
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
Merge b4bdev 20260219
Bring b4b-dev to master Some fixes to use the ifx compiler. Added handling of gzipped files in the short term archiver needed for DART. Use a CMake funciton for the PfUnit build. Make sure mksurfdata_esmf PIO library is used as shared in the build. Fix to a typo in the Technical Note. Use pytest instead of unittest in our python unit test framework, which allows many modern features. One test file, test_unit_longitude.py, has been modified to use pytest's "parametrize" functionality as an example. Most of the changed lines in that file are just whitespace differences. Existing run_ctsm_py_tests arguments have been ported to replicate the same functionality in pytest. Unknown arguments will be passed to pytest directly. Also: Made it so that the tests can be called from anywhere in the checkout, instead of only python/.
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
3 participants
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.
Merge master ctsm5.4.021 back to b4b-dev