vortex-nwp 2.0.0b2__tar.gz → 2.1.0__tar.gz

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: vortex-nwp
-Version: 2.0.0b2
+Version: 2.1.0
 Summary: A Python library to write Numerical Weather Prediction pipelines components
 Author-email: The Vortex Team <vortex.support@meteo.fr>
 License: CECILL-C
@@ -21,6 +21,7 @@ Requires-Dist: sphinx-copybutton; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: ruff==0.9.1; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
+Dynamic: license-file
 
 ## vortex
 

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vortex-nwp"
-version = "2.0.0b2"
+version = "2.1.0"
 description = "A Python library to write Numerical Weather Prediction pipelines components"
 readme = "README.md"
 requires-python = ">=3.7"

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/src/vortex/__init__.py

@@ -21,7 +21,18 @@ strongly advised.
 """
 
 import atexit
-import importlib.metadata
+import sys
+import os
+
+# importlib.metadata included in stdlib from 3.8 onwards.
+# For older versions, import third-party importlib_metadata
+if sys.version_info < (3, 8):
+    import importlib_metadata
+    import importlib
+
+    importlib.metadata = importlib_metadata
+else:
+    import importlib.metadata
 
 from bronx.fancies import loggers as bloggers
 import bronx.stdtypes.date
@@ -42,10 +53,10 @@ from .toolbox import algo as task
 
 from . import nwp as nwp  # footprints import
 
-__version__ = "2.0.0b2"
+__version__ = "2.1.0"
 __prompt__ = "Vortex v-" + __version__ + ":"
 
-__nextversion__ = "2.0.0b3"
+__nextversion__ = "2.1.1"
 __tocinfoline__ = "VORTEX core package"
 
 __all__ = [
@@ -100,8 +111,11 @@ footprints.setup.callback = vortexfpdefaults
 ticket = sessions.get
 sh = sessions.system
 
-# If a config file can be found in current dir, load it
-config.load_config()
+# If a config file can be found in current dir, load it else load .vortex.d/vortex.toml
+if os.path.isfile("vortex.toml"):
+    config.load_config("vortex.toml")
+else:
+    config.load_config(os.environ["HOME"] + "/.vortex.d/vortex.toml")
 
 # Load some superstars sub-packages
 

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/src/vortex/algo/components.py

@@ -50,7 +50,7 @@ from bronx.syntax.decorators import nicedeco
 import footprints
 from taylorism import Boss
 import vortex
-from vortex.config import from_config
+import vortex.config as config
 from vortex.algo import mpitools
 from vortex.syntax.stdattrs import DelayedEnvValue
 from vortex.tools.parallelism import ParallelResultParser
@@ -704,15 +704,15 @@ class AlgoComponent(footprints.FootprintBase, metaclass=AlgoComponentMeta):
 
     def export(self, packenv):
         """Export environment variables in given pack."""
-        for k, v in from_config(section=packenv).items():
+        for k, v in config.from_config(section=packenv).items():
             if k not in self.env:
                 logger.info("Setting %s env %s = %s", packenv.upper(), k, v)
                 self.env[k] = v
 
     def prepare(self, rh, opts):
         """Set some defaults env values."""
-        if opts.get("fortran", True):
-            self.export("fortran")
+        if config.is_defined(section="env"):
+            self.export("env")
 
     def absexcutable(self, xfile):
         """Retuns the absolute pathname of the ``xfile`` executable."""
@@ -1841,7 +1841,7 @@ class Parallel(xExecutableAlgoComponent):
     def _mpitool_attributes(self, opts):
         """Return the dictionary of attributes needed to create the mpitool object."""
         # Read the appropriate configuration in the target file
-        conf_dict = from_config(section="mpitool")
+        conf_dict = config.from_config(section="mpitool")
         if self.mpiname:
             conf_dict["mpiname"] = self.mpiname
         # Make "mpirun" the default mpi command name
@@ -1850,7 +1850,7 @@ class Parallel(xExecutableAlgoComponent):
         possible_attrs = functools.reduce(
             lambda s, t: s | t,
             [
-                set(cls._footprint.attr.keys())
+                set(cls.footprint_retrieve().attr.keys())
                 for cls in footprints.proxy.mpitools
             ],
         )

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/src/vortex/algo/mpitools.py

@@ -182,8 +182,8 @@ class MpiTool(footprints.FootprintBase):
     )
 
     _envelope_bit_kind = "basicenvelopebit"
-    _envelope_wrapper_tpl = "@envelope_wrapper_default.tpl"
-    _wrapstd_wrapper_tpl = "@wrapstd_wrapper_default.tpl"
+    _envelope_wrapper_tpl = "envelope_wrapper_default.tpl"
+    _wrapstd_wrapper_tpl = "wrapstd_wrapper_default.tpl"
     _envelope_wrapper_name = "./global_envelope_wrapper.py"
     _wrapstd_wrapper_name = "./global_wrapstd_wrapper.py"
     _envelope_rank_var = "MPIRANK"
@@ -700,11 +700,11 @@ class MpiTool(footprints.FootprintBase):
         if not self.mpiwrapstd:
             return None
         # Create the launchwrapper
-        with importlib.resources.as_file(
-            importlib.resources.files("vortex.algo")
-        ) as path:
-            tplpath = path / "mpitools_templates" / self._wrapstd_wrapper_tpl
-        wtpl = config.load_template(tplpath, encoding="utf-8")
+        with importlib.resources.path(
+            "vortex.algo.mpitools_templates",
+            self._wrapstd_wrapper_tpl,
+        ) as tplpath:
+            wtpl = config.load_template(tplpath, encoding="utf-8")
         with open(self._wrapstd_wrapper_name, "w", encoding="utf-8") as fhw:
             fhw.write(
                 wtpl.substitute(
@@ -911,11 +911,11 @@ class MpiTool(footprints.FootprintBase):
             "Here are the envelope details:\n%s", "\n".join(binding_str)
         )
         # Create the launchwrapper
-        with importlib.resources.as_file(
-            importlib.resources.files("vortex.algo")
-        ) as path:
-            tplpath = path / "mpitools_templates" / self._envelope_wrapper_tpl
-        wtpl = config.load_template(tplpath, encoding="utf-8")
+        with importlib.resources.path(
+            "vortex.algo.mpitools_templates",
+            self._envelope_wrapper_tpl,
+        ) as tplpath:
+            wtpl = config.load_template(tplpath, encoding="utf-8")
         with open(self._envelope_wrapper_name, "w", encoding="utf-8") as fhw:
             fhw.write(
                 wtpl.substitute(

vortex_nwp-2.1.0/src/vortex/algo/mpitools_templates/__init__.py

@@ -0,0 +1 @@
+# Empty init file

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/src/vortex/data/handlers.py

@@ -5,6 +5,7 @@ the various caches or archives".
 """
 
 import functools
