From 52643ff7f473a4c069d4b2ae1dc4697b1d50601d Mon Sep 17 00:00:00 2001 From: Gautam Bisht Date: Sat, 11 May 2024 12:57:37 -0700 Subject: [PATCH] Updates the tests to not use use testmods --- cime_config/tests.py | 4 +-- .../testmods_dirs/elm/era5/shell_commands | 6 ---- .../era5/user_datm.streams.txt.ELMERA5.d2m | 35 ------------------- .../era5/user_datm.streams.txt.ELMERA5.mcpr | 35 ------------------- .../era5/user_datm.streams.txt.ELMERA5.mlspr | 35 ------------------- .../user_datm.streams.txt.ELMERA5.msdfswrf | 35 ------------------- .../user_datm.streams.txt.ELMERA5.msdrswrf | 35 ------------------- .../user_datm.streams.txt.ELMERA5.msdwlwrf | 35 ------------------- .../elm/era5/user_datm.streams.txt.ELMERA5.sp | 35 ------------------- .../era5/user_datm.streams.txt.ELMERA5.t2m | 35 ------------------- .../era5/user_datm.streams.txt.ELMERA5.w10 | 35 ------------------- .../testmods_dirs/elm/era56hr/shell_commands | 5 --- .../era56hr/user_datm.streams.txt.ERA56HR.d2m | 35 ------------------- .../user_datm.streams.txt.ERA56HR.mcpr | 35 ------------------- .../user_datm.streams.txt.ERA56HR.mlspr | 35 ------------------- .../user_datm.streams.txt.ERA56HR.msdfswrf | 35 ------------------- .../user_datm.streams.txt.ERA56HR.msdrswrf | 35 ------------------- .../user_datm.streams.txt.ERA56HR.msdwlwrf | 35 ------------------- .../era56hr/user_datm.streams.txt.ERA56HR.sp | 35 ------------------- .../era56hr/user_datm.streams.txt.ERA56HR.t2m | 35 ------------------- .../era56hr/user_datm.streams.txt.ERA56HR.w10 | 35 ------------------- 21 files changed, 2 insertions(+), 643 deletions(-) delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era5/shell_commands delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.d2m delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.mcpr delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.mlspr delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdfswrf delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdrswrf delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdwlwrf delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.sp delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.t2m delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.w10 delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/shell_commands delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.d2m delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.mcpr delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.mlspr delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.msdfswrf delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.msdrswrf delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.msdwlwrf delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.sp delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.t2m delete mode 100644 components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.w10 diff --git a/cime_config/tests.py b/cime_config/tests.py index cbc76c5d0558..8a4d5e6568a6 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -54,8 +54,8 @@ "e3sm_land_exenoshare" : { "time" : "0:45:00", "tests" : ( - "ERS.f19_g16.IERA5ELM.elm-era5", - "ERS.f19_g16.IERA56HRELM.elm-era56hr", + "ERS.f19_g16.IERA5ELM", + "ERS.f19_g16.IERA56HRELM", "ERS_Ld20.f45_f45.IELMFATES.elm-fates", "ERS.hcru_hcru.I20TRGSWCNPRDCTCBC.elm-erosion", "ERS.f09_g16.IELMBC.elm-simple_decomp", diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/shell_commands b/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/shell_commands deleted file mode 100644 index 53c5c100b14f..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/shell_commands +++ /dev/null @@ -1,6 +0,0 @@ -CASEDIR=`./xmlquery CASEROOT --value` -SRCROOT=`./xmlquery SRCROOT --value` -DIN_LOC_ROOT=`./xmlquery DIN_LOC_ROOT --value` -cp $SRCROOT/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.* $CASEDIR -sed 's@DIN_LOC_ROOT@'"$DIN_LOC_ROOT"'@' -i $CASEDIR/user_datm.* - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.d2m b/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.d2m deleted file mode 100644 index 3f331cf216df..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.d2m +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - d2m tdew - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614/tdew - - - elmforc.ERA5.c2018.0.25d.d2m.1979-01.nc - - - 0 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.mcpr b/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.mcpr deleted file mode 100644 index 3028cb27112f..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.mcpr +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - mcpr precc - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614/prec - - - elmforc.ERA5.c2018.0.25d.mcpr.1979-01.nc - - - -60 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.mlspr b/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.mlspr deleted file mode 100644 index a9a4f0148442..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.mlspr +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - mlspr precl - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614/prec - - - elmforc.ERA5.c2018.0.25d.mlspr.1979-01.nc - - - -60 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdfswrf b/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdfswrf deleted file mode 100644 index cbedbd08f6ef..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdfswrf +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - msdfswrf swdndf - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614/swdn - - - elmforc.ERA5.c2018.0.25d.msdfswrf.1979-01.nc - - - -3600 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdrswrf b/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdrswrf deleted file mode 100644 index f90c2c6fc111..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdrswrf +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - msdrswrf swdndr - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614/swdn - - - elmforc.ERA5.c2018.0.25d.msdrswrf.1979-01.nc - - - -3600 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdwlwrf b/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdwlwrf deleted file mode 100644 index cb5992f81694..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdwlwrf +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - msdwlwrf lwdn - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614/lwdn - - - elmforc.ERA5.c2018.0.25d.msdwlwrf.1979-01.nc - - - -60 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.sp b/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.sp deleted file mode 100644 index b602e1e96555..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.sp +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - sp pbot - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614/pbot - - - elmforc.ERA5.c2018.0.25d.sp.1979-01.nc - - - 0 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.t2m b/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.t2m deleted file mode 100644 index bfc76ea762f4..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.t2m +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - t2m tbot - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614/tbot - - - elmforc.ERA5.c2018.0.25d.t2m.1979-01.nc - - - 0 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.w10 b/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.w10 deleted file mode 100644 index d092de0d3fca..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.w10 +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - w10 wind - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.0.25d.v5.c180614/wind - - - elmforc.ERA5.c2018.0.25d.w10.1979-01.nc - - - 0 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/shell_commands b/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/shell_commands deleted file mode 100644 index 22b319b7d412..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/shell_commands +++ /dev/null @@ -1,5 +0,0 @@ -CASEDIR=`./xmlquery CASEROOT --value` -SRCROOT=`./xmlquery SRCROOT --value` -DIN_LOC_ROOT=`./xmlquery DIN_LOC_ROOT --value` -cp $SRCROOT/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.* $CASEDIR -sed 's@DIN_LOC_ROOT@'"$DIN_LOC_ROOT"'@' -i $CASEDIR/user_datm.* diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.d2m b/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.d2m deleted file mode 100644 index 4d14c34beaab..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.d2m +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - d2m tdew - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614/tdew - - - elmforc.ERA5.c2018.0.25d.d2m.1979-01.nc - - - 0 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.mcpr b/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.mcpr deleted file mode 100644 index dada0aef8f04..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.mcpr +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - mcpr precc - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614/prec - - - elmforc.ERA5.c2018.0.25d.mcpr.1979-01.nc - - - -60 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.mlspr b/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.mlspr deleted file mode 100644 index e420db6cec01..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.mlspr +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - mlspr precl - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614/prec - - - elmforc.ERA5.c2018.0.25d.mlspr.1979-01.nc - - - -60 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.msdfswrf b/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.msdfswrf deleted file mode 100644 index a47e9c05de57..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.msdfswrf +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - msdfswrf swdndf - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614/swdn - - - elmforc.ERA5.c2018.0.25d.msdfswrf.1979-01.nc - - - -21600 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.msdrswrf b/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.msdrswrf deleted file mode 100644 index f1c068c0d32f..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.msdrswrf +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - msdrswrf swdndr - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614/swdn - - - elmforc.ERA5.c2018.0.25d.msdrswrf.1979-01.nc - - - -21600 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.msdwlwrf b/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.msdwlwrf deleted file mode 100644 index e9ec034d30c3..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.msdwlwrf +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - msdwlwrf lwdn - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614/lwdn - - - elmforc.ERA5.c2018.0.25d.msdwlwrf.1979-01.nc - - - -60 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.sp b/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.sp deleted file mode 100644 index 6d5052e9e578..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.sp +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - sp pbot - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614/pbot - - - elmforc.ERA5.c2018.0.25d.sp.1979-01.nc - - - 0 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.t2m b/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.t2m deleted file mode 100644 index 3478f76bae1b..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.t2m +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - t2m tbot - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614/tbot - - - elmforc.ERA5.c2018.0.25d.t2m.1979-01.nc - - - 0 - - - diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.w10 b/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.w10 deleted file mode 100644 index 7410a658e399..000000000000 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.w10 +++ /dev/null @@ -1,35 +0,0 @@ - - - - GENERIC - - - - time time - xc lon - yc lat - area area - mask mask - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614 - - - domain.lnd.era5_721x1440_rdrlat_EC30to60E2r2.221115.nc - - - - - w10 wind - - - DIN_LOC_ROOT/atm/datm7/atm_forcing.datm7.ERA.6HRLY.0.25d.v5.c180614/wind - - - elmforc.ERA5.c2018.0.25d.w10.1979-01.nc - - - 0 - - -