Fixes and additions for new MODFLOW USG Transport support

.docs/Notebooks/mfusg_transport_Ex1_1D.py → .docs/Notebooks/mfusg_transport_tutorial01_1D.py

@@ -41,8 +41,8 @@
 import numpy as np
 
 import flopy
-from flopy.mfusg import MfUsg, MfUsgBct, MfUsgLpf, MfUsgOc, MfUsgPcb, MfUsgSms
-from flopy.modflow import ModflowBas, ModflowDis
+from flopy.mfusg import MfUsg, MfUsgBas, MfUsgBct, MfUsgLpf, MfUsgOc, MfUsgPcb, MfUsgSms
+from flopy.modflow import ModflowDis
 from flopy.utils import HeadFile
 
 # -
@@ -95,7 +95,7 @@
 strt = np.full((nlay, nrow, ncol), 100.0)
 strt[:, :, 0] = 1100.0
 
-bas = ModflowBas(mf, ibound=ibound, strt=strt)
+bas = MfUsgBas(mf, ibound=ibound, strt=strt)
 # -
 
 # +

.docs/Notebooks/mfusg_transport_Ex2_Radial.py → .docs/Notebooks/mfusg_transport_tutorial02_Radial.py

@@ -44,8 +44,8 @@
 import numpy as np
 
 import flopy
-from flopy.mfusg import MfUsg, MfUsgBct, MfUsgLpf, MfUsgOc, MfUsgSms, MfUsgWel
-from flopy.modflow import ModflowBas, ModflowChd, ModflowDis
+from flopy.mfusg import MfUsg, MfUsgBas, MfUsgBct, MfUsgLpf, MfUsgOc, MfUsgSms, MfUsgWel
+from flopy.modflow import ModflowChd, ModflowDis
 from flopy.utils import HeadFile
 
 # -
@@ -101,7 +101,7 @@
 strt[:, :, 0] = 20.0
 strt[:, :, -1] = 20.0
 
-bas = ModflowBas(mf, ibound=ibound, strt=strt)
+bas = MfUsgBas(mf, ibound=ibound, strt=strt)
 # -
 # +
 ipakcb = 50

.docs/Notebooks/mfusg_transport_Ex3_Conduit.py → .docs/Notebooks/mfusg_transport_tutorial03_Conduit.py

@@ -38,8 +38,17 @@
 import numpy as np
 
 import flopy
-from flopy.mfusg import MfUsg, MfUsgBcf, MfUsgBct, MfUsgCln, MfUsgOc, MfUsgSms, MfUsgWel
-from flopy.modflow import ModflowBas, ModflowChd, ModflowDis
+from flopy.mfusg import (
+    MfUsg,
+    MfUsgBas,
+    MfUsgBcf,
+    MfUsgBct,
+    MfUsgCln,
+    MfUsgOc,
+    MfUsgSms,
+    MfUsgWel,
+)
+from flopy.modflow import ModflowChd, ModflowDis
 from flopy.plot import PlotCrossSection, PlotMapView
 from flopy.utils import HeadFile
 
@@ -98,7 +107,7 @@
 strt[1, :, 0] = 60.0
 strt[1, :, -1] = 60.0
 
-bas = ModflowBas(mf, ibound=ibound, strt=strt)
+bas = MfUsgBas(mf, ibound=ibound, strt=strt)
 bas.ibound.fmtin = "(25I3)"
 bas.strt.fmtin = "(10e12.4)"
 # -

.docs/Notebooks/mfusg_transport_Ex4_DualDomain.py → .docs/Notebooks/mfusg_transport_tutorial04_DualDomain.py

@@ -63,8 +63,17 @@
 import numpy as np
 
 import flopy
-from flopy.mfusg import MfUsg, MfUsgBcf, MfUsgBct, MfUsgDpt, MfUsgOc, MfUsgPcb, MfUsgSms
-from flopy.modflow import ModflowBas, ModflowChd, ModflowDis
+from flopy.mfusg import (
+    MfUsg,
+    MfUsgBas,
+    MfUsgBcf,
+    MfUsgBct,
+    MfUsgDpt,
+    MfUsgOc,
+    MfUsgPcb,
+    MfUsgSms,
+)
+from flopy.modflow import ModflowChd, ModflowDis
 from flopy.utils import HeadFile
 
 # -
