Updating 1d examples to not use RESTART variable in Makefile.

rjleveque · Sep 11, 2017 · 97930d5 · 97930d5
1 parent 1cb4e73
commit 97930d5
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 10 deletions.
diff --git a/examples/acoustics_1d_heterogeneous/adjoint/Makefile b/examples/acoustics_1d_heterogeneous/adjoint/Makefile
@@ -20,7 +20,6 @@ SETPLOT_FILE = setplot.py           # File containing function to set plots
 PLOTDIR = _plots                    # Directory for plots
 
 OVERWRITE ?= True                   # False ==> make a copy of OUTDIR first
-RESTART ?= False                    # Should = clawdata.restart in setrun
 
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
 
@@ -39,7 +38,7 @@ SOURCES = \
   qinit.f \
   setprob.f \
   setaux.f \
-  $(ADJLIB)/riemann/rp1_acoustics_variable_adjoint.f90 \
+  $(CLAW)/riemann/src/rp1_acoustics_variable_adjoint.f90 \
   $(CLAW)/classic/src/1d/b4step1.f \
   $(CLAW)/classic/src/1d/bc1.f \
   $(CLAW)/classic/src/1d/claw1ez.f \

diff --git a/examples/acoustics_1d_heterogeneous/adjoint/setrun.py b/examples/acoustics_1d_heterogeneous/adjoint/setrun.py
@@ -88,8 +88,6 @@ def setrun(claw_pkg='classic'):
 
 
     # 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.qNNNN' specified below should be in 
     # the OUTDIR indicated in Makefile.

diff --git a/examples/acoustics_1d_heterogeneous/forward/Makefile b/examples/acoustics_1d_heterogeneous/forward/Makefile
@@ -20,7 +20,6 @@ SETPLOT_FILE = setplot.py           # File containing function to set plots
 PLOTDIR = _plots                    # Directory for plots
 
 OVERWRITE ?= True                   # False ==> make a copy of OUTDIR first
-RESTART ?= False                    # Should = clawdata.restart in setrun
 
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
 

diff --git a/examples/acoustics_1d_heterogeneous/forward/setrun.py b/examples/acoustics_1d_heterogeneous/forward/setrun.py
@@ -89,8 +89,6 @@ def setrun(claw_pkg='classic'):
 
 
     # 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.qNNNN' specified below should be in 
     # the OUTDIR indicated in Makefile.

diff --git a/paper1_examples/shelf1d/adjoint/Makefile b/paper1_examples/shelf1d/adjoint/Makefile
@@ -20,7 +20,6 @@ SETPLOT_FILE = setplot.py           # File containing function to set plots
 PLOTDIR = _plots                    # Directory for plots
 
 OVERWRITE ?= True                   # False ==> make a copy of OUTDIR first
-RESTART ?= False                    # Should = clawdata.restart in setrun
 
 # Environment variable FC should be set to fortran compiler, e.g. gfortran
 

diff --git a/paper1_examples/shelf1d/adjoint/setrun.py b/paper1_examples/shelf1d/adjoint/setrun.py
@@ -88,8 +88,6 @@ def setrun(claw_pkg='classic'):
 
 
     # 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.qNNNN' specified below should be in 
     # the OUTDIR indicated in Makefile.