subscript 0.17.1__tar.gz → 1.1.0__tar.gz

{subscript-0.17.1 → subscript-1.1.0}/.flake8

@@ -1,3 +1,5 @@
 [flake8]
 max-line-length = 88
 ignore = E203, W503
+exclude =
+    src/subscript/version.py

{subscript-0.17.1 → subscript-1.1.0}/.github/workflows/publish.yml

@@ -1,9 +1,8 @@
 name: Publish to PyPI
 
 on:
-  push:
-    tags:
-      - '*'
+  release:
+    types: [published]
 
 jobs:
   pypi-publish:
@@ -26,6 +25,11 @@ jobs:
         with:
           python-version: 3.8
 
+      - name: Install build dependencies
+        run: |
+          pip install -U pip
+          pip install build
+
       - name: Build distributions
         run: python -m build
 

{subscript-0.17.1 → subscript-1.1.0}/.github/workflows/subscript.yml

@@ -66,7 +66,7 @@ jobs:
 
       - name: Lint with black
         if: ${{ always() }}
-        run: black --check *.py src tests
+        run: black --check src tests
 
       - name: Lint with flake8
         if: ${{ always() }}
@@ -78,11 +78,7 @@ jobs:
 
       - name: Run tests
         if: ${{ always() }}
-        run: |
-          pytest -n auto tests
-          # Check that repository is untainted by test code:
-          git status --porcelain
-          test -z "$(git status --porcelain)"
+        run: pytest -n auto tests
 
       - name: Syntax check documentation
         if: ${{ always() }}

