Finish case3 (#29)

* Changed strat-time in use case 3 to be in line with use case 2

* text changes to notebook 3. Needs re-running but is taking (too?) long to start container on research cloud

* oops. This commit is without the output folder!

* fixed notebook 3

* finished text on case 3 and case 4. Needs final run to generate results and have cell-counts be nice in order. Once that is done, branch can be merged back into main.

* Case4 output (#27)

* Make case2 fair (#25)

* tried to make notebook 2 FAIR, failed on technicallities. Try again after weekend

* Found the porblem: using configparser creates .ini files that are byte for byte identical, but create an
error when calling initialize(). Raised an issue for this, not something I can fix.

* Fixed problem: used work-around

* final edits to text of notebook2 before pull request

* fixed and made FAIR case 2. Solved issue with configParser (thanks Stefan!)

* Added output files from case 4

* Reran case 4

Co-authored-by: Rolf Hut <[email protected]>

* moved files from case 5. Had to change filenames for 3 and 4 into 4 and 5 because Overleaf doesn't allow lists of sections to start at zero. Will change file names of other notebooks in other branch.

* finished case 3 (preivious case 2) by moving figure, changing a few lines in the notebook. Also fixed a final problem in notebook 4 (file names of figures)

* Rename Case0 to Case1

* Rename case1 to case2

* rename case5 to Case5 (capital)

* Remove duplicate Case4

Co-authored-by: Stefan Verhoeven <[email protected]>
Co-authored-by: Peter Kalverla <[email protected]>

Author: 3 people

Case0_Marrmot_Merrimack_ESMValTool.ipynb Case1_Marrmot_Merrimack_ESMValTool.ipynbCase0_Marrmot_Merrimack_ESMValTool.ipynb renamed to Case1_Marrmot_Merrimack_ESMValTool.ipynb

@@ -11,7 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Case study 2: replace subbasin in PCRGlobWB2.0 with a MARRMoT model\n",
+    "# Case study 3: replace subbasin in PCRGlobWB2.0 with a MARRMoT model\n",
     "This notebooks demonstrates how to use eWaterCycle to combine the output of two very different models in a single experiment. We run PCRGlobWB2.0 for the Rhine basin, but we replace the Moselle sub-basin with a MARRMoT model.\n",
     "\n",
     "PCRGlobWB2.0 (Sutanudjaja et al 2017, [10.5194/gmd-11-2429-2018](https://doi.org/10.5194/gmd-11-2429-2018)) is a distributed model written in python and MARRMoT (Knoben et al 2019, [10.5194/gmd-12-2463-2019](https://doi.org/10.5194/gmd-12-2463-2019)) is a suite of conceptual models written in Matlab. To make the difference as large as possible, we choose the simplest model available within MARRMoT: the m01, a single leaky bucket. This example is neither meant to show that replacing the entire Moselle sub-basin by a single leaky bucket is better than using PCRGlobWB2.0, nor that PCRGlobWB2.0 is better than MARRMoT. This example is to show the capabillities of the eWaterCycle platform by coupling two models with different philosophies (lumped versus distributed) and different programming languages (python versus Matlab) into a single computational hydrological experiment.\n",
@@ -815,7 +815,7 @@
     "# Overlay ocean and coastines\n",
     "ax.add_feature(cfeature.OCEAN, zorder=2)\n",
     "ax.coastlines(zorder=3)\n",
-    "fig.savefig(f\"pcrglobwb_RolfTestRhine_discharge_map\", bbox_inches=\"tight\", dpi=300)"
+    "fig.savefig(f\"figures/Case3_Rhine_discharge_map\", bbox_inches=\"tight\", dpi=300)"
    ]
   },
   {
@@ -869,14 +869,14 @@
     "ewatercycle.analysis.hydrograph(\n",
     "    discharge=df,\n",
     "    reference=\"Observations from GRDC\",\n",
-    "    filename=\"case2CouplingModels\",\n",
+    "    filename=\"figures/case3_CouplingModels\",\n",
     ")"
    ]
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -890,7 +890,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.7"
+   "version": "3.9.7"
   }
  },
  "nbformat": 4,

…_LISFlood_merrimack_inc_ESMValtool.ipynb …_LISFlood_merrimack_inc_ESMValtool.ipynbcase1_wflow_LISFlood_merrimack_inc_ESMValtool.ipynb renamed to Case2_wflow_LISFlood_merrimack_inc_ESMValtool.ipynb case1_wflow_LISFlood_merrimack_inc_ESMValtool.ipynb renamed to Case2_wflow_LISFlood_merrimack_inc_ESMValtool.ipynb

@@ -668,7 +668,7 @@
     "ax.coastlines(zorder=3)\n",
     "\n",
     "fig.savefig(\n",
-    "    f\"figures/Case3_ForcePCRGlobWithAdditionalDataMap\", bbox_inches=\"tight\", dpi=300\n",
+    "    f\"figures/Case4_ForcePCRGlobWithAdditionalDataMap\", bbox_inches=\"tight\", dpi=300\n",
     ")"
    ]
   },
@@ -710,7 +710,7 @@
     }
    ],
    "source": [
-    "ewatercycle.analysis.hydrograph(discharge_data, reference=\"GRDC\", filename=\"figures/Case3_ForcePCRGlobWithAdditionalDataHydrograph\")"
+    "ewatercycle.analysis.hydrograph(discharge_data, reference=\"GRDC\", filename=\"figures/Case4_ForcePCRGlobWithAdditionalDataHydrograph\")"
    ]
   },
   {