From 9079fc0ef9cfa61216472c8ab38a047d3a57bdfe Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 6 Feb 2025 16:21:21 -0700 Subject: [PATCH 01/16] Update README --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index af8f2cbaaa..12c6bbb94a 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 CRU or GSWP3 forcing data in place of a modeled atmosphere. CMEPS is the Community Mediator for Earth Prediction Systems. And CDEPS is the From 748f3ccf37c359d54f9595eea572b8ac82a0c77c Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 6 Feb 2025 16:22:38 -0700 Subject: [PATCH 02/16] Update files in /bld --- bld/namelist_files/namelist_defaults_ctsm.xml | 9 +++++++-- bld/namelist_files/namelist_definition_ctsm.xml | 6 +++--- bld/unit_testers/build-namelist_test.pl | 6 ++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index cee72ca5cf..f4c2dd1267 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 @@ -846,6 +846,9 @@ 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. 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..b8f1b6f852 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 (CRUJRA) - + + 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,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 d42487cfdb..40a7e90376 100755 --- a/bld/unit_testers/build-namelist_test.pl +++ b/bld/unit_testers/build-namelist_test.pl @@ -1976,11 +1976,13 @@ 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" or + $lndtuningmode eq "clm5_0_CRUJRA2024") { next; } my $clmoptions = "-res $res -mask $mask -sim_year $simyr -envxml_dir . -lnd_tuning_mod $lndtuningmode -bgc $bgc"; From d9bac05e10a0667dc6c77b8f57453b3336086cde Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 6 Feb 2025 16:24:09 -0700 Subject: [PATCH 03/16] Update files in /cime_config --- cime_config/buildnml | 1 + cime_config/config_component.xml | 10 ++-- cime_config/config_compsets.xml | 66 +++++++++++++++++---------- cime_config/testdefs/testlist_clm.xml | 10 ++++ 4 files changed, 58 insertions(+), 29 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 6215379912..a4c73b3f0a 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -110,6 +110,7 @@ def buildnml(case, caseroot, compname): "clm6_0_NLDAS2": "clm6_0_GSWP3v1", "clm6_0_ERA5": "clm6_0_GSWP3v1", "clm6_0_CRUv7": "clm6_0_GSWP3v1", + "clm6_0_CRUJRA2024": "clm6_0_GSWP3v1", } for mode, closest in closest_tuning.items(): if lnd_tuning_mode == mode: diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 55ca78f1f4..e053cf8090 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,10 +77,10 @@ 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,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 @@ -113,8 +114,9 @@ clm5_0_NLDAS2 clm5_0_ERA5 + clm6_0_CRUJRA2024 + 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..3afe5294e1 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -85,12 +85,12 @@ I2000Clm60SpRs - 2000_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV + 2000_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV I2000Clm60Sp - 2000_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV + 2000_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV @@ -98,7 +98,7 @@ I2000Clm60SpRs - 2000_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV + 2000_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV @@ -135,12 +135,12 @@ I2000Clm60BgcCrop - 2000_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + 2000_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV I2000Clm60Bgc - 2000_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV + 2000_DATM%CRUJRA2024_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV @@ -158,6 +158,10 @@ + + I1850Clm60SpCrujra + 1850_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV + I1850Clm60SpCru 1850_DATM%CRUv7_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV @@ -172,25 +176,25 @@ I1850Clm60BgcCrop - 1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + 1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV I1850Clm60BgcCrop - 1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + 1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV I1850Clm60Sp - 1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV + 1850_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV I1850Clm60Bgc - 1850_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV + 1850_DATM%CRUJRA2024_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV @@ -202,7 +206,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 +217,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 @@ -225,6 +229,10 @@ + + I1850Clm60BgcCropCrujra + 1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + I1850Clm60BgcCropCru 1850_DATM%CRUv7_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV @@ -264,7 +272,7 @@ I2000Clm60Fates - 2000_DATM%GSWP3v1_CLM60%FATES_SICE_SOCN_MOSART_SGLC_SWAV + 2000_DATM%CRUJRA2024_CLM60%FATES_SICE_SOCN_MOSART_SGLC_SWAV I2000Clm50Fates @@ -274,13 +282,17 @@ 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 I2000Clm60FatesSpRsGs - 2000_DATM%GSWP3v1_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV + 2000_DATM%CRUJRA2024_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV I2000Clm50FatesCru @@ -293,7 +305,7 @@ I2000Clm60FatesRs - 2000_DATM%GSWP3v1_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV + 2000_DATM%CRUJRA2024_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV @@ -303,13 +315,13 @@ I1850Clm60BgcNoAnthro - 1850_DATM%GSWP3v1_CLM60%BGC-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV + 1850_DATM%CRUJRA2024_CLM60%BGC-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV I1850Clm60SpNoAnthro - 1850_DATM%GSWP3v1_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV + 1850_DATM%CRUJRA2024_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV @@ -333,30 +345,30 @@ I1850Clm60SpNoAnthro - 1850_DATM%GSWP3v1_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV + 1850_DATM%CRUJRA2024_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV IHistClm60Sp - HIST_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV + HIST_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV IHistClm60SpRs - HIST_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV + HIST_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV IHistClm60Bgc - HIST_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV + HIST_DATM%CRUJRA2024_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV IHistClm60BgcCrop - HIST_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + HIST_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV @@ -373,6 +385,10 @@ + + IHistClm60SpCrujra + HIST_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV + IHistClm60SpCru HIST_DATM%CRUv7_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV @@ -447,7 +463,7 @@ ISSP585Clm60BgcCrop - SSP585_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + SSP585_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV @@ -641,7 +657,7 @@ I1850Clm60BgcCropG - 1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV + 1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV @@ -649,7 +665,7 @@ IHistClm60BgcCropG - HIST_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV + HIST_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV @@ -663,7 +679,7 @@ I1850Clm60SpRs - 1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV + 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..14de54339c 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -3379,6 +3379,16 @@ + + + + + + + + + + From df8342b6265a6e050a25d79fa93d81ab98887738 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 6 Feb 2025 16:24:56 -0700 Subject: [PATCH 04/16] Add TODO in subset_data.py --- python/ctsm/subset_data.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python/ctsm/subset_data.py b/python/ctsm/subset_data.py index fb0ba925a9..af58c3fdc6 100644 --- a/python/ctsm/subset_data.py +++ b/python/ctsm/subset_data.py @@ -571,6 +571,10 @@ def setup_files(args, defaults, cesmroot): abort("inputdata directory does not exist") # DATM data + # TODO issue #1895: allow datm_crujra, which also affects + # 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_gswp3" dir_output_datm = "datmdata" dir_input_datm = os.path.join(clmforcingindir, defaults.get(datm_type, "dir")) From 8b8f4b124850951525abca034208a5f5175a92f0 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 6 Feb 2025 16:53:41 -0700 Subject: [PATCH 05/16] Update (correction?) to init_interp_attributes in namelist_defaults_ctsm --- bld/namelist_files/namelist_defaults_ctsm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index f4c2dd1267..16e76d7e9f 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -843,8 +843,8 @@ 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. 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. 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_CRUJRA2024 use_excess_ice=.true. From fc2bca550496c149a141b10e239b14071d3bb0ed Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 6 Feb 2025 17:03:34 -0700 Subject: [PATCH 06/16] Rm potentially confusing DATM%CRU_CLM60 compset (left in earlier CLMs) --- cime_config/config_component.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index e053cf8090..3b9740e140 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -115,7 +115,6 @@ clm5_0_ERA5 clm6_0_CRUJRA2024 - clm6_0_CRUJRA2024 clm6_0_CRUv7 clm6_0_GSWP3v1 clm6_0_GSWP3v1 From fca46965fdc4fbf5a5fe8c1d9c763c15c1ad025e Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 6 Feb 2025 17:15:56 -0700 Subject: [PATCH 07/16] Added placeholder for clm5_0_CRUJRA2024 closest_tuning in buildnml --- cime_config/buildnml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index a4c73b3f0a..dfc1b37ed1 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -105,12 +105,12 @@ 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", "clm6_0_ERA5": "clm6_0_GSWP3v1", "clm6_0_CRUv7": "clm6_0_GSWP3v1", - "clm6_0_CRUJRA2024": "clm6_0_GSWP3v1", } for mode, closest in closest_tuning.items(): if lnd_tuning_mode == mode: From 4d51e4d7c28842e48e88e338fa9743b163c70931 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 7 Feb 2025 18:16:00 -0700 Subject: [PATCH 08/16] Add clm5 compsets with explicit use of the Crujra datm inputs --- bld/namelist_files/namelist_definition_ctsm.xml | 2 +- bld/unit_testers/build-namelist_test.pl | 3 +-- cime_config/config_component.xml | 3 ++- cime_config/config_compsets.xml | 12 ++++++++++++ cime_config/testdefs/testlist_clm.xml | 10 ++++++++++ 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml index b8f1b6f852..0d9f9c9131 100644 --- a/bld/namelist_files/namelist_definition_ctsm.xml +++ b/bld/namelist_files/namelist_definition_ctsm.xml @@ -2223,7 +2223,7 @@ Land mask description + 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 40a7e90376..5c6725f5f0 100755 --- a/bld/unit_testers/build-namelist_test.pl +++ b/bld/unit_testers/build-namelist_test.pl @@ -1981,8 +1981,7 @@ sub cat_and_create_namelistinfile { foreach my $bgc ( "sp", "bgc" ) { my $lndtuningmode = "${phys}_${forc}"; if ( $lndtuningmode eq "clm6_0_CRUv7" or - $lndtuningmode eq "clm4_5_CRUJRA2024" or - $lndtuningmode eq "clm5_0_CRUJRA2024") { + $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/config_component.xml b/cime_config/config_component.xml index 3b9740e140..db422d60f5 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -78,7 +78,7 @@ 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_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 + 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 @@ -98,6 +98,7 @@ clm4_5_NLDAS2 clm4_5_ERA5 + clm5_0_CRUJRA2024 clm5_0_CRUv7 clm5_0_CRUv7 clm5_0_GSWP3v1 diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 3afe5294e1..66108dec89 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -158,6 +158,10 @@ + + I1850Clm50SpCrujra + 1850_DATM%CRUJRA2024_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV + I1850Clm60SpCrujra 1850_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV @@ -227,6 +231,10 @@ + + I1850Clm50BgcCropCrujra + 1850_DATM%CRUJRA2024_CLM50%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + @@ -378,6 +386,10 @@ + + IHistClm50SpCrujra + HIST_DATM%CRUJRA2024_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV + IHistClm50SpCru HIST_DATM%CRUv7_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 14de54339c..7758c26c96 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -3389,6 +3389,16 @@ + + + + + + + + + + From 49d39ce0ffef519e0f59e4f33a4fdea5d815f00d Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 11 Feb 2025 16:21:37 -0700 Subject: [PATCH 09/16] Revisions part 1 from Erik's review --- README | 2 +- bld/namelist_files/namelist_definition_ctsm.xml | 2 +- cime_config/config_component.xml | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README b/README index 12c6bbb94a..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 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_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml index 0d9f9c9131..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 (CRUJRA) +li2024crujra: No reference paper yet, tuned with CRU-JRA forcing (CRUJRA2024) clm4_5_CRUv7 clm4_5_CRUv7 - clm4_5_CRUv7 clm4_5_GSWP3v1 clm4_5_cam6.0 clm4_5_cam4.0 @@ -100,7 +99,6 @@ clm5_0_CRUJRA2024 clm5_0_CRUv7 - clm5_0_CRUv7 clm5_0_GSWP3v1 clm5_0_GSWP3v1 clm5_0_cam6.0 From 2fa30394fa7f0b8a267e6bb0a2f88cd651764e56 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 11 Feb 2025 16:34:27 -0700 Subject: [PATCH 10/16] Revisions part 2 from Erik's review --- cime_config/config_compsets.xml | 46 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 66108dec89..6d3523d979 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -85,12 +85,12 @@ I2000Clm60SpRs - 2000_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV + 2000_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV I2000Clm60Sp - 2000_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV + 2000_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV @@ -98,7 +98,7 @@ I2000Clm60SpRs - 2000_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV + 2000_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV @@ -135,12 +135,12 @@ I2000Clm60BgcCrop - 2000_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + 2000_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV I2000Clm60Bgc - 2000_DATM%CRUJRA2024_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV + 2000_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV @@ -180,25 +180,25 @@ I1850Clm60BgcCrop - 1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + 1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV I1850Clm60BgcCrop - 1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + 1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV I1850Clm60Sp - 1850_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV + 1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV I1850Clm60Bgc - 1850_DATM%CRUJRA2024_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV + 1850_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV @@ -280,7 +280,7 @@ I2000Clm60Fates - 2000_DATM%CRUJRA2024_CLM60%FATES_SICE_SOCN_MOSART_SGLC_SWAV + 2000_DATM%GSWP3v1_CLM60%FATES_SICE_SOCN_MOSART_SGLC_SWAV I2000Clm50Fates @@ -300,7 +300,7 @@ I2000Clm60FatesSpRsGs - 2000_DATM%CRUJRA2024_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV + 2000_DATM%GSWP3v1_CLM60%FATES-SP_SICE_SOCN_SROF_SGLC_SWAV I2000Clm50FatesCru @@ -313,7 +313,7 @@ I2000Clm60FatesRs - 2000_DATM%CRUJRA2024_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV + 2000_DATM%GSWP3v1_CLM60%FATES_SICE_SOCN_SROF_SGLC_SWAV @@ -323,13 +323,13 @@ I1850Clm60BgcNoAnthro - 1850_DATM%CRUJRA2024_CLM60%BGC-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV + 1850_DATM%GSWP3v1_CLM60%BGC-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV I1850Clm60SpNoAnthro - 1850_DATM%CRUJRA2024_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV + 1850_DATM%GSWP3v1_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV @@ -353,30 +353,30 @@ I1850Clm60SpNoAnthro - 1850_DATM%CRUJRA2024_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV + 1850_DATM%GSWP3v1_CLM60%SP-NOANTHRO_SICE_SOCN_RTM_SGLC_SWAV IHistClm60Sp - HIST_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV + HIST_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV IHistClm60SpRs - HIST_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV + HIST_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV IHistClm60Bgc - HIST_DATM%CRUJRA2024_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV + HIST_DATM%GSWP3v1_CLM60%BGC_SICE_SOCN_MOSART_SGLC_SWAV IHistClm60BgcCrop - HIST_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + HIST_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV @@ -475,7 +475,7 @@ ISSP585Clm60BgcCrop - SSP585_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV + SSP585_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_SGLC_SWAV @@ -669,7 +669,7 @@ I1850Clm60BgcCropG - 1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV + 1850_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV @@ -677,7 +677,7 @@ IHistClm60BgcCropG - HIST_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV + HIST_DATM%GSWP3v1_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV @@ -691,7 +691,7 @@ I1850Clm60SpRs - 1850_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV + 1850_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_SROF_SGLC_SWAV From 25742524696af25bf2cdd6633b8848cf58f2c723 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 11 Feb 2025 19:01:13 -0700 Subject: [PATCH 11/16] Revisions part 3 from Erik's review --- cime_config/config_compsets.xml | 112 +++++++++++++++---- cime_config/testdefs/testlist_clm.xml | 150 +++++++++++--------------- 2 files changed, 154 insertions(+), 108 deletions(-) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 6d3523d979..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,10 +176,6 @@ - - I1850Clm50SpCrujra - 1850_DATM%CRUJRA2024_CLM50%SP_SICE_SOCN_MOSART_SGLC_SWAV - I1850Clm60SpCrujra 1850_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV @@ -178,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 @@ -200,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 + @@ -315,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 @@ -350,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 @@ -363,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 @@ -378,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 @@ -397,10 +444,6 @@ - - IHistClm60SpCrujra - HIST_DATM%CRUJRA2024_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV - IHistClm60SpCru HIST_DATM%CRUv7_CLM60%SP_SICE_SOCN_MOSART_SGLC_SWAV @@ -436,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 @@ -451,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 @@ -660,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 @@ -674,6 +733,13 @@ + + I1850Clm60BgcCropCrujraG + 1850_DATM%CRUJRA2024_CLM60%BGC-CROP_SICE_SOCN_MOSART_CISM2%GRIS-EVOLVE_SWAV + + + + IHistClm60BgcCropG @@ -690,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 7758c26c96..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 @@ - + @@ -3379,26 +3379,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -3648,7 +3628,7 @@ - + From b6acc8360f780f0864e9433c6eb40518d5be3155 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 12 Feb 2025 16:47:07 -0700 Subject: [PATCH 12/16] Update to share1.1.8 to avoid shr_sys_abort inconsistency --- .gitmodules | 2 +- share | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/share b/share index c5e7603c29..a30c62710d 160000 --- a/share +++ b/share @@ -1 +1 @@ -Subproject commit c5e7603c29ea5e2fe93ca16d88bc9c7f16175bcd +Subproject commit a30c62710d0c4e5a8ea9a5b780ac5b1b83677d55 From fbfe553b12bbb755985605f69598b43fbc9cf277 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 14 Feb 2025 12:15:28 -0700 Subject: [PATCH 13/16] Updated subset_data: hardwired default datm_crujra, available datm_gswp3 --- python/ctsm/subset_data.py | 2 +- python/ctsm/test/testinputs/default_data.cfg | 13 +++++++++++++ tools/site_and_regional/default_data_1850.cfg | 13 +++++++++++++ tools/site_and_regional/default_data_2000.cfg | 13 +++++++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/python/ctsm/subset_data.py b/python/ctsm/subset_data.py index af58c3fdc6..3eb601661c 100644 --- a/python/ctsm/subset_data.py +++ b/python/ctsm/subset_data.py @@ -575,7 +575,7 @@ def setup_files(args, defaults, cesmroot): # 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_gswp3" + 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/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 From ee875a0a9c7689021353211ba9591b74aa128750 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 14 Feb 2025 14:21:59 -0700 Subject: [PATCH 14/16] Fix FUNIT test that started failing with share1.1.08 --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From c1362c97224201cdb9a407ddf5a9fe8d202b1c7c Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 14 Feb 2025 14:25:37 -0700 Subject: [PATCH 15/16] Update TODO comment in subset_data --- python/ctsm/subset_data.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/ctsm/subset_data.py b/python/ctsm/subset_data.py index 3eb601661c..1e18a6e888 100644 --- a/python/ctsm/subset_data.py +++ b/python/ctsm/subset_data.py @@ -571,7 +571,8 @@ def setup_files(args, defaults, cesmroot): abort("inputdata directory does not exist") # DATM data - # TODO issue #1895: allow datm_crujra, which also affects + # 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 From ef8f3bdbca4d448cb40d9bb83f74ee0c4109324e Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 14 Feb 2025 15:25:51 -0700 Subject: [PATCH 16/16] Draft ChangeLog/ChangeSum --- doc/ChangeLog | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 3 ++ 2 files changed, 95 insertions(+) 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