diff --git a/examples/Notebooks/flopy3.3_PlotCrossSection.ipynb b/examples/Notebooks/flopy3.3_PlotCrossSection.ipynb index 391d87f6de..2f3e8c7c48 100644 --- a/examples/Notebooks/flopy3.3_PlotCrossSection.ipynb +++ b/examples/Notebooks/flopy3.3_PlotCrossSection.ipynb @@ -45,7 +45,6 @@ "source": [ "import sys\n", "import os\n", - "import platform\n", "import numpy as np\n", "import matplotlib as mpl\n", "import matplotlib.pyplot as plt\n", @@ -90,11 +89,6 @@ "exe_name_2005 = \"mf2005\"\n", "vmf6 = \"mf6\"\n", "exe_name_mf6 = \"mf6\"\n", - "exe_mp = \"mp6\"\n", - "if platform.system() == \"Windows\":\n", - " exe_name_2005 += \".exe\"\n", - " exe_name_mf6 += \".exe\"\n", - " exe_mp += \".exe\"\n", "\n", "# Set the paths\n", "prj_root = notebook_utils.get_project_root_path()\n", diff --git a/examples/Notebooks/flopy3.3_PlotMapView.ipynb b/examples/Notebooks/flopy3.3_PlotMapView.ipynb index 9b53692ddd..425c9046c9 100644 --- a/examples/Notebooks/flopy3.3_PlotMapView.ipynb +++ b/examples/Notebooks/flopy3.3_PlotMapView.ipynb @@ -45,7 +45,6 @@ "source": [ "import sys\n", "import os\n", - "import platform\n", "import numpy as np\n", "import matplotlib as mpl\n", "import matplotlib.pyplot as plt\n", @@ -92,11 +91,6 @@ "vmf6 = \"mf6\"\n", "exe_name_mf6 = \"mf6\"\n", "exe_mp = \"mp6\"\n", - "if platform.system() == \"Windows\":\n", - " exe_name_2005 += \".exe\"\n", - " exe_name_mf6 += \".exe\"\n", - " exe_mp += \".exe\"\n", - "\n", "\n", "# Set the paths\n", "prj_root = notebook_utils.get_project_root_path()\n", diff --git a/examples/Notebooks/flopy3_MT3D-USGS_example.ipynb b/examples/Notebooks/flopy3_MT3D-USGS_example.ipynb index 56f227aaf5..78b4a7f1f0 100644 --- a/examples/Notebooks/flopy3_MT3D-USGS_example.ipynb +++ b/examples/Notebooks/flopy3_MT3D-USGS_example.ipynb @@ -46,7 +46,6 @@ "source": [ "import sys\n", "import os\n", - "import platform\n", "import string\n", "from tempfile import TemporaryDirectory\n", "from io import StringIO, BytesIO\n", @@ -88,9 +87,6 @@ "modelname = \"CrnkNic\"\n", "mfexe = \"mfnwt\"\n", "mtexe = \"mt3dusgs\"\n", - "if platform.system() == \"Windows\":\n", - " mfexe += \".exe\"\n", - " mtexe += \".exe\"\n", "\n", "# Make sure modelpth directory exists\n", "if not os.path.isdir(modelpth):\n", diff --git a/examples/Notebooks/flopy3_PlotArrayExample.ipynb b/examples/Notebooks/flopy3_PlotArrayExample.ipynb index 3460c5510a..588a88ae70 100644 --- a/examples/Notebooks/flopy3_PlotArrayExample.ipynb +++ b/examples/Notebooks/flopy3_PlotArrayExample.ipynb @@ -38,7 +38,6 @@ "from IPython.display import Image\n", "import sys\n", "import os\n", - "import platform\n", "from tempfile import TemporaryDirectory\n", "\n", "import numpy as np\n", @@ -76,9 +75,6 @@ "# assumes executable is in users path statement\n", "version = \"mf2005\"\n", "exe_name = \"mf2005\"\n", - "if platform.system() == \"Windows\":\n", - " exe_name = \"mf2005.exe\"\n", - "mfexe = exe_name\n", "\n", "# Set the paths\n", "loadpth = os.path.join(\"..\", \"data\", \"secp\")\n", diff --git a/examples/Notebooks/flopy3_WatertableRecharge_example.ipynb b/examples/Notebooks/flopy3_WatertableRecharge_example.ipynb index 2bf1efced7..2b8b8f6d76 100644 --- a/examples/Notebooks/flopy3_WatertableRecharge_example.ipynb +++ b/examples/Notebooks/flopy3_WatertableRecharge_example.ipynb @@ -50,7 +50,6 @@ "source": [ "import os\n", "import sys\n", - "import platform\n", "from tempfile import TemporaryDirectory\n", "\n", "import numpy as np\n", diff --git a/examples/Notebooks/flopy3_Zaidel_example.ipynb b/examples/Notebooks/flopy3_Zaidel_example.ipynb index ece7e77439..72b397afb8 100644 --- a/examples/Notebooks/flopy3_Zaidel_example.ipynb +++ b/examples/Notebooks/flopy3_Zaidel_example.ipynb @@ -43,7 +43,6 @@ "source": [ "import os\n", "import sys\n", - "import platform\n", "from tempfile import TemporaryDirectory\n", "\n", "import numpy as np\n", @@ -79,10 +78,7 @@ "source": [ "# Set name of MODFLOW exe\n", "# assumes executable is in users path statement\n", - "exe_name = \"mfusg\"\n", - "if platform.system() == \"Windows\":\n", - " exe_name += \".exe\"\n", - "mfexe = exe_name\n", + "mfexe = \"mfusg\"\n", "\n", "modelname = \"zaidel\"\n", "temp_dir = TemporaryDirectory()\n", diff --git a/examples/Notebooks/flopy3_ZoneBudget_example.ipynb b/examples/Notebooks/flopy3_ZoneBudget_example.ipynb index 800a9e015a..71e4215043 100644 --- a/examples/Notebooks/flopy3_ZoneBudget_example.ipynb +++ b/examples/Notebooks/flopy3_ZoneBudget_example.ipynb @@ -40,7 +40,6 @@ "source": [ "import os\n", "import sys\n", - "import platform\n", "from tempfile import TemporaryDirectory\n", "\n", "import numpy as np\n", @@ -1635,9 +1634,6 @@ "source": [ "mf6_exe = \"mf6\"\n", "zb6_exe = \"zbud6\"\n", - "if platform.system().lower() == \"windows\":\n", - " mf6_exe += \".exe\"\n", - " zb6_exe += \".exe\"\n", "\n", "sim_ws = os.path.join(\"..\", \"data\", \"mf6-freyberg\")\n", "cpth = os.path.join(\".\", \"temp\")\n", diff --git a/examples/Notebooks/flopy3_array_outputformat_options.ipynb b/examples/Notebooks/flopy3_array_outputformat_options.ipynb index 484139abbd..b8f581d38d 100644 --- a/examples/Notebooks/flopy3_array_outputformat_options.ipynb +++ b/examples/Notebooks/flopy3_array_outputformat_options.ipynb @@ -53,7 +53,6 @@ "source": [ "import sys\n", "import os\n", - "import platform\n", "from tempfile import TemporaryDirectory\n", "\n", "import numpy as np\n", diff --git a/examples/Notebooks/flopy3_demo_of_modelgrid_classes.ipynb b/examples/Notebooks/flopy3_demo_of_modelgrid_classes.ipynb index 63d76e50f8..7372d7204f 100644 --- a/examples/Notebooks/flopy3_demo_of_modelgrid_classes.ipynb +++ b/examples/Notebooks/flopy3_demo_of_modelgrid_classes.ipynb @@ -50,7 +50,6 @@ "import numpy as np\n", "import matplotlib as mpl\n", "import matplotlib.pyplot as plt\n", - "import platform\n", "\n", "# run installed version of flopy or add local path\n", "try:\n", @@ -85,10 +84,7 @@ "# set the names of our modflow executables\n", "# assumes that the executable is in users path statement\n", "mf6_exe = \"mf6\"\n", - "gridgen_exe = \"gridgen\"\n", - "if platform.system().lower() == \"windows\":\n", - " mf6_exe += \".exe\"\n", - " gridgen_exe += \".exe\"" + "gridgen_exe = \"gridgen\"" ] }, { diff --git a/examples/Notebooks/flopy3_grid_intersection_demo.ipynb b/examples/Notebooks/flopy3_grid_intersection_demo.ipynb index 87ae6116e8..fb765ca6c2 100644 --- a/examples/Notebooks/flopy3_grid_intersection_demo.ipynb +++ b/examples/Notebooks/flopy3_grid_intersection_demo.ipynb @@ -63,7 +63,6 @@ ], "source": [ "import os\n", - "import platform\n", "import sys\n", "\n", "import matplotlib as mpl\n", diff --git a/examples/Notebooks/flopy3_gridgen.ipynb b/examples/Notebooks/flopy3_gridgen.ipynb index ee4924efaf..1b905b4236 100644 --- a/examples/Notebooks/flopy3_gridgen.ipynb +++ b/examples/Notebooks/flopy3_gridgen.ipynb @@ -37,7 +37,6 @@ "source": [ "import os\n", "import sys\n", - "import platform\n", "import shutil\n", "from tempfile import TemporaryDirectory\n", "\n", @@ -89,10 +88,6 @@ } ], "source": [ - "gridgen_exe = \"gridgen\"\n", - "if platform.system() in \"Windows\":\n", - " gridgen_exe += \".exe\"\n", - "\n", "gridgen_exe = flopy.which(\"gridgen\")\n", "if gridgen_exe is None:\n", " msg = (\n", diff --git a/examples/Notebooks/flopy3_mf6_A_simple-model.ipynb b/examples/Notebooks/flopy3_mf6_A_simple-model.ipynb index 23d502c2a9..d49248cae5 100644 --- a/examples/Notebooks/flopy3_mf6_A_simple-model.ipynb +++ b/examples/Notebooks/flopy3_mf6_A_simple-model.ipynb @@ -44,7 +44,6 @@ "source": [ "import sys\n", "import os\n", - "import platform\n", "from tempfile import TemporaryDirectory\n", "\n", "import numpy as np\n", diff --git a/examples/Notebooks/flopy3_mf6_B_complex-model.ipynb b/examples/Notebooks/flopy3_mf6_B_complex-model.ipynb index 288d766566..574190e226 100644 --- a/examples/Notebooks/flopy3_mf6_B_complex-model.ipynb +++ b/examples/Notebooks/flopy3_mf6_B_complex-model.ipynb @@ -44,7 +44,6 @@ "source": [ "import sys\n", "import os\n", - "import platform\n", "from tempfile import TemporaryDirectory\n", "\n", "import numpy as np\n", diff --git a/examples/Notebooks/flopy3_mf6_tutorial.ipynb b/examples/Notebooks/flopy3_mf6_tutorial.ipynb index 4741f666f9..8dfe17ca3d 100644 --- a/examples/Notebooks/flopy3_mf6_tutorial.ipynb +++ b/examples/Notebooks/flopy3_mf6_tutorial.ipynb @@ -92,7 +92,7 @@ "\n", "version='mf6'\n", "\n", - "exe_name='mf6.exe'\n", + "exe_name='mf6'\n", "\n", "sim_ws='.'\n", "\n", diff --git a/examples/Notebooks/flopy3_modpath7_create_simulation.ipynb b/examples/Notebooks/flopy3_modpath7_create_simulation.ipynb index 0e60769deb..9da6713925 100644 --- a/examples/Notebooks/flopy3_modpath7_create_simulation.ipynb +++ b/examples/Notebooks/flopy3_modpath7_create_simulation.ipynb @@ -42,7 +42,6 @@ "import numpy as np\n", "import matplotlib as mpl\n", "import matplotlib.pyplot as plt\n", - "import platform\n", "\n", "# run installed version of flopy or add local path\n", "try:\n", @@ -77,10 +76,7 @@ "source": [ "# define executable names\n", "mpexe = \"mp7\"\n", - "mfexe = \"mf6\"\n", - "if platform.system() == \"Windows\":\n", - " mpexe += \".exe\"\n", - " mfexe += \".exe\"" + "mfexe = \"mf6\"" ] }, { diff --git a/examples/Notebooks/flopy3_mt3d-usgs_example_with_sft_lkt_uzt.ipynb b/examples/Notebooks/flopy3_mt3d-usgs_example_with_sft_lkt_uzt.ipynb index f3ded2e146..afbe73e0f4 100644 --- a/examples/Notebooks/flopy3_mt3d-usgs_example_with_sft_lkt_uzt.ipynb +++ b/examples/Notebooks/flopy3_mt3d-usgs_example_with_sft_lkt_uzt.ipynb @@ -42,7 +42,6 @@ "source": [ "import os\n", "import sys\n", - "import platform\n", "from tempfile import TemporaryDirectory\n", "\n", "import numpy as np\n", @@ -97,10 +96,6 @@ "mfexe = \"mfnwt\"\n", "mtexe = \"mt3dusgs\"\n", "\n", - "if platform.system() == \"Windows\":\n", - " mfexe += \".exe\"\n", - " mtexe += \".exe\"\n", - "\n", "# Make sure modelpth directory exists\n", "if not os.path.isdir(modelpth):\n", " os.makedirs(modelpth, exist_ok=True)\n", diff --git a/examples/Notebooks/flopy3_nwt_options.ipynb b/examples/Notebooks/flopy3_nwt_options.ipynb index b158e1078d..018acf700b 100644 --- a/examples/Notebooks/flopy3_nwt_options.ipynb +++ b/examples/Notebooks/flopy3_nwt_options.ipynb @@ -35,7 +35,6 @@ "source": [ "import os\n", "import sys\n", - "import platform\n", "from tempfile import TemporaryDirectory\n", "\n", "try:\n", @@ -121,9 +120,6 @@ "source": [ "mfexe = \"mfnwt\"\n", "\n", - "if platform.system() == \"Windows\":\n", - " mfexe += \".exe\"\n", - "\n", "ml = flopy.modflow.Modflow.load(\n", " \"sagehen.nam\", model_ws=load_ws, exe_name=mfexe, version=\"mfnwt\"\n", ")\n", diff --git a/examples/Notebooks/flopy3_sfrpackage_example.ipynb b/examples/Notebooks/flopy3_sfrpackage_example.ipynb index cbd4efe24c..6eef01c401 100644 --- a/examples/Notebooks/flopy3_sfrpackage_example.ipynb +++ b/examples/Notebooks/flopy3_sfrpackage_example.ipynb @@ -44,7 +44,6 @@ ], "source": [ "import sys\n", - "import platform\n", "import os\n", "import glob\n", "import shutil\n", @@ -90,9 +89,7 @@ "source": [ "# Set name of MODFLOW exe\n", "# assumes executable is in users path statement\n", - "exe_name = \"mf2005\"\n", - "if platform.system() == \"Windows\":\n", - " exe_name += \".exe\"" + "exe_name = \"mf2005\"" ] }, { diff --git a/examples/Notebooks/flopy3_swi2package_ex1.ipynb b/examples/Notebooks/flopy3_swi2package_ex1.ipynb index b55c8100ff..e03ab7de1f 100644 --- a/examples/Notebooks/flopy3_swi2package_ex1.ipynb +++ b/examples/Notebooks/flopy3_swi2package_ex1.ipynb @@ -49,7 +49,6 @@ "source": [ "import os\n", "import sys\n", - "import platform\n", "from tempfile import TemporaryDirectory\n", "\n", "import numpy as np\n", @@ -95,8 +94,6 @@ "# Set name of MODFLOW exe\n", "# assumes executable is in users path statement\n", "exe_name = \"mf2005\"\n", - "if platform.system() == \"Windows\":\n", - " exe_name = \"mf2005.exe\"\n", "\n", "temp_dir = TemporaryDirectory()\n", "workspace = temp_dir.name\n", diff --git a/examples/Notebooks/flopy3_swi2package_ex4.ipynb b/examples/Notebooks/flopy3_swi2package_ex4.ipynb index ba626663dd..81101fbc82 100644 --- a/examples/Notebooks/flopy3_swi2package_ex4.ipynb +++ b/examples/Notebooks/flopy3_swi2package_ex4.ipynb @@ -54,7 +54,6 @@ "source": [ "import os\n", "import sys\n", - "import platform\n", "from tempfile import TemporaryDirectory\n", "\n", "import numpy as np\n", @@ -98,8 +97,6 @@ "# Set name of MODFLOW exe\n", "# assumes executable is in users path statement\n", "exe_name = \"mf2005\"\n", - "if platform.system() == \"Windows\":\n", - " exe_name = \"mf2005.exe\"\n", "\n", "temp_dir = TemporaryDirectory()\n", "workspace = temp_dir.name" diff --git a/examples/Notebooks/flopy3_uzf_example.ipynb b/examples/Notebooks/flopy3_uzf_example.ipynb index 1a61103c28..78eb80c551 100644 --- a/examples/Notebooks/flopy3_uzf_example.ipynb +++ b/examples/Notebooks/flopy3_uzf_example.ipynb @@ -49,7 +49,6 @@ "import os\n", "import sys\n", "import glob\n", - "import platform\n", "import shutil\n", "from tempfile import TemporaryDirectory\n", "\n", @@ -88,9 +87,7 @@ "source": [ "# Set name of MODFLOW exe\n", "# assumes executable is in users path statement\n", - "exe_name = \"mf2005\"\n", - "if platform.system() == \"Windows\":\n", - " exe_name += \".exe\"" + "exe_name = \"mf2005\"" ] }, { diff --git a/examples/Tutorials/modflow6output/tutorial01_mf6_output.py b/examples/Tutorials/modflow6output/tutorial01_mf6_output.py index f811e531e2..70395b1a43 100644 --- a/examples/Tutorials/modflow6output/tutorial01_mf6_output.py +++ b/examples/Tutorials/modflow6output/tutorial01_mf6_output.py @@ -19,7 +19,6 @@ # package object import os -import platform from pathlib import Path from tempfile import TemporaryDirectory @@ -31,8 +30,6 @@ # ## Load a simple demonstration model exe_name = "mf6" -if platform.system().lower() == "windows": - exe_name += ".exe" def get_project_root_path(path=None): diff --git a/examples/scripts/flopy_swi2_ex4.py b/examples/scripts/flopy_swi2_ex4.py index c221867b8f..7822337428 100644 --- a/examples/scripts/flopy_swi2_ex4.py +++ b/examples/scripts/flopy_swi2_ex4.py @@ -1,5 +1,4 @@ import os -import platform import sys from tempfile import TemporaryDirectory @@ -67,8 +66,6 @@ def run(workspace, quiet): # Set path and name of MODFLOW exe exe_name = "mf2005" - if platform.system() == "Windows": - exe_name = "mf2005" ncol = 61 nrow = 61 diff --git a/flopy/mbase.py b/flopy/mbase.py index f4807d5904..0e3743c86d 100644 --- a/flopy/mbase.py +++ b/flopy/mbase.py @@ -302,7 +302,7 @@ class BaseModel(ModelInterface): Name of the model, which is also used for model file names. namefile_ext : str, default "nam" Name file extension, without "." - exe_name : str, default "mf2k.exe" + exe_name : str, default "mf2005" Name of the modflow executable. model_ws : str, optional Path to the model workspace. Model files will be created in this @@ -326,7 +326,7 @@ def __init__( self, modelname="modflowtest", namefile_ext="nam", - exe_name="mf2k.exe", + exe_name="mf2005", model_ws=None, structured=True, verbose=False, @@ -1698,12 +1698,8 @@ def run_model( # Check to make sure that program and namefile exist exe = which(exe_name) if exe is None: - import platform - - if platform.system() in "Windows": - if not exe_name.lower().endswith(".exe"): - exe = which(exe_name + ".exe") - elif exe_name.lower().endswith(".exe"): + if exe_name.lower().endswith(".exe"): + # try removing .exe suffix exe = which(exe_name[:-4]) if exe is None: raise Exception( diff --git a/flopy/mf6/mfmodel.py b/flopy/mf6/mfmodel.py index f933c7f81b..3116da1b8c 100644 --- a/flopy/mf6/mfmodel.py +++ b/flopy/mf6/mfmodel.py @@ -75,7 +75,7 @@ def __init__( modelname="model", model_nam_file=None, version="mf6", - exe_name="mf6.exe", + exe_name="mf6", add_to_simulation=True, structure=None, model_rel_path=".", @@ -686,7 +686,7 @@ def load_base( model_nam_file="modflowtest.nam", mtype="gwf", version="mf6", - exe_name="mf6.exe", + exe_name="mf6", strict=True, model_rel_path=".", load_only=None, @@ -865,7 +865,7 @@ def inspect_cells( -------- >>> import flopy - >>> sim = flopy.mf6.MFSimulation.load("name", "mf6", "mf6.exe", ".") + >>> sim = flopy.mf6.MFSimulation.load("name", "mf6", "mf6", ".") >>> model = sim.get_model() >>> inspect_list = [(2, 3, 2), (0, 4, 2), (0, 2, 4)] >>> out_file = os.path.join("temp", "inspect_AdvGW_tidal.csv") diff --git a/flopy/mf6/modflow/mfgwf.py b/flopy/mf6/modflow/mfgwf.py index 72e0e2da2b..b94624ef48 100644 --- a/flopy/mf6/modflow/mfgwf.py +++ b/flopy/mf6/modflow/mfgwf.py @@ -83,7 +83,7 @@ def __init__( modelname="model", model_nam_file=None, version="mf6", - exe_name="mf6.exe", + exe_name="mf6", model_rel_path=".", list=None, print_input=None, @@ -119,7 +119,7 @@ def load( modelname="NewModel", model_nam_file="modflowtest.nam", version="mf6", - exe_name="mf6.exe", + exe_name="mf6", strict=True, model_rel_path=".", load_only=None, diff --git a/flopy/mf6/modflow/mfgwt.py b/flopy/mf6/modflow/mfgwt.py index 22b02d6826..dfe3db2f98 100644 --- a/flopy/mf6/modflow/mfgwt.py +++ b/flopy/mf6/modflow/mfgwt.py @@ -78,7 +78,7 @@ def __init__( modelname="model", model_nam_file=None, version="mf6", - exe_name="mf6.exe", + exe_name="mf6", model_rel_path=".", list=None, print_input=None, @@ -112,7 +112,7 @@ def load( modelname="NewModel", model_nam_file="modflowtest.nam", version="mf6", - exe_name="mf6.exe", + exe_name="mf6", strict=True, model_rel_path=".", load_only=None, diff --git a/flopy/mf6/modflow/mfsimulation.py b/flopy/mf6/modflow/mfsimulation.py index e8bacf0285..23dd78ac69 100644 --- a/flopy/mf6/modflow/mfsimulation.py +++ b/flopy/mf6/modflow/mfsimulation.py @@ -385,7 +385,7 @@ def __init__( self, sim_name="sim", version="mf6", - exe_name="mf6.exe", + exe_name="mf6", sim_ws=".", verbosity_level=1, continue_=None, @@ -593,7 +593,7 @@ def load( cls, sim_name="modflowsim", version="mf6", - exe_name="mf6.exe", + exe_name="mf6", sim_ws=".", strict=True, verbosity_level=1, diff --git a/flopy/mf6/utils/createpackages.py b/flopy/mf6/utils/createpackages.py index b36864cb3a..b7ed4e5585 100644 --- a/flopy/mf6/utils/createpackages.py +++ b/flopy/mf6/utils/createpackages.py @@ -393,7 +393,7 @@ def build_model_load(model_type): " @classmethod\n def load(cls, simulation, structure, " "modelname='NewModel',\n " "model_nam_file='modflowtest.nam', version='mf6',\n" - " exe_name='mf6.exe', strict=True, " + " exe_name='mf6', strict=True, " "model_rel_path='.',\n" " load_only=None):\n " "return mfmodel.MFModel.load_base(simulation, structure, " @@ -860,7 +860,7 @@ def create_packages(): init_vars = build_model_init_vars(model_param_list) model_param_list.insert(0, "model_rel_path='.'") - model_param_list.insert(0, "exe_name='mf6.exe'") + model_param_list.insert(0, "exe_name='mf6'") model_param_list.insert(0, "version='mf6'") model_param_list.insert(0, "model_nam_file=None") model_param_list.insert(0, "modelname='model'") diff --git a/flopy/mfusg/mfusg.py b/flopy/mfusg/mfusg.py index 4af40b7b90..a51aa75ba7 100644 --- a/flopy/mfusg/mfusg.py +++ b/flopy/mfusg/mfusg.py @@ -162,7 +162,7 @@ def load( Path to MODFLOW name file to load. version : str, default "mfusg" MODFLOW version. Must be "mfusg". - exe_name : str, default "mfusg.exe" + exe_name : str, default "mfusg" MODFLOW executable name. verbose : bool, default False Show messages that can be useful for debugging. diff --git a/flopy/modflow/mf.py b/flopy/modflow/mf.py index d8f574e729..92a601ff12 100644 --- a/flopy/modflow/mf.py +++ b/flopy/modflow/mf.py @@ -69,7 +69,7 @@ class Modflow(BaseModel): version : str, default "mf2005" MODFLOW version. Choose one of: "mf2k", "mf2005" (default), "mfnwt", or "mfusg". - exe_name : str, default "mf2005.exe" + exe_name : str, default "mf2005" The name of the executable to use. structured : bool, default True Specify if model grid is structured (default) or unstructured. @@ -107,7 +107,7 @@ def __init__( modelname="modflowtest", namefile_ext="nam", version="mf2005", - exe_name="mf2005.exe", + exe_name="mf2005", structured=True, listunit=2, model_ws=".", @@ -650,7 +650,7 @@ def load( cls, f, version="mf2005", - exe_name="mf2005.exe", + exe_name="mf2005", verbose=False, model_ws=".", load_only=None, @@ -668,7 +668,7 @@ def load( MODFLOW version. Choose one of: "mf2k", "mf2005" (default), or "mfnwt". Note that this can be modified on loading packages unique to different MODFLOW versions. - exe_name : str, default "mf2005.exe" + exe_name : str, default "mf2005" MODFLOW executable name. verbose : bool, default False Show messages that can be useful for debugging. diff --git a/flopy/modflowlgr/mflgr.py b/flopy/modflowlgr/mflgr.py index 2d4dd24c70..3313b61ed4 100644 --- a/flopy/modflowlgr/mflgr.py +++ b/flopy/modflowlgr/mflgr.py @@ -69,7 +69,7 @@ class ModflowLgr(BaseModel): Extension for the namefile. version : str, default "mflgr". Version of MODFLOW-LGR to use. - exe_name : str, default "mflgr.exe" + exe_name : str, default "mflgr" The name of the executable to use. iupbhsv : int, default 0 Unit number with boundary heads. @@ -114,7 +114,7 @@ def __init__( modelname="modflowlgrtest", namefile_ext="lgr", version="mflgr", - exe_name="mflgr.exe", + exe_name="mflgr", iupbhsv=0, iupbfsv=0, parent=None, @@ -466,7 +466,7 @@ def load( cls, f, version="mflgr", - exe_name="mflgr.exe", + exe_name="mflgr", verbose=False, model_ws=".", load_only=None, @@ -482,7 +482,7 @@ def load( Path to MODFLOW-LGR name file to load. version : str, default "mflgr". Version of MODFLOW-LGR to use. - exe_name : str, default "mflgr.exe" + exe_name : str, default "mflgr" The name of the executable to use. verbose : bool, default False Print additional information to the screen. diff --git a/flopy/modpath/mp6.py b/flopy/modpath/mp6.py index fa648ffbea..69960c8c90 100644 --- a/flopy/modpath/mp6.py +++ b/flopy/modpath/mp6.py @@ -39,7 +39,7 @@ class Modpath6(BaseModel): version : str, default "modpath" String that defines the MODPATH version. Valid versions are "modpath" (default). - exe_name : str, default "mp6.exe" + exe_name : str, default "mp6" The name of the executable to use. modflowmodel : flopy.modflow.Modflow MODFLOW model object with one of LPF, BCF6, or UPW packages. @@ -71,7 +71,7 @@ def __init__( simfile_ext="mpsim", namefile_ext="mpnam", version="modpath", - exe_name="mp6.exe", + exe_name="mp6", modflowmodel=None, dis_file=None, dis_unit=87, diff --git a/flopy/modpath/mp7.py b/flopy/modpath/mp7.py index 63c0e159b9..464649652f 100644 --- a/flopy/modpath/mp7.py +++ b/flopy/modpath/mp7.py @@ -53,7 +53,7 @@ class Modpath7(BaseModel): version : str, default "modpath7" String that defines the MODPATH version. Valid versions are "modpath7" (default). - exe_name : str, default "mp7.exe" + exe_name : str, default "mp7" The name of the executable to use. flowmodel : flopy.modflow.Modflow or flopy.mf6.MFModel object MODFLOW model object. @@ -84,7 +84,7 @@ def __init__( simfile_ext="mpsim", namefile_ext="mpnam", version="modpath7", - exe_name="mp7.exe", + exe_name="mp7", flowmodel=None, headfilename=None, budgetfilename=None,