rock-physics-open 0.2.3__py3-none-any.whl → 0.3.1__py3-none-any.whl

rock_physics_open/fluid_models/oil_model/dead_oil_density.py

@@ -10,17 +10,19 @@ def pressure_adjusted_dead_oil_density(
 
     Uses equation 18 from Batzle & Wang [1].
 
-    :param reference_density: The density (g/cc) of the dead oil at 15.6 degrees Celsius
+    :param reference_density: The density [kg/m^3] of the dead oil at 15.6 degrees Celsius
         and atmospheric pressure.
-    :param pressure: Pressure (MPa) to adjust to.
+    :param pressure: Pressure [Pa] to adjust to.
     :return: Density of oil at given pressure and 21 degrees Celsius (~70 degrees
-    Farenheit).
+    Farenheit). [kg/m^3]
     """
-    return (
-        reference_density
-        + (0.00277 * pressure - 1.71 * 10**-7 * pressure**3)
-        * (reference_density - 1.15) ** 2
-        + 3.49 * 10**-4 * pressure
+    pressure_mpa = pressure / 1e6
+    density_gcc = reference_density / 1000.0
+    return 1000.0 * (
+        density_gcc
+        + (0.00277 * pressure_mpa - 1.71e-7 * pressure_mpa**3)
+        * (density_gcc - 1.15) ** 2
+        + 3.49e-4 * pressure_mpa
     )
 
 
@@ -33,11 +35,14 @@ def temperature_adjusted_dead_oil_density(
 
     Uses equation 19 from Batzle & Wang [1].
 
-    :param density_at_21c: The density (g/cc) of the dead oil at 21 degrees Celsius
-    :param temperature: Temperature (Celsius) of oil.
-    :return: Density of oil at given temperature.
+    :param density_at_21c: The density [kg/m^3] of the dead oil at 21 degrees Celsius
+    :param temperature: Temperature [°C] of oil.
+    :return: Density of oil at given temperature. [kg/m^3]
     """