@@ -121,7 +130,7 @@
 strt[:, :, 0] = 10.0
 strt[:, :, -1] = 9.0
 
-bas = ModflowBas(mf, ibound=ibound, strt=strt)
+bas = MfUsgBas(mf, ibound=ibound, strt=strt)
 # -
 # +
 tran = 1000.0

.docs/Notebooks/mfusg_transport_Ex5_Henry.py → .docs/Notebooks/mfusg_transport_tutorial05_Henry.py

@@ -33,6 +33,7 @@
 import flopy
 from flopy.mfusg import (
     MfUsg,
+    MfUsgBas,
     MfUsgBct,
     MfUsgDdf,
     MfUsgDisU,
@@ -42,7 +43,7 @@
     MfUsgSms,
     MfUsgWel,
 )
-from flopy.modflow import ModflowBas, ModflowChd, ModflowDis
+from flopy.modflow import ModflowChd, ModflowDis
 from flopy.plot import PlotCrossSection
 from flopy.utils import HeadUFile
 from flopy.utils.gridgen import Gridgen
@@ -52,7 +53,7 @@
 model_ws = "Ex5_Henry"
 mf = MfUsg(
     version="mfusg",
-    structured=True,
+    structured=False,
     model_ws=model_ws,
     modelname="Ex5_Henry",
     exe_name="mfusg_gsi",
@@ -91,7 +92,7 @@
 # mf.modelgrid = ugrid
 # -
 # +
-bas = ModflowBas(mf)
+bas = MfUsgBas(mf)
 # -
 # +
 ipakcb = 53

.docs/Notebooks/mfusg_transport_Ex6_Stallman_Heat_Transport.py → .docs/Notebooks/mfusg_transport_tutorial06_StallmanHeatTransport.py

@@ -33,6 +33,7 @@
 import flopy
 from flopy.mfusg import (
     MfUsg,
+    MfUsgBas,
     MfUsgBct,
     MfUsgDdf,
     MfUsgDisU,
@@ -42,7 +43,7 @@
     MfUsgSms,
     MfUsgWel,
 )
-from flopy.modflow import ModflowBas, ModflowChd, ModflowDis
+from flopy.modflow import ModflowChd, ModflowDis
 from flopy.plot import PlotCrossSection
 from flopy.utils import HeadUFile
 from flopy.utils.gridgen import Gridgen
@@ -52,7 +53,7 @@
 model_ws = "Ex6a_Stallman_Heat"
 mf = MfUsg(
     version="mfusg",
-    structured=True,
+    structured=False,
     model_ws=model_ws,
     modelname="Ex6_Stallman",
     exe_name="mfusg_gsi",
@@ -103,7 +104,7 @@
 # -
 # +
 
-bas = ModflowBas(mf, strt=60.0)
+bas = MfUsgBas(mf, strt=60.0)
 # -
 
 # +
@@ -310,29 +311,29 @@
 success, buff = mf.run_model(silent=True)
 # -
 # +
-# vartype = [
-#     ("kstp", "<i4"),
-#     ("kper", "<i4"),
-#     ("pertim", "<f4"),
-#     ("totim", "<f4"),
-#     ("text", "S16"),
-#     ("nstrt", "<i4"),
-#     ("nndlay", "<i4"),
-#     ("ilay", "<i4"),
-#     ("data", "<f4"),
-# ]
-# hdr = np.fromfile(f"{mf.model_ws}/{mf.name}.con", vartype)
+vartype = [
+    ("kstp", "<i4"),
+    ("kper", "<i4"),
+    ("pertim", "<f4"),
+    ("totim", "<f4"),
+    ("text", "S16"),
+    ("nstrt", "<i4"),
+    ("nndlay", "<i4"),
+    ("ilay", "<i4"),
+    ("data", "<f4"),
+]
+hdr = np.fromfile(f"{mf.model_ws}/{mf.name}.con", vartype)
 
-# tmpr_data = hdr[np.char.strip(hdr['text'].astype(str)) == 'TMPR']
-# conc_data = hdr[np.char.strip(hdr['text'].astype(str)) == 'CONC']
-# simtemp = tmpr_data[(tmpr_data['kper']==601) & (tmpr_data['kstp']==6)]['data']
-# simconc = conc_data[(conc_data['kper']==601) & (conc_data['kstp']==6)]['data']
+tmpr_data = hdr[np.char.strip(hdr["text"].astype(str)) == "TMPR"]
+conc_data = hdr[np.char.strip(hdr["text"].astype(str)) == "CONC"]
+simtemp = tmpr_data[(tmpr_data["kper"] == 601) & (tmpr_data["kstp"] == 6)]["data"]
+simconc = conc_data[(conc_data["kper"] == 601) & (conc_data["kstp"] == 6)]["data"]
 
-tempobj = HeadUFile(f"{mf.model_ws}/{mf.name}.con", text="tmpr")
-simtemp = np.concatenate(tempobj.get_data())
-
-concobj = HeadUFile(f"{mf.model_ws}/{mf.name}.con", text="conc")
-simconc = concobj.get_data()
+# tempobj = HeadUFile(f"{mf.model_ws}/{mf.name}.con", precision="single", text=' TMPR           ')
+# simtemp = np.concatenate(tempobj.get_data())
+#
+# concobj = HeadUFile(f"{mf.model_ws}/{mf.name}.con", text="CONC")
+# simconc = concobj.get_data()
 # -
 # +
 depth = top - np.squeeze(dis.botm.array)

.docs/Notebooks/mfusg_transport_Ex7a_Discrete_Fracture.py → .docs/Notebooks/mfusg_transport_tutorial07a_DiscreteFracture.py

@@ -35,6 +35,7 @@
 import flopy.utils.binaryfile as bf
 from flopy.mfusg import (
     MfUsg,
+    MfUsgBas,
     MfUsgBct,
     MfUsgDisU,
     MfUsgLpf,
@@ -44,7 +45,7 @@
     MfUsgSms,
     MfUsgWel,
 )
-from flopy.modflow import ModflowBas, ModflowChd, ModflowDis
+from flopy.modflow import ModflowChd, ModflowDis
 from flopy.plot import PlotCrossSection, PlotMapView
 from flopy.utils import HeadUFile
 from flopy.utils.gridgen import Gridgen
@@ -66,7 +67,7 @@
 
 mf = MfUsg(
     version="mfusg",
-    structured=True,
+    structured=False,
     model_ws=model_ws,
     modelname="Ex7_MD",
     exe_name="mfusg_gsi",
@@ -107,7 +108,7 @@
 disu = MfUsgDisU(mf, **gridprops, itmuni=5, lenuni=1, nper=nper, perlen=perlen)
 # -
 # +
-bas = ModflowBas(mf, strt=10.0)
+bas = MfUsgBas(mf, strt=10.0)
 # -
 # +
 

.docs/Notebooks/mfusg_transport_Ex7b_SandBox.py → .docs/Notebooks/mfusg_transport_tutorial07b_SandBox.py

@@ -68,7 +68,7 @@
 model_ws = "Ex7_SandBox"
 mf = MfUsg(
     version="mfusg",
-    structured=True,
+    structured=False,
     model_ws=model_ws,
     modelname="Ex7_SandBox",
     exe_name="mfusg_gsi",

.docs/Notebooks/mfusg_transport_Ex7c_ChainDecay.py → .docs/Notebooks/mfusg_transport_tutorial07c_ChainDecay.py

@@ -33,6 +33,7 @@
 import flopy.utils.binaryfile as bf
 from flopy.mfusg import (
     MfUsg,
+    MfUsgBas,
     MfUsgBct,
     MfUsgDisU,
     MfUsgLpf,
@@ -42,7 +43,7 @@
     MfUsgSms,
     MfUsgWel,
 )
-from flopy.modflow import ModflowBas, ModflowChd, ModflowDis
+from flopy.modflow import ModflowChd, ModflowDis
 from flopy.plot import PlotCrossSection, PlotMapView
 from flopy.utils import HeadUFile
 from flopy.utils.gridgen import Gridgen
@@ -62,7 +63,7 @@
 
 mf = MfUsg(
     version="mfusg",
-    structured=True,
+    structured=False,
     model_ws=model_ws,
     modelname="Ex7_PCE",
     exe_name="mfusg_gsi",
@@ -117,7 +118,7 @@
 # -
 
 # +
-bas = ModflowBas(mf, strt=20.0)
+bas = MfUsgBas(mf, strt=20.0)
 # -
 
 # +