add head_array() methods for unstructured computation of heads

timflow/steady/aquifer.py

@@ -9,8 +9,6 @@
 
 """
 
-import inspect  # Used for storing the input
-
 import numpy as np
 import pandas as pd
 
@@ -132,9 +130,6 @@ def add_element(self, e):
     def isinside(self, x, y):
         raise Exception("Must overload AquiferData.isinside()")
 
-    def storeinput(self, frame):
-        self.inputargs, _, _, self.inputvalues = inspect.getargvalues(frame)
-
     def findlayer(self, z):
         """Returns layer-number, layer-type and model-layer-number."""
         if z > self.z[0]:

timflow/steady/circareasink.py

@@ -7,8 +7,6 @@
     CircAreaSink(ml, xc=0, yc=0, R=50, N=0.001, layer=0)
 """
 
-import inspect  # Used for storing the input
-
 import numpy as np
 from scipy.special import i0, i1, k0, k1
 
@@ -43,7 +41,6 @@ class CircAreaSink(Element):
     def __init__(
         self, model, xc=0, yc=0, R=1, N=0.001, layer=0, name="CircAreasink", label=None
     ):
-        self.storeinput(inspect.currentframe())
         Element.__init__(
             self, model, nparam=1, nunknowns=0, layers=layer, name=name, label=label
         )

timflow/steady/constant.py

@@ -8,8 +8,6 @@
     Constant(ml, xr=0, yr=0, hr=10.0, layer=0)
 """
 
-import inspect  # Used for storing the input
-
 import numpy as np
 
 from timflow.steady.element import Element
@@ -96,7 +94,6 @@ class Constant(ConstantBase, PotentialEquation):
     """
 
     def __init__(self, model, xr=0, yr=0, hr=0.0, layer=0, label=None):
-        self.storeinput(inspect.currentframe())
         ConstantBase.__init__(
             self, model, xr=xr, yr=yr, hr=hr, layer=layer, name="Constant", label=label
         )

timflow/steady/element.py

@@ -9,8 +9,6 @@ def initialize(self):
             pass
 """
 
-import inspect  # Used for storing the input
-
 import numpy as np
 
 __all__ = ["Element"]
@@ -140,9 +138,6 @@ def headinside(self):
     def setparams(self, sol):
         raise Exception("Must overload Element.setparams()")
 
-    def storeinput(self, frame):
-        self.inputargs, _, _, self.inputvalues = inspect.getargvalues(frame)
-
     # def stoptrace(self, xyz, layer, ltype, step, direction):
     #    return False, 0
 
@@ -161,20 +156,3 @@ def qztop(self, x, y, aq):
 
     def plot(self, **kwargs):
         pass
-
-    def write(self):
-        rv = self.name + "(" + self.model.modelname + ",\n"
-        for key in self.inputargs[2:]:  # The first two are ignored
-            if isinstance(self.inputvalues[key], np.ndarray):
-                rv += (
-                    key
-                    + " = "
-                    + np.array2string(self.inputvalues[key], separator=",")
-                    + ",\n"
-                )
-            elif isinstance(self.inputvalues[key], str):
-                rv += key + " = '" + self.inputvalues[key] + "',\n"
-            else:
-                rv += key + " = " + str(self.inputvalues[key]) + ",\n"
-        rv += ")\n"
-        return rv

timflow/steady/inhomogeneity.py

@@ -13,7 +13,6 @@
     )
 """
 
-import inspect  # Used for storing the input
 from warnings import warn
 
 import numpy as np
