diff --git a/.docs/Notebooks/mfusg_transport_07c_ChainDecay_dev.py b/.docs/Notebooks/mfusg_transport_07c_ChainDecay_dev.py index fe3b4fb4c9..9ec18beed4 100644 --- a/.docs/Notebooks/mfusg_transport_07c_ChainDecay_dev.py +++ b/.docs/Notebooks/mfusg_transport_07c_ChainDecay_dev.py @@ -66,7 +66,7 @@ structured=False, model_ws=model_ws, modelname="Ex7_PCE", - exe_name="mfusg_gsi", + exe_name="mfusgt", ) # - diff --git a/.docs/Notebooks/mfusg_transport_tutorial01_1D.py b/.docs/Notebooks/mfusg_transport_tutorial01_1D.py index 46cf29adcf..1189e5d23e 100644 --- a/.docs/Notebooks/mfusg_transport_tutorial01_1D.py +++ b/.docs/Notebooks/mfusg_transport_tutorial01_1D.py @@ -54,7 +54,7 @@ structured=True, model_ws=model_ws, modelname="ex1-1d", - exe_name="mfusg_gsi", + exe_name="mfusgt", ) # - diff --git a/.docs/Notebooks/mfusg_transport_tutorial02_Radial.py b/.docs/Notebooks/mfusg_transport_tutorial02_Radial.py index 92580d2cd8..3e089de75a 100644 --- a/.docs/Notebooks/mfusg_transport_tutorial02_Radial.py +++ b/.docs/Notebooks/mfusg_transport_tutorial02_Radial.py @@ -56,7 +56,7 @@ structured=True, model_ws=model_ws, modelname="Ex2_Radial", - exe_name="mfusg_gsi", + exe_name="mfusgt", ) # - # + diff --git a/.docs/Notebooks/mfusg_transport_tutorial03_Conduit.py b/.docs/Notebooks/mfusg_transport_tutorial03_Conduit.py index 3764b1999f..a3b7075811 100644 --- a/.docs/Notebooks/mfusg_transport_tutorial03_Conduit.py +++ b/.docs/Notebooks/mfusg_transport_tutorial03_Conduit.py @@ -60,7 +60,7 @@ structured=True, model_ws=model_ws, modelname="Ex3_CLN_Conduit", - exe_name="mfusg_gsi", + exe_name="mfusgt", ) # - # + diff --git a/.docs/Notebooks/mfusg_transport_tutorial04_DualDomain.py b/.docs/Notebooks/mfusg_transport_tutorial04_DualDomain.py index b0b5d264d7..45e06b7eae 100644 --- a/.docs/Notebooks/mfusg_transport_tutorial04_DualDomain.py +++ b/.docs/Notebooks/mfusg_transport_tutorial04_DualDomain.py @@ -85,7 +85,7 @@ structured=True, model_ws=model_ws, modelname="Ex4_DualDomain", - exe_name="mfusg_gsi", + exe_name="mfusgt", ) # - # + diff --git a/.docs/Notebooks/mfusg_transport_tutorial05_Henry.py b/.docs/Notebooks/mfusg_transport_tutorial05_Henry.py index c453992602..fe60c108fb 100644 --- a/.docs/Notebooks/mfusg_transport_tutorial05_Henry.py +++ b/.docs/Notebooks/mfusg_transport_tutorial05_Henry.py @@ -56,7 +56,7 @@ structured=False, model_ws=model_ws, modelname="Ex5_Henry", - exe_name="mfusg_gsi", + exe_name="mfusgt", ) # - # + diff --git a/.docs/Notebooks/mfusg_transport_tutorial06_StallmanHeatTransport.py b/.docs/Notebooks/mfusg_transport_tutorial06_StallmanHeatTransport.py index 1ef856d320..645de73796 100644 --- a/.docs/Notebooks/mfusg_transport_tutorial06_StallmanHeatTransport.py +++ b/.docs/Notebooks/mfusg_transport_tutorial06_StallmanHeatTransport.py @@ -56,7 +56,7 @@ structured=False, model_ws=model_ws, modelname="Ex6_Stallman", - exe_name="mfusg_gsi", + exe_name="mfusgt", ) # - # + @@ -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"] diff --git a/.docs/Notebooks/mfusg_transport_tutorial07a_DiscreteFracture.py b/.docs/Notebooks/mfusg_transport_tutorial07a_DiscreteFracture.py index cf6f18abc3..d21ef8f610 100644 --- a/.docs/Notebooks/mfusg_transport_tutorial07a_DiscreteFracture.py +++ b/.docs/Notebooks/mfusg_transport_tutorial07a_DiscreteFracture.py @@ -70,7 +70,7 @@ structured=False, model_ws=model_ws, modelname="Ex7_MD", - exe_name="mfusg_gsi", + exe_name="mfusgt", ) # - # + diff --git a/.docs/Notebooks/mfusg_transport_tutorial07b_SandBox.py b/.docs/Notebooks/mfusg_transport_tutorial07b_SandBox.py index bc285cbae5..a40529e3cb 100644 --- a/.docs/Notebooks/mfusg_transport_tutorial07b_SandBox.py +++ b/.docs/Notebooks/mfusg_transport_tutorial07b_SandBox.py @@ -71,7 +71,7 @@ structured=False, model_ws=model_ws, modelname="Ex7_SandBox", - exe_name="mfusg_gsi", + exe_name="mfusgt", ) # - # + diff --git a/.docs/Notebooks/mfusg_transport_tutorial09_PFAS.py b/.docs/Notebooks/mfusg_transport_tutorial09_PFAS.py index 6fc91076e1..0059c977a6 100644 --- a/.docs/Notebooks/mfusg_transport_tutorial09_PFAS.py +++ b/.docs/Notebooks/mfusg_transport_tutorial09_PFAS.py @@ -65,7 +65,7 @@ structured=False, model_ws=model_ws, modelname="Ex9_PFAS", - exe_name="mfusg_gsi", + exe_name="mfusgt", ) # - # + diff --git a/autotest/test_usg_transport.py b/autotest/test_usg_transport.py index f4a3d33e62..043fb1a99d 100644 --- a/autotest/test_usg_transport.py +++ b/autotest/test_usg_transport.py @@ -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") @@ -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 @@ -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 ): @@ -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 @@ -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 ): @@ -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 @@ -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 ): @@ -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 @@ -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 ): @@ -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 @@ -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 ): @@ -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 @@ -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 ): @@ -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 @@ -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") @@ -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 @@ -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 ): @@ -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 @@ -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 ): @@ -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 @@ -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 ): @@ -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 @@ -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 ): @@ -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 @@ -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 ): @@ -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 @@ -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 ): @@ -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 @@ -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") @@ -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 @@ -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") @@ -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 diff --git a/examples/data/mfusg_transport/Ex4_Dual_Domain/DualDomain.CIM b/examples/data/mfusg_transport/Ex4_Dual_Domain/DualDomain.CIM index a76afb2e8b..bc27c63daa 100644 Binary files a/examples/data/mfusg_transport/Ex4_Dual_Domain/DualDomain.CIM and b/examples/data/mfusg_transport/Ex4_Dual_Domain/DualDomain.CIM differ