Skip to content

Commit 60200fe

Browse files
peterdschwartzpeterdschwartz
committed
Change name of datm compset for review comments
1 parent 4d8a949 commit 60200fe

File tree

3 files changed

+17
-20
lines changed

3 files changed

+17
-20
lines changed

‎components/data_comps/datm/cime_config/config_component.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
This file may have atm desc entries.
1111
-->
1212
<description modifier_mode="1">
13-
<desc atm="DATM[%QIA][%WISOQIA][%CRU][%CRUv7][%GSWP3v1][%kmELM][%uELMTES][%ERA5][%ERA56HR][%GSWP3w5e5][%MOSARTTEST][%NLDAS2][%CPLHIST][%E3SMWCv2][%CPLWCH][%1PT][%NYF][%IAF][%JRA][%JRA-1p5][%JRA-1p5-2023][%JRA-1p4-2018][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%CFSv2][%CFSR]"> Data driven ATM </desc>
13+
<desc atm="DATM[%QIA][%WISOQIA][%CRU][%CRUv7][%GSWP3v1][%DaymetGSWP3][%DaymetERA5][%ERA5][%ERA56HR][%GSWP3w5e5][%MOSARTTEST][%NLDAS2][%CPLHIST][%E3SMWCv2][%CPLWCH][%1PT][%NYF][%IAF][%JRA][%JRA-1p5][%JRA-1p5-2023][%JRA-1p4-2018][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%CFSv2][%CFSR]"> Data driven ATM </desc>
1414
<desc option="QIA"> QIAN data set </desc>
1515
<desc option="WISOQIA">QIAN with water isotopes</desc>
1616
<desc option="CRU"> CRUNCEP data set </desc>
1717
<desc option="CRUv7"> CLM CRU NCEP v7 data set </desc>
1818
<desc option="GSWP3v1"> GSWP3v1 data set </desc>
19-
<desc option="kmELM"> Daymet NA data set, sub-daily downscaled with GSWP3 </desc>
20-
<desc option="uELMTES"> Daymet NA data set, sub-daily downscaled with ERA5 for TESSFA project </desc>
19+
<desc option="DaymetGSWP3"> Daymet NA data set, sub-daily downscaled with GSWP3 </desc>
20+
<desc option="DaymetERA5"> Daymet NA data set, sub-daily downscaled with ERA5 for TESSFA project </desc>
2121
<desc option="ERA5"> Fifth generation ECMWF reanalysis </desc>
2222
<desc option="ERA56HR"> Fifth generation ECMWF reanalysis,6 hourly data </desc>
2323
<desc option="GSWP3w5e5"> GSWP3w5e5 data set </desc>
@@ -79,8 +79,8 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
7979
<value compset="%CRU">CLMCRUNCEP</value>
8080
<value compset="%CRUv7">CLMCRUNCEPv7</value>
8181
<value compset="%GSWP3v1">CLMGSWP3v1</value>
82-
<value compset="%kmELM">uELM_NA</value>
83-
<value compset="%uELMTES">uELM_TES</value>
82+
<value compset="%DaymetGSWP3">uELM_NA</value>
83+
<value compset="%DaymetERA5">uELM_TES</value>
8484
<value compset="%ERA5">ELMERA5</value>
8585
<value compset="%ERA56HR">ERA56HR</value>
8686
<value compset="%GSWP3w5e5">ELMGSWP3w5e5</value>
@@ -384,17 +384,17 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
384384
<value compset="1850.*_DATM%QIA">1</value>
385385
<value compset="1850.*_DATM%CRU">1</value>
386386
<value compset="1850.*_DATM%GSW">1</value>
387-
<value compset="1850.*_DATM%kmELM">1</value>
388-
<value compset="1850.*_DATM%uELMTES">1</value>
387+
<value compset="1850.*_DATM%DaymetGSWP3">1</value>
388+
<value compset="1850.*_DATM%DaymetERA5">1</value>
389389
<value compset="HIST.*_DATM%QIA">1895</value>
390390
<value compset="HIST.*_DATM%CRU">1901</value>
391391
<value compset="HIST.*_DATM%GSW">1901</value>
392392
<value compset="HIST.*_DATM%NLDAS2">$DATM_CLMNCEP_YR_START</value>
393393
<value compset="20TR.*_DATM%QIA">1895</value>
394394
<value compset="20TR.*_DATM%CRU">1901</value>
395395
<value compset="20TR.*_DATM%GSW">1901</value>
396-
<value compset="20TR.*_DATM%kmELM">1980</value>
397-
<value compset="20TR.*_DATM%uELMTES">1980</value>
396+
<value compset="20TR.*_DATM%DaymetGSWP3">1980</value>
397+
<value compset="20TR.*_DATM%DaymetERA5">1980</value>
398398
<value compset="SSP.*_DATM%QIA">$DATM_CLMNCEP_YR_START</value>
399399
<value compset="SSP.*_DATM%CRU">$DATM_CLMNCEP_YR_START</value>
400400
<value compset="SSP.*_DATM%GSW">$DATM_CLMNCEP_YR_START</value>
@@ -424,8 +424,8 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
424424
<value compset="1850.*_DATM%QIA">1948</value>
425425
<value compset="1850.*_DATM%CRU">1901</value>
426426
<value compset="1850.*_DATM%GSW">1901</value>
427-
<value compset="1850.*_DATM%kmELM">1980</value>
428-
<value compset="1850.*_DATM%uELMTES">1980</value>
427+
<value compset="1850.*_DATM%DaymetGSWP3">1980</value>
428+
<value compset="1850.*_DATM%DaymetERA5">1980</value>
429429
<value compset="1850.*_DATM%NLDAS2">0</value> <!-- Unsupported -->
430430
<value compset="2000.*_DATM%WISOQIA">2000</value>
431431
<value compset="2000.*_DATM%QIA">1972</value>
@@ -436,8 +436,8 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
436436
<value compset="20TR.*_DATM%QIA">1948</value>
437437
<value compset="20TR.*_DATM%CRU">1901</value>
438438
<value compset="20TR.*_DATM%GSW">1901</value>
439-
<value compset="20TR.*_DATM%kmELM">1980</value>
440-
<value compset="20TR.*_DATM%uELMTES">1980</value>
439+
<value compset="20TR.*_DATM%DaymetGSWP3">1980</value>
440+
<value compset="20TR.*_DATM%DaymetERA5">1980</value>
441441
<value compset="20TR.*_DATM%NLDAS2">0</value> <!-- Unsupported -->
442442
<value compset="4804.*_DATM%QIA">1948</value>
443443
<value compset="SSP.*_DATM%QIA" >1995</value>
@@ -474,8 +474,8 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
474474
<value compset="1850.*_DATM%CRU">1920</value>
475475
<value compset="1850.*_DATM%GSW">1920</value>
476476
<value compset="1850.*_DATM%GSWP3w5e5">1920</value>
477-
<value compset="1850.*_DATM%kmELM">2014</value>
478-
<value compset="1850.*_DATM%uELMTES">2023</value>
477+
<value compset="1850.*_DATM%DaymetGSWP3">2014</value>
478+
<value compset="1850.*_DATM%DaymetERA5">2023</value>
479479
<value compset="1850.*_DATM%NLDAS2">-1</value> <!-- Unsupported -->
480480
<value compset="2000.*_DATM%WISOQIA">2004</value>
481481
<value compset="2000.*_DATM%QIA">2004</value>
@@ -488,8 +488,8 @@ data (see cime issue #3653 -- https://github.com/ESMCI/cime/issues/3653).
488488
<value compset="20TR.*_DATM%CRU">1920</value>
489489
<value compset="20TR.*_DATM%GSW">1920</value>
490490
<value compset="20TR.*_DATM%GSWP3w5e5">1920</value>
491-
<value compset="20TR.*_DATM%kmELM">2014</value>
492-
<value compset="20TR.*_DATM%uELMTES">2023</value>
491+
<value compset="20TR.*_DATM%DaymetGSWP3">2014</value>
492+
<value compset="20TR.*_DATM%DaymetERA5">2023</value>
493493
<value compset="20TR.*_DATM%NLDAS2">-1</value> <!-- Unsupported -->
494494
<value compset="4804.*_DATM%QIA">2004</value>
495495
<value compset="SSP.*_DATM%QIA">2004</value>

‎components/elm/cime_config/testdefs/testmods_dirs/elm/kilocraft/shell_commands‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
./xmlchange DATM_MODE=uELM_NA
22
./xmlchange DATM_CLMNCEP_YR_END=1948
3-
#./xmlchange PIO_TYPENAME="pnetcdf"
4-
#./xmlchange PIO_NETCDF_FORMAT="64bit_data"
53
./xmlchange DATM_CLMNCEP_YR_START=2014
64
./xmlchange DATM_CLMNCEP_YR_END=2014
75
./xmlchange ATM_NCPL=24

‎components/elm/cime_config/testdefs/testmods_dirs/elm/kilocraft/user_nl_elm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/MOF21_surfdata.Daymet_NA.1km.1d.c240524.nc'
2-
!fatmlndfrc = '$DIN_LOC_ROOT/share/domains/domain.clm/MOF21_domain.lnd.Daymet_NA.1km.1d.c240524.nc'

0 commit comments

Comments
 (0)