@@ -218,7 +217,6 @@ def __init__(
             assert topboundary[:4] == "conf", (
                 "Error: infiltration can only be added if topboundary='conf'"
             )
-        self.storeinput(inspect.currentframe())
         (
             kaq,
             c,
@@ -315,7 +313,6 @@ def __init__(
             assert topboundary[:4] == "conf", (
                 "Error: infiltration can only be added if topboundary='conf'"
             )
-        self.storeinput(inspect.currentframe())
         kaq, kzoverkh, c, npor, ltype = param_3d(
             kaq, z, kzoverkh, npor, topboundary, topres
         )

timflow/steady/inhomogeneity1d.py

@@ -10,7 +10,6 @@
 
 """
 
-import inspect  # user for storing the input
 import warnings
 
 import matplotlib.pyplot as plt
@@ -354,7 +353,6 @@ def __init__(
             c = []
         if z is None:
             z = [1, 0]
-        self.storeinput(inspect.currentframe())
         (
             kaq,
             c,
@@ -433,7 +431,6 @@ def __init__(
     ):
         if z is None:
             z = [1, 0]
-        self.storeinput(inspect.currentframe())
         (
             kaq,
             kzoverkh,

timflow/steady/linedoublet.py

@@ -7,7 +7,6 @@
     ImpLineDoublet(ml, x1=-10, y1=0, x2=10, y2=0, layers=0)
 """
 
-import inspect  # Used for storing the input
 import warnings
 
 import matplotlib.pyplot as plt
@@ -228,7 +227,6 @@ def __init__(
         label=None,
         addtomodel=True,
     ):
-        self.storeinput(inspect.currentframe())
         LineDoubletHoBase.__init__(
             self,
             model,
@@ -302,7 +300,6 @@ def __init__(
         label=None,
         addtomodel=True,
     ):
-        self.storeinput(inspect.currentframe())
         LineDoubletHoBase.__init__(
             self,
             model,
@@ -454,7 +451,6 @@ class ImpermeableWallString(LineDoubletStringBase, DisvecEquation):
     def __init__(self, model, xy=None, layers=0, order=0, label=None):
         if xy is None:
             xy = [(-1, 0), (1, 0)]
-        self.storeinput(inspect.currentframe())
         LineDoubletStringBase.__init__(
             self,
             model,
@@ -507,7 +503,6 @@ class LeakyWallString(LineDoubletStringBase, LeakyWallEquation):
     def __init__(self, model, xy=None, res=np.inf, layers=0, order=0, label=None):
         if xy is None:
             xy = [(-1, 0), (1, 0)]
-        self.storeinput(inspect.currentframe())
         LineDoubletStringBase.__init__(
             self,
             model,

timflow/steady/linedoublet1d.py

@@ -8,7 +8,6 @@
 
 """
 
-import inspect  # Used for storing the input
 import warnings
 
 import matplotlib.pyplot as plt
@@ -127,7 +126,6 @@ class ImpermeableWall1D(LineDoublet1D, DisvecEquation):
     """Create 1D impermeable wall."""
 
     def __init__(self, model, xld=0, layers=0, label=None):
-        self.storeinput(inspect.currentframe())
         LineDoublet1D.__init__(
             self,
             model,
@@ -173,7 +171,6 @@ class LeakyWall1D(LineDoublet1D, LeakyWallEquation):
     tiny = 1e-6
 
     def __init__(self, model, xld=0, res=np.inf, layers=0, label=None):
-        self.storeinput(inspect.currentframe())
         LineDoublet1D.__init__(
             self,
             model,

timflow/steady/linesink.py

@@ -7,7 +7,6 @@
     River(ml, x1=-10, y1=0, x2=10, y2=0, hls=5, layers=0)
 """
 
-import inspect  # Used for storing the input
 import warnings
 
 import matplotlib.pyplot as plt
@@ -286,7 +285,6 @@ def __init__(
         label=None,
         addtomodel=True,
     ):
-        self.storeinput(inspect.currentframe())
         LineSinkBase.__init__(
             self,
             model,
@@ -566,7 +564,6 @@ def __init__(
         addtomodel=True,
     ):
         """Initialize a steady head-specified line-sink."""
-        self.storeinput(inspect.currentframe())
         LineSinkHoBase.__init__(
             self,
             model,
@@ -672,7 +669,6 @@ def __init__(
         addtomodel=True,
     ):
         """Initialize a steady discharge-specified line-sink."""
-        self.storeinput(inspect.currentframe())
         River.__init__(
             self,
             model,
@@ -933,7 +929,6 @@ def __init__(
         """Initialize a steady string of head-specified line-sinks."""
         if xy is None:
             xy = [(-1, 0), (1, 0)]
-        self.storeinput(inspect.currentframe())
         LineSinkStringBase2.__init__(
             self,
             model,
@@ -1086,7 +1081,6 @@ def __init__(
         """Initialize a steady string of discharge-specified line-sinks."""
         if xy is None:
             xy = [(-1, 0), (1, 0)]
-        self.storeinput(inspect.currentframe())
         RiverString.__init__(
             self,
             model,

timflow/steady/linesink1d.py

@@ -7,7 +7,6 @@
     River1D(ml, xls=0, hls=1, layers=0)
 """
 
-import inspect  # Used for storing the input
 import warnings
 
 import matplotlib.pyplot as plt
@@ -171,7 +170,6 @@ class LineSink1D(LineSink1DBase, MscreenWellEquation):
 
     def __init__(self, model, xls=0, sigls=1, layers=0, label=None):
         """Initialize a steady 1D line-sink with specified discharge per length."""
-        self.storeinput(inspect.currentframe())
         LineSink1DBase.__init__(
             self,
             model,
@@ -228,7 +226,6 @@ class River1D(LineSink1DBase, HeadEquation):
 
     def __init__(self, model, xls=0, hls=1, res=0, wh=1, layers=0, label=None):
         """Initialize a steady 1D line-sink with a specified head."""
-        self.storeinput(inspect.currentframe())
         LineSink1DBase.__init__(
             self,
             model,