Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #215 #216

Merged
merged 1 commit into from
Aug 22, 2023
Merged

fix #215 #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions nlmod/sim/sim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
logger = logging.getLogger(__name__)


def write_and_run(sim, ds, write_ds=True, nb_path=None, silent=False):
def write_and_run(sim, ds, write_ds=True, script_path=None, silent=False):
"""write modflow files and run the model.
2 extra options:
Expand All @@ -35,24 +35,24 @@ def write_and_run(sim, ds, write_ds=True, nb_path=None, silent=False):
write_ds : bool, optional
if True the model dataset is cached to a NetCDF-file (.nc) with a name equal
to its attribute called "model_name". The default is True.
nb_path : str or None, optional
full path of the Jupyter Notebook (.ipynb) with the modelscript. The
default is None. Preferably this path does not have to be given
manually but there is currently no good option to obtain the filename
of a Jupyter Notebook from within the notebook itself.
script_path : str or None, optional
full path of the Jupyter Notebook (.ipynb) or the module (.py) with the
modelscript. The default is None. Preferably this path does not have to
be given manually but there is currently no good option to obtain the
filename of a Jupyter Notebook from within the notebook itself.
silent : bool, optional
write and run model silently
"""
if isinstance(sim, flopy.mf6.ModflowGwf):
sim = sim.simulation

if nb_path is not None:
new_nb_fname = (
f'{dt.datetime.now().strftime("%Y%m%d")}' + os.path.split(nb_path)[-1]
if script_path is not None:
new_script_fname = (
f'{dt.datetime.now().strftime("%Y%m%d")}' + os.path.split(script_path)[-1]
)
dst = os.path.join(ds.model_ws, new_nb_fname)
logger.info(f"write script {new_nb_fname} to model workspace")
copyfile(nb_path, dst)
dst = os.path.join(ds.model_ws, new_script_fname)
logger.info(f"write script {new_script_fname} to model workspace")
copyfile(script_path, dst)

if write_ds:
logger.info("write model dataset to cache")
Expand Down