Commit Graph

1057 Commits

Author SHA1 Message Date
Bård Skaflestad
71de144399
Merge pull request #3239 from osae/tracer
Tracer summary curves, collect well rates.
2021-06-25 17:48:40 +02:00
Bård Skaflestad
5e883e562c Chase Type Specific Aquifer Data API Change
This commit switches to using the new 'typeData' interface for
representing type-specific aquifer data items.  In particular we use
the new 'typeData.is<>()' and 'typeData.get<>()' member functions to
query and access the data that is specific to each aquifer type
(e.g., Carter-Tracy or numerical).

While here, also expand the reported data items for numerical
aquifers to one initial pressure value for each aquifer cell.  This
is needed for restart purposes.
2021-06-25 09:58:27 +02:00
Bård Skaflestad
6d3da3d2e0 Report Pressure Dependent Pore Volume in PRT File
This commit distinguishes the reference condition pore volume from
the dynamic, pressure (and/or temperature) dependent pore volume
value.  Previously we would report the latter as the 'PORV' value in
the "Field Totals" and "FIPNUM region" reports, but this commit
switches to reporting the former instead-mostly for compatibility.
We still report the dynamic pore volume value, but now we report
this on a line of its own, before the table, using one of the forms

Field total pressure dependent pore volume = 12345 RM3
FIPNUM report region 1 pressure dependent pore volume = 123 RM3
2021-06-22 12:00:56 +02:00
Arne Morten Kvarving
a8ffe91841 quell dune2.7+ warning 2021-06-18 15:18:06 +02:00
Arne Morten Kvarving
463a41d373 fixed: do not assert conditions guaranteed by unsigned 2021-06-18 13:27:58 +02:00
Ove Sævareid
33511b45c1 Relegating implementation details. 2021-06-15 17:18:46 +02:00
Ove Sævareid
c406216c7f Removed some tentative stuff. 2021-06-15 17:18:46 +02:00
Ove Sævareid
c4f41ccc5c Add some comments. 2021-06-15 17:18:46 +02:00
Ove Sævareid
39cf29a2a6 Variable names 2021-06-15 17:18:46 +02:00
Ove Sævareid
9478e8d03d Remove injector crossflow from tracer production. 2021-06-15 17:18:46 +02:00
Ove Sævareid
581408c760 Batchwise tracer calculations. 2021-06-15 17:18:46 +02:00
Ove Sævareid
6d76f6c557 Tracer summary curves, collect well rates. 2021-06-15 17:18:46 +02:00
Arne Morten Kvarving
a84d05c83b fixed: forward classes as classes 2021-06-14 09:09:15 +02:00
Tor Harald Sandve
5686d90c61
Merge pull request #3350 from totto82/maxNiWi
Change the inner iterations logic
2021-06-10 19:49:23 +02:00
Joakim Hove
308e191ad5 Remove unused #include <TimeMap> 2021-06-10 14:38:14 +02:00
Arne Morten Kvarving
059140f2ee split out typetag independent code from BlackoilWellModel 2021-06-07 12:04:06 +02:00
Tor Harald Sandve
3ca6e215dc Change the inner iterations logic
This replace the Boolean switch to enable inner iterations with a
int that controls for which maximum number of newton iterations
inner iterations applies.

