Improve lake and other stuff

docs/examples/09_schoonhoven.ipynb

@@ -119,7 +119,7 @@
     "norm = matplotlib.colors.Normalize(vmin=-3, vmax=1)\n",
     "cmap = \"viridis\"\n",
     "bgt.plot(\"summer_stage\", ax=ax, norm=norm, cmap=cmap)\n",
-    "nlmod.plot.colorbar_inside(norm=norm, cmap=cmap)"
+    "nlmod.plot.colorbar_inside(norm=norm, cmap=cmap);"
    ]
   },
   {
@@ -139,7 +139,7 @@
    "source": [
     "f, ax = nlmod.plot.get_map(extent)\n",
     "bgt.plot(\"ahn_min\", ax=ax, norm=norm, cmap=cmap)\n",
-    "nlmod.plot.colorbar_inside(norm=norm, cmap=cmap)"
+    "nlmod.plot.colorbar_inside(norm=norm, cmap=cmap);"
    ]
   },
   {
@@ -308,9 +308,7 @@
    "source": [
     "bed_resistance = 1.0\n",
     "\n",
-    "mg = nlmod.grid.modelgrid_from_ds(ds)\n",
-    "gi = flopy.utils.GridIntersect(mg, method=\"vertex\")\n",
-    "bgt_grid = nlmod.grid.gdf_to_grid(bgt, ix=gi).set_index(\"cellid\")\n",
+    "bgt_grid = nlmod.grid.gdf_to_grid(bgt, ds).set_index(\"cellid\")\n",
     "\n",
     "bgt_grid[\"cond\"] = bgt_grid.area / bed_resistance\n",
     "\n",
@@ -332,14 +330,17 @@
     "    \"W0656.cb3c3a25de4141d18c573b561f02e84a\",\n",
     "]\n",
     "\n",
-    "mask = bgt_grid[\"identificatie\"].isin(ids_grote_gracht) | bgt_grid[\n",
-    "    \"identificatie\"\n",
-    "].isin(ids_oude_haven)\n",
+    "mask = bgt_grid[\"identificatie\"].isin(ids_grote_gracht + ids_oude_haven)\n",
     "lakes = bgt_grid[mask].copy()\n",
     "lakes[\"name\"] = \"\"\n",
     "lakes.loc[lakes[\"identificatie\"].isin(ids_grote_gracht), \"name\"] = \"grotegracht\"\n",
     "lakes.loc[lakes[\"identificatie\"].isin(ids_oude_haven), \"name\"] = \"oudehaven\"\n",
-    "bgt_grid = bgt_grid[~mask]"
+    "bgt_grid = bgt_grid[~mask]\n",
+    "\n",
+    "# cut rainfall and evaporation from model dataset\n",
+    "lak_rainfall, lak_evaporation = nlmod.gwf.lake.clip_meteorological_data_from_ds(\n",
+    "    lakes, ds, boundname_column=\"name\"\n",
+    ")"
    ]
   },
   {
@@ -400,12 +401,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# add specific properties to the lake gdf\n",
-    "lakes.loc[lakes[\"identificatie\"].isin(ids_grote_gracht), \"lakeno\"] = 0\n",
-    "lakes.loc[lakes[\"identificatie\"].isin(ids_oude_haven), \"lakeno\"] = 1\n",
-    "\n",
     "# add general properties to the lake gdf\n",
-    "lakes[\"elev\"] = lakes[\"ahn_min\"] - 0.5\n",
     "summer_months = (4, 5, 6, 7, 8, 9)\n",
     "if pd.to_datetime(ds.time.start).month in summer_months:\n",
     "    lakes[\"strt\"] = lakes[\"summer_stage\"]\n",
@@ -418,13 +414,11 @@
     "# lakes.loc[lakes['identificatie'].isin(ids_oude_haven), 'INFLOW'] = 'inflow_lake'\n",
     "\n",
     "# add outlet to Oude Haven, water flows from Oude Haven to Grote Gracht.\n",
-    "lakes.loc[lakes[\"identificatie\"].isin(ids_oude_haven), \"lakeout\"] = 0\n",
-    "lakes.loc[lakes[\"identificatie\"].isin(ids_oude_haven), \"outlet_invert\"] = (\n",
-    "    1.0  # overstort hoogte\n",
-    ")\n",
+    "lakes.loc[lakes['name'] == \"oudehaven\", \"lakeout\"] = \"grotegracht\"\n",
+    "lakes.loc[lakes['name'] == \"oudehaven\", \"outlet_invert\"] = 1.0 # overstort hoogte\n",
     "\n",
     "# add lake to groundwaterflow model\n",
-    "lak = nlmod.gwf.lake_from_gdf(gwf, lakes, ds, boundname_column=\"name\")"
+    "lak = nlmod.gwf.lake_from_gdf(gwf, lakes, ds, boundname_column=\"name\", rainfall=lak_rainfall, evaporation=lak_evaporation)"
    ]
   },
   {
@@ -501,7 +495,7 @@
     "    colorbar_label=\"head [m NAP]\",\n",
     "    title=\"mean head\",\n",
     ")\n",
-    "bgt.dissolve().plot(ax=pc.axes, edgecolor=\"k\", facecolor=\"none\")"
+    "bgt.dissolve().plot(ax=pc.axes, edgecolor=\"k\", facecolor=\"none\");"
    ]
   },
   {
@@ -784,7 +778,7 @@
     "line = ax.add_collection(lc)\n",
     "nlmod.plot.colorbar_inside(line, label=\"Travel time (years)\")\n",
     "\n",
-    "bgt.dissolve().plot(ax=ax, edgecolor=\"k\", facecolor=\"none\")"
+    "bgt.dissolve().plot(ax=ax, edgecolor=\"k\", facecolor=\"none\");"
    ]
   },
   {