diff --git a/.gitmodules b/.gitmodules
index 4a9e4b8c0f..ce2fb90de1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -92,7 +92,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS.git
-fxtag = cdeps1.0.61
+fxtag = cdeps1.0.70
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
@@ -100,7 +100,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
[submodule "share"]
path = share
url = https://github.com/ESCOMP/CESM_share
-fxtag = share1.1.7
+fxtag = share1.1.8
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
diff --git a/README b/README
index af8f2cbaaa..99c6d8e9d4 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ $CTSMROOT/README 09/05/2024
Community Terrestrial Systems Model (CTSM) science version 5.3 series -- source code, tools,
offline-build and test scripts. This gives you everything you need
-to run CTSM with CESM with the CMEPS driver and CDEPS data models to provide CRU NCEP or GSWP3 forcing data in
+to run CTSM with CESM with the CMEPS driver and CDEPS data models to provide CRUJRA or GSWP3 forcing data (some older options also available) in
place of a modeled atmosphere.
CMEPS is the Community Mediator for Earth Prediction Systems. And CDEPS is the
diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index 6de11b3571..0cf46943f4 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -37,7 +37,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
clm4_5_CRUv7
clm5_0_cam6.0
-clm6_0_GSWP3v1
+clm6_0_CRUJRA2024
clm2
@@ -848,8 +848,11 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
+hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. phys=clm6_0 use_excess_ice=.true.
+
hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. lnd_tuning_mode=clm6_0_GSWP3v1 use_excess_ice=.true.
+>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. lnd_tuning_mode=clm6_0_CRUJRA2024 use_excess_ice=.true.
lnd/clm2/initdata_map/clmi.I1850Clm50SpCru.1706-01-01.0.9x1.25_gx1v7_simyr1850_c200806.nc
-
+
lnd/clm2/dustemisdata/dst_source2x2tunedcam6-2x2-forCLM_cdf5_c230312.nc
lnd/clm2/dustemisdata/dst_source2x2tunedcam6-2x2-forCLM_cdf5_c230312.nc
+lnd/clm2/dustemisdata/dst_source2x2tunedcam6-2x2-forCLM_cdf5_c230312.nc
lnd/clm2/dustemisdata/dust_2x2_ESMFmesh_cdf5_c230730.nc
diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
index 70a41296b5..3b580af6d2 100644
--- a/bld/namelist_files/namelist_definition_ctsm.xml
+++ b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -260,7 +260,7 @@ li2014qianfrc: Reference paper Li, et. al.(2014) tuned with QIAN atmospheric for
li2016crufrc: Reference paper Li, et. al.(2016) tuned with CRU-NCEP atmospheric forcing
li2021gswpfrc: No reference paper yet, tuned with GSWP3 atmospheric forcing
li2024gswpfrc: No reference paper yet, tuned with GSWP3 atmospheric forcing
-li2024crujra: No reference paper yet, tuned with CRU-JRA forcing
+li2024crujra: No reference paper yet, tuned with CRU-JRA forcing (CRUJRA2024)
-
+
+ valid_values="clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_cam7.0,clm4_5_cam6.0,clm4_5_cam5.0,clm4_5_cam4.0,clm5_0_cam7.0,clm5_0_cam6.0,clm5_0_cam5.0,clm5_0_cam4.0,clm5_0_CRUv7,clm5_0_GSWP3v1,clm5_0_CRUJRA2024,clm6_0_GSWP3v1,clm6_0_CRUJRA2024,clm6_0_cam7.0,clm6_0_cam6.0,clm6_0_cam5.0,clm6_0_cam4.0">
General configuration of model version and atmospheric forcing to tune the model to run under.
This sets the model to run with constants and initial conditions that were set to run well under
the configuration of model version and atmospheric forcing. To run well constants would need to be changed
diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index a3630f3286..2c95d2e624 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -1980,11 +1980,12 @@ sub cat_and_create_namelistinfile {
my $mode = "-phys $phys";
&make_config_cache($phys);
my @forclist = ();
- @forclist = ( "CRUv7", "GSWP3v1", "cam7.0", "cam6.0", "cam5.0", "cam4.0" );
+ @forclist = ( "CRUJRA2024", "CRUv7", "GSWP3v1", "cam7.0", "cam6.0", "cam5.0", "cam4.0" );
foreach my $forc ( @forclist ) {
foreach my $bgc ( "sp", "bgc" ) {
my $lndtuningmode = "${phys}_${forc}";
- if ( $lndtuningmode eq "clm6_0_CRUv7" ) {
+ if ( $lndtuningmode eq "clm6_0_CRUv7" or
+ $lndtuningmode eq "clm4_5_CRUJRA2024") {
next;
}
my $clmoptions = "-res $res -mask $mask -sim_year $simyr -envxml_dir . -lnd_tuning_mod $lndtuningmode -bgc $bgc";
diff --git a/cime_config/buildnml b/cime_config/buildnml
index 6215379912..dfc1b37ed1 100644
--- a/cime_config/buildnml
+++ b/cime_config/buildnml
@@ -105,6 +105,7 @@ def buildnml(case, caseroot, compname):
"clm5_0_QIAN": "clm5_0_GSWP3v1",
"clm5_0_NLDAS2": "clm5_0_GSWP3v1",
"clm5_0_ERA5": "clm5_0_GSWP3v1",
+ "clm5_0_CRUJRA2024": "clm5_0_GSWP3v1",
"clm6_0_1PT": "clm6_0_GSWP3v1",
"clm6_0_QIAN": "clm6_0_GSWP3v1",
"clm6_0_NLDAS2": "clm6_0_GSWP3v1",
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 55ca78f1f4..689fbcde0d 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -63,6 +63,7 @@
Options for all combinations of CLM physics and atm forcing are given. The buildnml and namelist_defaults will narrow it down to the ones
that have been tuned. The buildnml will also warn you if a tuning combination is based on another set.
Atm forcing options:
+ CRUJRA2024
CRUv7
GSWP3
CAM4.0
@@ -76,14 +77,13 @@
Other atm forcing options are invalid to run CLM and will result in an error.
UNSET
-
- clm5_0_cam6.0,clm5_0_cam7.0,clm5_0_cam5.0,clm5_0_cam4.0,clm5_0_GSWP3v1,clm5_0_CRUv7,clm5_0_QIAN,clm5_0_1PT,clm5_0_NLDAS2,clm5_0_ERA5,clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_QIAN,clm4_5_cam6.0,clm4_5_cam7.0,clm4_5_cam5.0,clm4_5_cam4.0,clm4_5_1PT,clm4_5_NLDAS2,clm4_5_ERA5,clm6_0_CRUv7,clm6_0_GSWP3v1,clm6_0_cam6.0,clm6_0_cam7.0,clm6_0_cam5.0,clm6_0_cam4.0,clm6_0_QIAN,clm6_0_1PT,clm6_0_NLDAS2,clm6_0_ERA5
+
+ clm5_0_cam6.0,clm5_0_cam7.0,clm5_0_cam5.0,clm5_0_cam4.0,clm5_0_GSWP3v1,clm5_0_CRUJRA2024,clm5_0_CRUv7,clm5_0_QIAN,clm5_0_1PT,clm5_0_NLDAS2,clm5_0_ERA5,clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_QIAN,clm4_5_cam6.0,clm4_5_cam7.0,clm4_5_cam5.0,clm4_5_cam4.0,clm4_5_1PT,clm4_5_NLDAS2,clm4_5_ERA5,clm6_0_CRUv7,clm6_0_GSWP3v1,clm6_0_CRUJRA2024,clm6_0_cam6.0,clm6_0_cam7.0,clm6_0_cam5.0,clm6_0_cam4.0,clm6_0_QIAN,clm6_0_1PT,clm6_0_NLDAS2,clm6_0_ERA5
-
+
clm4_5_CRUv7
clm4_5_CRUv7
- clm4_5_CRUv7
clm4_5_GSWP3v1
clm4_5_cam6.0
clm4_5_cam4.0
@@ -97,8 +97,8 @@
clm4_5_NLDAS2
clm4_5_ERA5
+ clm5_0_CRUJRA2024
clm5_0_CRUv7
- clm5_0_CRUv7
clm5_0_GSWP3v1
clm5_0_GSWP3v1
clm5_0_cam6.0
@@ -113,8 +113,8 @@
clm5_0_NLDAS2
clm5_0_ERA5
+ clm6_0_CRUJRA2024
clm6_0_CRUv7
- clm6_0_CRUv7
clm6_0_GSWP3v1
clm6_0_GSWP3v1
clm6_0_cam6.0
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index 51534f44ec..455c8212c7 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -87,6 +87,10 @@
I2000Clm60SpRs
2000_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV
+
+ I2000Clm60SpCrujraRs
+ 2000_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV
+
I2000Clm60Sp
@@ -94,11 +98,11 @@
-
-
- I2000Clm60SpRs
- 2000_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV
+ I2000Clm60SpCrujra
+ 2000_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV
+
+
@@ -137,11 +141,19 @@
I2000Clm60BgcCrop
2000_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV
+
+ I2000Clm60BgcCropCrujra
+ 2000_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV
+
I2000Clm60Bgc
2000_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV
+
+ I2000Clm60BgcCrujra
+ 2000_DATM%CRUJRA2024_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV
+
@@ -158,6 +170,10 @@
+
+ I1850Clm60SpCrujra
+ 1850_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV
+
I1850Clm60SpCru
1850_DATM%CRUv7_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV
@@ -170,15 +186,14 @@
+
I1850Clm60BgcCrop
1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV
-
-
- I1850Clm60BgcCrop
- 1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV
+ I1850Clm60BgcCropCrujra
+ 1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV
@@ -192,6 +207,10 @@
I1850Clm60Bgc
1850_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV
+
+ I1850Clm60BgcCrujra
+ 1850_DATM%CRUJRA2024_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV
+
@@ -204,6 +223,10 @@
I1850Clm60BgcCropCmip6
1850_DATM%GSWP3v1_CLM60%BGC-CROP-CMIP6DECK_SICE_SOCN_MOSART_SGLC_SWAV
+
+ I1850Clm60BgcCropCrujraCmip6
+ 1850_DATM%CRUJRA2024_CLM60%BGC-CROP-CMIP6DECK_SICE_SOCN_MOSART_SGLC_SWAV
+
@@ -215,6 +238,10 @@
I1850Clm60BgcCropCmip6waccm
1850_DATM%GSWP3v1_CLM60%BGC-CROP-CMIP6WACCMDECK_SICE_SOCN_MOSART_SGLC_SWAV
+
+ I1850Clm60BgcCropCrujraCmip6waccm
+ 1850_DATM%CRUJRA2024_CLM60%BGC-CROP-CMIP6WACCMDECK_SICE_SOCN_MOSART_SGLC_SWAV
+
@@ -274,6 +301,10 @@
I2000Clm50FatesCruRsGs
2000_DATM%CRUv7_CLM50%FATES_SICE_SOCN_SROF_SGLC_SWAV
+
+ I2000Clm60FatesSpCrujraRsGs
+ 2000_DATM%CRUJRA2024_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV
+
I2000Clm60FatesSpCruRsGs
2000_DATM%CRUv7_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV
@@ -295,6 +326,10 @@
I2000Clm60FatesRs
2000_DATM%GSWP3v1_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV
+
+ I2000Clm60FatesCrujraRs
+ 2000_DATM%CRUJRA2024_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV
+
I1850Clm50Bgc
@@ -306,12 +341,22 @@
1850_DATM%GSWP3v1_CLM60%BGC-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV
+
+ I1850Clm60BgcCrujraNoAnthro
+ 1850_DATM%CRUJRA2024_CLM60%BGC-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV
+
+
I1850Clm60SpNoAnthro
1850_DATM%GSWP3v1_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV
+
+ I1850Clm60SpCrujraNoAnthro
+ 1850_DATM%CRUJRA2024_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV
+
+
I1850Clm50BgcNoAnthro
@@ -331,23 +376,25 @@
-
- I1850Clm60SpNoAnthro
- 1850_DATM%GSWP3v1_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV
-
-
-
IHistClm60Sp
HIST_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV
+
+ IHistClm60SpCrujra
+ HIST_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV
+
IHistClm60SpRs
HIST_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV
+
+ IHistClm60SpCrujraRs
+ HIST_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV
+
IHistClm60Bgc
@@ -358,6 +405,10 @@
IHistClm60BgcCrop
HIST_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV
+
+ IHistClm60BgcCropCrujra
+ HIST_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV
+
IHistClm50Sp
@@ -408,6 +459,10 @@
ISSP585Clm50BgcCrop
SSP585_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV
+
+ ISSP585Clm60BgcCropCrujra
+ SSP585_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV
+
ISSP126Clm50BgcCrop
@@ -423,11 +478,19 @@
ISSP245Clm50BgcCrop
SSP245_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV
+
+ ISSP245Clm60BgcCropCrujra
+ SSP245_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV
+
ISSP370Clm50BgcCrop
SSP370_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV
+
+ ISSP370Clm60BgcCropCrujra
+ SSP370_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV
+
ISSP434Clm50BgcCrop
@@ -646,6 +709,13 @@
+
+ I1850Clm60BgcCropCrujraG
+ 1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV
+
+
+
+
IHistClm60BgcCropG
@@ -665,6 +735,10 @@
I1850Clm60SpRs
1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV
+
+ I1850Clm60SpCrujraRs
+ 1850_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV
+
@@ -777,6 +1089,15 @@
+
+
+
+
+
+
+
+
+
@@ -786,6 +1107,15 @@
+
+
+
+
+
+
+
+
+
@@ -1619,6 +1949,15 @@
+
+
+
+
+
+
+
+
+
@@ -2098,6 +2437,15 @@
+
+
+
+
+
+
+
+
+
@@ -2119,6 +2467,15 @@
+
+
+
+
+
+
+
+
+
@@ -2140,6 +2497,15 @@
+
+
+
+
+
+
+
+
+
@@ -2149,6 +2515,15 @@
+
+
+
+
+
+
+
+
+
@@ -2170,6 +2545,15 @@
+
+
+
+
+
+
+
+
+
@@ -2201,6 +2585,15 @@
+
+
+
+
+
+
+
+
+
@@ -2211,6 +2604,15 @@
+
+
+
+
+
+
+
+
+
@@ -2608,6 +3010,15 @@
+
+
+
+
+
+
+
+
+
@@ -2627,6 +3038,15 @@
+
+
+
+
+
+
+
+
+
@@ -2636,6 +3056,15 @@
+
+
+
+
+
+
+
+
+
@@ -2768,6 +3197,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3634,6 +4075,15 @@
+
+
+
+
+
+
+
+
+
@@ -3866,4 +4316,4 @@
-
\ No newline at end of file
+
diff --git a/components/cdeps b/components/cdeps
index 0750c91753..44dfda49db 160000
--- a/components/cdeps
+++ b/components/cdeps
@@ -1 +1 @@
-Subproject commit 0750c9175395d3ba3bf8eba65703dee230d08572
+Subproject commit 44dfda49db77cd38cd493a03d4b4c81ad54af525
diff --git a/doc/ChangeLog b/doc/ChangeLog
index b91f679494..184168ed02 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,96 @@
===============================================================
+Tag name: ctsm5.3.032
+Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
+Date: Mon 17 Mar 2025 09:49:08 AM MDT
+One-line Summary: Add option to use CRUJRA2024 with clm6 and clm5
+
+Purpose and description of changes
+----------------------------------
+
+ Added the option and included explicit Crujra compsets with clm6 and clm5.
+ This required changes in cdeps.
+ Unrelated updates in cdeps required updating share.
+
+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]:
+ Resolves #1895 add crujra option for ctsm's datm inputs
+ Partly addresses #2960 update subset_data to use crujra
+
+Notes of particular relevance for users
+---------------------------------------
+Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables):
+ Adding new compsets with Crujra in their names and allowing CRUJRA2024 in long compset names
+
+Changes made to namelist defaults (e.g., changed parameter values):
+ Limited changes revolving around lnd_tuning_mode settings
+
+Changes to documentation:
+ Updated only subset_data documentation to explain how to subset gswp datm files instead of the default crujra files
+
+Notes of particular relevance for developers:
+---------------------------------------------
+Changes to tests or testing:
+ New tests exercising Crujra compsets
+
+Testing summary:
+----------------
+
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+ build-namelist
+
+ derecho - PASS
+
+ python testing
+
+ derecho - PASS
+
+ regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+ derecho ----- OK
+ izumi ------- OK
+
+ ctsm_sci compared against most recent (ctsm_sci-ctsm5.3.021) baseline
+ derecho ----- OK
+
+ aux_cdeps compared against cdeps1.0.55 and then against cdeps1.0.70 baselines
+ derecho ----- OK
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: No
+
+Other details
+-------------
+List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
+ share1.1.7 to share1.1.8
+ cdeps1.0.61 to cdeps1.0.70
+
+Pull Requests that document the changes (include PR ids):
+ https://github.com/ESCOMP/ctsm/pull/2956
+ https://github.com/ESCOMP/CDEPS/pull/322
+
+===============================================================
+===============================================================
Tag name: ctsm5.3.031
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
Date: Thu 13 Mar 2025 02:37:18 PM MDT
diff --git a/doc/ChangeSum b/doc/ChangeSum
index 699ce977f8..e3e6f0fb74 100644
--- a/doc/ChangeSum
+++ b/doc/ChangeSum
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
+ ctsm5.3.032 slevis 03/17/2025 Add option to use CRUJRA2024 with clm6 and clm5
ctsm5.3.031 slevis 03/13/2025 Merge b4b-dev
ctsm5.3.030 samrabin 03/07/2025 Fix FATES branch runs
ctsm5.3.029 slevis 03/05/2025 Make Bytnerowicz the default nfix_method for clm6
diff --git a/python/ctsm/subset_data.py b/python/ctsm/subset_data.py
index fb0ba925a9..ba4212eff1 100644
--- a/python/ctsm/subset_data.py
+++ b/python/ctsm/subset_data.py
@@ -571,7 +571,12 @@ def setup_files(args, defaults, cesmroot):
abort("inputdata directory does not exist")
# DATM data
- datm_type = "datm_gswp3"
+ # TODO Issue #2960: Make datm_type a user option at the command
+ # line. For reference, this option affects three .cfg files:
+ # tools/site_and_regional/default_data_1850.cfg
+ # tools/site_and_regional/default_data_2000.cfg
+ # python/ctsm/test/testinputs/default_data.cfg
+ datm_type = "datm_crujra" # also available: datm_type = "datm_gswp3"
dir_output_datm = "datmdata"
dir_input_datm = os.path.join(clmforcingindir, defaults.get(datm_type, "dir"))
if args.create_datm:
diff --git a/python/ctsm/test/testinputs/default_data.cfg b/python/ctsm/test/testinputs/default_data.cfg
index 24aa811fee..a832d810cc 100644
--- a/python/ctsm/test/testinputs/default_data.cfg
+++ b/python/ctsm/test/testinputs/default_data.cfg
@@ -1,6 +1,19 @@
[main]
clmforcingindir = /glade/campaign/cesm/cesmdata/cseg/inputdata
+[datm_crujra]
+dir = atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c20241231/three_stream
+domain = domain.crujra_v2.3_0.5x0.5.c220801.nc
+solardir = .
+precdir = .
+tpqwdir = .
+solartag = clmforc.CRUJRAv2.5_0.5x0.5.Solr.
+prectag = clmforc.CRUJRAv2.5_0.5x0.5.Prec.
+tpqwtag = clmforc.CRUJRAv2.5_0.5x0.5.TPQWL.
+solarname = CLMCRUJRA2024.Solar
+precname = CLMCRUJRA2024.Precip
+tpqwname = CLMCRUJRA2024.TPQW
+
[datm_gswp3]
dir = atm/datm7/atm_forcing.datm7.GSWP3.0.5d.v1.c170516
domain = domain.lnd.360x720_gswp3.0v1.c170606.nc
diff --git a/share b/share
index c5e7603c29..a30c62710d 160000
--- a/share
+++ b/share
@@ -1 +1 @@
-Subproject commit c5e7603c29ea5e2fe93ca16d88bc9c7f16175bcd
+Subproject commit a30c62710d0c4e5a8ea9a5b780ac5b1b83677d55
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 70cf802e45..7af324f918 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -94,7 +94,7 @@ include_directories (${NETCDF}/include)
# Directories and libraries to include in the link step
link_directories(${CMAKE_CURRENT_BINARY_DIR})
-link_libraries( pioc piof netcdf )
+link_libraries( pioc piof netcdf esmf )
# Add the test directories
# Note: it's possible that these could be added by each source directory that
diff --git a/tools/site_and_regional/default_data_1850.cfg b/tools/site_and_regional/default_data_1850.cfg
index 0f3cdab60f..3c9f28c0a2 100644
--- a/tools/site_and_regional/default_data_1850.cfg
+++ b/tools/site_and_regional/default_data_1850.cfg
@@ -1,6 +1,19 @@
[main]
clmforcingindir = /glade/campaign/cesm/cesmdata/inputdata
+[datm_crujra]
+dir = atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c20241231/three_stream
+domain = domain.crujra_v2.3_0.5x0.5.c220801.nc
+solardir = .
+precdir = .
+tpqwdir = .
+solartag = clmforc.CRUJRAv2.5_0.5x0.5.Solr.
+prectag = clmforc.CRUJRAv2.5_0.5x0.5.Prec.
+tpqwtag = clmforc.CRUJRAv2.5_0.5x0.5.TPQWL.
+solarname = CLMCRUJRA2024.Solar
+precname = CLMCRUJRA2024.Precip
+tpqwname = CLMCRUJRA2024.TPQW
+
[datm_gswp3]
dir = atm/datm7/atm_forcing.datm7.GSWP3.0.5d.v1.c170516
domain = domain.lnd.360x720_gswp3.0v1.c170606.nc
diff --git a/tools/site_and_regional/default_data_2000.cfg b/tools/site_and_regional/default_data_2000.cfg
index 24aa811fee..a832d810cc 100644
--- a/tools/site_and_regional/default_data_2000.cfg
+++ b/tools/site_and_regional/default_data_2000.cfg
@@ -1,6 +1,19 @@
[main]
clmforcingindir = /glade/campaign/cesm/cesmdata/cseg/inputdata
+[datm_crujra]
+dir = atm/datm7/atm_forcing.datm7.CRUJRA.0.5d.c20241231/three_stream
+domain = domain.crujra_v2.3_0.5x0.5.c220801.nc
+solardir = .
+precdir = .
+tpqwdir = .
+solartag = clmforc.CRUJRAv2.5_0.5x0.5.Solr.
+prectag = clmforc.CRUJRAv2.5_0.5x0.5.Prec.
+tpqwtag = clmforc.CRUJRAv2.5_0.5x0.5.TPQWL.
+solarname = CLMCRUJRA2024.Solar
+precname = CLMCRUJRA2024.Precip
+tpqwname = CLMCRUJRA2024.TPQW
+
[datm_gswp3]
dir = atm/datm7/atm_forcing.datm7.GSWP3.0.5d.v1.c170516
domain = domain.lnd.360x720_gswp3.0v1.c170606.nc