Made Sarah's suggested modifications to the notebooks

Author: BSchilperoort

PyStemmusScope/__init__.py

@@ -2,7 +2,8 @@
 import logging
 from .iostreamer import create_io_dir
 from .iostreamer import read_config
-
+from . import iostreamer
+from . import forcing_io
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 

notebooks/run_model_in_notebook.ipynb

@@ -17,7 +17,8 @@
     "import os\n",
     "from pathlib import Path\n",
     "import subprocess\n",
-    "import PyStemmusScope"
+    "from PyStemmusScope import forcing_io\n",
+    "from PyStemmusScope import iostreamer"
    ]
   },
   {
@@ -46,7 +47,7 @@
     "# path to config file\n",
     "path_to_config_file = \"path_to_config_file\"\n",
     "# Instantiate working directories handler from PyStemmusScope\n",
-    "config_template = PyStemmusScope.read_config(path_to_config_file)"
+    "config_template = iostreamer.read_config(path_to_config_file)"
    ]
   },
   {
@@ -151,11 +152,11 @@
     "config_path_dict = {}\n",
     "input_dir_dict = {}\n",
     "for nc_file in forcing_filenames_list:\n",
-    "    input_dir, output_dir, config_path = PyStemmusScope.create_io_dir(nc_file, config_template)\n",
+    "    input_dir, output_dir, config_path = iostreamer.create_io_dir(nc_file, config_template)\n",
     "    config_path_dict[nc_file] = config_path\n",
     "    input_dir_dict[nc_file] = input_dir\n",
     "    \n",
-    "    config_run = PyStemmusScope.read_config(config_path)\n",
+    "    config_run = iostreamer.read_config(config_path)\n",
     "\n",
     "    forcing_io.prepare_forcing(input_dir, Path(config_run[\"ForcingPath\"]) / nc_file, config_run)\n",
     "    \n",

notebooks/run_model_in_notebook_dev.ipynb

@@ -17,7 +17,8 @@
     "import os\n",
     "from pathlib import Path\n",
     "import subprocess\n",
-    "import PyStemmusScope"
+    "from PyStemmusScope import forcing_io \n",
+    "from PyStemmusScope import iostreamer"
    ]
   },
   {
@@ -98,7 +99,7 @@
     "# path to config file\n",
     "path_to_config_file = \"path_to_config_file\"\n",
     "# Instantiate working directories handler from PyStemmusScope\n",
-    "config_template = PyStemmusScope.read_config(path_to_config_file)"
+    "config_template = iostreamer.read_config(path_to_config_file)"
    ]
   },
   {
@@ -192,7 +193,7 @@
    "source": [
     "# specify the forcing filename\n",
     "forcing_filename = config_template[\"ForcingFileName\"]\n",
-    "input_dir, output_dir, config_run_path = PyStemmusScope.create_io_dir(forcing_filename, config_template)\n",
+    "input_dir, output_dir, config_run_path = iostreamer.create_io_dir(forcing_filename, config_template)\n",
     "print(input_dir, output_dir, config_run_path)"
    ]
   },
@@ -202,7 +203,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "config_run = PyStemmusScope.read_config(config_run_path)\n",
+    "config_run = iostreamer.read_config(config_run_path)\n",
     "# Generate the forcing input data for STEMMUS_SCOPE\n",
     "forcing_io.prepare_forcing(input_dir, Path(config_run[\"ForcingPath\"]) / forcing_filename, config_run)"
    ]

notebooks/verify_model_modifications.ipynb

@@ -19,9 +19,9 @@
     "import subprocess\n",
     "import numpy as np\n",
     "import matplotlib.pyplot as plt\n",
-    "import PyStemmusScope\n",
     "import xarray as xr\n",
-    "from PyStemmusScope import forcing_io"
+    "from PyStemmusScope import forcing_io\n",
+    "from PyStemmusScope import iostreamer"
    ]
   },
   {
@@ -58,7 +58,7 @@
     "# path to config file\n",
     "path_to_config_template_file = path_to_model + \"/config_file_snellius.txt\"\n",
     "# Instantiate working directories handler from PyStemmusScope\n",
-    "config_template = PyStemmusScope.read_config(path_to_config_template_file)"
+    "config_template = iostreamer.read_config(path_to_config_template_file)"
    ]
   },
   {
@@ -99,9 +99,9 @@
    "source": [
     "# Specify the forcing filename\n",
     "forcing_filename = config_template[\"ForcingFileName\"]\n",
-    "input_dir, output_dir, config_run_path = PyStemmusScope.create_io_dir(forcing_filename, config_template)\n",
+    "input_dir, output_dir, config_run_path = iostreamer.create_io_dir(forcing_filename, config_template)\n",
     "\n",
-    "run_config = PyStemmusScope.read_config(config_run_path)\n",
+    "run_config = iostreamer.read_config(config_run_path)\n",
     "# Prepare the forcing data\n",
     "forcing_io.prepare_forcing(input_dir, Path(run_config[\"ForcingPath\"]) / forcing_filename, run_config)"
    ]