Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docs/Notebooks/mfusg_transport_07c_ChainDecay_dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
structured=False,
model_ws=model_ws,
modelname="Ex7_PCE",
exe_name="mfusg_gsi",
exe_name="mfusgt",
)
# -

Expand Down
2 changes: 1 addition & 1 deletion .docs/Notebooks/mfusg_transport_tutorial01_1D.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
structured=True,
model_ws=model_ws,
modelname="ex1-1d",
exe_name="mfusg_gsi",
exe_name="mfusgt",
)
# -

Expand Down
2 changes: 1 addition & 1 deletion .docs/Notebooks/mfusg_transport_tutorial02_Radial.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
structured=True,
model_ws=model_ws,
modelname="Ex2_Radial",
exe_name="mfusg_gsi",
exe_name="mfusgt",
)
# -
# +
Expand Down
2 changes: 1 addition & 1 deletion .docs/Notebooks/mfusg_transport_tutorial03_Conduit.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
structured=True,
model_ws=model_ws,
modelname="Ex3_CLN_Conduit",
exe_name="mfusg_gsi",
exe_name="mfusgt",
)
# -
# +
Expand Down
2 changes: 1 addition & 1 deletion .docs/Notebooks/mfusg_transport_tutorial04_DualDomain.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
structured=True,
model_ws=model_ws,
modelname="Ex4_DualDomain",
exe_name="mfusg_gsi",
exe_name="mfusgt",
)
# -
# +
Expand Down
2 changes: 1 addition & 1 deletion .docs/Notebooks/mfusg_transport_tutorial05_Henry.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
structured=False,
model_ws=model_ws,
modelname="Ex5_Henry",
exe_name="mfusg_gsi",
exe_name="mfusgt",
)
# -
# +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
structured=False,
model_ws=model_ws,
modelname="Ex6_Stallman",
exe_name="mfusg_gsi",
exe_name="mfusgt",
)
# -
# +
Expand Down Expand Up @@ -325,7 +325,7 @@
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"]
conc_data = hdr[np.char.startswith(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"]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
structured=False,
model_ws=model_ws,
modelname="Ex7_MD",
exe_name="mfusg_gsi",
exe_name="mfusgt",
)
# -
# +
Expand Down
2 changes: 1 addition & 1 deletion .docs/Notebooks/mfusg_transport_tutorial07b_SandBox.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
structured=False,
model_ws=model_ws,
modelname="Ex7_SandBox",
exe_name="mfusg_gsi",
exe_name="mfusgt",
)
# -
# +
Expand Down
2 changes: 1 addition & 1 deletion .docs/Notebooks/mfusg_transport_tutorial09_PFAS.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
structured=False,
model_ws=model_ws,
modelname="Ex9_PFAS",
exe_name="mfusg_gsi",
exe_name="mfusgt",
)
# -
# +
Expand Down
64 changes: 32 additions & 32 deletions autotest/test_usg_transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def mfusg_transport_Ex9_PFAS_model_path(example_data_path: Path):
return example_data_path / "mfusg_transport" / "Ex9_PFAS"


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex1_1D(function_tmpdir, mfusg_transport_Ex1_1D_model_path):
print("testing mfusg transport model loading: BTN_Test1.nam")

