From efad9151285c51c60bce6cc797bcf85be28300e2 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 24 May 2017 10:43:27 -0600 Subject: [PATCH 1/4] address issue with setting GET_REFCASE --- scripts/lib/CIME/case.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/lib/CIME/case.py b/scripts/lib/CIME/case.py index b4fafb599147..0c74884e5c35 100644 --- a/scripts/lib/CIME/case.py +++ b/scripts/lib/CIME/case.py @@ -755,6 +755,8 @@ def configure(self, compset_name, grid_name, machine_name=None, self.get_compset_var_settings() + self.clean_up_lookups() + #-------------------------------------------- # machine #-------------------------------------------- @@ -876,6 +878,8 @@ def configure(self, compset_name, grid_name, machine_name=None, expect(response.startswith("u"), "Aborting by user request") # miscellaneous settings + import pdb + pdb.set_trace() if self.get_value("RUN_TYPE") == 'hybrid': self.set_value("GET_REFCASE", True) @@ -889,7 +893,6 @@ def configure(self, compset_name, grid_name, machine_name=None, if test: self.set_value("TEST",True) - self.clean_up_lookups() self.initialize_derived_attributes() # Make sure that parallel IO is not specified if total_tasks==1 From 32c2b75567c63365214f92aaefec172261ad2ea6 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 24 May 2017 12:25:14 -0600 Subject: [PATCH 2/4] remove debug statement --- scripts/lib/CIME/case.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/lib/CIME/case.py b/scripts/lib/CIME/case.py index 0c74884e5c35..957c077688dc 100644 --- a/scripts/lib/CIME/case.py +++ b/scripts/lib/CIME/case.py @@ -878,8 +878,6 @@ def configure(self, compset_name, grid_name, machine_name=None, expect(response.startswith("u"), "Aborting by user request") # miscellaneous settings - import pdb - pdb.set_trace() if self.get_value("RUN_TYPE") == 'hybrid': self.set_value("GET_REFCASE", True) From e78b4217d5c3feefb29951ae5ada7905beb8de21 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 24 May 2017 14:09:06 -0600 Subject: [PATCH 3/4] X compsets need valid grid --- scripts/lib/update_acme_tests.py | 4 ++-- scripts/tests/scripts_regression_tests.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/lib/update_acme_tests.py b/scripts/lib/update_acme_tests.py index e9ff9f4e583f..cd51f4c6d795 100644 --- a/scripts/lib/update_acme_tests.py +++ b/scripts/lib/update_acme_tests.py @@ -39,8 +39,8 @@ "cime_developer" : (None, "0:10:00", ("NCK_Ld3.f45_g37_rx1.A", - "ERI.f45_g37.X", - "ERIO.f45_g37.X", + "ERI.f09_g16.X", + "ERIO.f09_g16.X", "SEQ_Ln9.f19_g16_rx1.A", "ERS.ne30_g16_rx1.A", "ERS_N2.f19_g16_rx1.A", diff --git a/scripts/tests/scripts_regression_tests.py b/scripts/tests/scripts_regression_tests.py index 81ee85166cd6..fc131838517c 100755 --- a/scripts/tests/scripts_regression_tests.py +++ b/scripts/tests/scripts_regression_tests.py @@ -738,8 +738,8 @@ def test_a_phases(self): ########################################################################### # exclude the MEMLEAK tests here. tests = update_acme_tests.get_full_test_names(["cime_test_only", - "^TESTMEMLEAKFAIL_P1.f19_g16.X", - "^TESTMEMLEAKPASS_P1.f19_g16.X", + "^TESTMEMLEAKFAIL_P1.f09_g16.X", + "^TESTMEMLEAKPASS_P1.f09_g16.X", "^TESTTESTDIFF_P1.f19_g16_rx1.A", "^TESTBUILDFAILEXC_P1.f19_g16_rx1.A", "^TESTRUNFAILEXC_P1.f19_g16_rx1.A"], @@ -1027,14 +1027,14 @@ class T_TestRunRestart(TestCreateTestCommon): ########################################################################### def test_run_restart(self): ########################################################################### - run_cmd_assert_result(self, "%s/create_test --test-root %s --output-root %s -t %s NODEFAIL_P1.f45_g37.X" + run_cmd_assert_result(self, "%s/create_test --test-root %s --output-root %s -t %s NODEFAIL_P1.f09_g16.X" % (SCRIPT_DIR, TEST_ROOT, TEST_ROOT, self._baseline_name)) if self._hasbatch: run_cmd_assert_result(self, "%s/wait_for_tests *%s/TestStatus" % (TOOLS_DIR, self._baseline_name), from_dir=self._testroot) casedir = os.path.join(self._testroot, - "%s.%s" % (CIME.utils.get_full_test_name("NODEFAIL_P1.f45_g37.X", machine=self._machine, compiler=self._compiler), self._baseline_name)) + "%s.%s" % (CIME.utils.get_full_test_name("NODEFAIL_P1.f09_g16.X", machine=self._machine, compiler=self._compiler), self._baseline_name)) fail_sentinel = os.path.join(casedir, "run", "FAIL_SENTINEL") self.assertTrue(os.path.exists(fail_sentinel), msg="Missing %s" % fail_sentinel) @@ -1045,7 +1045,7 @@ def test_run_restart(self): def test_run_restart_too_many_fails(self): ########################################################################### os.environ["NODEFAIL_NUM_FAILS"] = "5" - run_cmd_assert_result(self, "%s/create_test --test-root %s --output-root %s -t %s NODEFAIL_P1.f45_g37.X" + run_cmd_assert_result(self, "%s/create_test --test-root %s --output-root %s -t %s NODEFAIL_P1.f09_g16.X" % (SCRIPT_DIR, TEST_ROOT, TEST_ROOT, self._baseline_name), expected_stat=(0 if self._hasbatch else CIME.utils.TESTS_FAILED_ERR_CODE)) if self._hasbatch: @@ -1053,7 +1053,7 @@ def test_run_restart_too_many_fails(self): from_dir=self._testroot, expected_stat=CIME.utils.TESTS_FAILED_ERR_CODE) casedir = os.path.join(self._testroot, - "%s.%s" % (CIME.utils.get_full_test_name("NODEFAIL_P1.f45_g37.X", machine=self._machine, compiler=self._compiler), self._baseline_name)) + "%s.%s" % (CIME.utils.get_full_test_name("NODEFAIL_P1.f09_g16.X", machine=self._machine, compiler=self._compiler), self._baseline_name)) fail_sentinel = os.path.join(casedir, "run", "FAIL_SENTINEL") self.assertTrue(os.path.exists(fail_sentinel), msg="Missing %s" % fail_sentinel) From 108918994da9cb98519de68fb5a2f2197ecf8444 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 24 May 2017 15:07:01 -0600 Subject: [PATCH 4/4] these need to match scripts_regression_tests.py --- scripts/lib/update_acme_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/update_acme_tests.py b/scripts/lib/update_acme_tests.py index cd51f4c6d795..0c197e93e5ab 100644 --- a/scripts/lib/update_acme_tests.py +++ b/scripts/lib/update_acme_tests.py @@ -33,8 +33,8 @@ "TESTRUNFAILEXC_P1.f19_g16_rx1.A", "TESTRUNPASS_P1.f19_g16_rx1.A", "TESTTESTDIFF_P1.f19_g16_rx1.A", - "TESTMEMLEAKFAIL_P1.f19_g16.X", - "TESTMEMLEAKPASS_P1.f19_g16.X") + "TESTMEMLEAKFAIL_P1.f09_g16.X", + "TESTMEMLEAKPASS_P1.f09_g16.X") ), "cime_developer" : (None, "0:10:00",