subscript 1.6.0__tar.gz → 1.6.2__tar.gz

{subscript-1.6.0 → subscript-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.6.0
+Version: 1.6.2
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -700,11 +700,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: resdata
 Requires-Dist: res2df
-Requires-Dist: ert>=2.38.0b7
+Requires-Dist: ert
+Requires-Dist: ert>=10.2.0b13
 Requires-Dist: fmu-tools
 Requires-Dist: matplotlib
 Requires-Dist: numpy<2
-Requires-Dist: opm>=2021.10
+Requires-Dist: opm>=2023.04
 Requires-Dist: pandas
 Requires-Dist: pyscal
 Requires-Dist: pyyaml

{subscript-1.6.0 → subscript-1.6.2}/pyproject.toml

@@ -38,11 +38,12 @@ dynamic = ["version"]
 dependencies = [
     "resdata",
     "res2df",
-    "ert>=2.38.0b7",
+    "ert",
+    "ert>=10.2.0b13",
     "fmu-tools",
     "matplotlib",
     "numpy<2",
-    "opm>=2021.10",
+    "opm>=2023.04",
     "pandas",
     "pyscal",
     "pyyaml",

{subscript-1.6.0 → subscript-1.6.2}/src/subscript/csv_merge/csv_merge.py

@@ -7,9 +7,9 @@ import re
 import sys
 from typing import Dict, List, Optional
 
+import ert
 import pandas as pd
 from ert.config import ErtScript
-from ert.shared.plugins.plugin_manager import hook_implementation  # type: ignore
 
 from subscript import __version__, getLogger
 from subscript.eclcompress.eclcompress import glob_patterns
@@ -317,7 +317,7 @@ def csv_merge_main(
     logger.info(" - Finished writing to %s", output)
 
 
-@hook_implementation
+@ert.plugin(name="subscript")
 def legacy_ertscript_workflow(config):
     """Hook the CsvMerge class into ERT with the name CSV_MERGE,
     and inject documentation"""

{subscript-1.6.0 → subscript-1.6.2}/src/subscript/csv_stack/csv_stack.py

@@ -8,9 +8,9 @@ import sys
 import warnings
 from typing import Pattern
 
+import ert
 import pandas as pd
 from ert.config import ErtScript
-from ert.shared.plugins.plugin_manager import hook_implementation  # type: ignore
 
 from subscript import __version__, getLogger
 
@@ -334,7 +334,7 @@ def csv_stack(
     return dframe.reset_index(drop=True)
 
 
-@hook_implementation
+@ert.plugin(name="subscript")
 def legacy_ertscript_workflow(config) -> None:
     """Hook the CsvStack class into ERT with the name CSV_STACK,
     and inject documentation"""

{subscript-1.6.0 → subscript-1.6.2}/src/subscript/fmuobs/fmuobs.py

@@ -9,10 +9,10 @@ import sys
 from pathlib import Path
 from typing import Optional, Tuple, Union
 
+import ert
 import pandas as pd
 import yaml
 from ert.config import ErtScript
-from ert.shared.plugins.plugin_manager import hook_implementation  # type: ignore
 
 from subscript import __version__, getLogger
 from subscript.fmuobs.parsers import (
@@ -456,7 +456,7 @@ class FmuObs(ErtScript):
         fmuobs(**vars(parsed_args))
 
 
-@hook_implementation
+@ert.plugin(name="subscript")
 def legacy_ertscript_workflow(config):
     """A hook for usage of this script in an ERT workflow,
     using the legacy hook format."""

{subscript-1.6.0 → subscript-1.6.2}/src/subscript/hook_implementations/jobs.py

@@ -3,8 +3,7 @@ import os
 import pkgutil
 from typing import Any, Optional
 
-from ert.shared.plugins.plugin_manager import hook_implementation
-from ert.shared.plugins.plugin_response import plugin_response
+import ert
 
 # pylint: disable=no-value-for-parameter
 
@@ -26,15 +25,13 @@ def _get_jobs_from_directory(directory):
     return {os.path.basename(path): path for path in all_files}
 
 
-@hook_implementation
-@plugin_response(plugin_name="subscript")
+@ert.plugin(name="subscript")
 def installable_jobs():
     """Get the jobs/forward models exposed by subscript"""
     return _get_jobs_from_directory("config_jobs")
 
 
-@hook_implementation
-@plugin_response(plugin_name="subscript")
+@ert.plugin(name="subscript")
 def installable_workflow_jobs():
     """Get the workflow jobs exposed by subscript"""
     return {}
@@ -52,8 +49,7 @@ def _get_module_variable_if_exists(
     return getattr(script_module, variable_name, default)
 
 
-@hook_implementation
-@plugin_response(plugin_name="subscript")
+@ert.plugin(name="subscript")
 def job_documentation(job_name: str) -> Optional[dict]:
     """Build documentation for a specific job.
 

{subscript-1.6.0 → subscript-1.6.2}/src/subscript/legacy/runeclipse

@@ -8,15 +8,26 @@ use Cwd;
 use IO::File;
 
 # ------------------------------------------------------
+my $hostname           = `hostname`;
+my $_balance     = `date +%s`;
 
+$_balance = $_balance % 2;
+my $lisens = "7321\@eclipse1-lic-no.statoil.no:7321\@eclipse2-lic-no.statoil.no";
+if ($_balance == 1) {
+    $lisens = "7321\@eclipse2-lic-no.statoil.no:7321\@eclipse1-lic-no.statoil.no";
+}
+
+if (index($hostname, "stjohn-") == 0) {
+    $lisens = "7321\@stjohn-grid01.stjohn.statoil.no:$lisens";
+} elsif (index($hostname, "rio-") == 0) {
+    $lisens = "7321\@rio-grid01.rio.statoil.no:$lisens";
+}
 
 my $ecldir       = "/prog/res/ecl/grid";
 my $eclolddir    = "/prog/ecl/grid";
 my $ecltestdir   = "/prog/res/ecl/testgrid";
 my $mpiintelroot = "/prog/res/ecl/grid/tools/linux_x86_64/intel/mpi/2018.1.163";
 
-my $lisens = "7321\@eclipse-lic-no.statoil.no";
-
 my $extconfig   = "macros/CONFIG.ECL";
 my $extmpirun64 = "tools/linux_x86_64/mpich_x86_64/bin/mpirun";
 
@@ -73,7 +84,7 @@ my $workdir = cwd;
 my $scriptname = "runeclipse";
 
 my $usage =
-  "usage $scriptname  [-p program] [-q que_name] [-v version] [-x]  [-i] root";
+    "usage $scriptname  [-p program] [-q que_name] [-v version] [-x]  [-i] root";
 
 #
 # Get command line options:
@@ -400,7 +411,7 @@ sub build_batch {
     if ($testversion) {
         print BATCHFIL "echo \"*** RUNNING TEST VERSION $version ****\"\n";
     }
-    print BATCHFIL "export LM_LICENSE_FILE=$lisens\n";
+    print BATCHFIL "export SLBSLS_LICENSE_FILE=$lisens\n";
     print BATCHFIL "export F_UFMTENDIAN=big\n";
     print BATCHFIL "export ARCH=\`uname -m\`\n";
     print BATCHFIL "cd $workdir\n";
@@ -437,7 +448,7 @@ sub build_parallel_batch {
       or die "$scriptname: Cannot create batch file $batchfilename\n";
 
     print BATCHFIL "#!/bin/sh \n";
-    print BATCHFIL "export LM_LICENSE_FILE=$lisens\n";
+    print BATCHFIL "export SLBSLS_LICENSE_FILE=$lisens\n";
 
     #    print BATCHFIL
     #        "export FLEXLM_NO_CKOUT_INSTALL_LIC=1\n" ;

{subscript-1.6.0 → subscript-1.6.2}/src/subscript/params2csv/params2csv.py

@@ -12,9 +12,9 @@ import shutil
 from glob import glob
 from pathlib import Path
 
+import ert
 import pandas as pd
 from ert.config import ErtScript
-from ert.shared.plugins.plugin_manager import hook_implementation  # type: ignore
 
 from subscript import __version__, getLogger
 
@@ -39,19 +39,19 @@ EXAMPLES = """
 .. code-block:: console
 
   FORWARD_MODEL PARAMS2CSV(<PARAMETERFILES>=parameters.txt, <OUTPUT>=parameters.csv)
- 
-This forward model will convert all keys in `parameters.txt` to columns in 
-`parameters.csv`. 
 
-In addition, it will add a column `filename` which list the source parameters.txt file. 
+This forward model will convert all keys in `parameters.txt` to columns in
+`parameters.csv`.
+
+In addition, it will add a column `filename` which list the source parameters.txt file.
 This column will be useful when <PARAMETERFILES> contains wildcards.
 
 The `filename` column can be renamed by adding an argument <FILENAMECOLUMN> to the FORWARD_MODEL.
-    
+
 .. code-block:: console
 
   FORWARD_MODEL PARAMS2CSV(<PARAMETERFILES>=parameters.txt, <OUTPUT>=parameters.csv,<FILENAMECOLUMN>=source_file)
-  
+
 """  # noqa
 
 # The following string is used for the ERT workflow documentation, note
@@ -66,7 +66,7 @@ Add to your ERT config to have the workflow loaded upon launching::
 
   LOAD_WORKFLOW ../bin/workflows/wf_params2csv_iter0
 
-It is then possible to run the workflow either through ERT CLI or GUI. 
+It is then possible to run the workflow either through ERT CLI or GUI.
 
 Wildcards can be used to extract parameters from multiple iterations,
 this is done in the example below. Note also the use of ``HOOK_WORKFLOW`` to automatically
@@ -263,7 +263,7 @@ def main() -> None:
     params2csv_main(args)
 
 
-@hook_implementation
+@ert.plugin(name="subscript")
 def legacy_ertscript_workflow(config) -> None:
     """Hook the CsvStack class into ERT with the name PARAMS2CSV,
     and inject documentation"""

{subscript-1.6.0 → subscript-1.6.2}/src/subscript/sunsch/time_vector.py

@@ -3,13 +3,15 @@
 import datetime
 from operator import attrgetter
 
-from opm.io.parser import Parser
-
 try:
     from StringIO import StringIO
 except ImportError:
     from io import StringIO
 
+import opm.io
+from opm.io.parser import ParseContext, Parser
+
+error_actions = [("PARSE_INVALID_KEYWORD_COMBINATION", opm.io.action.ignore)]
 
 # This is from the TimeMap.cpp implementation in opm
 ecl_month = {
@@ -55,7 +57,6 @@ def _make_datetime(dates_record):
     date_dt = datetime.datetime(year, ecl_month[month], day)
     if len(dates_record) < 4:
         return date_dt
-
     time_str = dates_record[3].get_str(0)
     time_list = time_str.split(":")
     hour = minute = second = microsecond = 0
@@ -270,12 +271,13 @@ class TimeVector(object):
 
         self._add_dates_block(ts)
         start_dt = datetime.datetime(start_date.year, start_date.month, start_date.day)
+        parse_context = ParseContext(error_actions)
         if base_file:
-            deck = Parser().parse(base_file)
+            deck = Parser().parse(base_file, parse_context)
             self._add_deck(deck, start_dt)
 
         if base_string:
-            deck = Parser().parse_string(base_string)
+            deck = Parser().parse_string(base_string, parse_context)
             self._add_deck(deck, start_dt)
 
     def __len__(self):
@@ -301,7 +303,6 @@ class TimeVector(object):
         """
         if isinstance(index, int):
             return self.time_steps_list[index]
-
         if not isinstance(index, datetime.datetime) and isinstance(
             index, datetime.date
         ):
@@ -390,14 +391,16 @@ class TimeVector(object):
             tv.load("well.sch", date = datetime.datetime(2017, 4, 1))
 
         """
-        deck = Parser().parse(filename)
+        parse_context = ParseContext(error_actions)
+        deck = Parser().parse(filename, parse_context)
         self._add_deck(deck, date)
 
     def load_string(self, deck_string, date=None):
         """
         Like load() - but load from a string literal instead of file.
         """
-        deck = Parser().parse_string(deck_string)
+        parse_context = ParseContext(error_actions)
+        deck = Parser().parse_string(deck_string, parse_context)
         self._add_deck(deck, date)
 
     def __str__(self):

{subscript-1.6.0 → subscript-1.6.2}/src/subscript/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.0'
-__version_tuple__ = version_tuple = (1, 6, 0)
+__version__ = version = '1.6.2'
+__version_tuple__ = version_tuple = (1, 6, 2)

{subscript-1.6.0 → subscript-1.6.2}/src/subscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.6.0
+Version: 1.6.2
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -700,11 +700,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: resdata
 Requires-Dist: res2df
-Requires-Dist: ert>=2.38.0b7
+Requires-Dist: ert
+Requires-Dist: ert>=10.2.0b13
 Requires-Dist: fmu-tools
 Requires-Dist: matplotlib
 Requires-Dist: numpy<2
-Requires-Dist: opm>=2021.10
+Requires-Dist: opm>=2023.04
 Requires-Dist: pandas
 Requires-Dist: pyscal
 Requires-Dist: pyyaml

{subscript-1.6.0 → subscript-1.6.2}/src/subscript.egg-info/requires.txt

@@ -1,10 +1,11 @@
 resdata
 res2df
-ert>=2.38.0b7
+ert
+ert>=10.2.0b13
 fmu-tools
 matplotlib
 numpy<2
-opm>=2021.10
+opm>=2023.04
 pandas
 pyscal
 pyyaml

{subscript-1.6.0 → subscript-1.6.2}/tests/conftest.py

@@ -2,6 +2,7 @@ import shutil
 from os import path
 
 import pytest
+
 import subscript
 
 

{subscript-1.6.0 → subscript-1.6.2}/tests/test_bjobsusers.py

@@ -3,6 +3,7 @@ import subprocess
 
 import pandas as pd
 import pytest
+
 from subscript.bjobsusers import bjobsusers
 
 

{subscript-1.6.0 → subscript-1.6.2}/tests/test_casegen_upcars.py

@@ -8,6 +8,7 @@ from pathlib import Path
 import opm.io
 import pandas as pd
 import pytest
+
 from subscript.casegen_upcars import casegen_upcars
 
 TESTDATA = "testdata_casegen_upcars"

{subscript-1.6.0 → subscript-1.6.2}/tests/test_check_swatinit.py

@@ -6,6 +6,7 @@ import numpy as np
 import pandas as pd
 import pytest
 from matplotlib import pyplot
+
 from subscript.check_swatinit.check_swatinit import (
     __FINE_EQUIL__,
     __HC_BELOW_FWL__,

{subscript-1.6.0 → subscript-1.6.2}/tests/test_check_swatinit_simulators.py

@@ -17,6 +17,7 @@ import numpy as np
 import pandas as pd
 import pytest
 import res2df
+
 from subscript.check_swatinit.check_swatinit import (
     __HC_BELOW_FWL__,
     __PC_SCALED__,

{subscript-1.6.0 → subscript-1.6.2}/tests/test_convert_grid_format.py

@@ -4,8 +4,9 @@ import subprocess
 from pathlib import Path
 
 import pytest
-import subscript.convert_grid_format.convert_grid_format as cgf
 import xtgeo
+
+import subscript.convert_grid_format.convert_grid_format as cgf
 from subscript import getLogger
 
 logger = getLogger(__name__)

{subscript-1.6.0 → subscript-1.6.2}/tests/test_csv2ofmvol.py

@@ -7,6 +7,7 @@ from pathlib import Path
 import numpy as np
 import pandas as pd
 import pytest
+
 from subscript.csv2ofmvol import csv2ofmvol
 from subscript.ofmvol2csv import ofmvol2csv
 

{subscript-1.6.0 → subscript-1.6.2}/tests/test_csv_merge.py

@@ -6,6 +6,7 @@ from pathlib import Path
 
 import pandas as pd
 import pytest
+
 from subscript.csv_merge import csv_merge
 
 try:

{subscript-1.6.0 → subscript-1.6.2}/tests/test_csv_stack.py

@@ -7,6 +7,7 @@ from pathlib import Path
 
 import pandas as pd
 import pytest
+
 from subscript.csv_stack import csv_stack
 
 try:

{subscript-1.6.0 → subscript-1.6.2}/tests/test_eclcompress.py

@@ -9,6 +9,7 @@ from pathlib import Path
 import numpy as np
 import opm.io
 import pytest
+
 from subscript.eclcompress.eclcompress import (
     compress_multiple_keywordsets,
     eclcompress,

{subscript-1.6.0 → subscript-1.6.2}/tests/test_ecldiff2roff.py

@@ -7,6 +7,7 @@ from pathlib import Path
 import numpy as np
 import pytest
 import xtgeo
+
 from subscript import getLogger
 from subscript.ecldiff2roff import ecldiff2roff
 

{subscript-1.6.0 → subscript-1.6.2}/tests/test_fmu_copy_revision.py

@@ -5,6 +5,7 @@ import time
 from pathlib import Path
 
 import pytest
+
 import subscript.fmu_copy_revision.fmu_copy_revision as fcr
 
 SCRIPTNAME = "fmu_copy_revision"

{subscript-1.6.0 → subscript-1.6.2}/tests/test_fmuobs.py

@@ -9,6 +9,7 @@ from pathlib import Path
 import pandas as pd
 import pytest
 import yaml
+
 from subscript.fmuobs.fmuobs import autoparse_file, main
 from subscript.fmuobs.parsers import ertobs2df, obsdict2df, resinsight_df2df
 from subscript.fmuobs.writers import df2ertobs, df2obsdict, df2resinsight_df

{subscript-1.6.0 → subscript-1.6.2}/tests/test_fmuobs_parsers.py

@@ -9,6 +9,7 @@ from pathlib import Path
 
 import pandas as pd
 import pytest
+
 from subscript.fmuobs.parsers import (
     INCLUDE_RE,
     OBS_ARGS_RE,

{subscript-1.6.0 → subscript-1.6.2}/tests/test_fmuobs_writers.py

@@ -7,6 +7,7 @@ import datetime
 import numpy as np
 import pandas as pd
 import pytest
+
 from subscript.fmuobs.parsers import ertobs2df
 from subscript.fmuobs.writers import (
     block_df2obsdict,

{subscript-1.6.0 → subscript-1.6.2}/tests/test_grav_subs_maps.py

@@ -6,6 +6,7 @@ from pathlib import Path
 import pytest
 import yaml
 from pydantic import ValidationError
+
 from subscript.grav_subs_maps import grav_subs_maps
 from subscript.grav_subs_maps.grav_subs_maps import GravMapsConfig
 

{subscript-1.6.0 → subscript-1.6.2}/tests/test_hook_implementations.py

@@ -4,8 +4,9 @@ from pathlib import Path
 
 import pytest
 import rstcheck_core.checker
+from ert.plugins.plugin_manager import ErtPluginManager
+
 import subscript.hook_implementations.jobs
-from ert.shared.plugins.plugin_manager import ErtPluginManager
 
 # pylint: disable=redefined-outer-name
 

{subscript-1.6.0 → subscript-1.6.2}/tests/test_interp_relperm.py

@@ -9,6 +9,7 @@ from pydantic import ValidationError
 from pyscal import PyscalFactory
 from pyscal.utils.testing import sat_table_str_ok
 from res2df import satfunc
+
 from subscript.interp_relperm import interp_relperm
 from subscript.interp_relperm.interp_relperm import InterpRelpermConfig
 

{subscript-1.6.0 → subscript-1.6.2}/tests/test_merge_rft_ertobs.py

@@ -7,6 +7,7 @@ from pathlib import Path
 import numpy as np
 import pandas as pd
 import pytest
+
 from subscript import getLogger
 from subscript.merge_rft_ertobs.merge_rft_ertobs import (
     get_observations,

{subscript-1.6.0 → subscript-1.6.2}/tests/test_merge_unrst_files.py

@@ -4,6 +4,7 @@ from pathlib import Path
 
 import pytest
 import resfo
+
 from subscript.merge_unrst_files import merge_unrst_files
 
 UNRST_HIST = (

{subscript-1.6.0 → subscript-1.6.2}/tests/test_ofmvol2csv.py

@@ -6,6 +6,7 @@ from pathlib import Path
 
 import pandas as pd
 import pytest
+
 from subscript.csv2ofmvol import csv2ofmvol
 from subscript.ofmvol2csv import ofmvol2csv
 

{subscript-1.6.0 → subscript-1.6.2}/tests/test_pack_sim.py

@@ -5,6 +5,7 @@ import subprocess
 from pathlib import Path
 
 import pytest
+
 from subscript.pack_sim import pack_sim
 
 ECLDIR = Path(__file__).absolute().parent / "data" / "reek" / "eclipse" / "model"

{subscript-1.6.0 → subscript-1.6.2}/tests/test_params2csv.py

@@ -4,6 +4,7 @@ from pathlib import Path
 
 import pandas as pd
 import pytest
+
 from subscript.params2csv import params2csv
 
 try:

{subscript-1.6.0 → subscript-1.6.2}/tests/test_presentvalue.py

@@ -8,6 +8,7 @@ import pandas as pd
 import pytest
 import res2df
 from resdata.summary import Summary
+
 from subscript.presentvalue import presentvalue
 
 ECLDIR = Path(__file__).absolute().parent / "data" / "reek" / "eclipse" / "model"

{subscript-1.6.0 → subscript-1.6.2}/tests/test_prtvol2csv.py

@@ -10,6 +10,7 @@ import pandas as pd
 import pytest
 import yaml
 from fmu.tools.fipmapper.fipmapper import FipMapper
+
 from subscript.prtvol2csv import prtvol2csv
 
 TESTDATADIR = Path(__file__).absolute().parent / "data/reek/eclipse/model"

{subscript-1.6.0 → subscript-1.6.2}/tests/test_restartthinner.py

@@ -4,6 +4,7 @@ import subprocess
 from pathlib import Path
 
 import pytest
+
 from subscript.restartthinner import restartthinner
 
 ECLDIR = Path(__file__).absolute().parent / "data/reek/eclipse/model"

{subscript-1.6.0 → subscript-1.6.2}/tests/test_ri_wellmod.py

@@ -3,6 +3,7 @@ import subprocess
 from pathlib import Path
 
 import pytest
+
 from subscript.ri_wellmod import ri_wellmod
 
 SCRIPTNAME = "ri_wellmod"

{subscript-1.6.0 → subscript-1.6.2}/tests/test_rmsecl_volumetrics.py

@@ -6,6 +6,7 @@ import pandas as pd
 import pytest
 import yaml
 from fmu.tools.fipmapper import fipmapper
+
 from subscript.rmsecl_volumetrics.rmsecl_volumetrics import (
     _compare_volumetrics,
     _disjoint_sets_to_dict,

{subscript-1.6.0 → subscript-1.6.2}/tests/test_sector2fluxnum.py

@@ -2,6 +2,7 @@ import os
 from pathlib import Path
 
 import pytest
+
 from subscript.sector2fluxnum import sector2fluxnum
 
 TESTDATA = Path(__file__).absolute().parent / "testdata_sector2fluxnum"

{subscript-1.6.0 → subscript-1.6.2}/tests/test_summaryplot.py

@@ -5,6 +5,7 @@ from pathlib import Path
 
 import pytest
 from resdata.summary import Summary
+
 from subscript.summaryplot import summaryplot
 
 DATAFILE = Path(__file__).parent / "data/reek/eclipse/model/2_R001_REEK-0.DATA"

{subscript-1.6.0 → subscript-1.6.2}/tests/test_sunsch.py

@@ -7,6 +7,7 @@ from pathlib import Path
 import pytest  # noqa: F401
 import yaml
 from pydantic import ValidationError
+
 from subscript.sunsch import sunsch
 
 DATADIR = Path(__file__).absolute().parent / "testdata_sunsch"