remove plotModel option

scripts/ex-gwf-advtidal.py

@@ -21,7 +21,7 @@
 import numpy as np
 from flopy.plot.styles import styles
 from flopy.utils.gridintersect import GridIntersect
-from modflow_devtools.misc import is_in_ci, timed
+from modflow_devtools.misc import timed
 from shapely.geometry import Polygon
 
 # Simulation name and workspace
@@ -33,9 +33,8 @@
 # Configuration
 
 runModel = str(environ.get("RUN", True)).lower() == "true"
-plotModel = str(environ.get("PLOT", True)).lower() == "true"
-plotSave = str(environ.get("SAVE", is_in_ci())).lower() == "true"
-createGif = str(environ.get("GIF", False)).lower() == "true"
+plotSave = str(environ.get("SAVE", True)).lower() == "true"
+createGif = str(environ.get("GIF", True)).lower() == "true"
 
 # Model units
 
@@ -457,8 +456,6 @@ def plot_ts(sim):
 
 
 def plot_results(sim, silent=True):
-    if not plotModel:
-        return
     plot_grid(sim)
     plot_ts(sim)
 

scripts/ex-gwf-bcf2ss.py

@@ -18,7 +18,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 from flopy.plot.styles import styles
-from modflow_devtools.misc import is_in_ci, timed
+from modflow_devtools.misc import timed
 
 # Simulation name and workspace
 
@@ -29,9 +29,8 @@
 # Configuration
 
 runModel = str(environ.get("RUN", True)).lower() == "true"
-plotModel = str(environ.get("PLOT", True)).lower() == "true"
-plotSave = str(environ.get("SAVE", is_in_ci())).lower() == "true"
-createGif = str(environ.get("GIF", False)).lower() == "true"
+plotSave = str(environ.get("SAVE", True)).lower() == "true"
+createGif = str(environ.get("GIF", True)).lower() == "true"
 
 # Model units
 
@@ -372,9 +371,6 @@ def plot_simulated_results(num, gwf, ho, co, silent=True):
 
 
 def plot_results(silent=True):
-    if not plotModel:
-        return
-
     if silent:
         verbosity_level = 0
     else:

scripts/ex-gwf-bump.py

@@ -15,7 +15,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 from flopy.plot.styles import styles
-from modflow_devtools.misc import is_in_ci, timed
+from modflow_devtools.misc import timed
 
 # Set figure properties
 
@@ -35,9 +35,8 @@
 # Configuration
 
 runModel = str(environ.get("RUN", True)).lower() == "true"
-plotModel = str(environ.get("PLOT", True)).lower() == "true"
-plotSave = str(environ.get("SAVE", is_in_ci())).lower() == "true"
-createGif = str(environ.get("GIF", False)).lower() == "true"
+plotSave = str(environ.get("SAVE", True)).lower() == "true"
+createGif = str(environ.get("GIF", True)).lower() == "true"
 
 # Scenario parameters
 
@@ -327,13 +326,8 @@ def plot_grid(gwf, silent=True):
 
 
 def plot_results(idx, sim, silent=True):
-    if not plotModel:
-        return
-
-    with styles.USGSMap() as fs:
-        name = list(parameters.keys())[idx]
+    with styles.USGSMap():
         gwf = sim.get_model(sim_name)
-
         bot = gwf.dis.botm.array
 
         if idx == 0:

scripts/ex-gwf-capture.py

@@ -24,7 +24,7 @@
 import modflowapi
 import numpy as np
 from flopy.plot.styles import styles
-from modflow_devtools.misc import is_in_ci, timed
+from modflow_devtools.misc import timed
 
 # Simulation name and workspace
 
@@ -34,9 +34,8 @@
 # Configuration
 
 runModel = str(environ.get("RUN", True)).lower() == "true"
-plotModel = str(environ.get("PLOT", True)).lower() == "true"
-plotSave = str(environ.get("SAVE", is_in_ci())).lower() == "true"
-createGif = str(environ.get("GIF", False)).lower() == "true"
+plotSave = str(environ.get("SAVE", True)).lower() == "true"
+createGif = str(environ.get("GIF", True)).lower() == "true"
 
 # Model units
 
@@ -304,9 +303,6 @@ def run_model():
 
 
 def plot_results(silent=True):
-    if not plotModel:
-        return
-
     if silent:
         verbosity_level = 0
     else:

scripts/ex-gwf-csub-p01.py

@@ -20,7 +20,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 from flopy.plot.styles import styles
-from modflow_devtools.misc import is_in_ci, timed
+from modflow_devtools.misc import timed
 
 # Simulation name and workspace
 
@@ -31,9 +31,8 @@
 # Configuration
 
 runModel = str(environ.get("RUN", True)).lower() == "true"
