OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,101 Commits 18 Branches 75 Tags 73 MiB
530157c092
Commit Graph

1101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Paul Egberts
76c759ee17 fixed use of wrong saturations for gas relperm for gas-water system 2021-07-14 13:22:43 +02:00
Bård Skaflestad
0eb0d51186 Merge pull request #463 from akva2/janitoring 
Some janitoring
 2021-06-21 15:36:57 +02:00
Arne Morten Kvarving
d397cb0429 fix some issues in pvt classes 
comparison operators were broken by 15ff65ffcd
 2021-06-21 13:00:01 +02:00
Arne Morten Kvarving
25321c5558 fixed: remove unused variable 2021-06-21 12:59:54 +02:00
Arne Morten Kvarving
b2776b00e0 fixed: move header guard on top of file 
tools expect it to be the first thing
 2021-06-21 12:59:13 +02:00
Bård Skaflestad
9ae03c4095 Merge pull request #462 from akva2/janitoring 
fixed: do not assert conditions guaranteed by unsigned
 2021-06-18 16:56:01 +02:00
Arne Morten Kvarving
50c8cbea78 fixed: do not assert conditions guaranteed by unsigned 2021-06-18 13:24:02 +02:00
Bård Skaflestad
4ac1eab2cd Merge pull request #461 from akva2/janitoring 
Some janitoring
 2021-06-09 10:36:45 +02:00
Arne Morten Kvarving
1a75bd9ab4 avoid signed/unsigned comparison warnings 2021-06-09 08:30:39 +02:00
Arne Morten Kvarving
69970a0602 add missing includes 2021-06-09 08:30:01 +02:00
Bård Skaflestad
8960609e04 Merge pull request #460 from akva2/missing_includes 
fixed: add missing includes
 2021-05-25 20:49:35 +02:00
Arne Morten Kvarving
07af818a5e fixed: add missing includes 2021-05-25 11:44:53 +02:00
Bård Skaflestad
29e8f523de Merge pull request #459 from akva2/no_opm_in_opm_part_2 
fixed: do not use Opm:: prefix within Opm namespace part 2
 2021-05-07 21:39:24 +02:00
Arne Morten Kvarving
6689e6d08f fixed: do not use Opm:: prefix within Opm namespace part 2 
have to use anchoring to root namespace in some places due
to overlapping namespace and class type names.
 2021-05-05 21:58:33 +02:00
Arne Morten Kvarving
9e8d48f1d2 remove unused typedefs 
they cause conflicts with templates in Opm namespace.
 2021-05-05 21:53:12 +02:00
Arne Morten Kvarving
7241acabac changed: make enums enum class 
and put them outside class defintion to avoid template
parameter dependence.
 2021-05-05 21:44:13 +02:00
Bård Skaflestad
3e26468453 Merge pull request #458 from akva2/no_opm_in_opm 
fixed: do not use Opm:: prefix when inside namespace Opm
 2021-05-05 14:15:53 +02:00
Arne Morten Kvarving
13f0659d71 fixed: do not use Opm:: prefix when inside namespace Opm 2021-05-05 09:46:32 +02:00
Bård Skaflestad
e97f4d49f8 Merge pull request #455 from akva2/include_deck 
fixed: need to include Deck.hpp in test
 2021-04-26 14:19:36 +02:00
Arne Morten Kvarving
8cdc05caf0 fixed: need to include Deck.hpp in test 2021-04-26 12:04:35 +02:00
Bård Skaflestad
e706b69cad Merge pull request #451 from osae/fix2pIndex 
Correcting phase index.
 2021-04-08 15:11:52 +02:00
Ove Sævareid
f4b5fe48da Correcting phase index. 2021-04-08 12:14:25 +02:00
Bård Skaflestad
92f430cd1d Merge pull request #450 from joakim-hove/ep-value 
Use value objects for endpoint scaling
 2021-04-07 17:24:40 +02:00
Joakim Hove
6979b62754 Use value objects for endpoint scaling 2021-04-07 10:09:43 +02:00
Tor Harald Sandve
819d8379ed Merge pull request #446 from bska/eval-2p-krox 
Expose Two-Phase Oil Relperm As Individual Operation
 2021-04-06 08:49:52 +02:00
Bård Skaflestad
ab386e0074 Expose Two-Phase Oil Relperm As Individual Operation 
This commit adds new operations

    relpermOilInOilGasSystem(params, fluidState)
    relpermOilInOilWaterSystem(params, fluidState)

to the Ecl*Material implementations.  The primary objective is to
support calculating the KROG and KROW quantities separately for
summary output purposes (keywords BKROG, BKROW).  Reimplement the
'krn' operation in terms of these new functions.

At present, these operations are supported only for three-phase
simulation runs.
 2021-03-22 13:00:26 +01:00
Bård Skaflestad
af5f93c6f9 Merge pull request #447 from plgbrts/gaswater 
Adaptations neededed for gas-water system
 2021-03-22 12:59:36 +01:00
Atgeirr Flø Rasmussen
3218ae4286 Merge pull request #445 from bska/prevent-neg-kro-stone2 
Explicitly Prevent Negative 3-p Kro Values in Stone 2 Model
 2021-03-22 11:27:56 +01:00