+import importlib
 import re
 import sys
 
@@ -1116,18 +1117,23 @@ class Handler:
         self,
         pr_getter=None,
         tplfile=None,
-        tplskip="@sync-skip.tpl",
-        tplfetch="@sync-fetch.tpl",
         py_exec=sys.executable,
         py_opts="",
     ):
         """Build a getter for the expected resource."""
         if tplfile is None:
-            tplfile = tplfetch if self.is_expected() else tplskip
+            tplfile = (
+                "sync-" + ("fetch" if self.is_expected() else "skip") + ".tpl"
+            )
+        with importlib.resources.path(
+            "vortex.data.sync_templates",
+            tplfile,
+        ) as tplpath:
+            tpl = config.load_template(tplpath)
         if pr_getter is None:
             pr_getter = self.container.localpath() + ".getpr"
         t = self._cur_session
-        tpl = config.load_template(t, tplfile)
+
         with open(pr_getter, "w", encoding="utf-8") as fd:
             fd.write(
                 tpl.substitute(

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/src/vortex/data/stores.py

@@ -527,6 +527,10 @@ class _VortexBaseArchiveStore(ArchiveStore, _VortexStackedStorageMixin):
         """Remap actual remote path to distant store path for intrusive actions."""
         raise NotImplementedError
 
+    def remap_write(self, remote, options):
+        """Remap actual remote path to distant store path for intrusive actions."""
+        raise NotImplementedError
+
     def remap_list(self, remote, options):
         """Reformulates the remote path to compatible vortex namespace."""
         if len(remote["path"].split("/")) >= 4:
@@ -537,8 +541,6 @@ class _VortexBaseArchiveStore(ArchiveStore, _VortexStackedStorageMixin):
             )
             return None
 
-    remap_write = remap_read
-
     @property
     def stacks_autorefill(self):
         """Where to refill a stack retrieved from the archive."""
@@ -755,6 +757,8 @@ class VortexStdBaseArchiveStore(_VortexBaseArchiveStore):
             raise e
         return remote
 
+    remap_write = remap_read
+
 
 class VortexStdStackedArchiveStore(VortexStdBaseArchiveStore):
     """Archive for casual VORTEX experiments: Support for legacy/Olive XPIDs.
@@ -1105,16 +1109,10 @@ class VortexCacheStore(_AbstractVortexCacheMultiStore):
 
     def alternates_netloc(self):
         """For Non-Op users, Op caches may be accessed in read-only mode."""
-        netloc_m = re.match(
-            r"(?P<base>vortex.*)\.cache\.(?P<country>\w+)", self.netloc
-        )
-        mt_netloc = "{base:s}.cache-mt.{country:s}".format(
-            **netloc_m.groupdict()
-        )
-        s_mt_netloc = "{base:s}.stacked-cache-mt.{country:s}".format(
-            **netloc_m.groupdict()
-        )
-        return [mt_netloc, s_mt_netloc]
+        return [
+            f"{self.netloc.firstname}.cache-mt.fr",
+            f"{self.netloc.firstname}.stacked-cache-mt.fr",
+        ]
 
 
 class VortexVsopCacheStore(_AbstractVortexCacheMultiStore):
@@ -1219,13 +1217,7 @@ class VortexStackStore(_AbstractVortexStackMultiStore):
 
     def alternates_netloc(self):
         """Go through the various stacked stores."""
-        netloc_m = re.match(
-            r"(?P<base>vortex.*)\.stack\.(?P<country>\w+)", self.netloc
-        )
-        s_mt_netloc = "{base:s}.stacked-cache-mt.{country:s}".format(
-            **netloc_m.groupdict()
-        )
-        return [s_mt_netloc]
+        return [f"{self.netloc.firstname}.stacked-cache-mt.fr"]
 
 
 class VortexVsopStackStore(_AbstractVortexStackMultiStore):

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/src/vortex/nwp/algo/forecasts.py

@@ -283,21 +283,12 @@ class LAMForecast(Forecast):
                 values=["lamfc", "lamforecast"],
                 remap=dict(lamforecast="lamfc"),
             ),
-            synctool=dict(
-                info="The name of the script called when waiting for coupling files",
-                optional=True,
-                default="atcp.alad",
-                doc_visibility=footprints.doc.visibility.ADVANCED,
-            ),
-            synctpl=dict(
-                info="The template used to generate the *synctool* script",
-                optional=True,
-                default="@sync-fetch.tpl",
-                doc_visibility=footprints.doc.visibility.ADVANCED,
-            ),
         ),
     )
 
+    synctool = "atcp.alad"
+    synctpl = "sync-fetch.tpl"
+
     def spawn_command_options(self):
         """Dictionary provided for command line factory."""
         return dict(
@@ -341,10 +332,11 @@ class LAMForecast(Forecast):
             )
             sh.softlink(thisbound, lbcnc(number=i))
             if self.mksync:
-                thistool = self.synctool + ".{:03d}".format(i)
-                bound.mkgetpr(pr_getter=thistool, tplfetch=self.synctpl)
+                bound.mkgetpr(
+                    pr_getter=self.synctool + ".{:03d}".format(i),
+                )
                 if firstsync is None:
-                    firstsync = thistool
+                    firstsync = self.synctool + ".{:03d}".format(i)
 
         # Set up the first synchronization step
         if firstsync is not None:

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/src/vortex/nwp/algo/ifsroot.py

@@ -120,6 +120,11 @@ class IFSParallel(
         """Extend default tag with ``kind`` value."""
         return super().fstag() + "." + self.kind
 
+    def _mpitool_attributes(self, opts):
+        conf_dict = super()._mpitool_attributes(opts)
+        conf_dict.update({"mplbased": True})
+        return conf_dict
+
     def valid_executable(self, rh):
         """Be sure that the specifed executable is ifsmodel compatible."""
         valid = super().valid_executable(rh)

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/src/vortex/nwp/algo/monitoring.py

@@ -57,6 +57,11 @@ class OdbMonitoring(
         )
     )
 
+    def _mpitool_attributes(self, opts):
+        conf_dict = super()._mpitool_attributes(opts)
+        conf_dict.update({"mplbased": True})
+        return conf_dict
+
     def _fix_nam_macro(self, rh, macro, value):
         """Set a given namelist macro and issue a log message."""
         rh.contents.setmacro(macro, value)

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/src/vortex/nwp/algo/mpitools.py

@@ -64,18 +64,28 @@ class MpiAuto(mpitools.MpiTool):
             ),
             bindingmethod=dict(
                 info="How to bind the MPI processes",
-                values=["arch", "launcherspecific", "vortex"],
+                values=["vortex", "arch", "launcherspecific"],
                 optional=True,
                 doc_visibility=footprints.doc.visibility.ADVANCED,
                 doc_zorder=-90,
             ),
+            mplbased=dict(
+                info="Is the executable based on MPL?",
+                type=bool,
+                optional=True,
+                default=False,
+            ),
         )
     )
 
-    _envelope_wrapper_tpl = "@envelope_wrapper_mpiauto.tpl"
+    _envelope_wrapper_tpl = "envelope_wrapper_mpiauto.tpl"
     _envelope_rank_var = "MPIAUTORANK"
     _needs_mpilib_specific_mpienv = False
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.bindingmethod = "arch" if self.mplbased else "vortex"
+
     def _reshaped_mpiopts(self):
         """Raw list of mpi tool command line options."""
         options = super()._reshaped_mpiopts()

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/src/vortex/nwp/algo/odbtools.py

@@ -850,6 +850,11 @@ class OdbAverage(Parallel, odb.OdbComponentDecoMixin, drhook.DrHookDecoMixin):
         )
     )
 
+    def _mpitool_attributes(self, opts):
+        conf_dict = super()._mpitool_attributes(opts)
+        conf_dict.update({"mplbased": True})
+        return conf_dict
+
     def prepare(self, rh, opts):
         """Find any ODB candidate in input files."""
 
@@ -962,6 +967,11 @@ class OdbCompress(Parallel, odb.OdbComponentDecoMixin, drhook.DrHookDecoMixin):
         )
     )
 
+    def _mpitool_attributes(self, opts):
+        conf_dict = super()._mpitool_attributes(opts)
+        conf_dict.update({"mplbased": True})
+        return conf_dict
+
     def prepare(self, rh, opts):
         """Find any ODB candidate in input files and fox ODB env accordingly."""
 
@@ -1027,6 +1037,11 @@ class OdbMatchup(Parallel, odb.OdbComponentDecoMixin, drhook.DrHookDecoMixin):
         )
     )
 
+    def _mpitool_attributes(self, opts):
+        conf_dict = super()._mpitool_attributes(opts)
+        conf_dict.update({"mplbased": True})
+        return conf_dict
+
     def prepare(self, rh, opts):
         """Find ODB candidates in input files."""
 
@@ -1116,6 +1131,11 @@ class OdbReshuffle(
     _OUT_DIRECTORY = "reshuffled"
     _BARE_OUT_LAYOUT = "ccma"
 
+    def _mpitool_attributes(self, opts):
+        conf_dict = super()._mpitool_attributes(opts)
+        conf_dict.update({"mplbased": True})
+        return conf_dict
+
     def prepare(self, rh, opts):
         """Find ODB candidates in input files."""
 

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/src/vortex/nwp/algo/oopsroot.py

@@ -619,6 +619,11 @@ class OOPSParallel(
             logger.error("The binary < %s > has no cycle attribute", repr(rh))
             return False
 
+    def _mpitool_attributes(self, opts):
+        conf_dict = super()._mpitool_attributes(opts)
+        conf_dict.update({"mplbased": True})
+        return conf_dict
+
     def prepare(self, rh, opts):
         """Preliminary setups."""
         super().prepare(rh, opts)

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/src/vortex/tools/actions.py

@@ -10,8 +10,6 @@ to be processed: e.g. mail, routing, alarm.
 import bronx.stdtypes.catalog
 import footprints
 from bronx.fancies import loggers
-from bronx.fancies.display import dict_as_str
-from vortex import sessions
 
 #: Export nothing
 __all__ = []
@@ -134,105 +132,30 @@ class Action:
 class TunableAction(Action):
     """An Action that may be tuned
 
-    - may have it's own section in the target configuration files
-    - accepts the syntax `ad.action_tune(key=value)` (which has priority)
+    accepts the syntax `ad.action_tune(key=value)` (which has priority)
     """
 
     def __init__(self, configuration=None, **kwargs):
         super().__init__(**kwargs)
         self._tuning = dict()
-        self._conf_section = configuration
-        self._conf_dict = None
-
-    @property
-    def _shtarget(self):
-        """Warning: this may be a `vortex.syntax.stdattrs.DelayedInit` object
-        during Vortex initialization and may not have a `sections()` method
-        nor a `config` property.
-        """
-        return sessions.current().sh.default_target
-
-    @property
-    def _conf_items(self):
-        """Check and return the configuration: a section in the target-xxx.ini file.
-
-        If the configuration is None, an attempt is made to use the Action's kind.
-        Don't use before Vortex initialization is done (see `_shtarget`).
-        """
-        if self._conf_dict is None:
-            if self._conf_section is None:
-                if self.kind in self._shtarget.sections():
-                    self._conf_section = self.kind
-            else:
-                if self._conf_section not in self._shtarget.sections():
-                    raise KeyError(
-                        'No section "{}" in "{}"'.format(
-                            self._conf_section, self._shtarget.config.file
-                        )
-                    )
-            if self._conf_section is None:
-                self._conf_dict = dict()
-            else:
-                self._conf_dict = self._shtarget.items(self._conf_section)
-        return self._conf_dict
 
     def service_info(self, **kw):
-        for k, v in self._get_config_dict().items():
+        for k, v in self._tuning.items():
             kw.setdefault(k, v)
         return super().service_info(**kw)
 
-    def tune(self, section=None, **kw):
-        """Add options to override the .ini file configuration.
-
-        ``section`` is a specific section name, or ``None`` for all.
-        """
-        if section is None or section == self._conf_section:
-            self._tuning.update(kw)
-
-    def _get_config_dict(self):
-        final_dict = dict()
-        final_dict.update(self._conf_items)
-        final_dict.update(self._tuning)
-        return final_dict
-
-    def info(self):
-        """Informative string (may serve debugging purposes)."""
-        s = super().info() + " - tunable\n"
-        mix = dict()
-        mix.update(self._conf_items)
-        mix.update(self._tuning)
-        prt = dict()
-        for k, v in mix.items():
-            if k in self._tuning:
-                prt["++ " + k] = "{} (was: {})".format(
-                    v,
-                    str(self._conf_items[k])
-                    if k in self._conf_items
-                    else "<not set>",
-                )
-            else:
-                prt["   " + k] = v
-        if self._conf_section is not None:
-            s += " " * 4 + "configuration: " + self._conf_section + "\n"
-        s += dict_as_str(prt, prefix=4)
-        return s.strip()
+    def tune(self, **kw):
+        self._tuning.update(kw)
 
     def getx(self, key, *args, **kw):
         """Shortcut to access the configuration overridden by the tuning."""
         if key in self._tuning:
             return self._tuning[key]
 
-        if self._conf_section is not None:
-            return self._shtarget.getx(
-                key=self._conf_section + ":" + key, *args, **kw
-            )
-
         if "default" in kw:
             return kw["default"]
 
-        raise KeyError(
-            'The "{:s}" entry was not found in any configuration'.format(key)
-        )
+        raise KeyError('The "{:s}" entry was not found'.format(key))
 
 
 class SendMail(Action):

{vortex_nwp-2.0.0b2 → vortex_nwp-2.1.0}/src/vortex/tools/grib.py

@@ -10,6 +10,7 @@ It also provdes an AlgoComponent's Mixin to properly setup the environment
 when using the grib_api or ecCodes libraries.
 """
 
+from pathlib import Path
 from urllib import parse as urlparse
 
 import re
@@ -563,37 +564,41 @@ class EcGribDecoMixin(AlgoComponentDecoMixin):
                 "After gribapi_setup %s = %s", a_var, self.env.getvar(a_var)
             )
 