-plotModel = str(environ.get("PLOT", True)).lower() == "true"
-plotSave = str(environ.get("SAVE", is_in_ci())).lower() == "true"
-createGif = str(environ.get("GIF", False)).lower() == "true"
+plotSave = str(environ.get("SAVE", True)).lower() == "true"
+createGif = str(environ.get("GIF", True)).lower() == "true"
 
 # Model units
 
@@ -228,7 +227,7 @@ def write_model(sim, silent=True):
 def run_model(sim, silent=True):
     if not runModel:
         return
-    success, buff = sim.run_simulation(silent=silent)
+    success, buff = sim.run_simulation(silent=silent, report=True)
     assert success, buff
 
 
@@ -237,10 +236,7 @@ def run_model(sim, silent=True):
 
 
 def plot_results(sim, silent=True):
-    if not plotModel:
-        return
-
-    with styles.USGSMap() as fs:
+    with styles.USGSMap():
         gwf = sim.get_model(sim_name)
 
         # plot the grid

scripts/ex-gwf-csub-p02.py

@@ -18,7 +18,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 from flopy.plot.styles import styles
-from modflow_devtools.misc import is_in_ci, timed
+from modflow_devtools.misc import timed
 
 # Set figure properties specific to the problem
 
@@ -28,9 +28,8 @@
 # Configuration
 
 runModel = str(environ.get("RUN", True)).lower() == "true"
-plotModel = str(environ.get("PLOT", True)).lower() == "true"
-plotSave = str(environ.get("SAVE", is_in_ci())).lower() == "true"
-createGif = str(environ.get("GIF", False)).lower() == "true"
+plotSave = str(environ.get("SAVE", True)).lower() == "true"
+createGif = str(environ.get("GIF", True)).lower() == "true"
 
 # Simulation name and workspace
 
@@ -786,10 +785,7 @@ def plot_head_comparison(sim, silent=True):
 
 
 def plot_results(sim, silent=True):
-    if not plotModel:
-        return
     name = sim.name
-
     if name.endswith("a"):
         plot_grid(sim, silent=silent)
         plot_head_based(sim, silent=silent)

scripts/ex-gwf-csub-p03.py

@@ -23,7 +23,7 @@
 from flopy.plot.styles import styles
 from modflow_devtools.latex import (build_table, exp_format, float_format,
                                     int_format)
-from modflow_devtools.misc import is_in_ci, timed
+from modflow_devtools.misc import timed
 
 # Set figure properties specific to the problem
 
@@ -39,9 +39,8 @@
 # Configuration
 
 runModel = str(environ.get("RUN", True)).lower() == "true"
-plotModel = str(environ.get("PLOT", True)).lower() == "true"
-plotSave = str(environ.get("SAVE", is_in_ci())).lower() == "true"
-createGif = str(environ.get("GIF", False)).lower() == "true"
+plotSave = str(environ.get("SAVE", True)).lower() == "true"
+createGif = str(environ.get("GIF", True)).lower() == "true"
 
 # Load the constant time series
 
@@ -1677,12 +1676,11 @@ def build_head_data(df, year=1908):
 
 
 def plot_results(silent=True):
-    if plotModel:
-        plot_grid(silent=silent)
-        plot_boundary_heads(silent=silent)
-        plot_head_es_comparison(silent=silent)
-        plot_calibration(silent=silent)
-        plot_vertical_head()
+    plot_grid(silent=silent)
+    plot_boundary_heads(silent=silent)
+    plot_head_es_comparison(silent=silent)
+    plot_calibration(silent=silent)
+    plot_vertical_head()
 
 
 # Function that wraps all of the steps for the model

scripts/ex-gwf-csub-p04.py

@@ -19,7 +19,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 from flopy.plot.styles import styles
-from modflow_devtools.misc import is_in_ci, timed
+from modflow_devtools.misc import timed
 
 # Base simulation and model name and workspace
 
@@ -30,9 +30,8 @@
 # Configuration
 
 runModel = str(environ.get("RUN", True)).lower() == "true"
-plotModel = str(environ.get("PLOT", True)).lower() == "true"
-plotSave = str(environ.get("SAVE", is_in_ci())).lower() == "true"
-createGif = str(environ.get("GIF", False)).lower() == "true"
+plotSave = str(environ.get("SAVE", True)).lower() == "true"
+createGif = str(environ.get("GIF", True)).lower() == "true"
 
 # Set figure properties specific to the problem
 
@@ -846,10 +845,9 @@ def plot_compaction(sim, silent=True):
 
 
 def plot_results(sim, silent=True):
-    if plotModel:
-        plot_grid(sim, silent=silent)
-        plot_stresses(sim, silent=silent)
-        plot_compaction(sim, silent=silent)
+    plot_grid(sim, silent=silent)
+    plot_stresses(sim, silent=silent)
+    plot_compaction(sim, silent=silent)
 
 
 # Function that wraps all of the steps for the model