fmu-pem 0.0.3__tar.gz → 0.0.4__tar.gz

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/.gitignore

@@ -29,3 +29,4 @@ fmu-pem-schema.json
 /ERT/.runpath_list
 /logs/
 /tests/data/sim2seis/input/pem/venv_ext/
+scripts/debug_lines.py

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/ERT/run_pem.ert

@@ -36,6 +36,7 @@ DEFINE <PEM_CONFIGDIR> <RUNPATH>/sim2seis/model
 DEFINE <PEM_CONFIG_FILE_NAME> new_pem_config.yml
 DEFINE <GLOBAL_PATH> ../../fmuconfig/output
 DEFINE <GLOBAL_CONFIG_FILE> global_variables.yml
+DEFINE <MOD_PREFIX> HIST
 
 -- Run the PEM
-FORWARD_MODEL PEM(<CONFIG_DIR>=<PEM_CONFIGDIR>, <CONFIG_FILE>=<PEM_CONFIG_FILE_NAME>, <GLOBAL_DIR>=<GLOBAL_PATH>, <GLOBAL_FILE>=<GLOBAL_CONFIG_FILE>, <MODEL_DIR>=<MODEL_PATH>)
+FORWARD_MODEL PEM(<CONFIG_DIR>=<PEM_CONFIGDIR>, <CONFIG_FILE>=<PEM_CONFIG_FILE_NAME>, <GLOBAL_DIR>=<GLOBAL_PATH>, <GLOBAL_FILE>=<GLOBAL_CONFIG_FILE>, <MODEL_DIR>=<MODEL_PATH>, <MOD_DATE_PREFIX>=<MOD_PREFIX>)

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu-pem
-Version: 0.0.3
+Version: 0.0.4
 Summary: pem
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
@@ -695,6 +695,7 @@ Requires-Dist: xtgeo>=4.7.1
 Requires-Dist: fmu-tools
 Requires-Dist: fmu-config
 Requires-Dist: fmu-dataio
+Requires-Dist: fmu-datamodels
 Requires-Dist: rock-physics-open>=0.3.3
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: pydantic

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/documentation/docs/effective-pressure.md

@@ -12,7 +12,7 @@ provided by drilling or operational geology disciplines, and for most fields, it
 or in some cases one model per structure in the field. The relationship between overburden, formation and effective
 pressures is given as:
 
-$$P_{eff} = P_{ob} - \alpha \cdot P_f$$,
+$$P_{eff} = P_{ob} - \alpha \cdot P_f$$
 
 where $\alpha$ is the formation factor, also known as the Biot coefficient.
 

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/documentation/docs/ert-configuration.md

@@ -9,9 +9,10 @@ DEFINE <PEM_CONFIG_FILE_NAME> pem_config.yml
 DEFINE <GLOBAL_CONFIG_DIR> ../../fmuconfig/output
 DEFINE <GLOBAL_CONFIG_FILE> global_variables.yml
 DEFINE <MODEL_PATH> /my_fmu_structure/sim2seis/model
+DEFINE <MOD_PREFIX> HIST
 
 -- Run the pre-installed ERT forward model:
-FORWARD_MODEL PEM(<CONFIG_DIR>=<CONFIG_PATH>, <CONFIG_FILE>=<PEM_CONFIG_FILE_NAME>, <GLOBAL_DIR>=<GLOBAL_CONFIG_DIR>, <GLOBAL_FILE>=<GLOBAL_CONFIG_FILE>, <MODEL_DIR>=<MODEL_PATH>)
+FORWARD_MODEL PEM(<CONFIG_DIR>=<CONFIG_PATH>, <CONFIG_FILE>=<PEM_CONFIG_FILE_NAME>, <GLOBAL_DIR>=<GLOBAL_CONFIG_DIR>, <GLOBAL_FILE>=<GLOBAL_CONFIG_FILE>, <MODEL_DIR>=<MODEL_PATH>, <MOD_DATE_PREFIX>=<MOD_PREFIX>)
 ````
 
 On the next page you will get help on setting up your `pem_config.yml`.

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/documentation/docs/use-cases.md

