diff --git a/.gitmodules b/.gitmodules index 0771c90237..9f898fc129 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 64e00527fe..972180448e 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 @@ -843,8 +843,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 ac61b86852..938bc4fd78 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,clm6_0_GSWP3v1,clm5_0_CRUJRA2024,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..a7394b7aac 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_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,clm5_0_CRUJRA2024,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..495dae21b8 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 + @@ -150,6 +162,12 @@ + + I1850Clm50SpCrujra + 1850_DATM%CRUJRA2024_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV + + + I1850Clm50SpCru @@ -158,6 +176,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 +192,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 +213,10 @@ I1850Clm60Bgc 1850_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV + + I1850Clm60BgcCrujra + 1850_DATM%CRUJRA2024_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV + @@ -202,7 +227,7 @@ I1850Clm60BgcCropCmip6 - 1850_DATM%GSWP3v1_CLM60%BGC-CROP-CMIP6DECK_SICE_SOCN_MOSART_SGLC_SWAV + 1850_DATM%CRUJRA2024_CLM60%BGC-CROP-CMIP6DECK_SICE_SOCN_MOSART_SGLC_SWAV @@ -213,7 +238,7 @@ I1850Clm60BgcCropCmip6waccm - 1850_DATM%GSWP3v1_CLM60%BGC-CROP-CMIP6WACCMDECK_SICE_SOCN_MOSART_SGLC_SWAV + 1850_DATM%CRUJRA2024_CLM60%BGC-CROP-CMIP6WACCMDECK_SICE_SOCN_MOSART_SGLC_SWAV @@ -223,8 +248,16 @@ + + I1850Clm50BgcCropCrujra + 1850_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + + + I1850Clm60BgcCropCrujra + 1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + I1850Clm60BgcCropCru 1850_DATM%CRUv7_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV @@ -274,6 +307,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,23 +332,41 @@ I2000Clm60FatesRs 2000_DATM%GSWP3v1_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV + + I2000Clm60FatesCrujraRs + 2000_DATM%CRUJRA2024_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV + I1850Clm50Bgc 1850_DATM%GSWP3v1_CLM50%BGC_SICE_SOCN_MOSART_SGLC_SWAV + + I1850Clm50BgcCrujra + 1850_DATM%CRUJRA2024_CLM50%BGC_SICE_SOCN_MOSART_SGLC_SWAV + I1850Clm60BgcNoAnthro 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 @@ -330,12 +385,12 @@ - - I1850Clm60SpNoAnthro - 1850_DATM%GSWP3v1_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV - - + IHistClm50BgcCropCrujra + HIST_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + + + IHistClm60Sp @@ -343,11 +398,19 @@ + + 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 +421,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 @@ -366,6 +433,10 @@ + + IHistClm50SpCrujra + HIST_DATM%CRUJRA2024_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV + IHistClm50SpCru HIST_DATM%CRUv7_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV @@ -408,6 +479,10 @@ ISSP585Clm50BgcCrop SSP585_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + + ISSP585Clm50BgcCropCrujra + SSP585_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + ISSP126Clm50BgcCrop @@ -423,11 +498,19 @@ ISSP245Clm50BgcCrop SSP245_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + + ISSP245Clm50BgcCropCrujra + SSP245_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + ISSP370Clm50BgcCrop SSP370_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + + ISSP370Clm50BgcCropCrujra + SSP370_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + ISSP434Clm50BgcCrop @@ -632,6 +715,10 @@ I1850Clm50BgcCropG 1850_DATM%GSWP3v1_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV + + I1850Clm50BgcCropCrujraG + 1850_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV + IHistClm50BgcCropG @@ -646,6 +733,13 @@ + + I1850Clm60BgcCropCrujraG + 1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV + + + + IHistClm60BgcCropG @@ -662,8 +756,8 @@ - I1850Clm60SpRs - 1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV + I1850Clm60SpCrujraRs + 1850_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 2845bf8d7c..15e36999c0 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -15,7 +15,7 @@ aux_clm_mpi_serial: aux_clm tests using mpi-serial. Useful for redoing tests that failed due to https://github.com/ESCOMP/CTSM/issues/2916, after having replaced libraries/mpi-serial with a fresh copy. --> - + @@ -34,7 +34,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -227,7 +227,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -247,7 +247,7 @@ - + @@ -257,7 +257,7 @@ - + @@ -295,7 +295,7 @@ - + @@ -304,7 +304,7 @@ - + @@ -332,7 +332,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -350,7 +350,7 @@ - + @@ -360,7 +360,7 @@ - + @@ -414,7 +414,7 @@ - + @@ -423,7 +423,7 @@ - + @@ -492,7 +492,7 @@ - + @@ -509,7 +509,7 @@ - + @@ -528,7 +528,7 @@ - + @@ -574,7 +574,7 @@ - + @@ -584,7 +584,7 @@ - + @@ -593,7 +593,7 @@ - + @@ -603,7 +603,7 @@ - + @@ -612,7 +612,7 @@ - + @@ -621,7 +621,7 @@ - + @@ -629,7 +629,7 @@ - + @@ -639,7 +639,7 @@ - + @@ -649,7 +649,7 @@ - + @@ -659,7 +659,7 @@ - + @@ -669,7 +669,7 @@ - + @@ -679,7 +679,7 @@ - + @@ -689,7 +689,7 @@ - + @@ -699,7 +699,7 @@ - + @@ -709,7 +709,7 @@ - + @@ -719,7 +719,7 @@ - + @@ -729,7 +729,7 @@ - + @@ -739,7 +739,7 @@ - + @@ -759,7 +759,7 @@ - + @@ -768,7 +768,7 @@ - + @@ -778,7 +778,7 @@ - + @@ -787,7 +787,7 @@ - + @@ -1621,7 +1621,7 @@ - + @@ -2099,7 +2099,7 @@ - + @@ -2109,7 +2109,7 @@ - + @@ -2120,7 +2120,7 @@ - + @@ -2130,7 +2130,7 @@ - + @@ -2141,7 +2141,7 @@ - + @@ -2151,7 +2151,7 @@ - + @@ -2160,7 +2160,7 @@ - + @@ -2171,7 +2171,7 @@ - + @@ -2182,7 +2182,7 @@ - + @@ -2191,7 +2191,7 @@ - + @@ -2202,7 +2202,7 @@ - + @@ -2212,7 +2212,7 @@ - + @@ -2609,7 +2609,7 @@ - + @@ -2628,7 +2628,7 @@ - + @@ -2637,7 +2637,7 @@ - + @@ -2758,7 +2758,7 @@ - + @@ -2766,7 +2766,7 @@ - + @@ -3628,7 +3628,7 @@ - + diff --git a/doc/ChangeLog b/doc/ChangeLog index be97229017..5b672c599f 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,96 @@ =============================================================== +Tag name: ctsm5.3.027 +Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310) +Date: Fri 14 Feb 2025 02:47:32 PM MST +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]: + Partly addresses #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 revoling around lnd_tuning_mode settings + +Changes to documentation: + Not, yet + +Notes of particular relevance for developers: +--------------------------------------------- +Changes to tests or testing: + New tests exercising the Crujra compsets + +Testing summary: +---------------- + + [PASS means all tests PASS; OK means tests PASS other than expected fails.] + + build-namelist tests (if CLMBuildNamelist.pm has changed): + + derecho - PASS + + python testing (if python code has changed; see instructions in python/README.md; document testing done): + + derecho - PASS + + 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 +------------- +List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): + share1.1.7 to share1.1.8 + cdeps1.0.61 to ? + +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.026 +=============================================================== +=============================================================== +Tag name: ctsm5.3.025 +=============================================================== +=============================================================== Tag name: ctsm5.3.024 Originator(s): xinchang (Cathy Xinchang Li, U of Illinois - Urbana-Champaign) Date: Tue Feb 11 09:56:24 MST 2025 diff --git a/doc/ChangeSum b/doc/ChangeSum index dbe642f55c..ad62a97eff 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,8 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.3.027 slevis 02/??/2025 Add option to use CRUJRA2024 with clm6 and clm5 + ctsm5.3.026 + ctsm5.3.025 ctsm5.3.024 xinchang 02/11/2025 Change choice of pressure in CLMU building energy model ctsm5.3.023 afoster 02/08/2025 merge b4b-dev ctsm5.3.022 glemieux 02/06/2025 Update FATES namelist build to avoid Meier2022 diff --git a/python/ctsm/subset_data.py b/python/ctsm/subset_data.py index fb0ba925a9..1e18a6e888 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 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..c6093ef2e9 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.c2024/TRENDY2024/inputs/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..73dc38c791 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.c2024/TRENDY2024/inputs/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..c6093ef2e9 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.c2024/TRENDY2024/inputs/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