pyrestoolbox 3.7.6__tar.gz → 3.7.7__tar.gz

{pyrestoolbox-3.7.6 → pyrestoolbox-3.7.7}/Cargo.lock

@@ -152,7 +152,7 @@ dependencies = [
 
 [[package]]
 name = "pyrestoolbox-native"
-version = "3.7.6"
+version = "3.7.7"
 dependencies = [
  "pyo3",
  "rug",

{pyrestoolbox-3.7.6 → pyrestoolbox-3.7.7}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pyrestoolbox-native"
-version = "3.7.6"
+version = "3.7.7"
 edition = "2021"
 license = "GPL-3.0-or-later"
 description = "Rust acceleration extensions for pyResToolbox"

{pyrestoolbox-3.7.6 → pyrestoolbox-3.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrestoolbox
-Version: 3.7.6
+Version: 3.7.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Rust
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)

{pyrestoolbox-3.7.6 → pyrestoolbox-3.7.7}/mcp/pyrestoolbox_mcp/server.py

@@ -46,6 +46,13 @@ mcp = FastMCP(
         "recommend_methods(...) if unsure which correlation method suits a "
         "fluid. All inputs default to oilfield units (psia, deg F, ft, mD, "
         "cP); pass metric=True for Eclipse METRIC units where supported. "
+        "IMPORTANT: parameter NAMES keep their oilfield spelling under "
+        "metric=True. `degf` then takes deg C, `p`/`pr`/`pwf` take barsa, and "
+        "lengths take m; the docstring unit notation `(deg F | deg C)` gives "
+        "the field value first and the metric value second. Passing a "
+        "Fahrenheit value to `degf` with metric=True converts it twice and "
+        "returns a wrong answer silently. Standard volumes are always at "
+        "60 deg F and 14.696 psia, so metric sm3 is on that basis. "
         "Full module documentation is available as docs:// resources."
     ),
 )
@@ -104,6 +111,11 @@ def describe(name: str) -> str:
 
     name is 'module.function', e.g. 'gas.gas_z' or 'dca.fit_decline'.
     Also see the docs://<module> resources for worked examples.
+
+    Units live in the docstring, not the signature, which is why annotations
+    are stripped below. A parameter documented `(deg F | deg C)` takes the
+    first under the default and the second when metric=True; the parameter
+    name itself never changes.
     """
     _, obj = _resolve(name)
     target = obj.__init__ if inspect.isclass(obj) else obj
@@ -128,6 +140,10 @@ def call(name: str, arguments: dict = {}) -> dict:
 
     name is 'module.function', e.g. 'gas.gas_z'. arguments is a JSON object
     of keyword arguments, e.g. {"p": 2000, "sg": 0.75, "degf": 200}.
+    That example is oilfield units. With {"metric": true} the same keys take
+    metric values, so `degf` would be deg C and `p` barsa; the names do not
+    change. Call describe(name) first and read its unit notation: `(deg F |
+    deg C)` means field first, metric second.
     Correlation methods are strings (e.g. "zmethod": "DAK"); an invalid
     method string returns an error listing the valid options. Gas and brine
     functions accept lists for pressure-like inputs; oil functions are

{pyrestoolbox-3.7.6 → pyrestoolbox-3.7.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "pyrestoolbox"
-version = "3.7.6"
+version = "3.7.7"
 description = "pyResToolbox - A collection of Reservoir Engineering Utilities"
 license = {text = "GPL-3.0-or-later"}
 authors = [{name = "Mark W. Burgoyne", email = "mark.w.burgoyne@gmail.com"}]

{pyrestoolbox-3.7.6 → pyrestoolbox-3.7.7}/pyrestoolbox/brine/pr_vphi.py

@@ -107,12 +107,12 @@ _SW_NAME = {'NC4H10': 'nC4H10'}
 # measurements only by `fit_pr_vshift.py`. Regenerate with that script if any
 # calibration point changes; the values below are pinned in validation.py.
 VSHIFT = {
-    'CH4':  -0.109632,
-    'CO2':  -0.037913,
-    'H2S':  -0.078975,
-    'N2':   -0.176510,
-    'H2':   -0.177625,
-    'C2H6': -0.073142,
+    'CH4':  -0.111430,
+    'CO2':  -0.038965,
+    'H2S':  -0.079740,
+    'N2':   -0.176768,
+    'H2':   -0.178503,
+    'C2H6': -0.073843,
     # C3H8 added 2026-07-25. NOT fitted to a densimetric data set, because none
     # exists for propane in water. Set from the only two direct 298 K
     # determinations available, Moore (1982) 70.7 and Zhou & Battino (2001)
@@ -120,7 +120,7 @@ VSHIFT = {
     # is their mean, giving V_phi = 72.85 at 298 K. Those two disagree by 6.1%,
     # which is the honest uncertainty on this gas and is far wider than for any
     # other. It replaces a fallback that sat BELOW both of them (66.99).
-    'C3H8': -0.112963,
+    'C3H8': -0.113326,
     # NC4H10 added 2026-07-25 from Moore (1982) Table I, 76.6 +/- 0.1 cm3/mol
     # (2 runs; his stated overall imprecision is +/-1.5). Two oddities that
     # should not be smoothed over: the shift is POSITIVE, alone among the
@@ -128,7 +128,7 @@ VSHIFT = {
     # run +18.4, +17.8, then +5.9). Adopted because it is the only direct
     # measurement of this quantity, but it is a single lab and two runs, and
     # C4 sits outside the five-gas validated scope.
-    'NC4H10': +0.110924,
+    'NC4H10': +0.110920,
 }
 
 # Gases whose shift rests on 298 K data alone, so their temperature behaviour is
@@ -213,10 +213,12 @@ def V2_inf_raw(gas, T, P, m_nacl=0.0):
     # Switched from finite differences 2026-07-31; the difference evaluation
     # agrees to 4e-5 cm3/mol, its truncation error.
     v = v_water_liquid(T, P, m_nacl)
-    # Pinned to the 'mc3' kij_AQ set, which is what the VSHIFT values below were
-    # fitted against. This must not follow the library's default framework: the
-    # shift and the kij are one calibration and cannot be mixed across sets.
-    kij = _SW.get_kij_aq(_SW_NAME.get(gas, gas), T, m_nacl, framework='mc3')
+    # Pinned to the 'default' kij_AQ set (the published S&W-refresh
+    # recommendation), which is what the VSHIFT values below are fitted
+    # against since 2026-09-01. The pin stays explicit even while it matches
+    # the library default: the shift and the kij are one calibration and must
+    # not silently follow a future default move.
+    kij = _SW.get_kij_aq(_SW_NAME.get(gas, gas), T, m_nacl, framework='default')
     a1, b1 = _ab('H2O', T, m_nacl)
     a2, b2 = _ab(gas, T)
     a12 = np.sqrt(a1 * a2) * (1.0 - kij)

{pyrestoolbox-3.7.6 → pyrestoolbox-3.7.7}/pyrestoolbox/brine/vphi_route.py

@@ -48,7 +48,9 @@ DEFAULT_ROUTE = "auto"
 # brine-density data: the seven Tiepel & Gubbins (1972) KCl dilatometry points,
 # fitted as (generated by brine_props/code/relative_salt_shift.py)
 #     V_eff = V_phi(T,P) * (1 + g(m)),  g(m) = -c*m/(1 + d*m)
-# giving -1.56% at 1 molal and -5.85% at 5 molal. Enns and O'Sullivan & Smith
+# giving -1.52% at 1 molal and -5.27% at 5 molal (Tiepel's molar KCl
+# concentrations converted to molality at 25 degC since 2026-09-05; the
+# molar-as-molal fit gave -1.56% / -5.85%). Enns and O'Sullivan & Smith
 # agree on sign and size; the magnitude is known to about a factor of two
 # (O'Sullivan NaCl shallower, Tiepel KCl at this value).
 #
@@ -56,7 +58,7 @@ DEFAULT_ROUTE = "auto"
 # -0.03 to -0.07 cm3/mol per molal, an order of magnitude too small and linear
 # where the measurements saturate. It is therefore not used, and this term
 # carries the whole effect, so there is no double counting.
-SALT_C, SALT_D = 0.017009386, 0.090684173   # 8 sig digits, generated - do not retype
+SALT_C, SALT_D = 0.017061208, 0.12370899    # 8 sig digits, generated - do not retype
 
 
 def salt_fraction(m_nacl: float) -> float:

{pyrestoolbox-3.7.6 → pyrestoolbox-3.7.7}/pyrestoolbox/docs/brine.rst

@@ -709,9 +709,12 @@ exactly. The PR
 route needs one fitted number per gas against 35 coefficients per gas for the
 correlation, matches or beats it on five of six gases against the calibration
 densimetry, and reproduces an H2S temperature trend the correlation misses.
-The delivered shifts are CH4 -0.109632, CO2 -0.037913, H2S -0.078975,
-N2 -0.176510, H2 -0.177625, C2H6 -0.073142, C3H8 -0.112963 and
-nC4H10 +0.110924.
+The delivered shifts are CH4 -0.111430, CO2 -0.038965, H2S -0.079740,
+N2 -0.176768, H2 -0.178503, C2H6 -0.073843, C3H8 -0.113326 and
+nC4H10 +0.110920. They are fitted against the ``'default'`` kij_AQ set and the
+route pins that framework internally (refitted in 3.7.7; the values before it
+went with the ``'mc3'`` set the route pinned until then). A shift and the kij
+set it was fitted against are one calibration, so the two are never mixed.
 
 Three ceilings should not be conflated: the arithmetic stops at 623.15 K, the
 volume shift stops being fitted at 473.15 K, and **accuracy is claimed only to
@@ -723,9 +726,11 @@ the equation of state unaided.
 **Salinity shift on V_phi** (new in 3.7.3; relative form from 3.7.4). A
 gas-generic dimensionless fraction is applied,
 ``V_eff = V_phi(T,P) * (1 + g(m))`` with
-``g(m) = -1.7009 m/(1 + 0.090684 m)`` percent, giving -1.56% at 1 mol/kg and
--5.85% at 5 mol/kg (for CO2, -0.5 to -2.7 cm3/mol over the working range). It
-is fixed entirely from Tiepel and Gubbins (1972) KCl dilatometry with no
+``g(m) = -1.7061 m/(1 + 0.12371 m)`` percent, giving -1.52% at 1 mol/kg and
+-5.27% at 5 mol/kg (for CO2, -0.5 to -2.4 cm3/mol over the working range). It
+is fixed entirely from Tiepel and Gubbins (1972) KCl dilatometry, their molar
+concentrations converted to molality at 25 degC (from 3.7.7; the 3.7.4 fit
+treated them as molal: -1.56% / -5.85%), with no
 parameter fitted to any brine-density data; the magnitude is known to about a
 factor of two. Freshwater results are unchanged exactly; gas-saturated brine
 densities move by up to a few hundredths of a percent. Pass

{pyrestoolbox-3.7.6 → pyrestoolbox-3.7.7}/pyrestoolbox/docs/changelist.rst

@@ -1,3 +1,11 @@
+Changelist in 3.7.7:
+
+- **BRINE DENSITY: the dissolved-gas volume shifts refitted under the published ``'default'`` framework** (``brine.pr_vphi.VSHIFT``). A volume shift and the S&W kij_AQ set it was fitted against are one calibration and cannot be mixed, so the module pinned ``framework='mc3'``. The reference calibration has moved to the published recommendation, the ``'default'`` embedded delta-kij framework, and the shifts move with it: CH4 -0.111430 (was -0.109632), CO2 -0.038965 (-0.037913), H2S -0.079740 (-0.078975), N2 -0.176768 (-0.176510), H2 -0.178503 (-0.177625) and C2H6 -0.073843 (-0.073142), with the two literature-anchored gases re-derived on the same basis at C3H8 -0.113326 and nC4H10 +0.110920. The pin stays explicit at ``'default'`` so that a later move of the library default cannot silently cross the shifts with a kij set they were not fitted against. V_phi moves by up to 0.14% (CH4 at 350 K and 20 MPa, 39.4072 to 39.4624 cm3/mol), gas-saturated brine density by under 0.002%, and Cf_sat, being a difference of two densities, by 0.025%.
+
+- **BRINE DENSITY: the V_phi salinity fraction refitted on molality** (``brine.vphi_route.salt_fraction``). Tiepel and Gubbins' KCl concentrations are molar; the 3.7.4 fit treated them as molal. Converted with the KCl solution density at 25 degC (1, 2, 4 mol/L = 1.033, 2.133, 4.587 mol/kg) and refitted, ``g(m) = -1.7061 m/(1 + 0.12371 m)`` percent replaces ``-1.7009 m/(1 + 0.090684 m)``: -1.52% at 1 mol/kg (was -1.56%) and -5.27% at 5 (was -5.85%). Gas-saturated brine density moves by under 0.03% at 5 mol/kg; freshwater results are unchanged exactly.
+
+- **GAS docstrings carry both unit systems, and the MCP server states the convention.** Every ``gas`` parameter that the code converts under ``metric=True`` now shows both halves on its own parameter line in the ``(field | metric)`` form, 31 lines across nine functions. Parameter *names* never change, so ``degf`` takes deg C under ``metric=True`` and a reader who stops at the name converts twice and is silently wrong. ``pyrestoolbox-mcp``'s instructions, ``call`` and ``describe`` now say so, and also that standard volumes stay on the 60 degF, 14.696 psia basis in both unit systems. Documentation only, no numerical change.
+
 Changelist in 3.7.6:
 
 - **OIL Rs: the Velarde, Blasingame & McCain correlation now refuses fluids it cannot represent, instead of returning negative Rs.** For rich separator gas with a light oil at a high bubble point, the correlation's leading coefficient a0 exceeds 1 and the published form ``rsr = a0*pr^a1 + (1-a0)*pr^a2`` turns negative over most of the pressure range: at 45 API, 200 degF, sg_sp 1.0 and pb 6000 psia it returned -421 scf/stb at 1000 psia, recovering only near Pb where the form is pinned to rsb by construction, and downstream ``oil_viso`` failed on a complex intermediate. The coefficients match the 1997 paper, so this is a range limit rather than a transcription error; a 72,900-case sweep found ``a0 > 1`` an exact test, with every such case non-physical and no ``a0 <= 1`` case affected. The boundary at 200 degF sits near Pb 5000 psia at sg_sp 1.0 with 45 API, or 8100 psia at sg_sp 0.85 with 35 API, falling roughly 10% per 100 degF of heating. ``oil_rs(rsmethod='VELAR')`` now raises ``ValueError`` naming the inputs, the offending coefficient and ``rsmethod='STAN'`` as the working alternative (Valko-McCain is not offered because its own Pb ceiling refuses most of the same corner). The same fluids are refused once at the nodal VLP entry points, where the segment march carries its own copy of the formula and the Rust path would otherwise return NaN silently.

{pyrestoolbox-3.7.6 → pyrestoolbox-3.7.7}/pyrestoolbox/gas/gas.py

@@ -347,12 +347,12 @@ def gas_rate_radial(
 ) -> np.ndarray:
     """ Returns gas rate for radial flow (mscf/day) using Darcy pseudo steady state equation & gas pseudopressure
         k: Permeability (mD)
-        h: Net flow height (ft)
-        pr: Reservoir pressure (psia)
-        pwf: BHFP (psia)
-        r_w: Wellbore Radius (ft)
-        r_ext: External Reservoir Radius (ft)
-        degf: Reservoir Temperature (deg F)
+        h: Net flow height (ft | m)
+        pr: Reservoir pressure (psia | barsa)
+        pwf: BHFP (psia | barsa)
+        r_w: Wellbore Radius (ft | m)
+        r_ext: External Reservoir Radius (ft | m)
+        degf: Reservoir Temperature (deg F | deg C)
         zmethod: Method for calculating Z-Factor
                  'DAK' Dranchuk & Abou-Kassem (1975) using from Equations 2.7-2.8 from 'Petroleum Reservoir Fluid Property Correlations' by W. McCain et al.
                  'HY' Hall & Yarborough (1973)
@@ -433,10 +433,10 @@ def gas_rate_linear(
 ) -> np.ndarray:
     """ Returns gas rate for linear flow (mscf/day) using Darcy steady state equation & gas pseudopressure
         k: Permeability (mD)
-        pr: Reservoir pressure (psia)
-        pwf: BHFP (psia)
-        area: Net cross sectional area perpendicular to direction of flow (ft2).
-        length: Length over which flow takes place (ft)
+        pr: Reservoir pressure (psia | barsa)
+        pwf: BHFP (psia | barsa)
+        area: Net cross sectional area perpendicular to direction of flow (ft2 | m2).
+        length: Length over which flow takes place (ft | m)
         zmethod: Method for calculating Z-Factor
                  'DAK' Dranchuk & Abou-Kassem (1975) using from Equations 2.7-2.8 from 'Petroleum Reservoir Fluid Property Correlations' by W. McCain et al.
                  'HY' Hall & Yarborough (1973)
@@ -448,7 +448,7 @@ def gas_rate_linear(
                'BNS' for Burgoyne, Nielsen and Stanko method (2025). If h2 > 0, then 'BNS' will be used
                Defaults to 'PMC' if not specified
                 sg: Gas SG relative to air, Defaults to 0.75 if not specified
-        degf: Reservoir Temperature (deg F).
+        degf: Reservoir Temperature (deg F | deg C).
         co2: Molar fraction of CO2. Defaults to zero if not specified
         h2s: Molar fraction of H2S. Defaults to zero if not specified
         n2: Molar fraction of Nitrogen. Defaults to zero if not specified
@@ -1111,9 +1111,9 @@ def gas_ug(
         Uses Lee, Gonzalez & Eakin (1966) Correlation using equations 2.14-2.17 from 'Petroleum Reservoir Fluid Property Correlations' by W. McCain et al.
         Except if 'BNS' Z-Factor method chosen, in which case tuned LBC viscosity model will be used instead
 
-          p: Gas pressure (psia)
+          p: Gas pressure (psia | barsa)
           sg: Gas SG relative to air
-          degf: Reservoir Temperature (deg F).
+          degf: Reservoir Temperature (deg F | deg C).
           zmethod: Method for calculating Z-Factor
                    'DAK' Dranchuk & Abou-Kassem (1975) using from Equations 2.7-2.8 from 'Petroleum Reservoir Fluid Property Correlations' by W. McCain et al.
                    'HY' Hall & Yarborough (1973)
@@ -1129,7 +1129,7 @@ def gas_ug(
           n2: Molar fraction of Nitrogen. Defaults to zero if undefined
           h2: Molar fraction of Hydrogen. Defaults to zero if undefined
           tc: Critical gas temperature (deg R). Calculates using cmethod if not specified. For BNS, overrides only the hydrocarbon pseudo-component Tc (inert Tc stay at BNS internal constants)
-          pc: Critical gas pressure (psia). Calculates using cmethod if not specified. For BNS, overrides only the hydrocarbon pseudo-component Pc (inert Pc stay at BNS internal constants)
+          pc: Critical gas pressure (psia | barsa). Calculates using cmethod if not specified. For BNS, overrides only the hydrocarbon pseudo-component Pc (inert Pc stay at BNS internal constants)
           zee: Gas Z-Factor. If undefined, will trigger Z-Factor calculation.
           ugz: Boolean flag that if True returns ugZ instead of ug
           metric: If True, input/output in Eclipse METRIC units (barsa, degC). Defaults to False (FIELD)
@@ -1430,15 +1430,15 @@ def gas_cg(
     """ Returns gas compressibility (1/psi) using the 'DAK' Dranchuk & Abou-Kassem (1975) Z-Factor &
         Critical property correlation values if not explicitly specified
         If h2 > 0, will use the 'BNS' Z-Factor method
-        p: Gas pressure (psia)
+        p: Gas pressure (psia | barsa)
         sg: Gas SG relative to air
-        degf: Gas Temperature (deg F)
+        degf: Gas Temperature (deg F | deg C)
         co2: Molar fraction of CO2. Defaults to zero if undefined
         h2s: Molar fraction of H2S. Defaults to zero if undefined
         n2: Molar fraction of Nitrogen. Defaults to zero if undefined
         h2: Molar fraction of Hydrogen. Defaults to zero if undefined
         tc: Critical gas temperature (deg R). Uses cmethod correlation if not specified. For BNS, overrides only the hydrocarbon pseudo-component Tc (inert Tc stay at BNS internal constants)
-        pc: Critical gas pressure (psia). Uses cmethod correlation if not specified. For BNS, overrides only the hydrocarbon pseudo-component Pc (inert Pc stay at BNS internal constants)
+        pc: Critical gas pressure (psia | barsa). Uses cmethod correlation if not specified. For BNS, overrides only the hydrocarbon pseudo-component Pc (inert Pc stay at BNS internal constants)
         zmethod: Method for calculating Z-Factor
                    'DAK' Dranchuk & Abou-Kassem (1975) using from Equations 2.7-2.8 from 'Petroleum Reservoir Fluid Property Correlations' by W. McCain et al.
                    'HY' Hall & Yarborough (1973)
@@ -1488,9 +1488,9 @@ def gas_bg(
     metric: bool = False,
 ) -> np.ndarray:
     """ Returns Bg (gas formation volume factor) for natural gas (rcf/scf)
-        p: Gas pressure (psia)
+        p: Gas pressure (psia | barsa)
         sg: Gas SG relative to air
-        degf: Reservoir Temperature (deg F)
+        degf: Reservoir Temperature (deg F | deg C)
         zmethod: Method for calculating Z-Factor
                  'DAK' Dranchuk & Abou-Kassem (1975) using from Equations 2.7-2.8 from 'Petroleum Reservoir Fluid Property Correlations' by W. McCain et al.
                  'HY' Hall & Yarborough (1973)
@@ -1536,9 +1536,9 @@ def gas_den(
     metric: bool = False,
 ) -> np.ndarray:
     """ Returns gas density for natural gas (lb/cuft)
-          p: Gas pressure (psia)
+          p: Gas pressure (psia | barsa)
           sg: Gas SG relative to air
-          degf: Reservoir Temperature (deg F)
+          degf: Reservoir Temperature (deg F | deg C)
           zmethod: Method for calculating Z-Factor
                    'DAK' Dranchuk & Abou-Kassem (1975) using from Equations 2.7-2.8 from 'Petroleum Reservoir Fluid Property Correlations' by W. McCain et al.
                    'HY' Hall & Yarborough (1973)
@@ -1598,9 +1598,9 @@ def gas_ponz2p(
 ) -> np.ndarray:
     """ Returns pressure corresponding to a P/Z value for natural gas (psia)
         Calculated through iterative solution method
-        poverz: Gas pressure / Z-Factor (psia)
+        poverz: Gas pressure / Z-Factor (psia | barsa)
         sg: Gas SG relative to air
-        degf: Reservoir Temperature (deg F).
+        degf: Reservoir Temperature (deg F | deg C).
         zmethod: Method for calculating Z-Factor
                  'DAK' Dranchuk & Abou-Kassem (1975) using from Equations 2.7-2.8 from 'Petroleum Reservoir Fluid Property Correlations' by W. McCain et al.
                  'HY' Hall & Yarborough (1973)
@@ -1616,7 +1616,7 @@ def gas_ponz2p(
           n2: Molar fraction of Nitrogen. Defaults to zero if undefined
           h2: Molar fraction of Hydrogen. Defaults to zero if undefined
           tc: Critical gas temperature (deg R). Calculates using cmethod if not specified. For BNS, overrides only the hydrocarbon pseudo-component Tc (inert Tc stay at BNS internal constants)
-          pc: Critical gas pressure (psia). Calculates using cmethod if not specified. For BNS, overrides only the hydrocarbon pseudo-component Pc (inert Pc stay at BNS internal constants)
+          pc: Critical gas pressure (psia | barsa). Calculates using cmethod if not specified. For BNS, overrides only the hydrocarbon pseudo-component Pc (inert Pc stay at BNS internal constants)
           rtol: Relative solution tolerance. Will iterate until abs[(p - poverz * Z)/p] < rtol
           metric: If True, input/output in Eclipse METRIC units (barsa, degC). Defaults to False (FIELD)
     """
@@ -1703,9 +1703,9 @@ def gas_grad2sg(
         Calculated through iterative solution method. Bisection bounds span pure H2 (SG ~0.070) to 3.0 to
         accommodate H2-blend and CO2-rich compositions; results outside this range will fail.
 
-        grad: Observed gas gradient (psi/ft)
-        p: Pressure at observation (psia)
-        degf: Reservoir Temperature (deg F). Defaults to False if undefined
+        grad: Observed gas gradient (psi/ft | bar/m)
+        p: Pressure at observation (psia | barsa)
+        degf: Reservoir Temperature (deg F | deg C). Defaults to False if undefined
         zmethod: Method for calculating Z-Factor
                  'DAK' Dranchuk & Abou-Kassem (1975) using from Equations 2.7-2.8 from 'Petroleum Reservoir Fluid Property Correlations' by W. McCain et al.
                  'HY' Hall & Yarborough (1973)
@@ -1721,7 +1721,7 @@ def gas_grad2sg(
           n2: Molar fraction of Nitrogen. Defaults to zero if undefined
           h2: Molar fraction of Hydrogen. Defaults to zero if undefined
           tc: Critical gas temperature (deg R). Calculates using cmethod if not specified. For BNS, overrides only the hydrocarbon pseudo-component Tc (inert Tc stay at BNS internal constants)
-          pc: Critical gas pressure (psia). Calculates using cmethod if not specified. For BNS, overrides only the hydrocarbon pseudo-component Pc (inert Pc stay at BNS internal constants)
+          pc: Critical gas pressure (psia | barsa). Calculates using cmethod if not specified. For BNS, overrides only the hydrocarbon pseudo-component Pc (inert Pc stay at BNS internal constants)
           rtol: Relative solution tolerance. Will iterate until abs[(grad - calculation)/grad] < rtol
           metric: If True, input/output in Eclipse METRIC units (bar/m, barsa, degC). Defaults to False (FIELD)
     """
@@ -1770,9 +1770,9 @@ def gas_dmp(
 ) -> float:
     """ Numerical integration of real-gas pseudopressure between two pressures
         Returns integral over range between p1 to p2 (psi**2/cP)
-        p1: Starting (lower) pressure (psia)
-        p2: Ending (upper) pressure (psia)
-        degf: Gas Temperature (deg F)
+        p1: Starting (lower) pressure (psia | barsa)
+        p2: Ending (upper) pressure (psia | barsa)
+        degf: Gas Temperature (deg F | deg C)
         sg: Specific gravity of  gas (relative to air)
         zmethod: Method for calculating Z-Factor
                    'DAK' Dranchuk & Abou-Kassem (1975) using from Equations 2.7-2.8 from 'Petroleum Reservoir Fluid Property Correlations' by W. McCain et al.

{pyrestoolbox-3.7.6 → pyrestoolbox-3.7.7}/src/oil/density.rs

@@ -28,9 +28,7 @@ pub fn deno_below_pb(
     sg_o: f64,
     api: f64,
 ) -> f64 {
-    let rho_po: f64;
-
-    if sg_sp > 0.0 {
+    let rho_po: f64 = if sg_sp > 0.0 {
         // Iterative path (Eq 3.18b-3.18c)
         let a: [f64; 6] = [-49.8930, 85.0149, -3.70373, 0.0479818, 2.98914, -0.0356888];
         let mut rho_est = (52.8 - 0.01 * rs).max(20.0);
@@ -49,13 +47,13 @@ pub fn deno_below_pb(
             }
             rho_est = new_rho;
         }
-        rho_po = new_rho;
+        new_rho
     } else {
         // Non-iterative fallback using sg_g (Eq 3.17e)
         let rhoa = 38.52 * 10.0_f64.powf(-0.00326 * api)
             + (94.75 - 33.93 * api.log10()) * sg_g.log10();
-        rho_po = (rs * sg_g + 4600.0 * sg_o) / (73.71 + rs * sg_g / rhoa);
-    }
+        (rs * sg_g + 4600.0 * sg_o) / (73.71 + rs * sg_g / rhoa)
+    };
 
     // Pressure correction (Eq 3.19d)
     let p_k = p / 1000.0;