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

1081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joakim Hove
f4cb4dc292 Merge pull request #437 from joakim-hove/sched-oilvap 
Get OilVaporization properties from ScheduleState
 2021-01-08 09:21:36 +01:00
Joakim Hove
a431e8ba7f Get OilVaporization properties from ScheduleState 2021-01-07 09:20:19 +01:00
Bård Skaflestad
3db77dd5f9 Merge pull request #434 from bska/use-common-eps-api 
Extract Endpoints Using Common Facilities
 2021-01-05 11:52:52 +01:00
Bård Skaflestad
51e2efd431 Get Saturation Function Family From SatFuncControls 
There's no need to duplicate this logic.
 2020-12-21 00:51:36 +01:00
Bård Skaflestad
15c84cc3fc Extract Endpoints Using Common Facilities 
This means we get the "SWCO" handling in SOGCR based on SGOF for
free, and also removes duplicated and complex logic.
 2020-12-21 00:51:36 +01:00
Bård Skaflestad
fb5bdc1302 EPS Grid Properties: Prefer Single Assignments 2020-12-11 12:11:14 +01:00
Atgeirr Flø Rasmussen
ce4cbafe95 Merge pull request #435 from akva2/test_init 
Change static intialization of CO2 tables to avoid function call, use construction.
 2020-12-11 07:34:52 +01:00
Arne Morten Kvarving
75b2609336 test if apple clang likes this better 2020-12-08 15:27:50 +01:00
Atgeirr Flø Rasmussen
e58a660235 Merge pull request #432 from goncalvesmachadoc/aquifer 
Do not check for kr curves for water single-phase
 2020-12-01 08:38:02 +01:00
Cintia Goncalves Machado
5513bff1ba generalize single-phase fix 2020-11-25 17:48:45 +01:00
Cintia Goncalves Machado
1d4dd874ca do not check for kr curves for flow_onephase 2020-11-24 17:38:12 +01:00
Arne Morten Kvarving
2e7b1e4339 Merge pull request #430 from akva2/janitoring 
fix header guard
 2020-10-05 12:46:15 +02:00
Arne Morten Kvarving
d3a226166f fix header guard 2020-10-05 11:04:48 +02:00
Tor Harald Sandve
28dd5a2b36 Merge pull request #427 from totto82/co2pvt 
Add a co2brine pvt model
 2020-10-02 12:26:19 +02:00
Tor Harald Sandve
15ff65ffcd Add a co2brine pvt model 
The CO2BRINE model is activated by setting CO2STOR in the RUNSPEC section

The CO2 and brine pvt properties are computed based on pvt models in opm-material
- CO2 density is from Span and Wager (1996) as given in co2table.inc
- CO2 viscosity is from Fenhour et al (1998)
- Brine density and viscosity is based on H20 + correction based on Batzle and Wang (1992)
- H20 density is from Hu et al (2007)
- H20 viscosity is computed from density based on correlation given in IAPWS 97

At the current stage the oil-phase is used to model the brine. If a proper gas-water
simulator is made, the Brine PVT should be moved to the water phase.

Known limitations:
- Currently the viscosity of the Brine does not depend on the composition
- Salinity is assumed to be constant and given by SALINITY [mol/kg].
 2020-10-01 16:15:39 +02:00
Joakim Hove
e54ff1af09 Merge pull request #428 from joakim-hove/remove-common-exceptions 
Remove unusued #include common excpetions
 2020-09-21 14:27:34 +02:00
Joakim Hove
1315acfe51 Remove unusued #include common excpetions 2020-09-21 10:56:05 +02:00
Bård Skaflestad
a068071f88 Merge pull request #425 from goncalvesmachadoc/patch-3 
Extrapolate GASVISCT
 2020-08-22 00:12:38 +02:00
Bård Skaflestad
d846c7128a Merge pull request #424 from goncalvesmachadoc/patch-2 
Extrapolate OILVISCT
 2020-08-22 00:10:44 +02:00
Cintia Goncalves Machado
d4f6ed4366 Extrapolate GASVISCT 
Allow for extrapolation of gas viscosity curves.
 2020-08-06 17:26:14 +02:00
Cintia Goncalves Machado
2ac7f84b9f Extrapolate OILVISCT 
Allow for extrapolation of oil viscosity curves
 2020-08-06 17:20:58 +02:00
Bård Skaflestad
50bd881199 Merge pull request #423 from totto82/applyPVTWsalt 
make the water PVT salt dependent
 2020-07-08 09:28:53 +02:00
Tor Harald Sandve
74a6b98b4f fix return type getSaltConcentration 2020-07-08 08:09:26 +02:00
Tor Harald Sandve
b4c8dd5e86 make the water PVT salt dependent 2020-07-02 13:42:58 +02:00
Atgeirr Flø Rasmussen
a11b3a53b2 Merge pull request #422 from goncalvesmachadoc/patch-1 
Allow for extrapolation of WATVISC curve
 2020-06-26 09:55:30 +02:00
Cintia Goncalves Machado
50f0f36156 Allow for extrapolation of WATVISC curve 2020-06-25 14:25:26 +02:00
Atgeirr Flø Rasmussen
1a9c3c30ca Merge pull request #421 from atgeirr/sequential 
Add total saturation and capillary pressure to blackoil fluid state.
 2020-06-11 11:18:50 +02:00
hnil
efb7dce342 Add total saturation and capillary pressure to blackoil fluid state. 
This is intended for use with sequential formulations.
 2020-06-11 08:51:55 +02:00
Atgeirr Flø Rasmussen
1f9c136f20 Merge pull request #420 from atgeirr/add-phaseIsActive 
Add phaseIsActive(unsigned int) to base fluid system (returning true).
 2020-05-29 16:31:59 +02:00
Atgeirr Flø Rasmussen
b5bd0a519f Add phaseIsActive(unsigned int) to base fluid system (returning true). 
This promotes the feature from being a special function for the black oil
fluid system to being in theory available for all. The need for this
arose in downstream code.
 2020-05-29 14:49:59 +02:00
Joakim Hove
12161d9c79 Merge pull request #417 from bska/fix-missing-include 
Grid Properties: Include FieldPropsManager
 2020-04-07 11:49:41 +02:00
Bård Skaflestad
f343e605ea Grid Properties: Include FieldPropsManager 
We use the manager internally (for instance in the try_get() helper
function) and therefore need a declaration in scope.
 2020-04-06 17:30:19 +02:00
Joakim Hove
30cbe6ed25 Merge pull request #415 from joakim-hove/use-shared-ptr 
Use std::shared_ptr for Python handle
 2020-03-31 16:50:47 +02:00
Joakim Hove
68e779a827 Use std::shared_ptr for Python handle 2020-03-31 10:46:17 +02:00
Joakim Hove
0defd3de8e Merge pull request #414 from joakim-hove/add-python-arg 
Add Python arg to Schedule constructor
 2020-03-27 13:43:55 +01:00
Joakim Hove
b68bdea6e4 Add Python arg to Schedule constructor 2020-03-25 18:32:46 +01:00
Bård Skaflestad
778459ec84 Merge pull request #413 from akva2/followup_stonetype 
use relocated KrModel
 2020-03-10 07:58:17 -05:00