add read_parameters_dat config option

Author: amorison

stagpy/commands.py

@@ -9,9 +9,10 @@
 from shutil import get_terminal_size
 from textwrap import TextWrapper, indent
 
-from . import __version__, phyvars, stagyydata
+from . import __version__, phyvars
 from ._helpers import baredoc, walk
 from .config import CONFIG_LOCAL, Config
+from .stagyydata import _sdat_from_conf
 
 if typing.TYPE_CHECKING:
     from typing import Callable, Iterable, Mapping, Optional, Sequence, Union
@@ -23,7 +24,7 @@
 
 def info_cmd(conf: Config) -> None:
     """Print basic information about StagYY run."""
-    sdat = stagyydata.StagyyData(conf.core.path)
+    sdat = _sdat_from_conf(conf.core)
     lsnap = sdat.snaps[-1]
     lstep = sdat.steps[-1]
     print(f"StagYY run in {sdat.path}")

stagpy/config.py

@@ -38,6 +38,7 @@ class Core(Section):
     path: Path = path_entry(
         path=".", cli_short="p", doc="path of StagYY run directory or par file"
     )
+    read_parameters_dat: bool = switch_opt(True, None, "enable reading parameters.dat")
     outname: str = entry(val="stagpy", cli_short="n", doc="output file name prefix")
     shortname: bool = switch_opt(False, None, "output file name is only prefix")
     timesteps: Sequence[Union[int, slice]] = _indices.entry(

stagpy/field.py

@@ -14,7 +14,7 @@
 from . import _helpers, phyvars
 from .config import Config
 from .error import NotAvailableError
-from .stagyydata import StagyyData
+from .stagyydata import _sdat_from_conf
 
 if typing.TYPE_CHECKING:
     from typing import Any, Iterable, Optional, Union
@@ -362,7 +362,7 @@ def _findminmax(view: StepsView, sovs: Iterable[str]) -> dict[str, tuple[float,
 
 def cmd(conf: Config) -> None:
     """Implementation of field subcommand."""
-    sdat = StagyyData(conf.core.path)
+    sdat = _sdat_from_conf(conf.core)
     view = _helpers.walk(sdat, conf)
     # no more than two fields in a subplot
     lovs = [[slov[:2] for slov in plov] for plov in conf.field.plot]

stagpy/plates.py

@@ -15,7 +15,7 @@
 from ._helpers import saveplot
 from .config import Config
 from .datatypes import Field
-from .stagyydata import StagyyData
+from .stagyydata import _sdat_from_conf
 
 if typing.TYPE_CHECKING:
     from typing import Optional, Sequence, TextIO, Union
@@ -399,7 +399,7 @@ def plot_scalar_field(
 
 def cmd(conf: Config) -> None:
     """Implementation of plates subcommand."""
-    sdat = StagyyData(conf.core.path)
+    sdat = _sdat_from_conf(conf.core)
     view = _helpers.walk(sdat, conf)
 
     isurf = _isurf(next(iter(view)))

stagpy/refstate.py

@@ -9,7 +9,7 @@
 from . import _helpers
 from .config import Config
 from .phyvars import REFSTATE
-from .stagyydata import StagyyData
+from .stagyydata import StagyyData, _sdat_from_conf
 
 
 def plot_ref(sdat: StagyyData, var: str, conf: Optional[Config] = None) -> None:
@@ -45,7 +45,7 @@ def plot_ref(sdat: StagyyData, var: str, conf: Optional[Config] = None) -> None:
 
 def cmd(conf: Config) -> None:
     """Implementation of refstate subcommand."""
-    sdat = StagyyData(conf.core.path)
+    sdat = _sdat_from_conf(conf.core)
 
     for var in conf.refstate.plot:
         plot_ref(sdat, var, conf)

stagpy/rprof.py

@@ -8,7 +8,7 @@
 
 from . import _helpers
 from .config import Config
-from .stagyydata import StagyyData
+from .stagyydata import _sdat_from_conf
 
 if typing.TYPE_CHECKING:
     from typing import Optional, Sequence
@@ -94,7 +94,7 @@ def plot_grid(step: Step, conf: Optional[Config] = None) -> None:
 
 def cmd(conf: Config) -> None:
     """Implementation of rprof subcommand."""
-    sdat = StagyyData(conf.core.path)
+    sdat = _sdat_from_conf(conf.core)
     view = _helpers.walk(sdat, conf)
 
     if conf.rprof.grid:

stagpy/stagyydata.py

@@ -39,6 +39,8 @@
     from numpy.typing import NDArray
     from pandas import DataFrame, Series
 
+    from .config import Core
+
     StepIndex = Union[int, slice]
 
 
@@ -643,6 +645,10 @@ def __eq__(self, other: object) -> bool:
         return all(s1 is s2 for s1, s2 in zip_longest(self, other))
 
 
+def _sdat_from_conf(core: Core) -> StagyyData:
+    return StagyyData(core.path, core.read_parameters_dat)
+
+
 class StagyyData:
     """Generic lazy interface to StagYY output data.
 

stagpy/time_series.py

@@ -12,7 +12,7 @@
 from . import _helpers
 from .config import Config
 from .error import InvalidTimeFractionError
-from .stagyydata import StagyyData
+from .stagyydata import StagyyData, _sdat_from_conf
 
 if typing.TYPE_CHECKING:
     from typing import Optional, Sequence
@@ -124,7 +124,7 @@ def compstat(
 
 def cmd(conf: Config) -> None:
     """Implementation of time subcommand."""
-    sdat = StagyyData(conf.core.path)
+    sdat = _sdat_from_conf(conf.core)
     if sdat.tseries is None:
         return