1.6.1 update (#94)

fmaussion · web-flow · commit e17ac8926fbf · 2023-08-27T23:58:35.000+02:00
* update edu notebooks

* update water resources

* update requirements
diff --git a/_toc.yml b/_toc.yml
@@ -21,18 +21,11 @@ parts:
     - file: oggm-edu/accumulation_and_ablation
     - file: oggm-edu/advance_and_retreat
     - file: oggm-edu/low_pass_climate
-    - file: oggm-edu/temperature_index_model
     
   - caption: Glaciers as water resources
     chapters:
-    - file: oggm-edu/glacier_water_resources_index
-      sections:
-        - file: oggm-edu/glacier_water_resources_pre16
-        - file: oggm-edu/glacier_water_resources
-    - file: oggm-edu/glacier_water_resources_projections_index
-      sections:
-        - file: oggm-edu/glacier_water_resources_projections_pre16
-        - file: oggm-edu/glacier_water_resources_projections
+    - file: oggm-edu/glacier_water_resources
+    - file: oggm-edu/glacier_water_resources_projections
     
   - caption: Graphics
     chapters:
diff --git a/oggm-edu/accumulation_and_ablation.ipynb b/oggm-edu/accumulation_and_ablation.ipynb
@@ -561,7 +561,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.11.4"
   }
  },
  "nbformat": 4,
diff --git a/oggm-edu/advance_and_retreat.ipynb b/oggm-edu/advance_and_retreat.ipynb
@@ -572,7 +572,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.11.4"
   }
  },
  "nbformat": 4,
diff --git a/oggm-edu/edu_intro.ipynb b/oggm-edu/edu_intro.ipynb
@@ -702,7 +702,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.11.4"
   },
   "toc": {
    "base_numbering": 1,
diff --git a/oggm-edu/glacier_water_resources.ipynb b/oggm-edu/glacier_water_resources.ipynb
@@ -179,7 +179,7 @@
    "outputs": [],
    "source": [
     "# We pick the elevation-bands glaciers because they run a bit faster - but they create more step changes in the area outputs\n",
-    "base_url = 'https://cluster.klima.uni-bremen.de/~oggm/gdirs/oggm_v1.6/L3-L5_files/2023.1/elev_bands/W5E5'\n",
+    "base_url = 'https://cluster.klima.uni-bremen.de/~oggm/gdirs/oggm_v1.6/L3-L5_files/2023.3/elev_bands/W5E5'\n",
     "gdir = workflow.init_glacier_directories([rgi_id], from_prepro_level=5, prepro_border=80, prepro_base_url=base_url)[0]"
    ]
   },
@@ -809,7 +809,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.11.4"
   },
   "toc": {
    "base_numbering": 1,
diff --git a/oggm-edu/glacier_water_resources_index.md b/oggm-edu/glacier_water_resources_index.md
diff --git a/oggm-edu/glacier_water_resources_projections.ipynb b/oggm-edu/glacier_water_resources_projections.ipynb
@@ -149,7 +149,7 @@
    "outputs": [],
    "source": [
     "# We pick the elevation-bands glaciers because they run a bit faster - but they create more step changes in the area outputs\n",
-    "base_url = 'https://cluster.klima.uni-bremen.de/~oggm/gdirs/oggm_v1.6/L3-L5_files/2023.1/elev_bands/W5E5_spinup'\n",
+    "base_url = 'https://cluster.klima.uni-bremen.de/~oggm/gdirs/oggm_v1.6/L3-L5_files/2023.3/elev_bands/W5E5_spinup'\n",
     "gdir = workflow.init_glacier_directories([rgi_id], from_prepro_level=5, prepro_border=160, prepro_base_url=base_url)[0]"
    ]
   },
@@ -808,7 +808,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.11.4"
   },
   "toc": {
    "base_numbering": 1,
diff --git a/oggm-edu/glacier_water_resources_projections_index.md b/oggm-edu/glacier_water_resources_projections_index.md
diff --git a/oggm-edu/ice_flow_parameters.ipynb b/oggm-edu/ice_flow_parameters.ipynb
@@ -331,7 +331,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.6"
+   "version": "3.11.4"
   },
   "toc": {
    "base_numbering": 1,
diff --git a/oggm-edu/ice_on_incline.ipynb b/oggm-edu/ice_on_incline.ipynb
@@ -699,7 +699,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.11.4"
   },
   "toc": {
    "base_numbering": 1,
diff --git a/oggm-edu/low_pass_climate.ipynb b/oggm-edu/low_pass_climate.ipynb
@@ -749,7 +749,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.8"
+   "version": "3.11.4"
   }
  },
  "nbformat": 4,