@@ -38,3 +38,15 @@ from the asset, it is highly likely that wrong assumptions are made. The main re
 | Production history         | Reservoir Engineering, Production Engineering               | Historical production data for model validation                         |
 
 <span id="table-1-discipline-topics"><strong>Table 1:</strong> Topics that should be coordinated between disciplines during PEM calibration.</span>
+
+## Command-line runs
+
+PEM can be called from ERT, run as an external command in RMS, or run from command-line.
+In all cases, there is a number of required call arguments that must be provided:
+
+```shell
+> # Go to top of the project structure
+> cd /project/fmu/tutorial/drogon/resmod/ff/users/hfle/dev
+> # Call PEM, `--help` will show all call arguments
+> pem --help
+> pem -c ./sim2seis/model -f new_pem_config.yml -g ../../fmuconfig/output -o global_variables.yml -m ./sim2seis/model --mod-date-prefix HIST

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/documentation/package-lock.json

@@ -3808,14 +3808,16 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+      "license": "MIT"
     },
     "node_modules/lodash-es": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz",
+      "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==",
+      "license": "MIT"
     },
     "node_modules/loose-envify": {
       "version": "1.4.0",

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/pyproject.toml

@@ -31,6 +31,7 @@ dependencies = [
     "fmu-tools",
     "fmu-config",
     "fmu-dataio",
+    "fmu-datamodels",
     "rock-physics-open >= 0.3.3",
     "PyYAML >=6.0.1",
     "pydantic",

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/src/fmu/pem/__init__.py

@@ -11,9 +11,11 @@ except (ImportError, ModuleNotFoundError):
 else:
     INTERNAL_EQUINOR = True
 
+from .__main__ import main as pem
 from .run_pem import pem_fcn
 
 __all__ = [
     "pem_fcn",
+    "pem",
     "INTERNAL_EQUINOR",
 ]

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/src/fmu/pem/__main__.py

@@ -1,13 +1,17 @@
 # pylint: disable=missing-module-docstring
 import argparse
+import sys
 from pathlib import Path
+from typing import Any
 from warnings import warn
 
-from .pem_utilities import restore_dir
+from .pem_utilities import get_global_params_and_dates, read_pem_config, restore_dir
 from .run_pem import pem_fcn
 
 
-def main():
+def main(args_list=None):
+    if args_list is None:
+        args_list = sys.argv[1:]
     parser = argparse.ArgumentParser(__file__)
     parser.add_argument(
         "-c",
@@ -45,7 +49,29 @@ def main():
         help="For ERT run: Absolute directory name for model file, pre-experiment. Not "
         "needed for command line run",
     )
-    args = parser.parse_args()
+    parser.add_argument(
+        "-q",
+        "--mod-date-prefix",
+        type=str,
+        required=True,
+        help="Global seismic section: Prefix for seismic dates for modelled data",
+    )
+    parser.add_argument(
+        "-r",
+        "--run-from-rms",
+        type=bool,
+        required=False,
+        default=False,
+        help="Is PEM run as part of an RMS workflow?",
+    )
+    parser.add_argument(
+        "-s",
+        "--rms-project",
+        required=False,
+        default=None,
+        help="In case PEM is called from RMS: RMS project",
+    )
+    args = parser.parse_args(args_list)
     cwd = args.config_dir.absolute()
     if str(cwd).endswith("sim2seis/model"):
         run_folder = cwd
@@ -57,11 +83,22 @@ def main():
             warn(f"PEM model should be run from the sim2seis/model folder. {e}")
             run_folder = cwd
     with restore_dir(run_folder):
+        # Read and validate all PEM parameters
+        config = read_pem_config(yaml_file=run_folder / args.config_file)
+
+        # Read necessary part of global configurations and parameters
+        config.update_with_global(
+            get_global_params_and_dates(
+                global_config_dir=(run_folder / args.global_dir).resolve(),
+                global_conf_file=args.global_file,
+                mod_prefix=args.mod_date_prefix,
+            )
+        )
         pem_fcn(
+            config=config,
             config_dir=run_folder,
-            pem_config_file_name=args.config_file,
-            global_config_dir=args.global_dir,
-            global_config_file=args.global_file,
+            run_from_rms=args.run_from_rms,
+            proj=args.rms_project,
         )
 
 

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/src/fmu/pem/forward_models/pem_model.py

@@ -29,6 +29,8 @@ class PetroElasticModel(ForwardModelStepPlugin):
                 "<GLOBAL_FILE>",
                 "--model-dir",
                 "<MODEL_DIR>",
+                "--mod-date-prefix",
+                "<MOD_DATE_PREFIX>",
             ],
         )
 
@@ -40,6 +42,7 @@ class PetroElasticModel(ForwardModelStepPlugin):
     def validate_pre_experiment(self, fm_step_json: ForwardModelStepJSON) -> None:
         # Parse YAML parameter file by pydantic pre-experiment to catch errors at an
         # early stage
+
         config_file = Path(fm_step_json["argList"][3])
         model_dir = Path(fm_step_json["argList"][9])
         try:
@@ -58,7 +61,7 @@ class PetroElasticModel(ForwardModelStepPlugin):
             examples="""
 .. code-block:: console
 
-  FORWARD_MODEL PEM(<CONFIG_DIR>=../../sim2seis/model, <CONFIG_FILE>=new_pem.yml, <GLOBAL_DiR>=../../fmuconfig/output, <GLOBAL_FILE>=global_variables.yml, <MODEL_DIR>=/my_fmu_structure/sim2seis/model)
+  FORWARD_MODEL PEM(<CONFIG_DIR>=../../sim2seis/model, <CONFIG_FILE>=new_pem.yml, <GLOBAL_DiR>=../../fmuconfig/output, <GLOBAL_FILE>=global_variables.yml, <MODEL_DIR>=/my_fmu_structure/sim2seis/model, <MOD_DATE_PREFIX>=HIST)
 
 """,  # noqa: E501,
         )

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/src/fmu/pem/pem_utilities/__init__.py

@@ -30,7 +30,6 @@ from .pem_config_validation import (
     MineralProperties,
     PemConfig,
     RockMatrixProperties,
-    possible_date_string,
 )
 from .update_grid import update_inactive_grid_cells
 from .utils import (
@@ -66,7 +65,6 @@ __all__ = [
     "input_num_string_to_list",
     "missing_num_areas",
     "num_boolean_array",
-    "possible_date_string",
     "read_pem_config",
     "read_sim_grid_props",
     "restore_dir",

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/src/fmu/pem/pem_utilities/import_config.py

@@ -45,6 +45,8 @@ def find_key_first(d: dict, key: str) -> str | None:
 def get_global_params_and_dates(
     global_config_dir: Path,
     global_conf_file: Path,
+    mod_prefix: str | None = None,
+    obs_prefix: str | None = None,
 ) -> dict:
     """Read global configuration parameters, simulation model dates and seismic dates
     for difference calculation
@@ -58,35 +60,41 @@ def get_global_params_and_dates(
         list of tuples with
                 strings of dates to calculate difference properties
     """
-    global_config_par = yaml_load(str(global_config_dir / global_conf_file))
-    # check if 'HIST' or 'PRED' is used
-    if "SEISMIC_PRED_DATES" in global_config_par["global"]["dates"]:
-        date_str = "SEISMIC_PRED_DATES"
-    else:
-        date_str = "SEISMIC_HIST_DATES"
-    if "SEISMIC_PRED_DIFFDATES" in global_config_par["global"]["dates"]:
-        diff_str = "SEISMIC_PRED_DIFFDATES"
-    else:
-        diff_str = "SEISMIC_HIST_DIFFDATES"
-    seismic_dates = [
-        str(sdate).replace("-", "")
-        for sdate in global_config_par["global"]["dates"][date_str]
-    ]
-    diff_dates = [
-        [str(sdate).replace("-", "") for sdate in datepairs]
-        for datepairs in global_config_par["global"]["dates"][diff_str]
-    ]
+    global_config_par = yaml_load(
+        str(global_config_dir / global_conf_file),
+    )
     grid_model_name = find_key_first(global_config_par["global"], "ECLGRIDNAME_PEM")
     if grid_model_name is None:
         raise ValueError(
             f"{__file__}: no value for ECLGRIDNAME_PEM in global config file"
         )
-    return {
-        "grid_model": grid_model_name,
-        "seis_dates": seismic_dates,
-        "diff_dates": diff_dates,
+    # Find the correct seismic dates references
+    dates_config = global_config_par["global"]["dates"]
+    return_dict = {
         "global_config": global_config_par,
+        "grid_model": grid_model_name,
+        "seismic": global_config_par["global"]["seismic"],
     }
+    if mod_prefix:
+        return_dict.update(
+            {
+                "mod_dates": dates_config.get(f"SEISMIC_{mod_prefix}_DATES", None),
+                "mod_diffdates": dates_config.get(
+                    f"SEISMIC_{mod_prefix}_DIFFDATES", None
+                ),
+            }
+        )
+    if obs_prefix:
+        return_dict.update(
+            {
+                "obs_dates": dates_config.get(f"SEISMIC_{obs_prefix}_DATES", None),
+                "obs_diffdates": dates_config.get(
+                    f"SEISMIC_{obs_prefix}_DIFFDATES", None
+                ),
+            }
+        )
+
+    return return_dict
 
 
 def read_pem_config(yaml_file: Path) -> PemConfig:

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/src/fmu/pem/pem_utilities/pem_config_validation.py

@@ -5,6 +5,7 @@ from typing import Any, Self
 
 import numpy as np
 from pydantic import (
+    AliasChoices,
     BaseModel,
     ConfigDict,
     DirectoryPath,
@@ -15,6 +16,7 @@ from pydantic import (
 from pydantic.json_schema import SkipJsonSchema
 from pydantic_core.core_schema import ValidationInfo
 
+from fmu.datamodels.fmu_results.global_configuration import GlobalConfiguration
 from fmu.pem import INTERNAL_EQUINOR
 
 from .enum_defs import (
@@ -556,53 +558,51 @@ class Fluids(BaseModel):
         return v
 
 
-def possible_date_string(date_strings: list[str]) -> bool:
-    """
-    Validate a list of date strings in YYYYMMDD format.
+def date_to_string(date_obj: date) -> str:
+    return date_obj.strftime(format="%Y%m%d")
 
-    Args:
-        date_strings: list of strings to validate
 
-    Returns:
-        bool: True if all strings are valid dates
+class SeismicSurvey(BaseModel):
+    ecldate: list[str]
+    time: dict[str, str] | None = None
+    depth: dict[str, str] | None = None
 
-    Raises:
-        ValueError: If any string is not a valid date in YYYYMMDD format
-    """
-    for date_string in date_strings:
-        if len(date_string) != 8:
-            raise ValueError(
-                f"Invalid date format: '{date_string}' must be exactly 8 characters"
-            )
-        try:
-            date(
-                year=int(date_string[0:4]),
-                month=int(date_string[4:6]),
-                day=int(date_string[6:]),
-            )
-        except ValueError:
-            raise ValueError(
-                f"Invalid date: '{date_string}' must be a valid date in YYYYMMDD format"
-            )
-    return True
+    @field_validator("ecldate", mode="before")
+    def convert_ecldate_strings(cls, v: list[date]) -> list[str]:
+        return [date_to_string(date) for date in v]
 
 
-class FromGlobal(BaseModel):
-    grid_model: str
-    seis_dates: list[str]
-    diff_dates: list[list[str]]
-    global_config: dict[str, Any]
+class SeismicSection(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
 
-    @field_validator("seis_dates", mode="before")
-    def check_date_string(cls, v: list[str]) -> list[str]:
-        possible_date_string(v)
-        return v
+    templatecube_4d: str = Field(
+        validation_alias=AliasChoices("4d_templatecube", "templatecube_4d"),
+        serialization_alias="4d_templatecube",
+    )
+    real_4d_cropped_path: Path
+    real_4d: dict[str, SeismicSurvey]
 
-    @field_validator("diff_dates", mode="before")
-    def check_diffdate_string(cls, v: list[list[str]]) -> list[list[str]]:
-        for ll in v:
-            possible_date_string(ll)
-        return v
+
+class FromGlobal(BaseModel):
+    grid_model: str
+    mod_dates: list[str] | None = None
+    mod_diffdates: list[list[str]] | None = None
+    obs_dates: list[str] | None = None
+    obs_diffdates: list[list[str]] | None = None
+    seismic: SeismicSection
+    global_config: GlobalConfiguration
+
+    @field_validator("mod_dates", "obs_dates", mode="before")
+    def make_date_strings(cls, v: list[date]) -> list[str] | None:
+        if v:
+            return [date_to_string(date) for date in v]
+        return None
+
+    @field_validator("mod_diffdates", "obs_diffdates", mode="before")
+    def make_diffdate_strings(cls, v: list[list[str]]) -> list[list[str]] | None:
+        if v:
+            return [[date_to_string(date) for date in diffdate] for diffdate in v]
+        return None
 
 
 class PemPaths(BaseModel):

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/src/fmu/pem/run_pem.py

@@ -6,10 +6,8 @@ from fmu.pem import pem_utilities as pem_utils
 
 
 def pem_fcn(
+    config: pem_utils.PemConfig,
     config_dir: Path,
-    pem_config_file_name: Path,
-    global_config_dir: Path,
-    global_config_file: Path,
     run_from_rms=False,
     proj=None,
 ) -> None:
@@ -18,24 +16,13 @@ def pem_fcn(
     yaml-file control the selections made in the PEM.
 
     """
-    # Read and validate all PEM parameters
-    config = pem_utils.read_pem_config(yaml_file=config_dir / pem_config_file_name)
-
-    # Read necessary part of global configurations and parameters
-    config.update_with_global(
-        pem_utils.get_global_params_and_dates(
-            global_config_dir=(config_dir / global_config_dir).resolve(),
-            global_conf_file=global_config_file,
-        )
-    )
-
     # Import Eclipse simulation grid - INIT and RESTART
     sim_grid, constant_props, time_step_props = pem_utils.read_sim_grid_props(
         rel_dir_sim_files=config.eclipse_files.rel_path_simgrid,
         egrid_file=config.eclipse_files.egrid_file,
         init_property_file=config.eclipse_files.init_property_file,
         restart_property_file=config.eclipse_files.restart_property_file,
-        seis_dates=config.global_params.seis_dates,
+        seis_dates=config.global_params.mod_dates,
         fipnum_name=config.alternative_fipnum_name,
     )
 
@@ -65,7 +52,7 @@ def pem_fcn(
         sim_rst=time_step_props,
         matrix_props=matrix_properties,
         fluid_props=fluid_properties,
-        sim_dates=config.global_params.seis_dates,
+        sim_dates=config.global_params.mod_dates,
         fipnum=constant_props.fipnum,
     )
 
@@ -89,8 +76,8 @@ def pem_fcn(
     # Calculate difference properties. Possible properties are all that vary with time
     diff_props, diff_date_strs = pem_utils.calculate_diff_properties(
         props=[time_step_props, eff_pres, sat_rock_props, sum_delta_time],
-        diff_dates=config.global_params.diff_dates,
-        seis_dates=config.global_params.seis_dates,
+        diff_dates=config.global_params.mod_diffdates,
+        seis_dates=config.global_params.mod_dates,
         diff_calculation=config.diff_calculation,
     )
 
@@ -108,7 +95,7 @@ def pem_fcn(
         rms_project=proj,
         sim_grid=sim_grid,
         grid_name=config.global_params.grid_model,
-        seis_dates=config.global_params.seis_dates,
+        seis_dates=config.global_params.mod_dates,
         save_to_rms=config.results.save_results_to_rms,
         save_to_disk=config.results.save_results_to_disk,
         save_intermediate=config.results.save_intermediate_results,

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/src/fmu/pem/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.3'
-__version_tuple__ = version_tuple = (0, 0, 3)
+__version__ = version = '0.0.4'
+__version_tuple__ = version_tuple = (0, 0, 4)
 
 __commit_id__ = commit_id = None

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/src/fmu_pem.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu-pem
-Version: 0.0.3
+Version: 0.0.4
 Summary: pem
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
@@ -695,6 +695,7 @@ Requires-Dist: xtgeo>=4.7.1
 Requires-Dist: fmu-tools
 Requires-Dist: fmu-config
 Requires-Dist: fmu-dataio
+Requires-Dist: fmu-datamodels
 Requires-Dist: rock-physics-open>=0.3.3
 Requires-Dist: PyYAML>=6.0.1
 Requires-Dist: pydantic

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/src/fmu_pem.egg-info/SOURCES.txt

@@ -13,7 +13,7 @@ documentation/docs/effective-mineral-properties.md
 documentation/docs/effective-pressure.md
 documentation/docs/ert-configuration.md
 documentation/docs/ert.tmLanguage.json
-documentation/docs/fluid_properties.md
+documentation/docs/fluid-properties.md
 documentation/docs/import-sim-results.md
 documentation/docs/index.md
 documentation/docs/mineral-properties.md

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/src/fmu_pem.egg-info/requires.txt

@@ -3,6 +3,7 @@ xtgeo>=4.7.1
 fmu-tools
 fmu-config
 fmu-dataio
+fmu-datamodels
 rock-physics-open>=0.3.3
 PyYAML>=6.0.1
 pydantic

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/tests/data/ert/model/run_pem_condensate.ert

@@ -8,6 +8,7 @@ DEFINE <PEM_CONFIG_FILE_NAME> pem_config_condensate_multi.yml
 DEFINE <GLOBAL_PATH> ../../fmuconfig/output
 DEFINE <GLOBAL_CONFIG_FILE> global_variables.yml
 DEFINE <MODEL_PATH> <CONFIG_PATH>/../../sim2seis/model
+DEFINE <MOD_PREFIX> HIST
 
 -- Run the PEM
-FORWARD_MODEL PEM(<CONFIG_DIR>=<PEM_PATH>, <CONFIG_FILE>=<PEM_CONFIG_FILE_NAME>, <GLOBAL_DIR>=<GLOBAL_PATH>, <GLOBAL_FILE>=<GLOBAL_CONFIG_FILE>, <MODEL_DIR>=<MODEL_PATH>)
+FORWARD_MODEL PEM(<CONFIG_DIR>=<PEM_PATH>, <CONFIG_FILE>=<PEM_CONFIG_FILE_NAME>, <GLOBAL_DIR>=<GLOBAL_PATH>, <GLOBAL_FILE>=<GLOBAL_CONFIG_FILE>, <MODEL_DIR>=<MODEL_PATH>, <MOD_DATE_PREFIX>=<MOD_PREFIX>)

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/tests/data/ert/model/run_pem_no_condensate.ert

@@ -8,6 +8,7 @@ DEFINE <PEM_CONFIG_FILE_NAME> pem_config_no_condensate.yml
 DEFINE <GLOBAL_PATH> ../../fmuconfig/output
 DEFINE <GLOBAL_CONFIG_FILE> global_variables.yml
 DEFINE <MODEL_PATH> <CONFIG_PATH>/../../sim2seis/model
+DEFINE <MOD_PREFIX> HIST
 
 -- Run the PEM
-FORWARD_MODEL PEM(<CONFIG_DIR>=<PEM_PATH>, <CONFIG_FILE>=<PEM_CONFIG_FILE_NAME>, <GLOBAL_DIR>=<GLOBAL_PATH>, <GLOBAL_FILE>=<GLOBAL_CONFIG_FILE>, <MODEL_DIR>=<MODEL_PATH>)
+FORWARD_MODEL PEM(<CONFIG_DIR>=<PEM_PATH>, <CONFIG_FILE>=<PEM_CONFIG_FILE_NAME>, <GLOBAL_DIR>=<GLOBAL_PATH>, <GLOBAL_FILE>=<GLOBAL_CONFIG_FILE>, <MODEL_DIR>=<MODEL_PATH>, <MOD_DATE_PREFIX>=<MOD_PREFIX>)

{fmu_pem-0.0.3 → fmu_pem-0.0.4}/tests/test_config_file_validation.py

@@ -3,16 +3,56 @@ from pathlib import Path
 import pytest
 
 from fmu.pem import INTERNAL_EQUINOR
-from fmu.pem.pem_utilities.import_config import read_pem_config
+from fmu.pem.pem_utilities.import_config import (
+    get_global_params_and_dates,
+    read_pem_config,
+)
 from src.fmu.pem.pem_utilities.import_config import find_key_first
 
 
 def test_validate_new_pem_config_multizone(testdata, monkeypatch, data_dir):
-    monkeypatch.chdir(data_dir / "sim2seis" / "model")
+    run_folder = data_dir / "sim2seis" / "model"
+    monkeypatch.chdir(run_folder)
+    global_dir = "../../fmuconfig/output"
+    global_file = "global_variables.yml"
+    obs_date_prefix = "HIST"
+    mod_date_prefix = "HIST"
     pem_config_file_name = Path("../../sim2seis/model/pem_config_condensate_multi.yml")
     if INTERNAL_EQUINOR:
         try:
+            config = read_pem_config(pem_config_file_name)
+            # Read necessary part of global configurations and parameters
+            config.update_with_global(
+                get_global_params_and_dates(
+                    global_config_dir=(run_folder / global_dir).resolve(),
+                    global_conf_file=global_file,
+                    mod_prefix=mod_date_prefix,
+                    obs_prefix=obs_date_prefix,
+                )
+            )
+        except Exception as e:
+            pytest.fail(f"Validation failed: {e}")
+    else:
+        with pytest.raises(NotImplementedError):
             _ = read_pem_config(pem_config_file_name)
+
+
+def test_validate_new_pem_config_multizone_no_prefix(testdata, monkeypatch, data_dir):
+    run_folder = data_dir / "sim2seis" / "model"
+    monkeypatch.chdir(run_folder)
+    global_dir = "../../fmuconfig/output"
+    global_file = "global_variables.yml"
+    pem_config_file_name = Path("../../sim2seis/model/pem_config_condensate_multi.yml")
+    if INTERNAL_EQUINOR:
+        try:
+            config = read_pem_config(pem_config_file_name)
+            # Read necessary part of global configurations and parameters
+            config.update_with_global(
+                get_global_params_and_dates(
+                    global_config_dir=(run_folder / global_dir).resolve(),
+                    global_conf_file=global_file,
+                )
+            )
         except Exception as e:
             pytest.fail(f"Validation failed: {e}")
     else:

fmu_pem-0.0.4/tests/test_pem.py

@@ -0,0 +1,105 @@
+from pathlib import Path
+
+import pytest
+
+from fmu.pem import INTERNAL_EQUINOR, pem, pem_fcn
+from fmu.pem.pem_utilities import (
+    PemConfig,
+    get_global_params_and_dates,
+    read_pem_config,
+)
+
+
+def setup(data_dir: Path, config_file: Path) -> tuple[PemConfig, Path]:
+    run_folder = data_dir / "sim2seis" / "model"
+    global_dir = Path("../../fmuconfig/output")
+    global_file = Path("global_variables.yml")
+
+    config = read_pem_config(yaml_file=run_folder / config_file)
+
+    config.update_with_global(
+        get_global_params_and_dates(
+            global_config_dir=(run_folder / global_dir).resolve(),
+            global_conf_file=global_file,
+            mod_prefix="HIST",
+            obs_prefix="HIST",
+        )
+    )
+    return config, run_folder
+
+
+def test_pem_fcn(data_dir, monkeypatch):
+    monkeypatch.chdir(data_dir / "sim2seis" / "model")
+
+    conf, config_dir = setup(
+        data_dir=data_dir,
+        config_file="pem_config_no_condensate.yml",
+    )
+
+    pem_fcn(
+        config=conf,
+        config_dir=config_dir,
+    )
+
+
+def test_pem_fcn_multi(data_dir, monkeypatch):
+    monkeypatch.chdir(data_dir / "sim2seis" / "model")
+
+    if not INTERNAL_EQUINOR:
+        with pytest.raises((NotImplementedError, ImportError)):
+            conf, config_dir = setup(
+                data_dir=data_dir,
+                config_file="pem_config_condensate_multi.yml",
+            )
+            pem_fcn(
+                config=conf,
+                config_dir=config_dir,
+            )
+    else:
+        conf, config_dir = setup(
+            data_dir=data_dir,
+            config_file="pem_config_condensate_multi.yml",
+        )
+        pem_fcn(
+            config=conf,
+            config_dir=config_dir,
+        )
+
+
+def test_pem_main(data_dir, monkeypatch):
+    monkeypatch.chdir(data_dir / "sim2seis" / "model")
+
+    if not INTERNAL_EQUINOR:
+        pem(
+            args_list=[
+                "--config-dir",
+                str((data_dir / "sim2seis" / "model").resolve()),
+                "--config-file",
+                "pem_config_no_condensate.yml",
+                "--global-dir",
+                "../../fmuconfig/output",
+                "--global-file",
+                "global_variables.yml",
+                "--model-dir",
+                str((data_dir / "sim2seis" / "model").resolve()),
+                "--mod-date-prefix",
+                "HIST",
+            ]
+        )
+    else:
+        pem(
+            args_list=[
+                "--config-dir",
+                str((data_dir / "sim2seis" / "model").resolve()),
+                "--config-file",
+                "pem_config_condensate_multi.yml",
+                "--global-dir",
+                "../../fmuconfig/output",
+                "--global-file",
+                "global_variables.yml",
+                "--model-dir",
+                str((data_dir / "sim2seis" / "model").resolve()),
+                "--mod-date-prefix",
+                "HIST",
+            ]
+        )

fmu_pem-0.0.3/tests/test_pem.py

@@ -1,45 +0,0 @@
-from pathlib import Path
-
-import pytest
-
-from fmu.pem import INTERNAL_EQUINOR, pem_fcn
-
-
-def test_pem_fcn(data_dir, monkeypatch):
-    monkeypatch.chdir(data_dir / "sim2seis" / "model")
-
-    if not INTERNAL_EQUINOR:
-        with pytest.raises((NotImplementedError, ImportError)):
-            pem_fcn(
-                config_dir=data_dir / "sim2seis" / "model",
-                pem_config_file_name=Path("pem_config_condensate.yml"),
-                global_config_dir=Path("../../fmuconfig/output"),
-                global_config_file=Path("global_variables.yml"),
-            )
-    else:
-        pem_fcn(
-            config_dir=data_dir / "sim2seis" / "model",
-            pem_config_file_name=Path("pem_config_condensate.yml"),
-            global_config_dir=Path("../../fmuconfig/output"),
-            global_config_file=Path("global_variables.yml"),
-        )
-
-
-def test_pem_fcn_multi(data_dir, monkeypatch):
-    monkeypatch.chdir(data_dir / "sim2seis" / "model")
-
-    if not INTERNAL_EQUINOR:
-        with pytest.raises((NotImplementedError, ImportError)):
-            pem_fcn(
-                config_dir=data_dir / "sim2seis" / "model",
-                pem_config_file_name=Path("pem_config_condensate_multi.yml"),
-                global_config_dir=Path("../../fmuconfig/output"),
-                global_config_file=Path("global_variables.yml"),
-            )
-    else:
-        pem_fcn(
-            config_dir=data_dir / "sim2seis" / "model",
-            pem_config_file_name=Path("pem_config_condensate_multi.yml"),
-            global_config_dir=Path("../../fmuconfig/output"),
-            global_config_file=Path("global_variables.yml"),
-        )