Merge pull request clawpack#75 from rjleveque/chap22

update chap22/corner to 5.4.0
hudaquresh · Feb 24, 2017 · 4b5f483 · 4b5f483
2 parents 353f0ad + f675623
commit 4b5f483
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/fvmbook/chap22/corner/Makefile b/fvmbook/chap22/corner/Makefile
@@ -20,18 +20,32 @@ 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
 
 # Compiler flags can be specified here or set as an environment variable
 FFLAGS ?=  
 
 # ---------------------------------
-# List of sources for this program:
+# package sources for this program:
 # ---------------------------------
 
-LIB = $(CLAW)/classic/src/2d
+include $(CLAW)/classic/src/2d/Makefile.classic_2d
+
+# ---------------------------------------
+# package sources specifically to exclude
+# (i.e. if a custom replacement source 
+#  under a different name is provided)
+# ---------------------------------------
+
+EXCLUDE_MODULES = \
+
+EXCLUDE_SOURCES = \
+
+
+# ---------------------------------
+# List of custom sources for this program:
+# ---------------------------------
 
 MODULES = \
 
@@ -43,21 +57,8 @@ SOURCES = \
   $(CLAW)/classic/src/2d/cellave.f \
   $(CLAW)/riemann/src/rpn2_vc_elasticity.f90 \
   $(CLAW)/riemann/src/rpt2_vc_elasticity.f90 \
-  $(CLAW)/classic/src/2d/driver.f90 \
-  $(CLAW)/classic/src/2d/claw2ez.f \
-  $(CLAW)/classic/src/2d/claw2.f \
-  $(CLAW)/classic/src/2d/bc2.f \
-  $(CLAW)/classic/src/2d/b4step2.f90 \
-  $(CLAW)/classic/src/2d/step2.f90 \
-  $(CLAW)/classic/src/2d/step2ds.f90 \
-  $(CLAW)/classic/src/2d/dimsp2.f \
-  $(CLAW)/classic/src/2d/flux2.f90 \
-  $(CLAW)/classic/src/2d/copyq2.f \
-  $(CLAW)/classic/src/2d/inlinelimiter.f90 \
-  $(CLAW)/classic/src/2d/src2.f90 \
-  $(CLAW)/classic/src/2d/out2.f \
-  $(CLAW)/classic/src/2d/restart2.f \
-  $(CLAW)/classic/src/2d/opendatafile.f
+
+
 
 #-------------------------------------------------------------------
 # Include Makefile containing standard definitions and make options:

diff --git a/fvmbook/chap22/corner/setplot.py b/fvmbook/chap22/corner/setplot.py
@@ -7,6 +7,9 @@
     
 """ 
 
+from __future__ import absolute_import
+from __future__ import print_function
+
 #--------------------------
 def setplot(plotdata):
 #--------------------------
@@ -22,6 +25,10 @@ def setplot(plotdata):
     from clawpack.visclaw import colormaps
     from numpy import linspace
 
+    if plotdata is None:
+        from clawpack.visclaw.data import ClawPlotData
+        plotdata = ClawPlotData()
+
     plotdata.clearfigures()  # clear any old figures,axes,items data
 
     def plot_corner(current_data):