Skip to content

Commit

Permalink
Fixed Logic for CONTINUE_RUN as per @jgfouca
Browse files Browse the repository at this point in the history
 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, E3SM-Project/E3SM#1466

User interface changes?: Added --skip-preview-namelist option to
case.submit

Code review: @jgfouca, @rljacob
  • Loading branch information
Erich L Foster committed May 9, 2017
1 parent 6e0f510 commit 5a6d393
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions scripts/lib/CIME/case_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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()
Expand All @@ -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"))

###############################################################################
Expand Down

0 comments on commit 5a6d393

Please sign in to comment.