-    return density_at_21c / (0.972 + 3.81 * (10**-4) * (temperature + 17.78) ** 1.175)
+    density_at_21c_gcc = density_at_21c / 1000.0
+    return (
+        1000.0 * density_at_21c_gcc / (0.972 + 3.81e-4 * (temperature + 17.78) ** 1.175)
+    )
 
 
 def dead_oil_density(
@@ -51,10 +56,10 @@ def dead_oil_density(
     Uses equation 18 & 19 from Batzle & Wang [1].
 
     :param reference_density: Density of oil at 15.6 degrees Celsius and atmospheric
-        pressure. (g/cc)
-    :param pressure: Pressure (MPa) of oil
-    :param temperature: Temperature (Celsius) of oil.
-    :return: density of dead oil at given conditions.
+        pressure [kg/m^3]
+    :param pressure: Pressure [Pa] of oil
+    :param temperature: Temperature [°C] of oil.
+    :return: density of dead oil at given conditions (kg/m^3).
     """
     density_p = pressure_adjusted_dead_oil_density(pressure, reference_density)
     return temperature_adjusted_dead_oil_density(temperature, density_p)

rock_physics_open/fluid_models/oil_model/dead_oil_velocity.py

@@ -12,17 +12,19 @@ def dead_oil_velocity(
     Uses equation 20a from Batzle & Wang [1].
 
     :param reference_density: Density of oil at 15.6 degrees Celsius and atmospheric
-        pressure (g/cc)
-    :param pressure: Pressure (MPa) of oil
-    :param temperature: Temperature (Celsius) of oil.
+        pressure [kg/m^3]
+    :param pressure: Pressure [Pa] of oil
+    :param temperature: Temperature [°C] of oil.
     :return: primary velocity of dead oil in m/s.
     """
+    pressure_mpa = pressure * 1e-6
+    density_gcc = reference_density / 1000.0
     return (
-        2096 * np.sqrt(reference_density / (2.6 - reference_density))
+        2096 * np.sqrt(density_gcc / (2.6 - density_gcc))
         - 3.7 * temperature
-        + 4.64 * pressure
+        + 4.64 * pressure_mpa
         + 0.0115
-        * (4.12 * np.sqrt(1.08 * reference_density**-1 - 1) - 1)
+        * (4.12 * np.sqrt(1.08 * density_gcc**-1 - 1) - 1)
         * temperature
-        * pressure
+        * pressure_mpa
     )

rock_physics_open/fluid_models/oil_model/live_oil_density.py

@@ -14,17 +14,18 @@ def live_oil_density(
     Equation 24 in Batzle & Wang [1].
 
     :param reference_density: Density of the oil without dissolved gas
-        at 15.6 degrees Celsius and atmospheric pressure. (g/cc)
-    :param pressure: Pressure (MPa) of oil (for future implementation only)
+        at 15.6 degrees Celsius and atmospheric pressure. [kg/m^3]
+    :param pressure: Pressure [Pa] of oil (for future implementation only)
     :param gas_oil_ratio: The volume ratio of gas to oil [l/l]
-    :param temperature: Temperature (Celsius) of oil.
+    :param temperature: Temperature [°C] of oil.
     :param gas_gravity: molar mass of gas relative to air molar mas.
-    :return: Density of live oil [g/cc].
+    :return: Density of live oil [kg/m^3].
     """
+    density_gcc = reference_density / 1000.0
     b0 = live_oil_volume_factor(
         temperature, reference_density, gas_oil_ratio, gas_gravity
     )
-    return (reference_density + 0.0012 * gas_gravity * gas_oil_ratio) / b0
+    return 1000.0 * (density_gcc + 0.0012 * gas_gravity * gas_oil_ratio) / b0
 
 
 def live_oil_pseudo_density(
@@ -40,16 +41,17 @@ def live_oil_pseudo_density(
     Equation 22 in Batzle & Wang [1].
 
     :param reference_density: Density of the oil without dissolved gas
-        at 15.6 degrees Celsius and atmospheric pressure. (g/cc)
+        at 15.6 degrees Celsius and atmospheric pressure. [kg/m^3]
     :param gas_oil_ratio: The volume ratio of gas to oil [l/l]
-    :param temperature: Temperature (Celsius) of oil.
+    :param temperature: Temperature [°C] of oil.
     :param gas_gravity: molar mass of gas relative to air molar mas.
-    :return: Pseudo-density of live oil.
+    :return: Pseudo-density of live oil [kg/m^3].
     """
+    density_gcc = reference_density / 1000.0
     b0 = live_oil_volume_factor(
         temperature, reference_density, gas_oil_ratio, gas_gravity
     )
-    return (reference_density / b0) / (1 + 0.001 * gas_oil_ratio)
+    return 1000.0 * (density_gcc / b0) / (1 + 0.001 * gas_oil_ratio)
 
 
 def live_oil_volume_factor(
@@ -61,17 +63,18 @@ def live_oil_volume_factor(
     """
     Volume factor derived by Standing (1962), equation 23 in Batzle & Wang [1].
     :param reference_density: Density of the oil without dissolved gas
-        at 15.6 degrees Celsius and atmospheric pressure. (g/cc)
+        at 15.6 degrees Celsius and atmospheric pressure. [kg/m^3]
     :param gas_oil_ratio: The volume ratio of gas to oil [l/l]
-    :param temperature: Temperature (Celsius) of oil.
+    :param temperature: Temperature [°C] of oil.
     :param gas_gravity: molar mass of gas relative to air molar mas.
-    :return: A volume factor in calculating pseudo-density of live oil.
+    :return: A volume factor in calculating pseudo-density of live oil [unitless].
     """
+    density_gcc = reference_density / 1000.0
     return (
         0.972
         + 0.00038
         * (
-            2.4 * gas_oil_ratio * np.sqrt(gas_gravity / reference_density)
+            2.4 * gas_oil_ratio * np.sqrt(gas_gravity / density_gcc)
             + temperature
             + 17.8
         )

rock_physics_open/fluid_models/oil_model/live_oil_velocity.py

@@ -11,10 +11,10 @@ def live_oil_velocity(
     Substitute Equation 22 in Equation 20 of Batzle & Wang [1].
 
     :param reference_density: Density of the oil without dissolved gas
-        at 15.6 degrees Celsius and atmospheric pressure. (g/cc)
-    :param pressure: Pressure (MPa) of oil
+        at 15.6 degrees Celsius and atmospheric pressure. [kg/m^3]
+    :param pressure: Pressure [Pa] of oil
     :param gas_oil_ratio: The volume ratio of gas to oil [l/l]
-    :param temperature: Temperature (Celsius) of oil.
+    :param temperature: Temperature [°C] of oil.
     :param gas_gravity: molar mass of gas relative to air molar mas.
     :return: Primary wave velocity of live oil [m/s].
     """

rock_physics_open/fluid_models/oil_model/oil_properties.py

@@ -17,13 +17,13 @@ def oil_properties(
     gas_gravity: np.ndarray | float,
 ) -> np.ndarray | float:
     """
-    :param temperature: Temperature (Celsius) of oil.
-    :param pressure: Pressure (Pa) of oil
+    :param temperature: Temperature [°C] of oil.
+    :param pressure: Pressure [Pa] of oil
     :param rho0: Density of the oil without dissolved gas at 15.6 degrees Celsius and
-                 atmospheric pressure. (kg/m^3)
+                 atmospheric pressure. [kg/m^3]
     :param gas_oil_ratio: The volume ratio of gas to oil [l/l]
     :param gas_gravity: Gas Gravity, molar mass of gas relative to air molar mas.
-    :return: vel_oil, den_oil, k_oil
+    :return: vel_oil [m/s], den_oil [kg/m^3], k_oil [Pa]
     """
     # Since live_oil with gas_oil_ratio=0.0 is not equal to dead oil
     # we use an apodization function to interpolate between the two
@@ -41,10 +41,11 @@ def oil_properties(
         window = np.clip((np.abs(x) - length / 2) / (length / 2), 0, 1)
         return 1 - window
 
-    loil_den, loil_vel = live_oil(
-        temperature, pressure, rho0, gas_oil_ratio, gas_gravity
-    )
-    doil_den, doil_vel = dead_oil(temperature, pressure, rho0)
+    (
+        loil_vel,
+        loil_den,
+    ) = live_oil(temperature, pressure, rho0, gas_oil_ratio, gas_gravity)
+    doil_vel, doil_den = dead_oil(temperature, pressure, rho0)
     window = triangular_window(gas_oil_ratio)
     den_oil = doil_den * window + (1 - window) * loil_den
     vel_oil = doil_vel * window + (1 - window) * loil_vel
@@ -59,20 +60,16 @@ def dead_oil(
 ) -> tuple[np.ndarray | float, np.ndarray | float]:
     """
     :param reference_density: Density of the oil without dissolved gas
-        at 15.6 degrees Celsius and atmospheric pressure. kg/m3
+        at 15.6 degrees Celsius and atmospheric pressure. [kg/m^3]
     :param gas_oil_ratio: The volume ratio of gas to oil [l/l]
     :param gas_gravity: molar mass of gas relative to air molar mas.
-    :param pressure: Pressure (Pa) of oil
-    :param temperature: Temperature (Celsius) of oil.
-    :return: dead_oil_density, dead_oil_velocity
+    :param pressure: Pressure [Pa] of oil
+    :param temperature: Temperature [°C] of oil.
+    :return: dead_oil_density [kg/m^3], dead_oil_velocity [m/s]
     """
-    dead_oil_den = 1000 * dead_oil_density(
-        temperature, pressure * 1e-6, reference_density / 1000
-    )
-    dead_oil_vel = dead_oil_velocity(
-        temperature, pressure * 1e-6, reference_density / 1000
-    )
-    return dead_oil_den, dead_oil_vel
+    dead_oil_den = dead_oil_density(temperature, pressure, reference_density)
+    dead_oil_vel = dead_oil_velocity(temperature, pressure, reference_density)
+    return dead_oil_vel, dead_oil_den
 
 
 def live_oil(
@@ -84,12 +81,12 @@ def live_oil(
 ) -> tuple[np.ndarray | float, np.ndarray | float]:
     """
     :param reference_density: Density of the oil without dissolved gas
-        at 15.6 degrees Celsius and atmospheric pressure. (kg/m^3)
+        at 15.6 degrees Celsius and atmospheric pressure. [kg/m^3]
     :param gas_oil_ratio: The volume ratio of gas to oil [l/l]
     :param gas_gravity: molar mass of gas relative to air molar mas.
-    :param pressure: Pressure (Pa) of oil
-    :param temperature: Temperature (Celsius) of oil.
-    :return: live_oil_density, live_oil_velocity
+    :param pressure: Pressure [Pa] of oil
+    :param temperature: Temperature [°C] of oil.
+    :return: live_oil_density , live_oil_velocity
     """
     if np.any(
         pressure
@@ -99,18 +96,51 @@ def live_oil(
             "Pressure is below bubble point of oil, estimated elastic properties can be inaccurate",
             stacklevel=1,
         )
-    live_oil_den = 1000 * live_oil_density(
+    live_oil_den = live_oil_density(
         temperature,
-        pressure * 1e-6,
-        reference_density / 1000,
+        pressure,
+        reference_density,
         gas_oil_ratio,
         gas_gravity,
     )
     live_oil_vel = live_oil_velocity(
         temperature,
-        pressure * 1e-6,
-        reference_density / 1000,
+        pressure,
+        reference_density,
         gas_oil_ratio,
         gas_gravity,
     )
-    return live_oil_den, live_oil_vel
+    return (
+        live_oil_vel,
+        live_oil_den,
+    )
+
+
+def oil_viscosity(
+    temperature: np.ndarray | float,
+    pressure: np.ndarray | float,
+    reference_density: np.ndarray | float,
+) -> np.ndarray | float:
+    """
+    Calculate dead oil viscosity. If dissolved gas is present in the oil, the reference density
+    should be substituted by live oil density.
+
+    Equations 25a, 25b, 26a & 26b in Batzle and Wang 1992
+
+    Based on Beggs and Robinson 1975
+
+    :param temperature: Temperature [°C] of oil
+    :param pressure: Pressure [Pa] of oil
+    :param reference_density: Density of the oil without dissolved gas
+    """
+    # Change unit in pressure to MPa
+    pressure_mpa = pressure / 1.0e6
+    # Change unit in density to g/cc
+    density_gcc = reference_density / 1000.0
+
+    y_factor = 10 ** (5.693 - 2.863 / density_gcc)
+    eta_t = -1.0 + 10 ** (0.505 * y_factor * (17.8 + temperature) ** -1.163)
+    i_factor = 10 ** (
+        18.6 * (0.1 * np.log10(eta_t) + (np.log10(eta_t) + 2) ** -0.1 - 0.985)
+    )
+    return eta_t + 0.145 * pressure_mpa * i_factor

rock_physics_open/sandstone_models/__init__.py

@@ -22,6 +22,7 @@ from .patchy_cement_fluid_substitution_model import (
 from .patchy_cement_model import (
     constant_cement_model_pcm,
     patchy_cement_model_cem_frac,
+    patchy_cement_model_dry,
     patchy_cement_model_weight,
 )
 from .patchy_cement_optimisation import (
@@ -48,6 +49,7 @@ __all__ = [
     "friable_shaly_sand_sandy_shale_model",
     "patchy_cement_pressure_fluid_substitution",
     "constant_cement_model_pcm",
+    "patchy_cement_model_dry",
     "patchy_cement_model_cem_frac",
     "patchy_cement_model_weight",
     "patchy_cement_model_optimisation",

rock_physics_open/sandstone_models/constant_cement_optimisation.py

@@ -1,7 +1,10 @@
 import numpy as np
 
 from rock_physics_open.equinor_utilities import gen_utilities
-from rock_physics_open.t_matrix_models import gen_opt_routine, save_opt_params
+from rock_physics_open.equinor_utilities.optimisation_utilities import (
+    gen_opt_routine,
+    save_opt_params,
+)
 
 from .curvefit_sandstone_models import curvefit_constant_cement
 

rock_physics_open/sandstone_models/friable_models.py

@@ -124,7 +124,7 @@ def friable_model_dry(k_min, mu_min, phi, p_eff, phi_c, coord_num_func, n, shear
         Critical porosity [fraction].
     coord_num_func : str
         Indication if coordination number should be calculated from porosity or kept constant.
-    n : float
+    n : float | None
         Coordination number [unitless].
     shear_red : float
         Shear reduction factor [fraction].
@@ -135,18 +135,17 @@ def friable_model_dry(k_min, mu_min, phi, p_eff, phi_c, coord_num_func, n, shear
         k, mu : (np.ndarray, np.ndarray).
         Bulk modulus k [Pa], shear modulus mu [Pa] of dry rock.
     """
-    # Expand floats to arrays
-    phi, phi_c, n, shear_red = gen_utilities.dim_check_vector(
-        (phi, phi_c, n, shear_red)
+    # Expand floats to arrays, check for equal length
+    phi, phi_c, shear_red, k_min, mu_min, p_eff = gen_utilities.dim_check_vector(
+        (phi, phi_c, shear_red, k_min, mu_min, p_eff)
     )
-
     # Valid porosity values are less or equal to the critical porosity
     # Use filter_input_log to remove values that do not comply with this
     (
         idx_phi,
-        (k_min, mu_min, phi, p_eff, phi_c, n, shear_red, _),
+        (phi, phi_c, shear_red, k_min, mu_min, p_eff, _),
     ) = gen_utilities.filter_input_log(
-        (k_min, mu_min, phi, p_eff, phi_c, n, shear_red, phi_c - phi)
+        (phi, phi_c, shear_red, k_min, mu_min, p_eff, phi_c - phi)
     )
 
     # Dry rock properties of high-porosity end member calculated with

rock_physics_open/sandstone_models/friable_optimisation.py

@@ -1,7 +1,10 @@
 import numpy as np
 
 from rock_physics_open.equinor_utilities import gen_utilities
-from rock_physics_open.t_matrix_models import gen_opt_routine, save_opt_params
+from rock_physics_open.equinor_utilities.optimisation_utilities import (
+    gen_opt_routine,
+    save_opt_params,
+)
 
 from .curvefit_sandstone_models import curvefit_friable
 

rock_physics_open/sandstone_models/patchy_cement_model.py

@@ -1,6 +1,11 @@
 import numpy as np
 
 from rock_physics_open.equinor_utilities import std_functions
+from rock_physics_open.equinor_utilities.gen_utilities import (
+    dim_check_vector,
+    filter_input_log,
+    filter_output,
+)
 
 from .constant_cement_models import constant_cement_model_dry
 from .friable_models import friable_model_dry
@@ -213,6 +218,101 @@ def patchy_cement_model_cem_frac(
         vpvs : Saturated rock velocity ratio [ratio].
     """
 
+    k_dry, mu, _ = patchy_cement_model_dry(
+        k_min,
+        mu_min,
+        rho_min,
+        k_cem,
+        mu_cem,
+        rho_cem,
+        phi,
+        p_eff,
+        frac_cem,
+        phi_c,
+        coord_num_func,
+        n,
+        shear_red,
+    )
+    k_zero, mu_zero = std_functions.hashin_shtrikman_walpole(
+        k_cem, mu_cem, k_min, mu_min, FRAC_CEM_UP, bound="lower"
+    )
+
+    k = std_functions.gassmann(k_dry, phi, k_fl, k_zero)
+
+    rhob = phi * rho_fl + (1 - phi - frac_cem) * rho_min + frac_cem * rho_cem
+
+    vp, vs, ai, vpvs = std_functions.velocity(k, mu, rhob)
+
+    return vp, vs, rhob, ai, vpvs
+
+
+def patchy_cement_model_dry(
+    k_min,
+    mu_min,
+    rho_min,
+    k_cem,
+    mu_cem,
+    rho_cem,
+    phi,
+    p_eff,
+    frac_cem,
+    phi_c,
+    coord_num_func,
+    n,
+    shear_red,
+):
+    """
+    Patchy cement model for sands that are a combination of friable model and constant cement model. No fluid or
+    pressure substitution. In this implementation of the patchy cement model the given cement fraction for the constant
+    cement model defines the upper bound, and the effective pressure for the friable model defines the lower bound
+
+    Parameters
+    ----------
+    k_min : np.ndarray
+        Mineral bulk modulus [Pa].
+    mu_min : np.ndarray
+        Mineral shear modulus [Pa].
+    rho_min : np.ndarray
+        Mineral bulk density [kg/m^3].
+    k_cem : np.ndarray
+        Sandstone cement bulk modulus [Pa].
+    mu_cem : np.ndarray
+        Sandstone cement shear modulus [Pa].
+    rho_cem : np.ndarray
+        Cement bulk density [kg/m^3].
+    phi : np.ndarray
+        Total porosity [fraction].
+    p_eff : np.ndarray
+        Effective pressure [Pa].
+    frac_cem : float
+        Upper bound cement volume fraction [fraction].
+    shear_red : float
+        Shear reduction factor for sandstone [fraction].
+    phi_c : float
+        Critical porosity [fraction].
+    n : float
+        Coordination number [unitless].
+    coord_num_func : str
+        Indication if coordination number should be calculated from porosity or kept constant, either "ConstVal" or
+        "PoreBased" [default]
+
+    Returns
+    -------
+    tuple
+        k:dry, mu, rho_dry : (np.ndarray, np.ndarray, np.ndarray).
+        k_dry: dry rock bulk modulus [Pa],
+        mu : dry rock shear modulus [Pa],
+        rho_dry : dry rock density [kg/m3].,
+    """
+    # There are cases which suffer from a lack of consistency check at this stage,
+    # add dim_check_vector and filter input/output
+    phi, k_min, mu_min, rho_min, k_cem, mu_cem, rho_cem, p_eff = dim_check_vector(
+        (phi, k_min, mu_min, rho_min, k_cem, mu_cem, rho_cem, p_eff)
+    )
+    (idx, (phi, k_min, mu_min, rho_min, k_cem, mu_cem, rho_cem, p_eff)) = (
+        filter_input_log((phi, k_min, mu_min, rho_min, k_cem, mu_cem, rho_cem, p_eff))
+    )
+
     k_zero, mu_zero = std_functions.hashin_shtrikman_walpole(
         k_cem, mu_cem, k_min, mu_min, FRAC_CEM_UP, bound="lower"
     )
@@ -277,10 +377,8 @@ def patchy_cement_model_cem_frac(
     k_dry = k_fri + weight_k * (k_up - k_fri)
     mu = mu_fri + weight_mu * (mu_up - mu_fri)
 
-    k = std_functions.gassmann(k_dry, phi, k_fl, k_zero)
+    rho_dry = (1 - phi - frac_cem) * rho_min + frac_cem * rho_cem
 
-    rhob = phi * rho_fl + (1 - phi - frac_cem) * rho_min + frac_cem * rho_cem
+    k_dry, mu, rho_dry = filter_output(idx, (k_dry, mu, rho_dry))
 
-    vp, vs, ai, vpvs = std_functions.velocity(k, mu, rhob)
-
-    return vp, vs, rhob, ai, vpvs
+    return k_dry, mu, rho_dry

rock_physics_open/sandstone_models/patchy_cement_optimisation.py

@@ -1,7 +1,10 @@
 import numpy as np
 
 from rock_physics_open.equinor_utilities import gen_utilities
-from rock_physics_open.t_matrix_models import gen_opt_routine, save_opt_params
+from rock_physics_open.equinor_utilities.optimisation_utilities import (
+    gen_opt_routine,
+    save_opt_params,
+)
 
 from .curvefit_sandstone_models import (
     curvefit_patchy_cement,

rock_physics_open/t_matrix_models/__init__.py

@@ -1,10 +1,4 @@
 from .carbonate_pressure_substitution import carbonate_pressure_model
-from .opt_subst_utilities import (
-    gen_opt_routine,
-    opt_param_info,
-    opt_param_to_ascii,
-    save_opt_params,
-)
 from .parse_t_matrix_inputs import parse_t_matrix_inputs
 from .run_t_matrix import run_t_matrix
 from .t_matrix_C import t_matrix_porosity_c_alpha_v
@@ -26,10 +20,6 @@ from .t_matrix_vector import (
 
 __all__ = [
     "carbonate_pressure_model",
-    "gen_opt_routine",
-    "opt_param_info",
-    "opt_param_to_ascii",
-    "save_opt_params",
     "parse_t_matrix_inputs",
     "run_t_matrix",
     "t_matrix_porosity_c_alpha_v",

rock_physics_open/t_matrix_models/carbonate_pressure_substitution.py

@@ -1,6 +1,6 @@
 import pandas as pd
 
-from rock_physics_open.equinor_utilities.machine_learning_utilities import (
+from rock_physics_open.equinor_utilities.machine_learning_utilities.run_regression import (
     run_regression,
 )
 

rock_physics_open/t_matrix_models/curvefit_t_matrix_exp.py

@@ -1,11 +1,10 @@
 import numpy as np
 
 from rock_physics_open.equinor_utilities.gen_utilities import dim_check_vector
+from rock_physics_open.equinor_utilities.optimisation_utilities import opt_param_info
 from rock_physics_open.equinor_utilities.std_functions import hashin_shtrikman_average
 from rock_physics_open.t_matrix_models import t_matrix_porosity_c_alpha_v
 
-from .opt_subst_utilities import opt_param_info
-
 
 def curvefit_t_matrix_exp(
     x_data,

rock_physics_open/t_matrix_models/t_matrix_opt_fluid_sub_exp.py

@@ -1,15 +1,15 @@
 import numpy as np
 
 from rock_physics_open.equinor_utilities import gen_utilities
-
-from .curvefit_t_matrix_exp import curvefit_t_matrix_exp
-from .opt_subst_utilities import (
+from rock_physics_open.equinor_utilities.optimisation_utilities import (
     gen_mod_routine,
     gen_sub_routine,
     load_opt_params,
     opt_param_info,
 )
 
+from .curvefit_t_matrix_exp import curvefit_t_matrix_exp
+
 
 def run_t_matrix_with_opt_params_exp(
     fl_k_orig,

rock_physics_open/t_matrix_models/t_matrix_opt_fluid_sub_petec.py

@@ -1,9 +1,13 @@
 import numpy as np
 
 from rock_physics_open.equinor_utilities import gen_utilities
+from rock_physics_open.equinor_utilities.optimisation_utilities import (
+    gen_mod_routine,
+    gen_sub_routine,
+    load_opt_params,
+)
 
 from .curvefit_t_matrix_min import curve_fit_2_inclusion_sets
-from .opt_subst_utilities import gen_mod_routine, gen_sub_routine, load_opt_params
 
 
 def run_t_matrix_with_opt_params_petec(

rock_physics_open/t_matrix_models/t_matrix_opt_forward_model_exp.py

@@ -1,9 +1,13 @@
 import numpy as np
 
 from rock_physics_open.equinor_utilities import gen_utilities
+from rock_physics_open.equinor_utilities.optimisation_utilities import (
+    gen_mod_routine,
+    load_opt_params,
+    opt_param_info,
+)
 
 from .curvefit_t_matrix_exp import curvefit_t_matrix_exp
-from .opt_subst_utilities import gen_mod_routine, load_opt_params, opt_param_info
 
 
 def run_t_matrix_forward_model_with_opt_params_exp(

rock_physics_open/t_matrix_models/t_matrix_opt_forward_model_min.py

@@ -1,9 +1,12 @@
 import numpy as np
 
 from rock_physics_open.equinor_utilities import gen_utilities
+from rock_physics_open.equinor_utilities.optimisation_utilities import (
+    gen_mod_routine,
+    load_opt_params,
+)
 
 from .curvefit_t_matrix_min import curve_fit_2_inclusion_sets
-from .opt_subst_utilities import gen_mod_routine, load_opt_params
 
 
 def run_t_matrix_forward_model_with_opt_params_petec(

rock_physics_open/t_matrix_models/t_matrix_parameter_optimisation_exp.py

@@ -1,9 +1,13 @@
 import numpy as np
 
 from rock_physics_open.equinor_utilities import gen_utilities
+from rock_physics_open.equinor_utilities.optimisation_utilities import (
+    gen_opt_routine,
+    opt_param_info,
+    save_opt_params,
+)
 
 from .curvefit_t_matrix_exp import curvefit_t_matrix_exp
-from .opt_subst_utilities import gen_opt_routine, opt_param_info, save_opt_params
 from .t_matrix_parameter_optimisation_min import DEF_VP_VS_RATIO