Kai Bao
91ec74dffc
fixing the initialization of aquifer pressure for CT aquifer
2020-09-24 15:37:31 +02:00
Arne Morten Kvarving
914053ac3c
changed: remove GET_PROP_VALUE macro usage
2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
74fac38d85
changed: remove GET_PROP_TYPE / GET_PROP macro usage
2020-08-27 08:19:39 +02:00
Tor Harald Sandve
88ee892fdf
pass the saltConcentration to the waterPVT
2020-07-02 13:44:01 +02:00
Arne Morten Kvarving
e31062aa4e
add missing license header
2020-06-26 09:49:01 +02:00
Arne Morten Kvarving
9906cc47f7
changed: use AquiferConfig when setting up aquifers
2020-03-24 13:36:39 +01:00
Joakim Hove
9c8d5946b4
Add POC for AquiferConfig can be used
2020-02-18 16:19:25 +01:00
Joakim Hove
3a7f5799af
Refactor Aquifer datastructures to follow opm-common
...
- Replace use of Base:: with this-> in derived classes
- Add AquiferInterface::size() utility functions
- Remove AquiferInterface::cell_idx_ member
2020-02-18 07:13:30 +01:00
Joakim Hove
d17b21089f
Use member variable in Aquifer code
2020-02-09 10:13:15 +01:00
Joakim Hove
0e1a210ef2
Use std::pair<bool, double> for initial aquifer pressure
2020-02-07 12:32:09 +01:00
Joakim Hove
cb8a76d098
Use [i] instead of at(i) when accessing Aquifer container
2020-02-07 07:31:25 +01:00
Joakim Hove
e910ebe738
Aquifer accessor renamed
2020-02-07 07:31:25 +01:00
Joakim Hove
1c4021f0a3
Use TableManager in AquiferCT constructor
2020-02-07 07:31:25 +01:00
Arne Morten Kvarving
75f2b34ba6
avoid deck usage on non-root processes checking for AQUFETP
...
aquifers are currently broken in parallel, add a throw if used in
a parallel simulation.
2020-01-29 15:30:55 +01:00
Arne Morten Kvarving
737cb0bb3e
avoid deck usage on non-root processes checking for AQUCT
...
aquifers are currently broken in parallel, add a throw if used in
a parallel simulation.
2020-01-29 15:30:55 +01:00
Tor Harald Sandve
2877a984a1
Adapt FluidState in Aquifer model to interface change due to Brine
2020-01-09 15:09:53 +01:00
Kai Bao
d1fd04e635
WIP in fixing the non-defaulted influx coefficient for AquiferFetkovich
2020-01-02 10:55:03 +01:00
Kai Bao
7fc81ae228
using range for a few occasions in BlackoilAquiferModel_impl.hpp
2019-12-20 15:32:39 +01:00
Kai Bao
3fb96deb36
re-formatting aquifer files with clang-format
2019-12-20 14:30:13 +01:00
Atgeirr Flø Rasmussen
63c766cd30
Add override to silence warnings.
2019-12-10 11:37:52 +01:00
Bård Skaflestad
ce1e0691a8
Aquifer Restart: Address Review Comments
...
Mostly 'throw'ing in the case of unsupported operations. While
here, also remove an unused header.
2019-12-05 13:41:05 +01:00
Bård Skaflestad
4c4a893781
Aquifer Model: Add Initialization from Restart Data
...
This commit adds a new member function,
initFromRestart()
to the EclBaseAquiferModel and the BlackoilAquiferModel. The former
does nothing, the latter calls AquiferInterface::initFromRestart()
on the contained analytic aquifer objects.
2019-12-05 09:41:21 +01:00
Bård Skaflestad
df86d01486
Add Means of Initializing Analytic Aquifers From Restart Data
...
This commit adds a new member function,
AquiferInterface::initFromRestart()
that consumes a vector<data::AquiferData> constructed from
information in the restart file's SAAQ and XAAQ vectors. At the
moment, we use the initial aquifer pressure, the total produced
liquid volume and the current aquifer pressure at restart.
We implement the interface's member function in terms of the virtual
function
AquiferInterface::assignRestartData()
that must be overridden in derived classes.
Implement a trivial such function for Carter-Tracy aquifers, and a
function that only stores the current aquifer pressure for the
Fetkovich aquifer model.
Additionally, record whether or not the aquifer object was
initialised from a previous solution. If so, don't reset total
produce liquid volumes or aquifer pressures to their base values
from the model input file.
2019-12-05 09:41:21 +01:00
Kai Bao
0c6adbbba0
some small cleaning up for Aquifer models
...
there should be no functional change.
2019-11-17 10:37:10 +01:00
Kai Bao
eea833ced2
correcting the way of calculate initial aquifer pressure
...
for AquiferFetkovich.
2019-11-17 10:37:10 +01:00
Kai Bao
383748b161
some cleaning up for the AquiferFetkovich
2019-11-17 10:37:10 +01:00
Kai Bao
21d69a7af0
making dp is Eval for AquiferFetkovich
2019-11-17 10:37:10 +01:00
Kai Bao
c4a9bd346c
converting the aquifer files to be unix format
...
to avoid ^M in git diff and when editing.
2019-10-19 20:53:35 +02:00
Atgeirr Flø Rasmussen
c17adf788f
Moved files to opm/simulators/ subdirs.
2019-05-08 12:58:19 +02:00
