Commit Graph

1029 Commits

Author SHA1 Message Date
Paul Egberts
2cc76c5c53 PVT for combined wet(vaporized oil) and humid (vaprized water) gas 2022-04-12 11:15:22 +02:00
Markus Blatt
d5b6152d6d Merge pull request #494 from totto82/co2brinepvt
add a simple program to access the pvt properties of co2 and brine
2022-04-10 11:08:18 +02:00
Tor Harald Sandve
a85b6a3475 Merge pull request #491 from plgbrts/vapwat
Adding PVT for gas without oil-vapor (dry) and  with vaporized water (humid)
2022-04-05 11:33:19 +02:00
Paul Egberts
b50bf7ec22 cleanup 2022-04-04 14:34:16 +02:00
Tor Harald Sandve
38fae4b6de add some more comments 2022-04-04 14:17:47 +02:00
Paul Egberts
396ad6a3db fix of unused argument issue 2022-04-04 14:15:08 +02:00
Tor Harald Sandve
eb27f693bf add a simple interfase to access the pvt properties of co2 and brine 2022-04-01 15:52:24 +02:00
Markus Blatt
d9356d3351 Converted BrineCo2Pvt.hpp to UTF-8 2022-04-01 13:12:21 +02:00
Paul Egberts
70f55cf519 clean up 2022-03-06 17:34:53 +01:00
Paul Egberts
1a0cfe48cd gas density correction for humid gas 2022-03-06 17:26:04 +01:00
Paul Egberts
114e30540e add pvt for dry gas with vaporized water 2022-03-01 16:29:07 +01:00
Paul Egberts
31b08b4512 removed OPM_UNUSED 2022-01-20 11:36:28 +01:00
Tor Harald Sandve
4e76ab742d Merge pull request #490 from plgbrts/saltp
add getSaltSaturation
2022-01-18 12:02:07 +01:00
Paul Egberts
cbaa467104 add getSaltSaturation 2022-01-06 14:40:10 +01:00
Joakim Hove
aaec6ebd80 Merge pull request #487 from joakim-hove/repo-reor
Downstream of opm-common filesystem reorganisation
2022-01-03 10:38:14 +01:00
Joakim Hove
4b8f2f9814 Downstream of opm-common filesystem reorganisation 2022-01-02 14:32:39 +01:00
Atgeirr Flø Rasmussen
50bc945836 Merge pull request #488 from akva2/avoid_vector_shared_ptrs
changed: avoid long vectors of shared ptrs
2021-12-16 09:34:37 +01:00
Arne Morten Kvarving
441fd396ea drop shared_ptr for MaterialLawParameters 2021-12-14 13:49:59 +01:00
Arne Morten Kvarving
dcf4b382d1 fix bug: wrong twophase type passed
no consequence though as the parameter passed is unused,
but let's correct it nontheless
2021-12-14 13:48:20 +01:00
Arne Morten Kvarving
5e2af431b2 avoid shared_ptr for OilWaterScalingInfo 2021-12-14 13:37:27 +01:00
Arne Morten Kvarving
bce2e60133 remove unused member and unused typedefs 2021-12-14 13:29:18 +01:00
Arne Morten Kvarving
2a7084457a changed: avoid long vectors of shared ptrs
this use a lot of memory with many elements
2021-12-14 10:19:44 +01:00
Tor Harald Sandve
4a292455e0 Merge pull request #429 from goncalvesmachadoc/vapwat
Preparation for Water Evaporation and Salt Precipitation
2021-12-09 15:37:24 +01:00
Bård Skaflestad
ac2cc98b32 Merge pull request #486 from totto82/fixOilWaterF2
Fix oil water case SOF2 + SWFN
2021-11-26 14:50:00 +01:00
Tor Harald Sandve
df3973965c Fix oil water case SOF2 + SWFN 2021-11-26 12:33:02 +00:00
Joakim Hove
6013677105 Merge pull request #485 from joakim-hove/update-deck-get
Update deck access api
2021-11-23 14:58:13 +01:00
Joakim Hove
b1e889f619 Update deck access api 2021-11-18 15:12:30 +01:00
Markus Blatt
f62a448c4b Fixes spelling error in EclMaterialLawManager.hpp 2021-11-16 13:06:39 +01:00
Joakim Hove
06a7c51a27 Merge pull request #481 from joakim-hove/equil-debug
Explicitly check for a == b before creating scale_factor = a/b
2021-11-05 09:46:01 +01:00
Joakim Hove
3e623d4182 Explicitly check for a == b before creating scale_factor = a/b 2021-11-02 16:18:36 +01:00
Arne Morten Kvarving
26a4a38579 Merge pull request #480 from akva2/use_python3
changed: use python3
2021-10-27 08:32:50 +02:00
Arne Morten Kvarving
93543e5f7d changed: use python3 2021-10-27 07:23:24 +02:00
Markus Blatt
cdf32d7b23 Merge pull request #478 from totto82/add_extrapolate
extrapolate in calulateMoleFraction for CO2STORE
2021-10-20 15:27:04 +02:00
Tor Harald Sandve
977c1801cf extrapolate in calulateMoleFraction for CO2STORE 2021-10-20 10:09:17 +02:00
Markus Blatt
b915c359e6 Merge pull request #477 from totto82/extrapolate_binaryCoefficients
extrapolate binary coefficients for co2brine
2021-10-19 19:48:38 +02:00
Tor Harald Sandve
bb8ae243b1 extrapolate binary coefficients for co2brine 2021-10-18 08:50:14 +02:00
Markus Blatt
03c0890b4a Merge pull request #476 from totto82/extrapolate_co2store
extrapolate co2, brine and h2O properties only when called via CO2STORE  module
2021-10-14 14:03:58 +02:00
Tor Harald Sandve
588604ae8f extrapolate co2, brine and h2O properties only when called from the CO2STORE module 2021-10-14 12:01:07 +02:00
Tor Harald Sandve
1171817349 Merge pull request #474 from totto82/brinethermal
allow for brine + thermal
2021-10-08 10:38:06 +02:00
Tor Harald Sandve
334482196d allow for brine and thermal 2021-10-07 14:53:20 +02:00
Cintia Goncalves Machado
7484caa42c Change name to enableSaltPrecipitation 2021-09-29 11:29:39 +02:00
Tor Harald Sandve
f8647c2ced Merge pull request #473 from blattms/hardcode-extrapolation-co2
Use extrapolation for unreasonable/untabulated values for CO2 sequestration cases.
2021-09-29 08:42:04 +02:00
Markus Blatt
dd1bb73472 Fixed old type extend -> extent 2021-09-28 17:07:25 +02:00
Markus Blatt
868531e414 Extrapolate for values not in domain (UniformTabulated2DFunction/liquidDensity).
Extrapolate liquidDensity for unreasonable
pressure/temperature (Brine) and in UniformTabulated2DFunction.
In the current code the interpolation actually already works if the
values are outside of the tabulated region.

With this change there is now an additional function parameter
If it is true we will interpolate for every value instead of throwing
and aborting (was the case always before).
2021-09-28 16:34:42 +02:00
Tor Harald Sandve
99a67af32c Merge pull request #471 from totto82/fixOilPvtMult
make oilReferenceDensity const
2021-09-20 08:21:45 +02:00
Tor Harald Sandve
4306c593c1 make oilReferenceDensity const 2021-09-17 14:45:45 +02:00
Markus Blatt
1978121580 Merge pull request #468 from akva2/drop_unused_macro
changed: get rid of OPM_UNUSED macro usage
2021-08-18 16:27:13 +02:00
Cintia Goncalves Machado
599c55b9a7 preparation for water evaporation and salt precipitatio 2021-08-04 22:31:51 +02:00
Tor Harald Sandve
f127b5b162 Merge pull request #466 from plgbrts/gaswater5
fixed use of wrong saturations for gas relperm for gas-water system
2021-08-03 11:59:00 +02:00
Arne Morten Kvarving
24dba01e99 changed: get rid of OPM_UNUSED macro usage
prefer anonymous parameters and c++17 [[maybe_unused]]
2021-08-03 09:32:02 +02:00