diff --git a/oggm-edu/mass_balance_gradients.ipynb b/oggm-edu/mass_balance_gradients.ipynb
@@ -604,7 +604,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.11.4"
   },
   "toc": {
    "base_numbering": 1,
diff --git a/oggm-edu/pre16/glacier_water_resources_pre16.ipynb b/oggm-edu/pre16/glacier_water_resources_pre16.ipynb
diff --git a/oggm-edu/pre16/glacier_water_resources_projections_pre16.ipynb b/oggm-edu/pre16/glacier_water_resources_projections_pre16.ipynb
diff --git a/oggm-edu/surging_experiment.ipynb b/oggm-edu/surging_experiment.ipynb
@@ -398,7 +398,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.11.4"
   },
   "toc": {
    "base_numbering": 1,
diff --git a/oggm-edu/temperature_index_model.ipynb b/oggm-edu/temperature_index_model.ipynb
@@ -716,7 +716,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.11.4"
   }
  },
  "nbformat": 4,
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 jupyter-book
-oggm==1.6.0
+oggm==1.6.1
 bokeh
 panel
 holoviews
@@ -15,5 +15,5 @@ numpy
 scipy
 pyproj
 geopandas
-sklearn
+scikit-learn
 git+https://github.com/oggm/oggm-edu.git@master#egg=oggm_edu
diff --git a/welcome.ipynb b/welcome.ipynb
@@ -42,6 +42,8 @@
     "- [Glaciers as water resources: part 1 (idealized climate)](oggm-edu/glacier_water_resources.ipynb)\n",
     "- [Glaciers as water resources: part 2 (projections)](oggm-edu/glacier_water_resources_projections.ipynb)\n",
     "\n",
+    "*Same notebooks for OGGM versions < 1.6: [Part 1](oggm-edu/pre16/glacier_water_resources_pre16.ipynb), [Part 2](oggm-edu/pre16/glacier_water_resources_projections_pre16.ipynb)*\n",
+    "\n",
     "**Educational graphics:**\n",
     "- [ELA changes and response time](graphics/ela_changes_response_time.ipynb)"
    ]
@@ -119,7 +121,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.11.4"
   },
   "toc": {
    "base_numbering": 1,

Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,7 @@`
`561`	`561`	`"name": "python",`
`562`	`562`	`"nbconvert_exporter": "python",`
`563`	`563`	`"pygments_lexer": "ipython3",`
`564`		`- "version": "3.10.9"`
	`564`	`+ "version": "3.11.4"`
`565`	`565`	`}`
`566`	`566`	`},`
`567`	`567`	`"nbformat": 4,`
Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@`
`572`	`572`	`"name": "python",`
`573`	`573`	`"nbconvert_exporter": "python",`
`574`	`574`	`"pygments_lexer": "ipython3",`
`575`		`- "version": "3.10.9"`
	`575`	`+ "version": "3.11.4"`
`576`	`576`	`}`
`577`	`577`	`},`
`578`	`578`	`"nbformat": 4,`
Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,7 @@`
`749`	`749`	`"name": "python",`
`750`	`750`	`"nbconvert_exporter": "python",`
`751`	`751`	`"pygments_lexer": "ipython3",`
`752`		`- "version": "3.10.8"`
	`752`	`+ "version": "3.11.4"`
`753`	`753`	`}`
`754`	`754`	`},`
`755`	`755`	`"nbformat": 4,`
Original file line number	Diff line number	Diff line change
`@@ -716,7 +716,7 @@`
`716`	`716`	`"name": "python",`
`717`	`717`	`"nbconvert_exporter": "python",`
`718`	`718`	`"pygments_lexer": "ipython3",`
`719`		`- "version": "3.10.9"`
	`719`	`+ "version": "3.11.4"`
`720`	`720`	`}`
`721`	`721`	`},`
`722`	`722`	`"nbformat": 4,`