update

Author: EvenSol

README.md

@@ -144,14 +144,7 @@ NeqSim also includes a `pvtsimulation` package for common PVT experiments (CCE/C
 - Documentation: `docs/pvt_simulation.md`
 - Direct Java access examples: `examples/pvtsimulation/README.md`
 
-## Transient Multiphase Flow (Two-Fluid Model)
-
-NeqSim includes a mechanistic **Two-Fluid Transient Multiphase Flow Model** for pipeline simulation.
-
-- Jupyter notebook demo (direct Java access): `examples/jupyter/two_fluid_model.ipynb`
-- Upstream documentation (NeqSim Java): https://github.com/equinor/neqsim/blob/master/docs/wiki/two_fluid_model.md
-
-### Prerequisites
+## Prerequisites
 
 Java version 8 or higher ([Java JDK](https://adoptium.net/)) needs to be installed. The Python package [JPype](https://github.com/jpype-project/jpype) is used to connect Python and Java. Read the [installation requirements for Jpype](https://jpype.readthedocs.io/en/latest/install.html). Be aware that mixing 64 bit Python with 32 bit Java and vice versa crashes on import of the jpype module. The needed Python packages are listed in the [NeqSim Python dependencies page](https://github.com/equinor/neqsim-python/network/dependencies).
 

docs/pvt_simulation.md

@@ -33,20 +33,18 @@ Other available simulations (direct Java access):
 
 Many PVTsimulation methods expect Java `double[]`. With JPype you can pass:
 
-- A Python list (often auto-converted), or
-- An explicit `double[]` using `jpype.types.JDouble[:]`
+- A Python list (auto-converted to `double[]` by JPype)
 
 Example:
 
 ```python
-from jpype.types import JDouble
 from neqsim import jneqsim
 
 pressures = [400.0, 300.0, 200.0]
 temperatures = [373.15, 373.15, 373.15]
 
 cme = jneqsim.pvtsimulation.simulation.ConstantMassExpansion(oil)
-cme.setTemperaturesAndPressures(JDouble[:](temperatures), JDouble[:](pressures))
+cme.setTemperaturesAndPressures(temperatures, pressures)
 cme.runCalc()
 ```
 

examples/pvtsimulation/pvt_experiments_java_access.py

@@ -25,8 +25,6 @@
 
 from __future__ import annotations
 
-from jpype.types import JDouble
-
 from neqsim import jneqsim
 from neqsim.thermo import TPflash, fluid
 
@@ -71,7 +69,7 @@ def main() -> None:
 
     print("\n--- Constant Mass Expansion (CCE/CME) ---")
     cme = jneqsim.pvtsimulation.simulation.ConstantMassExpansion(oil.clone())
-    cme.setTemperaturesAndPressures(JDouble[:](temperatures), JDouble[:](pressures))
+    cme.setTemperaturesAndPressures(temperatures, pressures)
     cme.setTemperature(reservoir_temperature_k, "K")
     cme.runCalc()
     print("relativeVolume:", _as_list(cme.getRelativeVolume()))
@@ -84,7 +82,7 @@ def main() -> None:
 
     print("\n--- Constant Volume Depletion (CVD) ---")
     cvd = jneqsim.pvtsimulation.simulation.ConstantVolumeDepletion(oil.clone())
-    cvd.setPressures(JDouble[:](pressures))
+    cvd.setPressures(pressures)
     cvd.setTemperature(reservoir_temperature_k, "K")
     cvd.runCalc()
     print("relativeVolume:", _as_list(cvd.getRelativeVolume()))
@@ -96,7 +94,7 @@ def main() -> None:
 
     print("\n--- Differential Liberation (DL) ---")
     dl = jneqsim.pvtsimulation.simulation.DifferentialLiberation(oil.clone())
-    dl.setPressures(JDouble[:](pressures + [1.01325]))
+    dl.setPressures(pressures + [1.01325])
     dl.setTemperature(reservoir_temperature_k, "K")
     dl.runCalc()
     print("Bo [m3/Sm3]:", _as_list(dl.getBo()))
@@ -107,7 +105,7 @@ def main() -> None:
     sep_pressures = [50.0, 10.0, 1.01325]
     sep_temperatures = [313.15, 303.15, 293.15]
     sep = jneqsim.pvtsimulation.simulation.SeparatorTest(oil.clone())
-    sep.setSeparatorConditions(JDouble[:](sep_temperatures), JDouble[:](sep_pressures))
+    sep.setSeparatorConditions(sep_temperatures, sep_pressures)
     sep.runCalc()
     print("separator GOR [Sm3/Sm3]:", _as_list(sep.getGOR()))
     print("separator Bo [m3/Sm3]:", _as_list(sep.getBofactor()))
@@ -122,21 +120,21 @@ def main() -> None:
     swell = jneqsim.pvtsimulation.simulation.SwellingTest(oil.clone())
     swell.setInjectionGas(injection_gas)
     swell.setTemperature(reservoir_temperature_k, "K")
-    swell.setCummulativeMolePercentGasInjected(JDouble[:](mol_percent_injected))
+    swell.setCummulativeMolePercentGasInjected(mol_percent_injected)
     swell.runCalc()
     print("swell pressures [bara]:", _as_list(swell.getPressures()))
     print("relativeOilVolume [-]:", _as_list(swell.getRelativeOilVolume()))
 
     print("\n--- Viscosity study ---")
     visc = jneqsim.pvtsimulation.simulation.ViscositySim(oil.clone())
-    visc.setTemperaturesAndPressures(JDouble[:](temperatures), JDouble[:](pressures))
+    visc.setTemperaturesAndPressures(temperatures, pressures)
     visc.runCalc()
     print("oilViscosity [Pa*s]:", _as_list(visc.getOilViscosity()))
     print("gasViscosity [Pa*s]:", _as_list(visc.getGasViscosity()))
 
     print("\n--- GOR / Bo vs pressure ---")
     gor = jneqsim.pvtsimulation.simulation.GOR(oil.clone())
-    gor.setTemperaturesAndPressures(JDouble[:](temperatures), JDouble[:](pressures))
+    gor.setTemperaturesAndPressures(temperatures, pressures)
     gor.runCalc()
     print("GOR [Sm3/Sm3]:", _as_list(gor.getGOR()))
     print("Bo [m3/Sm3]:", _as_list(gor.getBofactor()))

examples/pvtsimulation/pvt_tuning_cme.py

@@ -15,8 +15,6 @@
 
 from __future__ import annotations
 
-from jpype.types import JDouble
-
 from neqsim import jneqsim
 from neqsim.thermo import fluid
 
@@ -56,7 +54,7 @@ def main() -> None:
 
     cme = jneqsim.pvtsimulation.simulation.ConstantMassExpansion(oil)
     cme.setTemperature(temperature_k, "K")
-    cme.setTemperaturesAndPressures(JDouble[:](temperatures), JDouble[:](pressures))
+    cme.setTemperaturesAndPressures(temperatures, pressures)
 
     cme.runCalc()
     rv_before = _as_list(cme.getRelativeVolume())

examples/pvtsimulation/pvt_tuning_cvd.py

@@ -14,8 +14,6 @@
 
 from __future__ import annotations
 
-from jpype.types import JDouble
-
 from neqsim import jneqsim
 from neqsim.thermo import fluid
 
@@ -53,7 +51,7 @@ def main() -> None:
 
     cvd = jneqsim.pvtsimulation.simulation.ConstantVolumeDepletion(oil)
     cvd.setTemperature(temperature_k, "K")
-    cvd.setTemperaturesAndPressures(JDouble[:](temperatures), JDouble[:](pressures))
+    cvd.setTemperaturesAndPressures(temperatures, pressures)
 
     cvd.runCalc()
     rv_before = _as_list(cvd.getRelativeVolume())

examples/pvtsimulation/pvt_tuning_viscosity.py

@@ -14,8 +14,6 @@
 
 from __future__ import annotations
 
-from jpype.types import JDouble
-
 from neqsim import jneqsim
 from neqsim.thermo import fluid
 
@@ -48,9 +46,7 @@ def main() -> None:
     exp_viscosity = [2.0e-4, 2.8e-4, 4.0e-4, 5.5e-4]
 
     visc = jneqsim.pvtsimulation.simulation.ViscositySim(oil)
-    visc.setTemperaturesAndPressures(
-        JDouble[:](temperatures_k), JDouble[:](pressures_bara)
-    )
+    visc.setTemperaturesAndPressures(temperatures_k, pressures_bara)
     visc.runCalc()
     mu_before = _as_list(visc.getOilViscosity())
 

src/neqsim/process/processTools.py

@@ -162,7 +162,6 @@
 from typing import Any, Optional, List, Dict, Union
 
 import pandas as pd
-from jpype.types import JDouble
 from jpype.types import *
 
 from neqsim import jneqsim
@@ -174,6 +173,22 @@
 _YAML_SUFFIXES = {".yaml", ".yml"}
 
 
+def _as_float_list(values) -> list[float]:
+    if values is None:
+        return []
+    if hasattr(values, "tolist"):
+        values = values.tolist()
+    return [float(v) for v in list(values)]
+
+
+def _as_float_matrix(values) -> list[list[float]]:
+    if values is None:
+        return []
+    if hasattr(values, "tolist"):
+        values = values.tolist()
+    return [[float(v) for v in row] for row in list(values)]
+
+
 def _resolve_path_in_cwd(
     user_path: str,
     *,
@@ -4372,35 +4387,37 @@ def compressor(
 
 def compressorChart(compressor, curveConditions, speed, flow, head, polyEff):
     compressor.getCompressorChart().setCurves(
-        JDouble[:](curveConditions),
-        JDouble[:](speed),
-        JDouble[:][:](flow),
-        JDouble[:][:](head),
-        JDouble[:][:](polyEff),
+        _as_float_list(curveConditions),
+        _as_float_list(speed),
+        _as_float_matrix(flow),
+        _as_float_matrix(head),
+        _as_float_matrix(polyEff),
     )
 
 
 def pumpChart(pump, curveConditions, speed, flow, head, polyEff):
     pump.getPumpChart().setCurves(
-        JDouble[:](curveConditions),
-        JDouble[:](speed),
-        JDouble[:][:](flow),
-        JDouble[:][:](head),
-        JDouble[:][:](polyEff),
+        _as_float_list(curveConditions),
+        _as_float_list(speed),
+        _as_float_matrix(flow),
+        _as_float_matrix(head),
+        _as_float_matrix(polyEff),
     )
 
 
 def compressorSurgeCurve(compressor, curveConditions, surgeflow, surgehead):
     compressor.getCompressorChart().getSurgeCurve().setCurve(
-        JDouble[:](curveConditions), JDouble[:](surgeflow), JDouble[:](surgehead)
+        _as_float_list(curveConditions),
+        _as_float_list(surgeflow),
+        _as_float_list(surgehead),
     )
 
 
 def compressorStoneWallCurve(compressor, curveConditions, stoneWallflow, stoneWallHead):
     compressor.getCompressorChart().getStoneWallCurve().setCurve(
-        JDouble[:](curveConditions),
-        JDouble[:](stoneWallflow),
-        JDouble[:](stoneWallHead),
+        _as_float_list(curveConditions),
+        _as_float_list(stoneWallflow),
+        _as_float_list(stoneWallHead),
     )
 
 
@@ -4534,7 +4551,7 @@ def splitter(
     spl = jneqsim.process.equipment.splitter.Splitter(name, teststream)
     if splitfactors is not None and len(splitfactors) > 0:
         spl.setSplitNumber(len(splitfactors))
-        spl.setSplitFactors(JDouble[:](splitfactors))
+        spl.setSplitFactors(_as_float_list(splitfactors))
     _add_to_process(spl, process)
     return spl