From c3e14193abf0c2be1b418ac781c9210e03b7ac3c Mon Sep 17 00:00:00 2001 From: Randy LeVeque Date: Wed, 21 Dec 2016 22:03:08 -0800 Subject: [PATCH 1/2] remove RESTART from Makefile and comment from setrun.py --- examples/multi-layer/plane_wave/Makefile | 2 -- examples/multi-layer/plane_wave/setrun.py | 4 +--- examples/storm-surge/ike/setrun.py | 2 -- examples/tsunami/bowl-radial/setrun.py | 2 -- examples/tsunami/bowl-slosh/setrun.py | 2 -- examples/tsunami/chile2010/Makefile | 2 -- examples/tsunami/chile2010/setrun.py | 12 ++++++------ 7 files changed, 7 insertions(+), 19 deletions(-) diff --git a/examples/multi-layer/plane_wave/Makefile b/examples/multi-layer/plane_wave/Makefile index b7fb5c09a..f42fa9eb7 100644 --- a/examples/multi-layer/plane_wave/Makefile +++ b/examples/multi-layer/plane_wave/Makefile @@ -18,8 +18,6 @@ OUTDIR = _output # Directory for output SETPLOT_FILE = setplot.py # File containing function to set plots PLOTDIR = _plots # Directory for plots -RESTART = False - # Environment variable FC should be set to fortran compiler, e.g. gfortran # Compiler flags can be specified here or set as an environment variable diff --git a/examples/multi-layer/plane_wave/setrun.py b/examples/multi-layer/plane_wave/setrun.py index 4066f87c9..239c961d7 100644 --- a/examples/multi-layer/plane_wave/setrun.py +++ b/examples/multi-layer/plane_wave/setrun.py @@ -154,8 +154,6 @@ def setrun(claw_pkg='geoclaw'): # Restart from checkpoint file of a previous run? - # Note: If restarting, you must also change the Makefile to set: - # RESTART = True # If restarting, t0 above should be from original run, and the # restart_file 'fort.chkNNNNN' specified below should be in # the OUTDIR indicated in Makefile. @@ -534,4 +532,4 @@ def write_topo_file(run_data, out_file, **kwargs): rundata.write() - write_topo_file(rundata, 'topo.tt2') \ No newline at end of file + write_topo_file(rundata, 'topo.tt2') diff --git a/examples/storm-surge/ike/setrun.py b/examples/storm-surge/ike/setrun.py index 3ad7dec2f..72a057d71 100644 --- a/examples/storm-surge/ike/setrun.py +++ b/examples/storm-surge/ike/setrun.py @@ -106,8 +106,6 @@ def setrun(claw_pkg='geoclaw'): # clawdata.t0 = days2seconds(ike_landfall.days - 1) + ike_landfall.seconds # Restart from checkpoint file of a previous run? - # Note: If restarting, you must also change the Makefile to set: - # RESTART = True # If restarting, t0 above should be from original run, and the # restart_file 'fort.chkNNNNN' specified below should be in # the OUTDIR indicated in Makefile. diff --git a/examples/tsunami/bowl-radial/setrun.py b/examples/tsunami/bowl-radial/setrun.py index 1d8d3a074..8c3158562 100644 --- a/examples/tsunami/bowl-radial/setrun.py +++ b/examples/tsunami/bowl-radial/setrun.py @@ -94,8 +94,6 @@ def setrun(claw_pkg='geoclaw'): # Restart from checkpoint file of a previous run? - # Note: If restarting, you must also change the Makefile to set: - # RESTART = True # If restarting, t0 above should be from original run, and the # restart_file 'fort.chkNNNNN' specified below should be in # the OUTDIR indicated in Makefile. diff --git a/examples/tsunami/bowl-slosh/setrun.py b/examples/tsunami/bowl-slosh/setrun.py index 5e17603f2..444e0a2d4 100644 --- a/examples/tsunami/bowl-slosh/setrun.py +++ b/examples/tsunami/bowl-slosh/setrun.py @@ -94,8 +94,6 @@ def setrun(claw_pkg='geoclaw'): # Restart from checkpoint file of a previous run? - # Note: If restarting, you must also change the Makefile to set: - # RESTART = True # If restarting, t0 above should be from original run, and the # restart_file 'fort.chkNNNNN' specified below should be in # the OUTDIR indicated in Makefile. diff --git a/examples/tsunami/chile2010/Makefile b/examples/tsunami/chile2010/Makefile index 983df2234..2106f068a 100644 --- a/examples/tsunami/chile2010/Makefile +++ b/examples/tsunami/chile2010/Makefile @@ -18,8 +18,6 @@ OUTDIR = _output # Directory for output SETPLOT_FILE = setplot.py # File containing function to set plots PLOTDIR = _plots # Directory for plots -RESTART = False - # Environment variable FC should be set to fortran compiler, e.g. gfortran # Compiler flags can be specified here or set as an environment variable diff --git a/examples/tsunami/chile2010/setrun.py b/examples/tsunami/chile2010/setrun.py index 2670dd01c..534b50cba 100644 --- a/examples/tsunami/chile2010/setrun.py +++ b/examples/tsunami/chile2010/setrun.py @@ -109,14 +109,12 @@ def setrun(claw_pkg='geoclaw'): # Restart from checkpoint file of a previous run? - # Note: If restarting, you must also change the Makefile to set: - # RESTART = True # If restarting, t0 above should be from original run, and the # restart_file 'fort.chkNNNNN' specified below should be in # the OUTDIR indicated in Makefile. - clawdata.restart = False # True to restart from prior results - clawdata.restart_file = 'fort.chk00036' # File to use for restart data + clawdata.restart = False # True to restart from prior results + clawdata.restart_file = 'fort.chk00096' # File to use for restart data # ------------- # Output times: @@ -131,7 +129,7 @@ def setrun(claw_pkg='geoclaw'): if clawdata.output_style==1: # Output nout frames at equally spaced times up to tfinal: clawdata.num_output_times = 18 - clawdata.tfinal = 32400.0 + clawdata.tfinal = 9*3600. clawdata.output_t0 = True # output at initial (or restart) time? elif clawdata.output_style == 2: @@ -273,7 +271,7 @@ def setrun(claw_pkg='geoclaw'): elif clawdata.checkpt_style == 3: # Checkpoint every checkpt_interval timesteps (on Level 1) # and at the final time. - clawdata.checkpt_interval = 5 + clawdata.checkpt_interval = 10 # --------------- @@ -345,6 +343,8 @@ def setrun(claw_pkg='geoclaw'): rundata.gaugedata.gauges = [] # for gauges append lines of the form [gaugeno, x, y, t1, t2] rundata.gaugedata.gauges.append([32412, -86.392, -17.975, 0., 1.e10]) + rundata.gaugedata.min_time_increment = 200 + rundata.gaugedata.display_format = "e16.5" return rundata From 0dc6a54ead32fd52bba888079cb3ad1d52224e2d Mon Sep 17 00:00:00 2001 From: Randy LeVeque Date: Wed, 21 Dec 2016 22:19:06 -0800 Subject: [PATCH 2/2] revert tests that shouldn't be included in PR --- examples/tsunami/chile2010/setrun.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/tsunami/chile2010/setrun.py b/examples/tsunami/chile2010/setrun.py index 534b50cba..2cd3ae241 100644 --- a/examples/tsunami/chile2010/setrun.py +++ b/examples/tsunami/chile2010/setrun.py @@ -271,7 +271,7 @@ def setrun(claw_pkg='geoclaw'): elif clawdata.checkpt_style == 3: # Checkpoint every checkpt_interval timesteps (on Level 1) # and at the final time. - clawdata.checkpt_interval = 10 + clawdata.checkpt_interval = 5 # --------------- @@ -343,8 +343,6 @@ def setrun(claw_pkg='geoclaw'): rundata.gaugedata.gauges = [] # for gauges append lines of the form [gaugeno, x, y, t1, t2] rundata.gaugedata.gauges.append([32412, -86.392, -17.975, 0., 1.e10]) - rundata.gaugedata.min_time_increment = 200 - rundata.gaugedata.display_format = "e16.5" return rundata