Update for 1.4

OGGM · Feb 7, 2021 · 81e909f · 81e909f
1 parent 644d723
commit 81e909f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/docs/_code/prepro_invert_multi.py b/docs/_code/prepro_invert_multi.py
@@ -4,6 +4,7 @@
 
 # Use multiprocessing to apply the OGGM tasks and the new task to all glaciers
 from oggm import workflow
+cfg.PARAMS['use_multiprocessing'] = True
 gdirs = workflow.init_glacier_regions(rgidf)
 workflow.execute_entity_task(tasks.glacier_masks, gdirs)
 # Yes, also your new task!

diff --git a/docs/_code/prepro_mb.py b/docs/_code/prepro_mb.py
@@ -17,6 +17,7 @@
 cfg.PARAMS['baseline_climate'] = 'CUSTOM'
 cfg.PARAMS['run_mb_calibration'] = True
 cfg.PARAMS['border'] = 80
+cfg.PARAMS['use_multiprocessing'] = True
 
 # Glacier directory for Hintereisferner in Austria
 entity = gpd.read_file(get_demo_file('Hintereisferner_RGI5.shp')).iloc[0]

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -3,17 +3,19 @@ scipy
 pandas
 shapely
 matplotlib
-pyproj
+pyproj==2.5.0
 rasterio
 Pillow
 geopandas
 netcdf4==1.3.1
+cftime
 scikit-image
 configobj
 joblib
 xarray
 progressbar2
 pytest
+tables
 motionless
 dask
 bottleneck

diff --git a/oggmcontrib/mbmod.py b/oggmcontrib/mbmod.py
@@ -71,7 +71,7 @@ def get_random_ela_h(self, year):
         self.ela_h_per_year[year] = ela_h
         return ela_h
 
-    def get_annual_mb(self, heights, year=None, fl_id=None):
+    def get_annual_mb(self, heights, year=None, fl_id=None, fls=None):
 
         # Compute the mass-balance gradient
         ela_h = self.get_random_ela_h(year)