updated to new grf-laplace routine; better Input handling; cleanup

GeoStat-Framework · Mar 7, 2019 · 3c7f8c6 · 3c7f8c6
1 parent 360e8b0
commit 3c7f8c6
Show file tree

Hide file tree

Showing 6 changed files with 356 additions and 463 deletions.
diff --git a/anaflow/__init__.py b/anaflow/__init__.py
@@ -26,6 +26,7 @@
 .. autosummary::
    thiem
    theis
+   grf_model
 
 Heterogeneous
 ^^^^^^^^^^^^^
@@ -48,7 +49,7 @@
 Special solutions for special aquifers
 
 .. autosummary::
-   grf_model
+   grf_disk
 
 Laplace
 =======
@@ -68,11 +69,12 @@
 from anaflow.flow import (
     thiem,
     theis,
+    grf_model,
     ext_thiem2D,
     ext_theis2D,
     ext_thiem3D,
     ext_theis3D,
-    grf_model,
+    grf_disk,
 )
 from anaflow.tools.laplace import get_lap_inv, get_lap
 
@@ -86,6 +88,7 @@
     "ext_thiem3D",
     "ext_theis3D",
     "grf_model",
+    "grf_disk",
     "get_lap_inv",
     "get_lap",
 ]
diff --git a/anaflow/flow/__init__.py b/anaflow/flow/__init__.py
@@ -26,6 +26,7 @@
 .. autosummary::
    thiem
    theis
+   grf_model
 
 Heterogeneous
 ~~~~~~~~~~~~~
@@ -48,25 +49,26 @@
 Special solutions for special aquifers
 
 .. autosummary::
-   grf_model
+   grf_disk
 """
 from __future__ import absolute_import
 
-from anaflow.flow.homogeneous import thiem, theis
+from anaflow.flow.homogeneous import thiem, theis, grf_model
 from anaflow.flow.heterogeneous import (
     ext_thiem2D,
     ext_theis2D,
     ext_thiem3D,
     ext_theis3D,
 )
-from anaflow.flow.special import grf_model
+from anaflow.flow.special import grf_disk
 
 __all__ = [
     "thiem",
     "theis",
+    "grf_model",
     "ext_thiem2D",
     "ext_theis2D",
     "ext_thiem3D",
     "ext_theis3D",
-    "grf_model",
+    "grf_disk",
 ]