Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
3b6584b
feat: read and write zarr methods to replace read_pickle
gampnico Apr 30, 2026
50cec31
feat: add support for zarr compatible downstream line
gampnico May 1, 2026
43fead9
refactor: rename pickle_jar to data_store
gampnico May 1, 2026
6988ffb
merge: merge branch 'master' into fix-pickle-doomsday
gampnico May 11, 2026
cf81e8a
fix: merge conflicts
gampnico May 11, 2026
b744fb2
feat: zarr-pickle interchange validation
gampnico May 18, 2026
18f7fa1
chore: minor type fixes
gampnico May 19, 2026
3c409b1
feat: framework for writing to zarr
gampnico May 19, 2026
7762443
fix: open datatree instead of zarr
gampnico May 20, 2026
25813ca
Merge pull request #2 from gampnico/ON-60-write-data-to-zarr
gampnico May 20, 2026
2b2b43f
fix: write storage mismatch
gampnico May 20, 2026
f502b66
merge: merge branch 'master' into ON-60-write-data-to-zarr
gampnico Jun 8, 2026
14fdfa4
feat: support write_store
gampnico Jun 9, 2026
e72f721
merge: merge branch 'master' into fix-pickle-doomsday
gampnico Jun 9, 2026
8123f9a
merge: merge branch 'ON-60-write-data-to-zarr' into fix-pickle-doomsday
gampnico Jun 9, 2026
b823991
fix: skip test which check for now-disabled warning
gampnico Jun 9, 2026
ea9f83e
refactor: support for pickles with multi-object lists
gampnico Jun 9, 2026
d3a2391
fix: add lock to file_downloader in run_prepro_levels
gampnico Jun 9, 2026
308a59d
fix: force zarr conversion
gampnico Jun 9, 2026
f46d1d3
merge: merge branch 'ON-63-tests-hang-when-calling-run_prepro_levels'…
gampnico Jun 10, 2026
fa56289
fix(tests): some failing tests
gampnico Jun 10, 2026
f44c535
refactor: replace rw methods for geometries
gampnico Jun 10, 2026
4691126
fix(tests): workaround for zarr async io messing up unittest-style tests
gampnico Jun 10, 2026
b911bdd
refactor: migrate entirely to read_store
gampnico Jun 10, 2026
4f55295
fix: zarr compatibility fixes
gampnico Jun 10, 2026
6f8bb18
fix(tests): multiprocessing fixes, zarr concurrency
gampnico Jun 11, 2026
e49a542
Merge pull request #3 from gampnico/merge-fix-pickle-ON-60-ON-63
gampnico Jun 11, 2026
c8bb654
merge: Merge pull request #4 from gampnico/ON-60-write-data-to-zarr
gampnico Jun 11, 2026
3010cc6
fix(workflow): replacement zarr groups
gampnico Jun 11, 2026
530401e
merge: merge pull request #5 from gampnico/merge-fix-pickle-ON-60-ON-63
gampnico Jun 11, 2026
9242040
feat: add parameter for selecting zarr format
gampnico Jun 17, 2026
a803d6c
merge: merge branch 'master' into fix-pickle-doomsday
gampnico Jun 27, 2026
a3901e8
feat: add proper support for geometries
gampnico Jun 28, 2026
652e1b3
fix: alignment error between downstream line and full line
gampnico Jun 28, 2026
17cf08c
fix: missing flowline support
gampnico Jun 28, 2026
48f8a71
refactor: switch to warn-once behaviour to avoid flooding logs
gampnico Jun 28, 2026
862ebec
fix(tests): read downstream line from zarr
gampnico Jun 28, 2026
2e68944
docs: add missing docstrings
gampnico Jun 28, 2026
aa81010
merge: merge branch 'master' into fix-pickle-doomsday
gampnico Jun 28, 2026
e6c5bb7
Merge branch 'master' of github.com:gampnico/oggm into fix-pickle-doo…
gampnico Jun 28, 2026
faceb57
fix: refactor read_pickle functions from master branch
gampnico Jun 28, 2026
db7a60e
merge: merge branch 'master' into fix-pickle-doomsday
gampnico Jul 2, 2026
623b816
merge: merge branch 'master' into fix-pickle-doomsday
gampnico Jul 2, 2026
f14fadd
merge: merge branch 'master' into fix-pickle-doomsday
gampnico Jul 3, 2026
b9ca7a3
fix: support ragged MultiLineStrings
gampnico Jul 3, 2026
b914098
merge: merge branch 'master' into fix-pickle-doomsday
gampnico Jul 3, 2026
bb00d8f
docs: merge whats-new.rst
gampnico Jul 3, 2026
9c7b524
feat: incremental glacier dir creation
gampnico Jul 6, 2026
8c2572c
feat: compatibility wrappers for cumulative and incremental system
gampnico Jul 6, 2026
a1f0325
refactor: revert filesuffix construction to match convention.
gampnico Jul 6, 2026
c1ff53c
merge: merge branch 'fix-pickle-doomsday' into feat-ON-94-incremental…
gampnico Jul 6, 2026
fb65355
feat: wire in zarr support during conversion
gampnico Jul 6, 2026
20317b9
fix: avoid poisoning the cache
gampnico Jul 6, 2026
476d090
merge: merge branch 'master' into merge-ON-101-master-fix-pickle-doom…
gampnico Jul 9, 2026
9471259
fix: removed in master update
gampnico Jul 9, 2026
387ad3a
merge: merge branch 'master' into feat-ON-94-incremental-gdirs
gampnico Jul 29, 2026
f17519d
fix(tests): somehow a test was dropped when merging
gampnico Jul 29, 2026
2b9deb4
Merge branch 'master' into feat-ON-94-incremental-gdirs
gampnico Jul 29, 2026
e0ce020
merge: merge branch 'master' into fix-pickle-doomsday
gampnico Jul 30, 2026
8e5d8db
merge: merge branch 'fix-pickle-doomsday' into feat-ON-94-incremental…
gampnico Jul 30, 2026
e34f8d4
merge: merge branch 'master' into feat-ON-94-incremental-gdirs
gampnico Aug 10, 2026
88b19ad
Merge branch 'master' into fix-pickle-doomsday
gampnico Aug 11, 2026
1d4c6d5
chore: replace instances of pickle with store
gampnico Aug 11, 2026
799ec7a
merge: merge branch 'master' into feat-ON-94-incremental-gdirs
gampnico Aug 11, 2026
76f7e0d
merge: merge branch 'master' into fix-pickle-doomsday
gampnico Aug 11, 2026
a916fe1
chore: replace pickle methods
gampnico Aug 11, 2026
e64e2ca
refactor: temp_bias_run guards
gampnico Aug 11, 2026
b72bbf0
merge: merge branch 'fix-pickle-doomsday' into feat-ON-94-incremental…
gampnico Aug 11, 2026
0a11f07
fix: clean up bad merge
gampnico Aug 11, 2026
30d2d43
Merge remote-tracking branch 'origin/master' into fix-pickle-doomsday
gampnico Sep 2, 2026
747527e
fix: replace pickle regressions introduced by #1991
gampnico Sep 2, 2026
2999ba8
merge: merge branch 'master' into feat-ON-116-replace-zarr-with-npz
gampnico Sep 11, 2026
17ca67f
refactor: switch from zarr to npz
gampnico Sep 14, 2026
568f89e
chore: rename modules
gampnico Sep 14, 2026
e22254c
docs: update whats-new.txt
gampnico Sep 14, 2026
42aaf9a
docs: fix typo
gampnico Sep 17, 2026
1eb9f8c
fix: name not actually passed to path
gampnico Sep 17, 2026
a2f5ad1
fix(docs): small typo
gampnico Sep 17, 2026
64609d6
fix: more legible method names
gampnico Sep 21, 2026
652db77
refactor: use type registry for legibility
gampnico Sep 21, 2026
268de94
feat: add get_store_paths
gampnico Sep 21, 2026
61b0ea4
feat: compatiblity wrapper for pickle to npz conversion
gampnico Sep 23, 2026
c7bddaa
fix: centerline junctions weren't being correctly stored
gampnico Sep 23, 2026
86c5d75
fix: numpy scalar encoding
gampnico Sep 23, 2026
19464c2
merge: merge branch 'fix-pickle-doomsday' into feat-ON-94-incremental…
gampnico Sep 23, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/_code/prepare_hef.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
out = workflow.calibrate_inversion_from_volume(gdir, vol_ref_m3=refv)
np.testing.assert_allclose(refv, out['vol_oggm_m3'], rtol=0.01)

