Update image - Add RGI_DIR to possible env vars (#1552)

OGGM · Mar 23, 2023 · 71e58ed · 71e58ed
1 parent dcc9c35
commit 71e58ed
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -24,7 +24,7 @@ jobs:
           - workflow-multi
           - graphics-mpl
         container:
-          - ghcr.io/oggm/untested_base:20230305
+          - ghcr.io/oggm/untested_base:20230319
           - ghcr.io/oggm/untested_base:py3.8
           - ghcr.io/oggm/untested_base:py3.9
         include:

diff --git a/oggm/cfg.py b/oggm/cfg.py
@@ -695,6 +695,8 @@ def oggm_static_paths():
         edir = os.path.abspath(os.environ.get('OGGM_EXTRACT_DIR'))
         config['tmp_dir'] = os.path.join(edir, 'tmp')
         config['rgi_dir'] = os.path.join(edir, 'rgi')
+    if os.environ.get('OGGM_RGI_DIR') is not None:
+        config['rgi_dir'] = os.path.abspath(os.environ.get('OGGM_RGI_DIR'))
 
     # Fill the PATH dict
     for k, v in config.iteritems():

diff --git a/oggm/tests/test_models.py b/oggm/tests/test_models.py
@@ -5380,7 +5380,7 @@ def test_sliding_and_compare_to_fluxbased(self, hef_elev_gdir,
                                        fmod_impl.fls[-1].length_m,
                                        atol=100.1)
             assert utils.rmsd(fmod_impl.fls[-1].thick,
-                              fmod_flux.fls[-1].thick) < 2.1
+                              fmod_flux.fls[-1].thick) < 2.5
 
         # compare velocities
         f = hef_elev_gdir.get_filepath('fl_diagnostics',

diff --git a/oggm/utils/_downloads.py b/oggm/utils/_downloads.py
@@ -69,7 +69,7 @@
 # The given commit will be downloaded from github and used as source for
 # all sample data
 SAMPLE_DATA_GH_REPO = 'OGGM/oggm-sample-data'
-SAMPLE_DATA_COMMIT = 'fd628ad03175e9558835cbf220af65995127a071'
+SAMPLE_DATA_COMMIT = '0fa95d0e65eb9f5ab2c355a6ea0c8812c0a81cd0'
 
 CHECKSUM_URL = 'https://cluster.klima.uni-bremen.de/data/downloads.sha256.hdf'
 CHECKSUM_VALIDATION_URL = CHECKSUM_URL + '.sha256'