-    def _eccodes_envsetup(self, eccodes_lib):
-        """Setup environment variables for ecCodes."""
-        dep_warn = (
-            "%s is left unconfigured because the old grib_api's variable is defined."
-            + "Please remove that !"
+    def _eccodes_envsetup(
+        self,
+        eccodes_lib,
+        envvar="ECCODES_DEFINITIONS_PATH",
+        tgt_path="definitions",
+    ):
+        """Export envirionment variables required by ECCODES
+
+        Value is
+
+        /path/to/eccodes-X.Y.Z/share/eccodes/<target_path>
+
+        eccodes_lib: Absolute path to the eccodes so file
+        envvar: Name of the environment variable to export
+        tgt_path: Name of the eccodes install subdirectory to appear
+          in the value
+        """
+        if envvar in self.env:
+            return envvar
+        if envvar.replace("ECCODES", "GRIB") in self.env:
+            logger.warning(
+                (
+                    "%s is left unconfigured because the old grib_api's"
+                    "variable is defined. ",
+                    "Please remove that!",
+                ),
+                envvar,
+            )
+            return envvar.replace("ECCODES", "GRIB")
+        eccodes_root = Path(eccodes_lib).parent.parent
+        self.env.setgenericpath(
+            envvar,
+            str(eccodes_root / "share" / "eccodes" / tgt_path),
         )
-        eccodes_root = self.system.path.dirname(eccodes_lib)
-        eccodes_root = self.system.path.split(eccodes_root)[0]
-        eccodes_share = self.system.path.join(eccodes_root, "share", "eccodes")
-        defvar = "ECCODES_DEFINITION_PATH"
-        if defvar not in self.env:
-            if "GRIB_DEFINITION_PATH" in self.env:
-                logger.warning(dep_warn, defvar)
-                defvar = "GRIB_DEFINITION_PATH"
-            else:
-                self.env.setgenericpath(
-                    defvar, self.system.path.join(eccodes_share, "definitions")
-                )
-        samplevar = "ECCODES_SAMPLES_PATH"
-        if samplevar not in self.env:
-            if "GRIB_SAMPLES_PATH" in self.env:
-                logger.warning(dep_warn, samplevar)
-                samplevar = "GRIB_SAMPLES_PATH"
-            else:
-                self.env.setgenericpath(
-                    samplevar,
-                    self.system.path.join(
-                        eccodes_share, "ifs_samples", "grib1"
-                    ),
-                )
-        return defvar, samplevar
+        return envvar
 
     def eccodes_setup(self, rh, opts, compat=False, fatal=True):
         """Setup the grib_api related stuff.
@@ -605,7 +610,19 @@ class EcGribDecoMixin(AlgoComponentDecoMixin):
         # Detect the library's path and setup appropriate variables
         eccodes_lib, gribapi_lib = self._ecgrib_libs_detext(rh)
         if eccodes_lib is not None:
-            defvar, samplevar = self._eccodes_envsetup(eccodes_lib)
+            defvar = self._eccodes_envsetup(
+                eccodes_lib,
+                envvar="ECCODES_DEFINITIONS_PATH",
+                tgt_path="definitions",
+            )
+            subdir = Path("ifs_samples") / (
+                "grib1" if rh.resource.cycle < "cy49" else "grib1_mlgrib2"
+            )
+            samplevar = self._eccodes_envsetup(
+                eccodes_lib,
+                envvar="ECCODES_SAMPLES_PATH",
+                tgt_path=subdir,
+            )
         elif compat:
             defvar, samplevar = self._gribapi_envsetup(gribapi_lib)
         else: