David Landa Marban
a19e70c59a
fix to broken built with clang
2023-03-10 22:39:39 +01:00
Bård Skaflestad
f25d204281
Tag Unused Parameter as Maybe_Unused
...
Noted by [at]akva2
2023-03-10 11:36:11 +01:00
Bård Skaflestad
7abfdc52e0
Refactor Construction of Analytic Aquifer Objects
...
In particular, split the 'static' aquifer object initialisation
of member function 'init()' into a new helper function
initializeStaticAquifers()
This is in preparation of adding a similar function to handle
dynamic aquifer object initialisation from a restart file. To that
end, also add a new member function
createDynamicAquifers(episode_index)
containing the current implementation of beginEpisode(). Creating
the dynamic objects from a restart file then amounts to calling this
function with a different 'episode_index'. As another aid to
maintainability, add a new templated member function
createAnalyticAquiferPointer()
which forms 'unique_ptr<AquiferInterface>' objects for every known
type of analytic aquifer. This, in turn, requires reordering the
parameters of the AquiferConstantFlux constructor to match those of
the existing Fetkovich and Carter-Tracy types.
Finally, split the calculation of the constant flux aquifer's total
flux rate out to a new helper function
AquiferConstantFlux::totalFluxRate()
2023-03-09 18:04:55 +01:00
Atgeirr Flø Rasmussen
c9ba0afea3
Silence warnings: struct/class, missing override.
2023-03-03 10:12:46 +01:00
Arne Morten Kvarving
da4784b314
AquiferConstantFlux: add restart serialization support
2023-02-22 14:41:07 +01:00
Arne Morten Kvarving
9418110d3e
AquiferConstantFlux: mark method override
2023-02-22 14:41:07 +01:00
Arne Morten Kvarving
6073af784d
AquiferConstantFlux: add missing includes
2023-02-22 14:41:07 +01:00
Kai Bao
7a67b16c3e
addressing review comments for PR OPM/opm-simulators#4429
2023-02-21 15:27:05 +01:00
Kai Bao
73dc31a7a5
updating AquiferConstantFlux with AQUFLUX
...
not recreating new instances to avoid unnecessary cost from constructor.
2023-02-21 13:20:36 +01:00
Kai Bao
71119b6e42
WIP in making AQUFLUX running in parallel.
2023-02-21 13:20:36 +01:00
Kai Bao
7bd1cd9aa1
following the AQUFLUX design change from opm-common
2023-02-21 13:20:36 +01:00
Kai Bao
9a0ea0cb97
WIP in adding summary output for AQUFLUX aquifers
...
FAQR and FAQT are not working properly yet.
2023-02-21 13:20:36 +01:00
Kai Bao
248f6b73d9
WIP of supporting AQUFLUX from simulator side
2023-02-21 13:20:36 +01:00
Arne Morten Kvarving
d5f22dbc99
BlackoilAquiferModel: add serialization of dynamic state
2023-02-14 17:51:25 +01:00
Arne Morten Kvarving
a66fd75715
AquiferNumerical: add serialization of dynamic state
2023-02-14 16:15:25 +01:00
Arne Morten Kvarving
03f6309ff7
AquiferFetkovich: add serialization of dynamic state
2023-02-14 16:15:25 +01:00
Arne Morten Kvarving
51e5e61c39
AquiferCarterTracy: add serialization of dynamic state
2023-02-14 16:15:25 +01:00
Arne Morten Kvarving
6dc63b2da8
AquiferAnalytical: add serialization of dynamic state
2023-02-14 16:15:25 +01:00
Tor Harald Sandve
5854b8a7a1
Support gas dissolution in water (Rsw)
...
- adapt to interface change in waterPvt()
- add gas + water + disgasw simulator
Note
- MSW is not supported
- EQUIL initialization is not supported
2022-12-21 13:13:52 +01:00
Arne Morten Kvarving
f9f6fdb3bf
BlackoilAquiferModel: only include alugrid if it is to be used
2022-11-14 15:11:12 +01:00
Arne Morten Kvarving
ada17881cc
AquiferAnalytical: use elements and intersections range generators
2022-10-13 23:01:37 +02:00
Arne Morten Kvarving
72bed4449b
AquiferNumerical: use elements range generator
2022-10-13 23:01:37 +02:00
Tor Harald Sandve
3ad04d8326
fix analytical aquifers + energy
2022-09-02 08:57:55 +02:00
Arne Morten Kvarving
71ca7a0c40
changed: no need to pull in polyhedralgrid if it is not used
2022-08-26 08:25:05 +02:00
Atgeirr Flø Rasmussen
c0e5996b70
Merge pull request #4024 from atgeirr/silence-override-warning
...
Add override qualifier to silence warning.
2022-08-24 16:07:04 +02:00
Atgeirr Flø Rasmussen
6cf02813e5
Add override qualifier to silence warning.
2022-08-24 15:36:56 +02:00
Bård Skaflestad
6d3d64a843
Merge pull request #4015 from GitPaean/handling_numerical_aquifer_no_connection
...
ignoring analytical aquifers without valid connections
2022-08-24 09:59:26 +02:00
Kai Bao
c25e1392ba
ignoring analytical aquifers without valid connections
2022-08-23 15:50:50 +02:00
Kai Bao
d69c80b84a
simplifying the constructor for AquiferNumerical
...
removing the unused global_cell and avoid the unnecessary construction of cartesianToCompressed
2022-08-18 15:55:04 +02:00
Arne Morten Kvarving
4917c860fe
BlackOilAquiferModel: use aquifers through base interface
2022-08-11 10:04:49 +02:00
Arne Morten Kvarving
271d5bee3a
added: (re)introduce AquiferInterface
...
now a base class for both analytical and numerical aquifers
2022-08-11 09:59:49 +02:00
Arne Morten Kvarving
f166920e75
changed: rename AquiferInterface to AquiferAnalytical
2022-08-11 09:59:49 +02:00
Arne Morten Kvarving
66b4f1edb7
Aquiferxxx: some modernization
...
- typedef -> using
- use constexpr
2022-08-11 09:59:46 +02:00
Atgeirr Flø Rasmussen
a5c8d40cfa
Remove unneeded timeIdx arguments, also silence other warnings.
2022-08-10 10:01:54 +02:00
Atgeirr Flø Rasmussen
322dcbfb36
Make getWaterFlux() take const ref argument. Minor formatting cleanups.
2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
5fba14373b
Modification to reduce PR to minimal changes.
2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
0da2b68e0b
Adapt to changed interface.
2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
b1bcab31b9
Refactor addToSource to add interface not using element context.
2022-08-09 11:09:48 +02:00
hnil
060877a08b
runs first steps of norne
2022-08-09 11:09:48 +02:00
Elyes Ahmed
5c2b60bcd0
rebasing
2022-07-28 20:40:34 +02:00
Joakim Hove
6b92443cb4
Downstream filesystem reorganisation in opm-common
2022-01-02 14:33:34 +01:00
Tor Harald Sandve
1baee5ec9b
Merge pull request #3715 from goncalvesmachadoc/vapwat
...
update parameters BlackoilFluidSystem
2021-12-09 15:37:49 +01:00
goncalvesmachadoc
90380c35ad
update parameters BlackoilFluidSystem
...
fix
update parameters BlackoilFluidSystem
2021-11-29 16:38:43 +01:00
Tor Harald Sandve
6277d12d16
fix return type for phaseIdx and compIdx
2021-11-25 14:56:27 +00:00
Tor Harald Sandve
2352d94c0e
fix co2store + aqunum
2021-11-24 11:13:50 +00:00
Elyes Ahmed
f53c597f90
Replacing use of MPI_COMM_WORLD with a variable communicator.
2021-10-05 13:07:52 +02:00
Markus Blatt
3cda8a2fdb
Added missing parallel try-catch clause for updatePrimaryIntensities.
...
As Problem::updatePrimaryIntensities might throw we need to do this
to prevent dealocks in parallel run in case problem occurs.
2021-09-24 09:25:44 +02:00
Tor Harald Sandve
50cf80910b
support aquct and co2store
2021-09-21 11:08:10 +02:00
Bård Skaflestad
bbb0c7f263
Add Restart Support for Numerical Aquifers
...
We assign cumulative production only on the process that connects to
the reservoir model. As a tiny optimisation, we return 0.0 early
as the aquifer flux on processes that do not connect to the
reservoir.
2021-08-19 21:07:05 +02:00
Bård Skaflestad
a0af111bd8
Reduce Restarted Cumulative Volume if Aquifer Split
...
If, in a restarted run, a single analytical aquifer object happens
to connect to the reservoir model from multiple separate MPI
processes we must not attribute the full historic cumulative water
production from the aquifer to each process.
This commit makes a rough estimate based on the connection areas of
how much of the total cumulative production is attributable to each
process and reduces the restart value using that fraction. This is,
at best, a hack but it is currently the best we can do with the
information available in the restart files. Complete fidelity will
entail tracking cumulative production at the connection level.
2021-08-19 21:07:05 +02:00