{subscript-0.17.1 → subscript-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 0.17.1
+Version: 1.1.0
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -696,9 +696,48 @@ Classifier: Natural Language :: English
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: configsuite
+Requires-Dist: resdata
+Requires-Dist: ecl2df
+Requires-Dist: ert>=2.38.0b7
+Requires-Dist: fmu-tools
+Requires-Dist: matplotlib
+Requires-Dist: numpy<2
+Requires-Dist: opm>=2021.10
+Requires-Dist: pandas
+Requires-Dist: pyscal
+Requires-Dist: pyyaml
+Requires-Dist: rips
+Requires-Dist: scipy
+Requires-Dist: seaborn
+Requires-Dist: segyio
+Requires-Dist: shapely
+Requires-Dist: urllib3<2
+Requires-Dist: xlrd
+Requires-Dist: xtgeo
 Provides-Extra: tests
+Requires-Dist: black; extra == "tests"
+Requires-Dist: flake8; extra == "tests"
+Requires-Dist: isort; extra == "tests"
+Requires-Dist: mypy; extra == "tests"
+Requires-Dist: pytest; extra == "tests"
+Requires-Dist: pytest-cov; extra == "tests"
+Requires-Dist: pytest-mock; extra == "tests"
+Requires-Dist: pytest-xdist; extra == "tests"
+Requires-Dist: rstcheck; extra == "tests"
+Requires-Dist: rstcheck-core; extra == "tests"
+Requires-Dist: types-Jinja2; extra == "tests"
+Requires-Dist: types-PyYAML; extra == "tests"
+Requires-Dist: types-python-dateutil; extra == "tests"
 Provides-Extra: docs
-License-File: LICENSE
+Requires-Dist: autoapi; extra == "docs"
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-argparse; extra == "docs"
+Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
+Requires-Dist: sphinx-copybutton; extra == "docs"
+Requires-Dist: sphinx-togglebutton; extra == "docs"
+Requires-Dist: sphinx_rtd_theme; extra == "docs"
 
 # subscript
 

subscript-1.1.0/SECURITY.md

@@ -0,0 +1,16 @@
+If you discover a security vulnerability in this project, please follow these steps to responsibly disclose it:
+
+1. **Do not** create a public GitHub issue for the vulnerability.
+2. Follow our guideline for Responsible Disclosure Policy at [https://www.equinor.com/about-us/csirt](https://www.equinor.com/about-us/csirt) to report the issue
+
+The following information will help us triage your report more quickly:
+
+- Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+- Full paths of source file(s) related to the manifestation of the issue
+- The location of the affected source code (tag/branch/commit or direct URL)
+- Any special configuration required to reproduce the issue
+- Step-by-step instructions to reproduce the issue
+- Proof-of-concept or exploit code (if possible)
+- Impact of the issue, including how an attacker might exploit the issue
+
+We prefer all communications to be in English.

{subscript-0.17.1 → subscript-1.1.0}/docs/conf.py

@@ -48,6 +48,7 @@ release = version
 extensions = [
     "autoapi.sphinx",
     "sphinx_copybutton",
+    "sphinx_togglebutton",
     "sphinx.ext.autodoc",
     "sphinx.ext.autosummary",
     "sphinx.ext.inheritance_diagram",

subscript-1.1.0/docs/scripts/casegen_upcars.rst

@@ -0,0 +1,271 @@
+
+CASEGEN_UPCARS
+==============
+
+casegen_upcars is a script to generate simple conceptual models at different
+scales, containing different types of heterogeneity e.g. matrix, fracture, vug,
+fault, super-K layers etc. The script is developed as part of UpCaRs (Upscaling
+in complex carbonate reservoirs) project.
+
+Output from casegen_upcars is in the form of Eclipse simulation models. These
+models can be run to investigate the impact of changing geological properties on
+fluid flow.
+
+The script can generate various types of grid structures (tilting, dome, and
+hull) and throws. The input file is in yaml format.
+
+.. figure:: images/casegen_upcars_geometry.png
+   :align: center
+   :width: 90%
+
+|  
+
+.. admonition:: Example of configuration file
+   :class: dropdown
+
+   .. code:: yaml
+
+      # UpCaRs Case Generator Configuration File
+      General:
+      # Path to Eclipse template file ('--et','--ET','--eclTemplate')
+      TemplateFile : upcars_eclipse_ref_ss.tmpl
+      # BaseName of generated simulation files
+      #BaseName : AHM_<nCells>_LXY_<lx>_X_<ly>_M_GXY_<geometryFacX>_<geometryFacY>
+      BaseName : SMALL_SCALE
+      Seed : 12345
+
+      Geometry:
+      # Number of matrix/main element grid cells, x-direction ('--nMatrixX','--NMATRIXX','--nMatrixX')
+      CellMatrixX : [25,25]
+
+      # Increment in x-direction ('--dx','--DX','--incX')
+      dx : 0.08
+
+      # Number of matrix/main element grid cells, y-direction ('--nMatrixY','--NMATRIXY','--nMatrixY')
+      CellMatrixY : [25, 25]
+
+      # Increment in y-direction ('--dy','--DY','--incY')
+      dy : 0.08
+
+      # Top point of the model ('--top')
+      top : 1500.0
+
+      # Parameters  describing the shape of model
+      # Formula for top depth is defined as:
+      #      z : radius_z*(1.0 - (x-xo)² / radius_x² - (y-yo)² / radius_y²)^0.5 + (x - xo) * tan(tilt)
+      #    For slab, set radius_z to 0
+      #    For hull, set either radius_x or radius_y to very high number e.g. 1E999
+
+      # Curvature radius in x-direction for dome/hull shape ('--radiusX')
+      radius_x : 9000.0
+      # Curvature radius in y-direction for dome/hull shape ('--radiusY')
+      radius_y : 9000.0
+      # Curvature radius in z-direction for home/hull shape, set to zero for slab ('--radiusZ')
+      radius_z : 0.0
+      # Tilting angle in degree (relative to x-axis) ('--tilt')
+      tilt : 0.0
+      # Location of dome/hull top point, fraction to length of the model in X-direction ('--centroidX', '--centroid_x')
+      centroid_x : 0.5
+      # Location of dome/hull top point, fraction to length of the model in Y-direction ('--centroidY', '--centroid_y')
+      centroid_y : 0.5
+
+      Layers:
+      Background Matrix:
+         NZ : 50                   # Total number of cells in z-direction, including heterogeneous layers ('--matrix_nz)
+         dz : 0.02                 # Cell size in z-direction, only applied to background matrix ('--matrix_dz')
+         Porosity: 0.09            # background matrix porosity ('--matrix_poro')
+         Permeability: 5.0         # background matrix permeability ('--matrix_perm')
+         MULTX: 1.0                # background MULTX ('--matrix_multx')
+         MULTY: 1.0                # background MULTY ('--matrix_multy')
+         MULTPV: 1.0               # background MULTPV ('--matrix_multpv')
+         FIPNUM: 1                 # background FIPNUM ('--matrix_fipnum')
+         SATNUM: 1                 # background SATNUM ('--matrix_satnum')
+         SWATINIT: 0.2             # background SWATINIT ('--matrix_swatinit')
+      Streaks:
+         k: [25]                   # Streak start index ('--streak_k')
+         NZ: 1                     # Streak NZ, can be constant for all streaks or specified for each streak ('--streak_nz')
+         dz: 0.05                  # Streak dz, can be constant for all streaks or specified for each streak ('--streak_dz')
+         Porosity: 0.1             # Streak porosity, can be constant for all streaks or specified for each streak ('--streak_poro')
+         Permeability: 500.0       # Streak permeability, can be constant for all streaks or specified for each streak ('-streak_perm')
+         MULTX: 1.0                # Streak MULTX, can be constant for all streaks or specified for each streak ('--streak_multx')
+         MULTY: 1.0                # Streak MULTY, can be constant for all streaks or specified for each streak ('--streak_multy')
+         MULTPV: 1.0               # Streak MULTPV, can be constant for all streaks or specified for each streak ('--streak_multpv')
+         FIPNUM: 3                 # Streak FIPNUM, can be constant for all streaks or specified for each streak ('--streak_fipnum')
+         SATNUM: 2                 # Streak SATNUM, can be constant for all streaks or specified for each streak ('--streak_satnum')
+         SWATINIT: 0.2             # Streak SWATINIT, can be constant for all streaks or specified for each streak ('--streak_swatinit')
+         BoundingBox:  # Streak bounding box [i1, i2, j1, j2], can be single box for all streaks or specified for each streak
+
+      Throws:
+      # Define throws, can be left empty. Use '--throw' to specify the list of throws and '--no_throw' to remove all specified throws
+      # Start_region_in_x-_direction
+      i1 : []
+      # End_region_in_x-_direction
+      i2 : []
+      # Start_region in_y-_direction
+      j1 : []
+      # End_region_in_y-_direction
+      j2 : []
+      # Shift_amount_in_z-_direction
+      dz : []
+
+      Fracture:
+      # Flag to remove fracture at boundary ('--noBoundaryFracture', '--BoundaryFracture')
+      NoBoundaryFracture : No
+      # Fracture thickness ('--ft','--FT','--fractureThickness')
+      FractureThickness : 0.05
+      # Number of cells in fracture ('--ndz','--NDZ','--cellsDamageZone')
+      FractureCells  : 1
+
+      # Properties for fracture along x-axis
+      FractureX:
+         # Length of the fracture in fraction of model lx ('--fLengthX', '--FLENGTHX', '--flengthx')
+         Length: 1.0
+         # Offset of the fracture in fraction of model lx, will be adjusted to honor length ('--fOffsetX', '--FOFFSETX', '--foffsetx')
+         Offset: 0.0
+         # Height of the fracture in fraction of model lz ('--fHeightX', '--FHEIGHTX', '--fheightx')
+         Height: 1.0
+         # Z-offset of the fracture in fraction of model lz, will be adjusted to honor height ('--fVertOffsetX', '--FVERTOFFSETX', '--fvertoffsetx')
+         ZOffset: 0.0
+         # Fracture permeability for x-direction faults, can be a single value or list of values ('--fracPermX', '--FRACPERMX', '--fracpermx')
+         Permeability: 780.0
+
+      FractureY:
+         # Length of the fracture in fraction of model ly ('--fLengthY', '--FLENGTHY', '--flengthy')
+         Length: 1.0
+         # Offset of the fracture in fraction of model ly, will be adjusted to honor length ('--fOffsetY', '--FOFFSETY', '--foffsety')
+         Offset: 0
+         # Height of the fracture in fraction of model lz ('--fHeightY', '--FHEIGHTY', '--fheighty')
+         Height: 1.0
+         # Z-offset of the fracture in fraction of model lz, will be adjusted to honor height ('--fVertOffsetY', '--FVERTOFFSETY', '--fvertoffsety')
+         ZOffset: 0.0
+         # Fracture permeability for y-direction faults, can be a single value or list of values ('--fracPermY', '--FRACPERMY', '--fracpermy')
+         Permeability: 780.0
+
+      # Fracture porosity ('--porf','--PORF','--poroFracture')
+      Porosity : 0.1
+      # Fracture transmissibility multiplier in x- direction ('--multx','--MULTX','--multx')
+      MULTX : 1
+      # Fracture transmissibility multiplier in y- direction ('--multy','--MULTY','--multy')
+      MULTY : 1
+      # Fracture pore volume multiplier ('--pvDamage','--PVDAMAGE','--pvDamage')
+      MULTPV : 1
+      # Fracture FIPNUM ('--fipnumf','--FIPNUMF','--fipnumF')
+      FIPNUM : 2
+      # Fracture SATNUM ('--satnumf','--SATNUMF','--satnumF')
+      SATNUM : 2
+      # Fracture SWATINIT ('--swatinitf', '--SWATINITF', '--swatinitF')
+      SWATINIT : 1.0
+
+      Near Fracture Vug:
+      # Specify how many cells between fracture and vugs, put 0 to allow connection between fracture and vugs
+      Distance_to_fracture: 0
+      # Fraction of vugs to matrix, between 0 and 1 ('--vug1volume', '--VUG1VOLUME', '--vug1Volume')
+      Fraction :
+         Min : 0.0
+         Max : 0.0
+      # Spreading factor for near fracture vug. Small value will make vug concentrated near fracture ('--vug1Spread', '--VUG1SPREAD','--vug1_spread')
+      SpreadingFactor: 2.0
+      # Vug porosity interval, uniformly distributed ('--vug1Poro','--VUG1PORO','--vug1Poro')
+      Porosity :
+         Min : 0.1
+         Max : 0.1
+      # Vug permeability interval, uniformly distributed ('--vug1Perm','--VUG1PERM','--vug1Perm')
+      Permeability :
+         Min : 1000
+         Max : 10000
+      # Vugs transmissibility multiplier in x- direction ('--vug1MULTX', '--vug1multx')
+      MULTX : 1
+      # Vugs transmissibility multiplier in y- direction ('--vug1MULTY', '--vug1multy')
+      MULTY : 1
+      # Vugs pore volume multiplier ('--vug1MULTPV', '--vug1multpv')
+      MULTPV : 1
+      # Vugs FIPNUM ('--vug1FIPNUM', '--vug1fipnum')
+      FIPNUM : 3
+      # Vugs SATNUM ('--vug1SATNUM', '--vug1satnum')
+      SATNUM : 2
+      # Vugs initial water saturation ('--vug1SWATINIT', '--vug1swatinit')
+      SWATINIT : 1.0
+
+      Random Vug:
+      # Fraction of vugs to matrix, between 0 and 1  ('--vug2Volume', '--VUG2VOLUME', '--vug2Volume')
+      Fraction :
+         Min : 0.0
+         Max : 0.0
+      # Vug porosity interval, uniformly distributed ('--vug2Poro','--VUG2PORO','--vug2Poro')
+      Porosity :
+         Min : 0.1
+         Max : 0.1
+      # Vug permeability interval, uniformly distributed ('--vug2Perm','--VUG2PERM','--vug2Perm')
+      Permeability :
+         Min : 1000.0
+         Max : 10000.0
+      # Vugs transmissibility multiplier in x- direction ('--vug2MULTX', '--vug2multx')
+      MULTX : 1.0
+      # Vugs transmissibility multiplier in y- direction ('--vug2MULTY', '--vug2multy')
+      MULTY : 1.0
+      # Vugs pore volume multiplier ('--vug2MULTPV', '--vug2multpv')
+      MULTPV : 1.0
+      # Vugs FIPNUM ('--vug2FIPNUM', '--vug2fipnum')
+      FIPNUM : 4
+      # Vugs SATNUM ('--vug2SATNUM', '--vug2satnum')
+      SATNUM : 2
+      # Vugs initial water saturation.('--vug2SWATINIT', '--vug2swatinit')
+      SWATINIT : 1.0
+
+      Near Streak Vug:
+      # Specify how many cells between streak and vug, put 0 to allow connection between streak and vugs
+      Distance_to_streak: 1
+      # Fraction of vugs to matrix, between 0 and 1 ('--vug3volume', '--VUG3VOLUME', '--vug3Volume')
+      Fraction :
+         Min :  0.0
+         Max : 0.0
+      # Spreading factor for near fracture vug. Small value will make vug concentrated near fracture ('--vug3Spread', '--VUG3SPREAD','--vug3_spread')
+      SpreadingFactor: 2.0
+      # Vug porosity interval, uniformly distributed ('--vug3Poro','--VUG3PORO','--vug3Poro')
+      Porosity :
+         Min : 0.1
+         Max : 0.1
+      # Vug permeability interval, uniformly distributed ('--vug3Perm','--VUG3PERM','--vug3Perm')
+      Permeability :
+         Min : 1000
+         Max : 10000
+      # Vugs transmissibility multiplier in x- direction ('--vug3MULTX', '--vug3multx')
+      MULTX : 1
+      # Vugs transmissibility multiplier in y- direction ('--vug3MULTY', '--vug3multy')
+      MULTY : 1
+      # Vugs pore volume multiplier ('--vug3MULTPV', '--vug3multpv')
+      MULTPV : 1
+      # Vugs FIPNUM ('--vug3FIPNUM', '--vug3fipnum')
+      FIPNUM : 4
+      # Vugs SATNUM ('--vug3SATNUM', '--vug3satnum')
+      SATNUM : 2
+      # Vugs initial water saturation ('--vug3SWATINIT', '--vug3swatinit')
+      SWATINIT : 0.0
+
+      Variables:
+      # Optional variables that can be used as expression in template file
+      # Can be added/changed in command line using ('--var', '--VAR', '--Var')
+      # for example --var nx_prod 2
+
+      # Number of perforated blocks for production well in x-direction
+      nx_prod : 2
+      # Number of perforated blocks for injection well in y-direction
+      nx_inj : 3
+      # Permeability anisotropy
+      kvkh : 1
+      # Injection rate
+      injRate : 0.01
+      # Production rate
+      prodRate : 0.01   
+
+There is an ERT workflow which utilized casegen_upcars for sensitivity study.
+More information can be found in `wiki page <https://wiki.equinor.com/wiki/index.php/UpCaRs_Upscaling_casegenERT>`_
+
+Command line syntax
+-------------------
+
+.. argparse::
+   :module: subscript.casegen_upcars.casegen_upcars
+   :func: get_parser
+   :prog: casegen_upcars
+

{subscript-0.17.1 → subscript-1.1.0}/docs/scripts/co2_containment.rst

@@ -12,9 +12,8 @@ Calculates the amount of CO\ :sub:`2` inside and outside a given perimeter, and
 The most common use of the script is to calculate CO\ :sub:`2` mass. Options for calculation type input:
 
 * "mass": CO\ :sub:`2` mass (kg), the default option
-* "volume_extent": CO\ :sub:`2` volume (m\ :sup:`3`), a simple calculation finding the grid cells with some CO\ :sub:`2` and summing the volume of those cells
-* "volume_actual": CO\ :sub:`2` volume (m\ :sup:`3`), an attempt to calculate a more precise representative volume of CO\ :sub:`2`
-* "volume_actual_simple": CO\ :sub:`2` volume (m\ :sup:`3`), simplified version of "volume_actual"
+* "cell_volume": CO\ :sub:`2` volume (m\ :sup:`3`), a simple calculation finding the grid cells with some CO\ :sub:`2` and summing the volume of those cells
+* "actual_volume": CO\ :sub:`2` volume (m\ :sup:`3`), an attempt to calculate a more precise representative volume of CO\ :sub:`2`
 
 CSV file example
 ----------------------------

{subscript-0.17.1 → subscript-1.1.0}/docs/scripts/eclcompress.rst

@@ -76,9 +76,7 @@ Notes
   compressed file into account.
 - Eclipse loading time of the compressed file is probably reduced by the
   same factor as the compression factor.
-- Only known compressable keywords are compressed by default. If you wish
-  to specify particular keywords or a regex instead this can be provided
-  directly through the command line.
+- Only known compressable keywords are compressed.
 
 
 Possible improvements

{subscript-0.17.1 → subscript-1.1.0}/pyproject.toml

@@ -36,16 +36,14 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
     "configsuite",
-    "ecl",
+    "resdata",
     "ecl2df",
     "ert>=2.38.0b7",
     "fmu-tools",
     "matplotlib",
     "numpy<2",
     "opm>=2021.10",
-    "packaging",
     "pandas",
-    "protobuf",
     "pyscal",
     "pyyaml",
     "rips",
@@ -72,7 +70,6 @@ tests = [
     "rstcheck-core",
     "types-Jinja2",
     "types-PyYAML",
-    "types-pkg_resources",
     "types-python-dateutil",
 ]
 docs = [
@@ -81,6 +78,7 @@ docs = [
     "sphinx-argparse",
     "sphinx-autodoc-typehints",
     "sphinx-copybutton",
+    "sphinx-togglebutton",
     "sphinx_rtd_theme",
 ]
 
@@ -127,6 +125,16 @@ CsvStack = "subscript.csv_stack.csv_stack"
 FmuObs = "subscript.fmuobs.fmuobs"
 Params2Csv = "subscript.params2csv.params2csv"
 
+[tool.setuptools]
+script-files = [
+    "src/subscript/legacy/duf",
+    "src/subscript/legacy/eclmanual",
+    "src/subscript/legacy/ertwatch",
+    "src/subscript/legacy/list_rms_usage",
+    "src/subscript/legacy/nosim",
+    "src/subscript/legacy/runeclipse",
+]
+
 [tool.black]
 line-length = 88
 

{subscript-0.17.1 → subscript-1.1.0}/src/subscript/__init__.py

@@ -2,10 +2,10 @@ import logging
 import sys
 
 try:
-    import pkg_resources
+    from importlib import metadata
 
-    __version__ = pkg_resources.get_distribution(__name__).version
-except pkg_resources.DistributionNotFound:
+    __version__ = metadata.version(__name__)
+except metadata.PackageNotFoundError:
     pass
 
 

{subscript-0.17.1 → subscript-1.1.0}/src/subscript/check_swatinit/plotter.py

@@ -88,7 +88,7 @@ def visual_depth(qc_frame: pd.DataFrame) -> float:
 
 
 def swat_depth(
-    qc_frame: pd.DataFrame, axis: pyplot.Axes = None, hue: str = "QC_FLAG"
+    qc_frame: pd.DataFrame, axis: Optional[pyplot.Axes] = None, hue: str = "QC_FLAG"
 ) -> None:
     """Make a SWAT vs depth plot on current axis"""
     if axis is None:
@@ -103,7 +103,7 @@ def swat_depth(
 
 
 def swatinit_depth(
-    qc_frame: pd.DataFrame, axis: pyplot.Axes = None, hue: str = "QC_FLAG"
+    qc_frame: pd.DataFrame, axis: Optional[pyplot.Axes] = None, hue: str = "QC_FLAG"
 ) -> None:
     """Make a swatinit vs depth plot on current axis"""
     if axis is None:
@@ -118,7 +118,7 @@ def swatinit_depth(
 
 
 def pressure_depth(
-    qc_frame: pd.DataFrame, axis: pyplot.Axes = None, hue: str = "QC_FLAG"
+    qc_frame: pd.DataFrame, axis: Optional[pyplot.Axes] = None, hue: str = "QC_FLAG"
 ) -> None:
     """Make a pressure vs. depth plot on current axis"""
     if axis is None:
@@ -133,7 +133,7 @@ def pressure_depth(
 
 
 def pc_depth(
-    qc_frame: pd.DataFrame, axis: pyplot.Axes = None, hue: str = "QC_FLAG"
+    qc_frame: pd.DataFrame, axis: Optional[pyplot.Axes] = None, hue: str = "QC_FLAG"
 ) -> None:
     """Make a pc vs depth plot on current axis"""
     if axis is None:

{subscript-0.17.1 → subscript-1.1.0}/src/subscript/co2_containment/calculate.py

@@ -60,7 +60,7 @@ def calculate_co2_containment(
         hazardous_polygon (Union[Polygon,Multipolygon]): The polygon that defines
              the hazardous area
         calc_type (CalculationType): Which calculation is to be performed
-             (mass / volume_extent / volume_actual / volume_actual_simple)
+             (mass / cell_volume / actual_volume / actual_volume_simplified)
 
     Returns:
         List[ContainedCo2]
@@ -85,7 +85,7 @@ def calculate_co2_containment(
     is_inside = [x if not y else False for x, y in zip(is_contained, is_hazardous)]
     is_outside = [not x and not y for x, y in zip(is_contained, is_hazardous)]
     if co2_data.zone is None:
-        if calc_type == CalculationType.VOLUME_EXTENT:
+        if calc_type == CalculationType.CELL_VOLUME:
             return [
                 c
                 for w in co2_data.data_list
@@ -131,7 +131,7 @@ def calculate_co2_containment(
             ]
         ]
     zone_map = {z: co2_data.zone == z for z in np.unique(co2_data.zone)}
-    if calc_type == CalculationType.VOLUME_EXTENT:
+    if calc_type == CalculationType.CELL_VOLUME:
         return [
             c
             for w in co2_data.data_list