Default is set to 3
2021-06-04 10:51:15 +02:00
Joakim Hove
fcc4970337
Merge pull request #3318 from akva2/eclwellmodel_no_default
changed: do not set the ebos well model as default type
2021-06-04 09:58:46 +02:00
Atgeirr Flø Rasmussen
be0515dcba Avoid warning by defining static variable inline. 2021-06-03 13:27:49 +02:00
Atgeirr Flø Rasmussen
52877883d8 Add virtual destructor for base class. 2021-06-03 13:01:56 +02:00
Bård Skaflestad
d974f6bd03
Merge pull request #3333 from totto82/fixTEMPrestart
Pass the temperature to the restart machinary if enableTemperature is true
2021-06-02 13:09:41 +02:00
Tor Harald Sandve
3422e18583 Optional passing of the temperature vector to the restart machinary
If enableTemperature and --enable-opm-restart-file=true the temperature is passed to or read from the restart file
2021-06-02 11:53:57 +02:00
Arne Morten Kvarving
c2211b532f eclwriter: fix regression in parallel
order of constructing and obtaining global transmissibilities
was off. replace constructor argument with a setter so it can be
set at the appropriate time.
2021-06-01 09:08:38 +02:00
Bård Skaflestad
bd9b9a7118 Prepare to Save/Restore Richer Set of Aquifer Values
This commit adds logic to communicate more dynamic aquifer values
between the simulation and I/O layers.  In particular, we ensure
that we allocate the 'aquFet' and 'aquCT' substructures of the
dynamic aquifer data as appropriate and that we collect this
information on the I/O rank as part of the restart output process.
We furthermore make the 'ParallelRestart' facility aware of dynamic
aquifer data in preparation of loading these values from the restart
file.
2021-05-28 14:47:17 +02:00
Arne Morten Kvarving
d65a9a5f70 changed: do not set the ebos well model as default type
rather, only set it where we want to use it. this avoids including
eclwellmanager.hh and eclpeacemanwell.hh unnecessarily in
simulator objects (where BlackoilWellModel is used).
2021-05-28 11:28:43 +02:00
Arne Morten Kvarving
a128c64a03 use if constexpr 2021-05-28 09:03:17 +02:00
Arne Morten Kvarving
cbd7cfe8b6 split eclproblem in typetag dependent and typetag independent classes 2021-05-28 08:54:10 +02:00
Arne Morten Kvarving
b82d83dd60 eclpeacemanwell: anonymize unused parameters 2021-05-27 15:51:26 +02:00
Arne Morten Kvarving
f1965a58f3 eclpeacemanwell: use override 2021-05-27 15:51:26 +02:00
Arne Morten Kvarving
6045391bbd eclpeacemanwell: use std::array 2021-05-27 15:51:26 +02:00
Bård Skaflestad
f32a08124d
Merge pull request #3307 from akva2/eclproblem_cleanups
Various small cleanups in eclproblem
2021-05-26 22:02:23 +02:00
Arne Morten Kvarving
89443dd6a3 fixed: do not take reference to a temporary
getWellsatEnd returns a temporary vector. it goes out of
scope on the line, thus the reference taken is dangling.
2021-05-26 15:50:27 +02:00
Arne Morten Kvarving
f7dd0e34c3 eclproblem: fix typo in alugrid code 2021-05-26 15:12:08 +02:00
Arne Morten Kvarving
d5e9d32d7c eclproblem: use .empty() instead of size() == 0 2021-05-26 15:11:14 +02:00
Arne Morten Kvarving
3294917710 eclproblem: remove unused accessor 2021-05-26 15:03:22 +02:00
Arne Morten Kvarving
2a2b128820 eclproblem: remove unused type alias 2021-05-26 14:59:39 +02:00
Arne Morten Kvarving
fe57de72b2 eclproblem: only call function if an extension is enabled 2021-05-26 14:59:12 +02:00
Arne Morten Kvarving
aa7ec98c0f eclproblem: use if constexpr for enableApiTracking 2021-05-26 14:51:24 +02:00
Arne Morten Kvarving
be9c03bfac eclproblem: use if constexpr for enableDiffusion 2021-05-26 14:50:27 +02:00
Arne Morten Kvarving
99273fee85 eclproblem: use if constexpr for enableEnergy 2021-05-26 14:50:04 +02:00
Arne Morten Kvarving
94fe38fc93 eclproblem: use if constexpr for enableExtbo 2021-05-26 14:48:06 +02:00
Arne Morten Kvarving
baad3a7722 eclproblem: use if constexpr for enableBrine 2021-05-26 14:47:10 +02:00
Arne Morten Kvarving
68f9aeb78f eclproblem: use if constexpr for enablePolymerMolarWeight 2021-05-26 14:45:42 +02:00
Arne Morten Kvarving
3578c13236 eclproblem: use if constexpr for enablePolymer 2021-05-26 14:43:09 +02:00
Arne Morten Kvarving
cf2ab1cb41 eclproblem: use if constexpr for enableSolvent 2021-05-26 14:38:35 +02:00
Arne Morten Kvarving
836251aca1 eclproblem: use if constexpr for enableExperiments 2021-05-26 14:31:57 +02:00
Arne Morten Kvarving
b51f57a5c3 eclproblem: replace typedef with using 2021-05-26 14:30:50 +02:00
Arne Morten Kvarving
df4fdc9794 eclproblem: use maybe_unused attribute instead of macro 2021-05-26 14:19:23 +02:00
Arne Morten Kvarving
8ed738b188 eclproblem: anonymize unused parameters 2021-05-26 14:18:44 +02:00
Arne Morten Kvarving
d55df4330e fixed: do not use Opm:: prefix when inside namespace Opm 2021-05-25 12:06:06 +02:00