galform-execution 0.2.2__tar.gz → 0.2.4__tar.gz

{galform_execution-0.2.2 → galform_execution-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: galform_execution
-Version: 0.2.2
+Version: 0.2.4
 Summary: GALFORM execution helper utilities
 Author: Oscar Hickman
 License: MIT

{galform_execution-0.2.2 → galform_execution-0.2.4}/galform_execution/__init__.py

@@ -2,4 +2,4 @@
 galform_execution: Python-based utility to manage GALFORM N-body simulation submissions to SLURM.
 """
 
-__version__ = "0.2.2"
+__version__ = "0.2.4"

galform_execution-0.2.4/galform_execution/config/redshift_lists/COLIBRE-L100m6.txt

@@ -0,0 +1,138 @@
+# COLIBRE-L100m6 snapshot -> output redshift.
+# Full 128-snapshot table, generated 2026-07-28 from the authoritative
+# outputTimes/{snapshotNumber,redshift} datasets in
+# /cosma8/data/dp004/jch/COLIBRE/HBT/L100_m6/DMO/trees/tree_127.0.hdf5.
+# Previously only snapshots 18/92/102/127 were listed, which silently
+# capped every COLIBRE run to z in {10, 1, 0.5, 0}: the tcsh script does
+# `set z = awk '$1==iz {print $2}' $snapshot_file` and aborts on a miss,
+# so an unlisted snapshot was simply not runnable. All four original
+# entries were re-verified against the tree metadata before extending.
+# iz    z
+0      30
+1      25
+2      22.5
+3      20
+4      19
+5      18
+6      17
+7      16
+8      15
+9      14.5
+10     14
+11     13.5
+12     13
+13     12.5
+14     12
+15     11.5
+16     11
+17     10.5
+18     10
+19     9.75
+20     9.5
+21     9.25
+22     9
+23     8.75
+24     8.5
+25     8.25
+26     8
+27     7.75
+28     7.5
+29     7.375
+30     7.25
+31     7.125
+32     7
+33     6.875
+34     6.75
+35     6.625
+36     6.5
+37     6.375
+38     6.25
+39     6.125
+40     6
+41     5.875
+42     5.75
+43     5.625
+44     5.5
+45     5.375
+46     5.25
+47     5.125
+48     5
+49     4.875
+50     4.75
+51     4.625
+52     4.5
+53     4.375
+54     4.25
+55     4.125
+56     4
+57     3.875
+58     3.75
+59     3.625
+60     3.5
+61     3.375
+62     3.25
+63     3.125
+64     3
+65     2.875
+66     2.75
+67     2.625
+68     2.5
+69     2.4375
+70     2.375
+71     2.3125
+72     2.25
+73     2.1875
+74     2.125
+75     2.0625
+76     2
+77     1.9375
+78     1.875
+79     1.8125
+80     1.75
+81     1.6875
+82     1.625
+83     1.5625
+84     1.5
+85     1.4375
+86     1.375
+87     1.3125
+88     1.25
+89     1.1875
+90     1.125
+91     1.0625
+92     1
+93     0.95
+94     0.9
+95     0.85
+96     0.8
+97     0.75
+98     0.7
+99     0.65
+100    0.6
+101    0.55
+102    0.5
+103    0.475
+104    0.45
+105    0.425
+106    0.4
+107    0.375
+108    0.35
+109    0.325
+110    0.3
+111    0.275
+112    0.25
+113    0.225
+114    0.2
+115    0.18
+116    0.16
+117    0.14
+118    0.12
+119    0.1
+120    0.08
+121    0.06
+122    0.05
+123    0.04
+124    0.03
+125    0.02
+126    0.01
+127    0

galform_execution-0.2.4/galform_execution/config/redshift_lists/COLIBRE-L200m6.txt

@@ -0,0 +1,142 @@
+# COLIBRE-L200m6 snapshot -> output redshift.
+# Full 128-snapshot table. Re-verified 2026-08-20 (imf project, ROADMAP.md
+# item 8.4) to be byte-identical to COLIBRE-L100m6.txt's iz/z mapping,
+# confirmed directly against the authoritative outputTimes/{snapshotNumber,
+# redshift} datasets in both
+# /cosma8/data/dp004/jch/COLIBRE/HBT/L100_m6/DMO/trees/tree_127.0.hdf5 and
+# /cosma8/data/dp004/jch/COLIBRE/HBT/L200_m6/DMO/trees/tree_127.0.hdf5
+# (np.allclose on redshift, exact match on snapshotNumber, both length 128).
+# Content is therefore an exact copy of COLIBRE-L100m6.txt, kept as its own
+# file (rather than reusing that filename from this simulation's config
+# entry) for naming clarity and so the two boxes' redshift lists can
+# diverge safely in future if COLIBRE-L200m6's trees are ever rebuilt with
+# different output times.
+# iz    z
+0      30
+1      25
+2      22.5
+3      20
+4      19
+5      18
+6      17
+7      16
+8      15
+9      14.5
+10     14
+11     13.5
+12     13
+13     12.5
+14     12
+15     11.5
+16     11
+17     10.5
+18     10
+19     9.75
+20     9.5
+21     9.25
+22     9
+23     8.75
+24     8.5
+25     8.25
+26     8
+27     7.75
+28     7.5
+29     7.375
+30     7.25
+31     7.125
+32     7
+33     6.875
+34     6.75
+35     6.625
+36     6.5
+37     6.375
+38     6.25
+39     6.125
+40     6
+41     5.875
+42     5.75
+43     5.625
+44     5.5
+45     5.375
+46     5.25
+47     5.125
+48     5
+49     4.875
+50     4.75
+51     4.625
+52     4.5
+53     4.375
+54     4.25
+55     4.125
+56     4
+57     3.875
+58     3.75
+59     3.625
+60     3.5
+61     3.375
+62     3.25
+63     3.125
+64     3
+65     2.875
+66     2.75
+67     2.625
+68     2.5
+69     2.4375
+70     2.375
+71     2.3125
+72     2.25
+73     2.1875
+74     2.125
+75     2.0625
+76     2
+77     1.9375
+78     1.875
+79     1.8125
+80     1.75
+81     1.6875
+82     1.625
+83     1.5625
+84     1.5
+85     1.4375
+86     1.375
+87     1.3125
+88     1.25
+89     1.1875
+90     1.125
+91     1.0625
+92     1
+93     0.95
+94     0.9
+95     0.85
+96     0.8
+97     0.75
+98     0.7
+99     0.65
+100    0.6
+101    0.55
+102    0.5
+103    0.475
+104    0.45
+105    0.425
+106    0.4
+107    0.375
+108    0.35
+109    0.325
+110    0.3
+111    0.275
+112    0.25
+113    0.225
+114    0.2
+115    0.18
+116    0.16
+117    0.14
+118    0.12
+119    0.1
+120    0.08
+121    0.06
+122    0.05
+123    0.04
+124    0.03
+125    0.02
+126    0.01
+127    0

{galform_execution-0.2.2 → galform_execution-0.2.4}/galform_execution/config/redshift_lists/Mill1.txt

@@ -1,2 +1,3 @@
 33 1.91
+36 1.503637
 63 0.0

galform_execution-0.2.4/galform_execution/config/simulations/colibre_family.json

@@ -0,0 +1,66 @@
+{
+  "COLIBRE-L100m6": {
+    "aquarius_particle_file": "/cosma8/data/dp004/jch/COLIBRE/HBT/L100_m6/DMO/trees/particle_lists/particle_list_127",
+    "aquarius_tree_file": "/cosma8/data/dp004/jch/COLIBRE/HBT/L100_m6/DMO/trees/tree_127",
+    "h0": 0.681,
+    "iz0": 127,
+    "iz_list": [
+      127,
+      102,
+      92
+    ],
+    "lambda0": 0.693922,
+    "lbox": 68.1,
+    "mpart": 1569616.5,
+    "nbody_trees_dir": "/cosma8/data/dp004/jch/COLIBRE/HBT/L100_m6/DMO/trees",
+    "nvol_range": "1-64",
+    "omega0": 0.306078,
+    "omegab": 0.0486,
+    "pk_file": "Power_Spec/pk_FLAMINGO_DMO_FIDUCIAL.dat",
+    "sigma8": 0.807,
+    "snapshot_file": "COLIBRE-L100m6.txt",
+    "volume": 4934.706890625
+  },
+  "COLIBRE-L200m6": {
+    "_note": "Re-added 2026-08-20 (imf project, ROADMAP.md/achievements.md item 8.4) after this entry was found missing entirely from colibre_family.json -- git history shows no commit ever added it, so the entry used by the real 2026-08-08 21-run L200m6 redshift-ladder campaign must have existed only as an uncommitted local edit that was later lost. Re-derived from ground truth, not guessed: aquarius_tree_file/particle_file paths confirmed to exist on disk with the same naming convention as COLIBRE-L100m6 (256 tree/particle-list files each, vs L100m6's 64); lbox=136.2 and volume=9869.413781249998 independently re-derived (200*h0 for lbox; lbox**3/nvol_range for volume) and cross-checked byte-for-byte against a real completed job's own substituted .input.temp file at /cosma/apps/durham/dc-hick2/galform/params/COLIBRE-L200m6_lc16_iz127_ivol8.input.temp, which literally has 'volume = 9869.413781249998'. mpart is still an inference, not a measurement (both L100m6 and L200m6 trees store simulation.particleMass=-1.0, verified directly from tree_127.0.hdf5's own attrs) -- set equal to L100m6's on the basis both share the 'm6' resolution-tier label, same as before this entry was lost; see achievements.md's 'L200m6 config investigation' section and ROADMAP.md item 1 for why this is still provisional pending COLIBRE-team confirmation. snapshot_file COLIBRE-L200m6.txt is a fresh copy of COLIBRE-L100m6.txt's 128-row table, re-verified 2026-08-20 byte-identical against both trees' own outputTimes/{snapshotNumber,redshift} HDF5 datasets (not reused from the stale, unverified 2026-07-28 claim -- independently re-checked this pass).",
+    "aquarius_particle_file": "/cosma8/data/dp004/jch/COLIBRE/HBT/L200_m6/DMO/trees/particle_lists/particle_list_127",
+    "aquarius_tree_file": "/cosma8/data/dp004/jch/COLIBRE/HBT/L200_m6/DMO/trees/tree_127",
+    "h0": 0.681,
+    "iz0": 127,
+    "iz_list": [
+      127,
+      102,
+      92
+    ],
+    "lambda0": 0.693922,
+    "lbox": 136.2,
+    "mpart": 1569616.5,
+    "nbody_trees_dir": "/cosma8/data/dp004/jch/COLIBRE/HBT/L200_m6/DMO/trees",
+    "nvol_range": "1-256",
+    "omega0": 0.306078,
+    "omegab": 0.0486,
+    "pk_file": "Power_Spec/pk_FLAMINGO_DMO_FIDUCIAL.dat",
+    "sigma8": 0.807,
+    "snapshot_file": "COLIBRE-L200m6.txt",
+    "volume": 9869.413781249998
+  },
+  "COLIBRE-L400m7": {
+    "_note": "GALFORM-format aquarius trees not yet built from COLIBRE DMO. dhalo trees at /cosma7/data/dp004/jch/COLIBRE/L400_m7/DMO/dhalo_trees/ (not yet in GALFORM aquarius format). Update tree paths and iz0/iz_list/nvol_range before submitting.",
+    "aquarius_particle_file": "/cosma5/data/jch/Galform/Merger_Trees/COLIBRE/L400_m7/particle_lists/particle_list_TBD",
+    "aquarius_tree_file": "/cosma5/data/jch/Galform/Merger_Trees/COLIBRE/L400_m7/treedir_TBD/tree_TBD",
+    "h0": 0.681,
+    "iz0": null,
+    "iz_list": [],
+    "lambda0": 0.693922,
+    "lbox": 272.4,
+    "mpart": 12556932.0,
+    "nbody_trees_dir": "/cosma5/data/jch/Galform/Merger_Trees/COLIBRE/L400_m7",
+    "nvol_range": "1-64",
+    "omega0": 0.306078,
+    "omegab": 0.0486,
+    "pk_file": "Power_Spec/pk_COLIBRE_norm.dat",
+    "sigma8": 0.807,
+    "snapshot_file": "/cosma5/data/jch/Galform/Merger_Trees/COLIBRE/L400_m7/redshift_list.txt",
+    "volume": null
+  }
+}

{galform_execution-0.2.2 → galform_execution-0.2.4}/galform_execution/submit_galform_job.py

@@ -9,7 +9,7 @@ import sys
 import time
 from dataclasses import dataclass, field, fields
 from pathlib import Path
-from typing import Dict, List, Optional, Tuple
+from typing import Dict, List, Optional, Sequence, Tuple
 
 
 @dataclass
@@ -244,6 +244,20 @@ def _resolve_log_path(explicit: Optional[str], output_folder_name: str) -> Path:
     return _default_cosma_user_root() / output_folder_name / "logs"
 
 
+def _validate_ivols(ivols: Sequence[int], sim_config) -> List[int]:
+    """Check an explicit ivol list: non-empty, unique, integer, in [0, k)."""
+    out = [int(i) for i in ivols]
+    if not out:
+        raise ValueError("ivols must not be empty")
+    if len(set(out)) != len(out):
+        raise ValueError("ivols must be unique")
+    k = _parse_nvol_range(sim_config.nvol_range)[1] if sim_config is not None else None
+    bad = [i for i in out if i < 0 or (k is not None and i >= k)]
+    if bad:
+        raise ValueError(f"ivols out of range [0, {k}): {bad[:5]}")
+    return out
+
+
 def _parse_nvol_range(nvol_range: str) -> Tuple[int, int]:
     """Parse a legacy nvol range string (e.g. ``'12'`` or ``'1001-1024'``)."""
     raw = str(nvol_range).strip()
@@ -303,7 +317,14 @@ class GalformSubmitter:
         submit_retry_backoff: float = 2.0,
         mail_user: Optional[str] = None,
         mail_type: str = "END,FAIL",
+        ivols: Optional[Sequence[int]] = None,
     ):
+        """Configure a submitter.
+
+        ``ivols``: optional explicit list of 0-based subvolume indices (the ``ivol<N>``
+        output directories), for non-contiguous selections such as a random m-of-k draw.
+        Mutually exclusive with ``nvol``/``nvol_range``; task id t runs ``ivols[t-1]``.
+        """
         self.galform_dir = Path(galform_dir)
         self.nbody_sim = nbody_sim
         self.model = model
@@ -378,7 +399,7 @@ class GalformSubmitter:
             if nvol is not None and nvol_range is not None:
                 raise ValueError("Specify only one of nvol and nvol_range")
             resolved_nvol_range = nvol if nvol is not None else nvol_range
-            if iz_list is None or resolved_nvol_range is None:
+            if iz_list is None or (resolved_nvol_range is None and ivols is None):
                 raise ValueError(
                     f"Unknown simulation '{nbody_sim}'. "
                     "Provide iz_list and nvol explicitly."
@@ -396,8 +417,19 @@ class GalformSubmitter:
         if self.iz is not None:
             self.iz_list = [self.iz]
 
-        self.nvol_start, self.nvol_end = _parse_nvol_range(self.nvol_range)
-        self.nvol_count = self.nvol_end - self.nvol_start + 1
+        if ivols is not None:
+            if nvol is not None or nvol_range is not None:
+                raise ValueError("Specify only one of ivols and nvol/nvol_range")
+            self.ivols = _validate_ivols(ivols, self.sim_config)
+            self.nvol_range = (
+                f"{min(self.ivols) + 1}-{max(self.ivols) + 1}"  # informational
+            )
+            self.nvol_start, self.nvol_end = 1, len(self.ivols)
+            self.nvol_count = len(self.ivols)
+        else:
+            self.ivols = None
+            self.nvol_start, self.nvol_end = _parse_nvol_range(self.nvol_range)
+            self.nvol_count = self.nvol_end - self.nvol_start + 1
 
         # Validate
         if not self.galform_dir.is_dir():
@@ -497,7 +529,18 @@ class GalformSubmitter:
         lines = [
             "# ---- model parameter file setup ----",
             f"set base_inputs_file = {mc.base_inputs_file}",
-            "set galform_inputs_file = ./params/${Nbody_sim}_${model}_iz${iz}_ivol${ivol}.input.temp",
+            # The job id MUST stay in this path. Without it, any two jobs
+            # sharing (Nbody_sim, model, iz, ivol) that run concurrently write
+            # the same file: each begins with `cp $base_inputs_file ...`, which
+            # wipes the other's substitutions, so GALFORM can read a parameter
+            # set belonging to a different job. This is not hypothetical -- it
+            # silently mixed x_imf branches across most of the 2026 redshift-
+            # ladder and counter-ladder campaigns, whose three branches per
+            # rung collide on exactly this key. Affected runs are identifiable
+            # after the fact only from each galaxies.hdf5's /Parameters group.
+            "set galform_inputs_file = "
+            "./params/${Nbody_sim}_${model}_iz${iz}_ivol${ivol}"
+            "_job${SLURM_JOB_ID}.input.temp",
             "\\mkdir -p ./params",
             "cp $base_inputs_file $galform_inputs_file",
         ]
@@ -765,6 +808,15 @@ rm -f $galform_inputs_file
 exit
 """
 
+    def _ivol_assignment(self) -> str:
+        """tcsh lines mapping the 1-based task id to a 0-based ivol."""
+        if self.ivols is None:
+            return f"@ ivol        = $slurm_task_id + {self.nvol_start} - 2"
+        listed = " ".join(str(i) for i in self.ivols)
+        return (
+            f"set ivol_list = ( {listed} )\n@ ivol        = $ivol_list[$slurm_task_id]"
+        )
+
     def _create_tcsh_script(self, iz: int) -> str:
         """Generate the inner tcsh GALFORM script for snapshot iz.
 
@@ -834,7 +886,7 @@ set model     = {self.model}
 set Nbody_sim = {self.nbody_sim}
 set iz        = {iz}
 @ slurm_task_id = ${{SLURM_ARRAY_TASK_ID}}
-@ ivol        = $slurm_task_id + {self.nvol_start} - 2
+{self._ivol_assignment()}
 
 # Change to GALFORM source directory (scripts use relative paths)
 cd {self.galform_dir}

{galform_execution-0.2.2 → galform_execution-0.2.4}/galform_execution.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: galform_execution
-Version: 0.2.2
+Version: 0.2.4
 Summary: GALFORM execution helper utilities
 Author: Oscar Hickman
 License: MIT

{galform_execution-0.2.2 → galform_execution-0.2.4}/galform_execution.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ galform_execution/config/models.json
 galform_execution/config/partition_configs.json
 galform_execution/config/run_flags.json
 galform_execution/config/redshift_lists/COLIBRE-L100m6.txt
+galform_execution/config/redshift_lists/COLIBRE-L200m6.txt
 galform_execution/config/redshift_lists/FLAMINGO-L1000N1800.txt
 galform_execution/config/redshift_lists/L800.txt
 galform_execution/config/redshift_lists/Mill1.txt

{galform_execution-0.2.2 → galform_execution-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "galform_execution"
-version = "0.2.2"
+version = "0.2.4"
 description = "GALFORM execution helper utilities"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -32,3 +32,11 @@ galform_execution = ["config/**/*.json", "config/**/*.txt"]
 [tool.isort]
 profile = "black"
 
+[tool.ruff.lint]
+# Pin the rule set explicitly. Without this, ruff's "no config" default
+# selection changes between ruff releases (e.g. 0.15 -> 0.16 started
+# enabling rules like FA100/BLE001), which broke CI even though nothing
+# in this codebase changed. E4/E7/E9/F match ruff's long-standing
+# original defaults (pyflakes + a handful of pycodestyle error checks).
+select = ["E4", "E7", "E9", "F"]
+

{galform_execution-0.2.2 → galform_execution-0.2.4}/tests/test_submit_galform_job.py

@@ -878,3 +878,115 @@ def test_multi_output_respects_explicit_mgalmin_descendant_override():
             "./replace_variable.csh $galform_inputs_file mgalmin_output_descendants .false."
             in script
         )
+
+
+def test_params_file_path_is_job_unique():
+    """The generated parameter file must not be shared between concurrent jobs.
+
+    Two jobs sharing (Nbody_sim, model, iz, ivol) each run
+    ``cp $base_inputs_file $galform_inputs_file`` before substituting, so a
+    shared path lets one job wipe the other's substitutions and lets GALFORM
+    read a parameter set belonging to a different job. This silently mixed
+    x_imf branches across the 2026 redshift-ladder campaigns.
+    """
+    with tempfile.TemporaryDirectory() as tmpdir:
+        gdir = _make_galform_dir(tmpdir)
+
+        submitter = GalformSubmitter(
+            galform_dir=gdir,
+            nbody_sim="L800",
+            model="gp14",
+            output_folder_name="Galform_Out_Test",
+        )
+        script_content = submitter._create_tcsh_script(iz=100)
+
+        line = next(
+            l
+            for l in script_content.splitlines()
+            if l.strip().startswith("set galform_inputs_file")
+        )
+        assert "${SLURM_JOB_ID}" in line, (
+            "parameter file path must be job-unique; got: " + line
+        )
+
+
+def test_explicit_ivols_list_in_tcsh_script():
+    """An explicit, non-contiguous ivol list is looked up by task id (tcsh arrays are 1-based)."""
+    with tempfile.TemporaryDirectory() as tmpdir:
+        gdir = _make_galform_dir(tmpdir)
+
+        submitter = GalformSubmitter(
+            galform_dir=gdir, nbody_sim="L800", model="gp14", iz=271, ivols=[5, 900, 17]
+        )
+
+        assert submitter.ivols == [5, 900, 17]
+        assert submitter.nvol_count == 3
+        script = submitter._create_tcsh_script(iz=271)
+        assert "set ivol_list = ( 5 900 17 )" in script
+        assert "@ ivol        = $ivol_list[$slurm_task_id]" in script
+        assert "$slurm_task_id + " not in script
+
+
+def test_explicit_ivols_sizes_job_wrapper():
+    """The bash wrapper covers exactly len(ivols) task ids."""
+    with tempfile.TemporaryDirectory() as tmpdir:
+        gdir = _make_galform_dir(tmpdir)
+        ivols = list(range(0, 1024, 16))  # 64 ivols
+
+        submitter = GalformSubmitter(
+            galform_dir=gdir,
+            nbody_sim="L800",
+            model="gp14",
+            iz=271,
+            ivols=ivols,
+            log_path=str(Path(tmpdir) / "logs"),
+            partition="cosma8-shm",
+        )
+
+        script = submitter.create_job_script(iz=271, tcsh_path="/x.csh")
+        assert "#SBATCH --cpus-per-task=64" in script
+        assert "[ $task_id -le 64 ]" in script
+
+
+def test_explicit_ivols_validation():
+    """ivols must be unique, in range, non-empty and exclusive with nvol/nvol_range."""
+    import pytest
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+        gdir = _make_galform_dir(tmpdir)
+        kw = dict(galform_dir=gdir, nbody_sim="L800", model="gp14", iz=271)
+        for bad in ([], [3, 3], [-1], [1024]):
+            with pytest.raises(ValueError):
+                GalformSubmitter(**kw, ivols=bad)
+        with pytest.raises(ValueError):
+            GalformSubmitter(**kw, ivols=[1, 2], nvol="1-2")
+        with pytest.raises(ValueError):
+            GalformSubmitter(**kw, ivols=[1, 2], nvol_range="1-2")
+
+
+def test_contiguous_nvol_unchanged_without_ivols():
+    """Without ivols the legacy contiguous mapping is untouched."""
+    with tempfile.TemporaryDirectory() as tmpdir:
+        gdir = _make_galform_dir(tmpdir)
+        submitter = GalformSubmitter(
+            galform_dir=gdir, nbody_sim="L800", model="gp14", iz=271, nvol="1-64"
+        )
+        assert submitter.ivols is None
+        script = submitter._create_tcsh_script(iz=271)
+        assert "@ ivol        = $slurm_task_id + 1 - 2" in script
+        assert "ivol_list" not in script
+
+
+def test_explicit_ivols_with_unknown_sim():
+    """ivols stands in for nvol when the simulation is not in SIMULATION_CONFIGS."""
+    with tempfile.TemporaryDirectory() as tmpdir:
+        gdir = _make_galform_dir(tmpdir)
+        submitter = GalformSubmitter(
+            galform_dir=gdir,
+            nbody_sim="MyCustomSim",
+            model="gp14",
+            iz_list=[100],
+            ivols=[7, 2],
+        )
+        assert submitter.nvol_count == 2
+        assert submitter.nvol_range == "3-8"

galform_execution-0.2.2/galform_execution/config/redshift_lists/COLIBRE-L100m6.txt

@@ -1,3 +0,0 @@
-92 1.0
-102 0.5
-127 0.0

galform_execution-0.2.2/galform_execution/config/simulations/colibre_family.json

@@ -1,43 +0,0 @@
-{
-  "COLIBRE-L100m6": {
-    "aquarius_particle_file": "/cosma8/data/dp004/jch/COLIBRE/HBT/L100_m6/DMO/trees/particle_lists/particle_list_127",
-    "aquarius_tree_file": "/cosma8/data/dp004/jch/COLIBRE/HBT/L100_m6/DMO/trees/tree_127",
-    "h0": 0.681,
-    "iz0": 127,
-    "iz_list": [
-      127,
-      102,
-      92
-    ],
-    "lambda0": 0.693922,
-    "lbox": 68.1,
-    "mpart": 1569616.5,
-    "nbody_trees_dir": "/cosma8/data/dp004/jch/COLIBRE/HBT/L100_m6/DMO/trees",
-    "nvol_range": "1-64",
-    "omega0": 0.306078,
-    "omegab": 0.0486,
-    "pk_file": "Power_Spec/pk_FLAMINGO_DMO_FIDUCIAL.dat",
-    "sigma8": 0.807,
-    "snapshot_file": "COLIBRE-L100m6.txt",
-    "volume": 4934.706890625
-  },
-  "COLIBRE-L400m7": {
-    "_note": "GALFORM-format aquarius trees not yet built from COLIBRE DMO. dhalo trees at /cosma7/data/dp004/jch/COLIBRE/L400_m7/DMO/dhalo_trees/ (not yet in GALFORM aquarius format). Update tree paths and iz0/iz_list/nvol_range before submitting.",
-    "aquarius_particle_file": "/cosma5/data/jch/Galform/Merger_Trees/COLIBRE/L400_m7/particle_lists/particle_list_TBD",
-    "aquarius_tree_file": "/cosma5/data/jch/Galform/Merger_Trees/COLIBRE/L400_m7/treedir_TBD/tree_TBD",
-    "h0": 0.681,
-    "iz0": null,
-    "iz_list": [],
-    "lambda0": 0.693922,
-    "lbox": 272.4,
-    "mpart": 12556932.0,
-    "nbody_trees_dir": "/cosma5/data/jch/Galform/Merger_Trees/COLIBRE/L400_m7",
-    "nvol_range": "1-64",
-    "omega0": 0.306078,
-    "omegab": 0.0486,
-    "pk_file": "Power_Spec/pk_COLIBRE_norm.dat",
-    "sigma8": 0.807,
-    "snapshot_file": "/cosma5/data/jch/Galform/Merger_Trees/COLIBRE/L400_m7/redshift_list.txt",
-    "volume": null
-  }
-}