cl = gdir.read_pickle('inversion_input')[-1]
cl = gdir.read_store('inversion_input')[-1]
mbmod = massbalance.ConstantMassBalance(gdir, y0=1985)
mbx = mbmod.get_annual_mb(cl['hgt']) * cfg.SEC_IN_YEAR * cfg.PARAMS['ice_density']
fdf = pd.DataFrame(index=np.arange(len(mbx))*cl['dx'])
Expand Down
2 changes: 1 addition & 1 deletion docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ level 5.
prepro_border=80)
gdir = gdirs[0] # init_glacier_directories always returns a list

fls = gdir.read_pickle('model_flowlines')
fls = gdir.read_store('model_flowlines')
fls
[fl.order for fl in fls]

Expand Down
5 changes: 5 additions & 0 deletions docs/whats-new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,11 @@ break some code, but remain minor in nature:
resulting thickness fields. This would yield to weird effects at glacier boundaries
and seemed overkill since topography is smoothed quite aggressively as well (:pull:`1773`).
By `Fabien Maussion <https://github.com/fmaussion>`_
- ``read_pickle`` and ``write_pickle`` are now deprecated in favour of
``read_store`` and ``write_store``. The latter uses npz files inside glacier
directories instead of pickles. Users should migrate to the new functions, as
compatibility with pickles is not guaranteed in the future. (:pull:`1908`).
By `Nicolas Gampierakis <https://github.com/gampnico>`_.


v1.6.2 (August 25, 2024)
Expand Down
4 changes: 4 additions & 0 deletions oggm/cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,10 @@ def _log_param_change(self, key, value):
_doc = "A dict containing all observations used during the OGGM workflow."
BASENAMES['observations'] = ('observations.yml', _doc)

_doc = "A store of npz files containing previously pickled data."
BASENAMES['data_store'] = ('data_store', _doc)



def set_logging_config(logging_level='INFO'):
"""Set the global logger parameters.
Expand Down
5 changes: 3 additions & 2 deletions oggm/cli/benchmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ def run_benchmark(rgi_version=None, rgi_reg=None, border=None,
# Initialize OGGM and set up the run parameters
cfg.initialize(logging_level=logging_level, params=override_params)

# Use multiprocessing?
cfg.PARAMS['use_multiprocessing'] = platform.system() != 'Darwin'
# Allow multiprocessing override in tests/platform
if 'use_multiprocessing' not in override_params:
cfg.PARAMS['use_multiprocessing'] = platform.system() != 'Darwin'

# How many grid points around the glacier?
# Make it large if you expect your glaciers to grow large
Expand Down
Loading
Loading