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

1118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Paul Egberts
d2d86e250b added throw when wrong saturation family is specified 2021-03-22 09:59:21 +01:00
Paul Egberts
fc2524a57a fix to allow running a one-phase system 2021-03-19 10:18:04 +01:00
Paul Egberts
eea578a0ef small clean up 2021-03-16 10:21:37 +01:00
Paul Egberts
249983c52a fix to avoid reading gaswater parameters if oil is present 2021-03-11 16:07:53 +01:00
Paul Egberts
809c1d3f1b fix of the wrong number of template arguments error in test_fluidmatrixintercations.cpp 2021-03-11 16:07:53 +01:00
Paul Egberts
ace2930603 use of normalizeKrValues() to account for TOLCRIT 2021-03-11 16:07:52 +01:00
Paul Egberts
b2ce73012e Adaptations neededed for gas-water system 2021-03-11 16:07:52 +01:00
Bård Skaflestad
1479adf6af Explicitly Prevent Negative 3-p Kro Values in Stone 2 Model 
This makes the material balance equations converge more smoothly in
corner cases and makes a real field case run at all.
 2021-02-23 09:17:13 +01:00
Tor Harald Sandve
372bb122a6 Merge pull request #448 from totto82/addExtrapolationThermalVisc 
Extrapolate oil viscosity temperature factor for undersaturated case
 2021-02-23 08:52:01 +01:00
Tor Harald Sandve
ea03ba8287 Extrapolate oil viscosity temperatuer factor for undersaturated case 2021-02-22 15:31:13 +01:00
Bård Skaflestad
c7317befa7 Merge pull request #443 from totto82/blackoilDiff 
Add support for diffusion in the blackoil fluid system
 2021-02-18 18:05:15 +01:00
Tor Harald Sandve
ac4a3871ef Add expression that return diffusion coefficient based on temperature, pressure and salinity 
Diffusion coefficient of CO2 in pure water according to (McLachlan and Danckwerts, 1972)
Diffusion coefficient of CO2 in the brine phase modified following (Ratcliff and Holdcroft,1963 and Al-Rawajfeh, 2004)
 2021-02-12 12:18:07 +01:00
Tor Harald Sandve
f9552a2081 fix assert statement 2021-02-04 09:44:56 +01:00
Tor Harald Sandve
e55568a646 dont allow for default molar weight in DIFFC table 2021-02-04 09:44:56 +01:00
Tor Harald Sandve
f406ecd914 fix molar weights 2021-02-04 09:44:56 +01:00
Tor Harald Sandve
570ec20598 init diffusion from deck 2021-02-04 09:44:56 +01:00
Tor Harald Sandve
ceb71c53a2 Add diffusion to blackoil fluidsystem. Diffusion coefficients are only implemented for the CO2-Brine system 2021-02-04 09:44:56 +01:00
Bård Skaflestad
d10786a18c Merge pull request #439 from bska/vscale-disp-sat-general 
Implement Three-Point Vertical Scaling for Non-Wetting Phase Relative Permeability
 2021-01-27 21:27:47 +01:00
Bård Skaflestad
a56df026be Implement Three-Point Vertical Scaling for Krn 
This commit implements the vertical scaling mode activated by the
keywords KRORW, KRORG, and KRGR.  This is the same scaling mode as
the KRWR feature implemented, but requires reversing the logic since
we implement the non-wetting phase's relative permeability function
in terms of the wetting phase's saturation.
 2021-01-27 18:34:24 +01:00
Bård Skaflestad
2f07358322 Honour TOLCRIT for Tabulated Relative Permeability 
This commit ensures that we honour TOLCRIT settings when
constructing the internal representations of tabulated relative
permeability functions.  In particular, relative permeability values
less than or equal to TOLCRIT are treated as zero.
 2021-01-27 18:34:24 +01:00
Bård Skaflestad
a5a45e4020 Merge pull request #438 from bska/fix-famI-sogcr 
Fix Family I SOGCR Endpoint Hack
 2021-01-27 18:29:57 +01:00
Bård Skaflestad
c390e356f3 Fix Family I SOGCR Endpoint Hack 
The maximum attainable oil saturation in the G/O system is 1-SWL.
Update call sites accordingly.
 2021-01-25 20:37:54 +01:00
Bård Skaflestad
247ce0e3fa Mark Objects 'const' Where Possible 
Also, don't use lifetime extension for 'Evaluation' objects where
these are constructed inside functions.  Doing so inhibits NRVO.
 2021-01-25 20:37:54 +01:00
Tor Harald Sandve
f8f1bfc341 Merge pull request #444 from totto82/addInternalEnergy3 
add missing internal energy function in CO2-Brine module
 2021-01-25 14:12:00 +01:00
Tor Harald Sandve
61d262684d add missing internal energy function in CO2-Brine module 2021-01-21 15:11:10 +01:00
Bård Skaflestad
d0bc4a2c05 Merge pull request #442 from totto82/co2outofidx 
fix out of bound in CO2.hpp

Closes #441.
 2021-01-19 12:39:04 +01:00
Tor Harald Sandve
f528b2c33f fix out of bound in CO2.hpp 2021-01-18 10:12:30 +01:00
Bård Skaflestad
292ee5174a Merge pull request #436 from bska/vscale-disp-sat 
Implement KRWR Vertical Scaling
 2021-01-14 14:15:46 +01:00
Bård Skaflestad
5a30a49e53 Implement KRWR Vertical Scaling 
This commit adds support for scaling of the relative permeability
value for water at the residual saturation of the displacing
(non-wetting) phase.  We use pure vertical scaling in the left
interval [SWL, SR], and a linear/affine function in the right
interval [SR, SWU].
 2021-01-13 15:38:34 +01:00
Bård Skaflestad
d1ccb8fcee Capture Three-Point Vertical Scaling Properties 
These scale relative permeability function values at the residual
saturation of the displacing phase.
 2021-01-13 15:38:34 +01:00
Bård Skaflestad
bb191a5381 Always Store Three Saturation End-Points 
The two-point scalings will use [0] and [2] instead of [0] and [1].
This is in preparation of introducing 'KRWR' scaling which does not
necessarily require the alternative scaling method ('SCALECRS') for
the horizontal direction.
 2021-01-13 15:38:34 +01:00
Atgeirr Flø Rasmussen
bc70036de5 Merge pull request #440 from totto82/fixIdxSalinity 
fix the index into salinity in the BrineCo2Pvt model
 2021-01-13 15:01:54 +01:00
Tor Harald Sandve
474d8c72c5 fix the index into salinity in the BrineCo2Pvt model 2021-01-13 12:35:04 +01:00