Merge branch 'qzhu-lbl/lnd/bugfix2' (PR #1395)

1. Add ALM-ECA related tests 2. Bug fix 3. Code cleanup 4. Adds tests for ECA compset [BFB] Conflicts: components/clm/cime_config/config_compsets.xml
ESMCI · Apr 19, 2017 · 6686302 · 6686302
2 parents 9398ece + 59709a8
commit 6686302
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/cime_config/acme/testmods_dirs/allactive/clm/eca/user_nl_clm b/cime_config/acme/testmods_dirs/allactive/clm/eca/user_nl_clm
@@ -0,0 +1,2 @@
+finidat             = ''
+
diff --git a/utils/python/update_acme_tests.py b/utils/python/update_acme_tests.py
@@ -65,6 +65,8 @@
                              ("ERS.f19_f19.I1850CLM45CN",
                               "ERS.f09_g16.I1850CLM45CN",
                               "SMS.hcru_hcru.I1850CRUCLM45CN",
+                             ("ERS.f19_g16.I1850CNECACNTBC" ,"clm-eca"),
+                             ("ERS.f19_g16.I1850CNECACTCBC" ,"clm-eca"),
                              ("SMS_Ly3_P1x1.1x1_smallvilleIA.ICLM45CNCROP", "force_netcdf_pio"),
                              ("ERS.f19_g16.I1850CLM45","clm-betr"),
                               "ERS.ne11_oQU240.I20TRCLM45",