Merge branch 'cwhicker_m20240206_2_datm-era5' into next (PR #6234)

Re-merges the PR after the tests have been updated.
E3SM-Project · May 11, 2024 · 11aa2cc · 11aa2cc
2 parents 96ed35f + 52643ff
commit 11aa2cc
Show file tree

Hide file tree

Showing 21 changed files with 2 additions and 643 deletions.
diff --git 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.f09_g16.IELMBC.elm-simple_decomp",
             "ERS.hcru_hcru.IELM.elm-multi_inst",

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
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
diff --git a/...onents/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.mcpr b/...onents/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.mcpr
diff --git a/...nents/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.mlspr b/...nents/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.mlspr
diff --git a/...ts/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdfswrf b/...ts/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdfswrf
diff --git a/...ts/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdrswrf b/...ts/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdrswrf
diff --git a/...ts/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdwlwrf b/...ts/elm/cime_config/testdefs/testmods_dirs/elm/era5/user_datm.streams.txt.ELMERA5.msdwlwrf
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
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
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
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
diff --git a/...ents/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.d2m b/...ents/elm/cime_config/testdefs/testmods_dirs/elm/era56hr/user_datm.streams.txt.ERA56HR.d2m