MESMER-group · mathause · Dec 19, 2023 · Nov 19, 2023 · Dec 15, 2023 · Dec 19, 2023
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,23 +4,14 @@ Changelog
 v0.9.1 - unreleased
 -------------------
 
-New Features
-^^^^^^^^^^^^
-
-Breaking changes
-^^^^^^^^^^^^^^^^
-
-Deprecations
-^^^^^^^^^^^^
-
 Bug fixes
 ^^^^^^^^^
 
-Documentation
-^^^^^^^^^^^^^
-
-Internal Changes
-^^^^^^^^^^^^^^^^
+Ensure de-duplicating the historical ensemble members conserves their order. Previously,
+the legacy calibration routines used `np.unique`, which shuffles them. See `#338
+<https://github.com/MESMER-group/mesmer/issues/338>`_ for details.
+(`#339 <https://github.com/MESMER-group/mesmer/pull/339>`_).
+By `Mathias Hauser`_.
 
 
 v0.9.0 - 2023.12.19

diff --git a/mesmer/utils/convert.py b/mesmer/utils/convert.py
@@ -95,7 +95,10 @@ def separate_hist_future(var_c, time_c, cfg):
     hist = np.vstack(hist)
 
     # exclude duplicate historical runs that are available in several scenarios
-    var_s["hist"] = np.unique(hist, axis=0)
+    __, idx = np.unique(hist, axis=0, return_index=True)
+    # ensure hist is not re-ordered
+    var_s["hist"] = np.take(hist, indices=np.sort(idx), axis=0)
+
     time_s["hist"] = time[:idx_start_fut]
 
     # gather proj

diff --git a/tests/test-data/output/tas/multi_scen_multi_ens/test-mesmer-bundle.pkl b/tests/test-data/output/tas/multi_scen_multi_ens/test-mesmer-bundle.pkl
diff --git a/tests/test-data/output/tas/one_scen_multi_ens/test-mesmer-bundle.pkl b/tests/test-data/output/tas/one_scen_multi_ens/test-mesmer-bundle.pkl
diff --git a/tests/test-data/output/tas_tas2_hfds/multi_scen_multi_ens/test-mesmer-bundle.pkl b/tests/test-data/output/tas_tas2_hfds/multi_scen_multi_ens/test-mesmer-bundle.pkl
diff --git a/tests/test-data/output/tas_tas2_hfds/one_scen_multi_ens/test-mesmer-bundle.pkl b/tests/test-data/output/tas_tas2_hfds/one_scen_multi_ens/test-mesmer-bundle.pkl