Expand All @@ -117,7 +117,7 @@ def test_usg_load_Ex1_1D(function_tmpdir, mfusg_transport_Ex1_1D_model_path):

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand All @@ -142,7 +142,7 @@ def test_usg_load_Ex1_1D(function_tmpdir, mfusg_transport_Ex1_1D_model_path):
assert success, msg


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex2_Radial_adv(
function_tmpdir, mfusg_transport_Ex2_Radial_2D_model_path
):
Expand All @@ -154,7 +154,7 @@ def test_usg_load_Ex2_Radial_adv(

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand All @@ -178,7 +178,7 @@ def test_usg_load_Ex2_Radial_adv(
assert success


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex2_Radial_Disp(
function_tmpdir, mfusg_transport_Ex2_Radial_2D_model_path
):
Expand All @@ -190,7 +190,7 @@ def test_usg_load_Ex2_Radial_Disp(

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand All @@ -214,7 +214,7 @@ def test_usg_load_Ex2_Radial_Disp(
assert success


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex3_CLN_Conduit(
function_tmpdir, mfusg_transport_Ex3_CLN_Conduit_model_path
):
Expand All @@ -225,7 +225,7 @@ def test_usg_load_Ex3_CLN_Conduit(

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand Down Expand Up @@ -254,7 +254,7 @@ def test_usg_load_Ex3_CLN_Conduit(
assert success, msg


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex3_CLN_Conduit_Dispersion(
function_tmpdir, mfusg_transport_Ex3_CLN_Conduit_model_path
):
Expand All @@ -267,7 +267,7 @@ def test_usg_load_Ex3_CLN_Conduit_Dispersion(

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand Down Expand Up @@ -296,7 +296,7 @@ def test_usg_load_Ex3_CLN_Conduit_Dispersion(
assert success, msg


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex3_CLN_Conduit_Nest(
function_tmpdir, mfusg_transport_Ex3_CLN_Conduit_model_path
):
Expand All @@ -307,7 +307,7 @@ def test_usg_load_Ex3_CLN_Conduit_Nest(

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand Down Expand Up @@ -336,7 +336,7 @@ def test_usg_load_Ex3_CLN_Conduit_Nest(
assert success, msg


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex4_Dual_Domain(
function_tmpdir, mfusg_transport_Ex4_Dual_Domain_model_path
):
Expand All @@ -347,7 +347,7 @@ def test_usg_load_Ex4_Dual_Domain(

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand Down Expand Up @@ -376,7 +376,7 @@ def test_usg_load_Ex4_Dual_Domain(
assert success, msg


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex5_Henry(function_tmpdir, mfusg_transport_Ex5_Henry_model_path):
print("testing mfusg transport model loading: Conduit.nam")

Expand All @@ -385,7 +385,7 @@ def test_usg_load_Ex5_Henry(function_tmpdir, mfusg_transport_Ex5_Henry_model_pat

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand Down Expand Up @@ -416,7 +416,7 @@ def test_usg_load_Ex5_Henry(function_tmpdir, mfusg_transport_Ex5_Henry_model_pat
assert success, msg


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex6_Stallman_Heat(
function_tmpdir, mfusg_transport_Ex6_Stallman_model_path
):
Expand All @@ -427,7 +427,7 @@ def test_usg_load_Ex6_Stallman_Heat(

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand All @@ -454,7 +454,7 @@ def test_usg_load_Ex6_Stallman_Heat(
assert success, msg


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex6_Stallman_Solute(
function_tmpdir, mfusg_transport_Ex6_Stallman_model_path
):
Expand All @@ -465,7 +465,7 @@ def test_usg_load_Ex6_Stallman_Solute(

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand All @@ -492,7 +492,7 @@ def test_usg_load_Ex6_Stallman_Solute(
assert success, msg


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex6_Stallman_Solute_Heat(
function_tmpdir, mfusg_transport_Ex6_Stallman_model_path
):
Expand All @@ -503,7 +503,7 @@ def test_usg_load_Ex6_Stallman_Solute_Heat(

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand All @@ -530,7 +530,7 @@ def test_usg_load_Ex6_Stallman_Solute_Heat(
assert success, msg


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex7_Matrix_Diffusion_DiscreteFracture(
function_tmpdir, mfusg_transport_Ex7_Matrix_Diffusion_model_path
):
Expand All @@ -544,7 +544,7 @@ def test_usg_load_Ex7_Matrix_Diffusion_DiscreteFracture(

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand Down Expand Up @@ -573,7 +573,7 @@ def test_usg_load_Ex7_Matrix_Diffusion_DiscreteFracture(
assert success, msg


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex7_Matrix_Diffusion(
function_tmpdir, mfusg_transport_Ex7_Matrix_Diffusion_model_path
):
Expand All @@ -587,7 +587,7 @@ def test_usg_load_Ex7_Matrix_Diffusion(

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand Down Expand Up @@ -616,7 +616,7 @@ def test_usg_load_Ex7_Matrix_Diffusion(
assert success, msg


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex7_SandTank(
function_tmpdir, mfusg_transport_Ex7_Matrix_Diffusion_model_path
):
Expand All @@ -629,7 +629,7 @@ def test_usg_load_Ex7_SandTank(

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand Down Expand Up @@ -660,7 +660,7 @@ def test_usg_load_Ex7_SandTank(
assert success, msg


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex8_Lake(function_tmpdir, mfusg_transport_Ex8_Lake_model_path):
print("testing mfusg transport model loading: lak_usg_01.nam")

Expand All @@ -669,7 +669,7 @@ def test_usg_load_Ex8_Lake(function_tmpdir, mfusg_transport_Ex8_Lake_model_path)

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand Down Expand Up @@ -703,7 +703,7 @@ def test_usg_load_Ex8_Lake(function_tmpdir, mfusg_transport_Ex8_Lake_model_path)
# assert success, msg


@requires_exe("mfusg_gsi")
@requires_exe("mfusgt")
def test_usg_load_Ex9_PFAS(function_tmpdir, mfusg_transport_Ex9_PFAS_model_path):
print("testing mfusg transport model loading: PFAS_C1.nam")

Expand All @@ -712,7 +712,7 @@ def test_usg_load_Ex9_PFAS(function_tmpdir, mfusg_transport_Ex9_PFAS_model_path)

# Create the model
m = MfUsg.load(
fname, exe_name="mfusg_gsi", verbose=True, model_ws=function_tmpdir, check=True
fname, exe_name="mfusgt", verbose=True, model_ws=function_tmpdir, check=True
)

# assert disu, lpf, bas packages have been loaded
Expand Down
Binary file modified examples/data/mfusg_transport/Ex4_Dual_Domain/DualDomain.CIM
Binary file not shown.
Loading