From 5a6d39399beab5bcc4071c45628febb74440cb45 Mon Sep 17 00:00:00 2001 From: Erich L Foster Date: Mon, 8 May 2017 14:13:11 -0600 Subject: [PATCH] Fixed Logic for CONTINUE_RUN as per @jgfouca Removed the logic for skip_pnl in the CONTINUE_RUN portion of the code as per @jgfouca Test suite: scripts_regression_tests.py Test baseline: Test namelist changes: Test status: bit for bit Fixes #1276, ACME-Climate/ACME#1466 User interface changes?: Added --skip-preview-namelist option to case.submit Code review: @jgfouca, @rljacob --- scripts/lib/CIME/case_run.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/lib/CIME/case_run.py b/scripts/lib/CIME/case_run.py index 011ee2bf3ec..cca41e47469 100644 --- a/scripts/lib/CIME/case_run.py +++ b/scripts/lib/CIME/case_run.py @@ -80,7 +80,7 @@ def pre_run_check(case, lid, skip_pnl=False): def _run_model_impl(case, lid, skip_pnl=False): ############################################################################### - pre_run_check(case, lid) + pre_run_check(case, lid, skip_pnl=skip_pnl) model = case.get_value("MODEL") @@ -123,7 +123,6 @@ def _run_model_impl(case, lid, skip_pnl=False): orig_cont = case.get_value("CONTINUE_RUN") if not orig_cont: case.set_value("CONTINUE_RUN", True) - if not skip_pnl: create_namelists(case) lid = new_lid() @@ -144,7 +143,7 @@ def _run_model_impl(case, lid, skip_pnl=False): ############################################################################### def run_model(case, lid, skip_pnl=False): ############################################################################### - functor = lambda: _run_model_impl(case, lid, skip_pnl) + functor = lambda: _run_model_impl(case, lid, skip_pnl=skip_pnl) return run_and_log_case_status(functor, "case.run", caseroot=case.get_value("CASEROOT")) ###############################################################################