Joakim Hove
7695abfe25
Move wellMap() and numWells() accessors
2021-05-21 14:57:38 +02:00
Joakim Hove
6ac9e722fc
Move reportConnections
2021-05-21 14:57:38 +02:00
Joakim Hove
5b86ecd3e2
Move WellState::report to WellStateFullyImplicitBlackOil
2021-05-21 14:57:38 +02:00
Bård Skaflestad
3ef04a3335
Merge pull request #3286 from akva2/gasliftsinglewell_typetag_split
...
GasLiftSingleWell: split typetag independent code to separate class
2021-05-21 12:26:54 +02:00
Atgeirr Flø Rasmussen
dee7030784
Merge pull request #3273 from akva2/clang_cleanups
...
Quell various clang warnings
2021-05-21 09:22:31 +02:00
Arne Morten Kvarving
1614767362
GasLiftSingleWell: split typetag independent code to separate class
2021-05-21 09:09:10 +02:00
Bård Skaflestad
3dbab3b7d6
Merge pull request #3284 from akva2/gasliftsinglewell_cleanup
...
Some small cleanups in GasLiftWellState
2021-05-20 17:26:56 +02:00
Joakim Hove
506a349085
Use wellcontainer2 ( #3255 )
...
Use WellContainer<> to manage members in WellState
2021-05-20 16:16:12 +02:00
Arne Morten Kvarving
82d125d1c0
GasLiftSingleWell: drop undefined symbols
2021-05-20 14:17:34 +02:00
Arne Morten Kvarving
e8603dfea3
drop type alias GasLiftSingleWell::GLiftWellState
2021-05-20 14:12:41 +02:00
Arne Morten Kvarving
28b9f04721
remove empty _impl file
2021-05-20 12:17:24 +02:00
Arne Morten Kvarving
09cbfb4cde
remove unnecessary includes
2021-05-20 12:17:24 +02:00
Arne Morten Kvarving
31cb01ae24
no reason for GasLiftWellState to be typetag dependent
2021-05-20 12:17:24 +02:00
Joakim Hove
db731ac1ad
Use well local indices when iterating over segments
2021-05-20 08:17:19 +02:00
Joakim Hove
1e9a5195e9
Add rst_ prefix to restart variables
2021-05-20 07:47:55 +02:00
Bård Skaflestad
91dae1aa6f
Merge pull request #3269 from akva2/small_cleanups
...
Some small cleanups
2021-05-19 23:50:01 +02:00
Bård Skaflestad
e3e4c2e96a
Merge pull request #2980 from totto82/cleanUpPot
...
Only compute potentials at beginTimeStep after an event
2021-05-19 19:10:55 +02:00
Joakim Hove
38587b0c07
Merge pull request #3281 from alfbr/remove-supported
...
Remove GLIFTOPT and NETWORK from unsupported keywords.
2021-05-19 16:22:59 +02:00
Joakim Hove
3de4213c8c
Merge pull request #3236 from akva2/wellinterface_generic_split
...
changed: split out non-typetag dependent code from WellInterface
2021-05-19 14:46:56 +02:00
Joakim Hove
b0458cee33
Merge pull request #3268 from joakim-hove/wellstate-iget
...
Wellstate iget
2021-05-19 14:29:26 +02:00
Alf Birger Rustad
7c9d87de4f
Remove GLIFTOPT and NETWORK from unsupported keywords.
2021-05-19 13:19:26 +02:00
Tor Harald Sandve
dacd782639
Merge pull request #3270 from akva2/well_small_optims
...
Some small code eliminiations in well code
2021-05-19 12:35:57 +02:00
Tor Harald Sandve
84dcde5377
Merge pull request #3272 from totto82/fixRESVgroup
...
FIX wrong type RESV group control
2021-05-19 12:17:33 +02:00
Joakim Hove
203cc2ff73
Update WellState::temperature()
2021-05-19 10:05:11 +02:00
Joakim Hove
6af03f4a6a
Update WellState::thp()
2021-05-19 10:05:11 +02:00
Joakim Hove
3ec7feba75
Update WellState::bhp()
2021-05-19 10:05:11 +02:00
Tor Harald Sandve
2a5610e5cf
Merge pull request #3276 from hakonhagland/stage2_fix2
...
Fixes a bug in GasLiftStage2_impl.hpp
2021-05-19 09:28:44 +02:00
Arne Morten Kvarving
0f4bb49ed9
changed: split out non-typetag dependent code from WellInterface
2021-05-19 09:25:03 +02:00
Tor Harald Sandve
ce5e3ac075
remove ElemType and zero()
2021-05-19 09:00:53 +02:00
Tor Harald Sandve
93237ec345
FIX wrong type RESV group control
2021-05-19 09:00:53 +02:00
Tor Harald Sandve
7f3dc1dc48
Merge pull request #3275 from atgeirr/fix-msw-indices
...
Fix incorrect indices for 1 and 2-phase cases with MSW.
2021-05-19 07:53:43 +02:00
Håkon Hægland
0abcac3777
Fixes a bug in GasLiftStage2_impl.hpp
...
When making gas lift parallel, see PR #3148 , redistributeALQ() did not
reserve space for the decremental and incremental gradients. Later in
execution thread when push_back() was called to add elements to the
vectors, the capacity of the vector could get exceeded and hence the
internal representation of the vector could be reallocated. This seems
to have caused access to undefined memory errors since the iterators into
the vectors was long longer valid.
2021-05-19 00:54:48 +02:00
Atgeirr Flø Rasmussen
377d7eca60
Merge pull request #3271 from totto82/fixRESVpred
...
BUGFIX fix direction of the resv check
2021-05-18 19:05:17 +02:00
Atgeirr Flø Rasmussen
32d0854f14
Fix incorrect indices for 1 and 2-phase cases with MSW.
2021-05-18 15:32:15 +02:00
Arne Morten Kvarving
bcfab1fed3
use if constexpr to eliminate some brine code
2021-05-18 15:04:47 +02:00
Arne Morten Kvarving
db668e8d80
make has_energy constexpr and use if constexpr to eliminate code
2021-05-18 15:04:47 +02:00
Arne Morten Kvarving
268201eeb1
make has_polymermw constexpr and use if constexpr to eliminate code
2021-05-18 15:04:47 +02:00
Arne Morten Kvarving
a7507cf544
fixed: forward structs as structs
...
clang warns
2021-05-18 12:07:04 +02:00
Tor Harald Sandve
4cf08deede
BUGFIX fix direction of the resv check
2021-05-18 10:45:10 +02:00
Arne Morten Kvarving
dd04eb128a
use if constexpr to eliminate some zFraction code
2021-05-18 10:18:11 +02:00
Arne Morten Kvarving
83595d84c3
use if constexpr to eliminate some polymer code
2021-05-18 10:18:11 +02:00
Arne Morten Kvarving
1fa74b5889
use if constexpr to eliminate some foam code
2021-05-18 10:18:11 +02:00
Arne Morten Kvarving
6157122bd8
use if constexpr to eliminate some solvent code
2021-05-18 10:17:21 +02:00
Arne Morten Kvarving
8c34172ef0
remove some Opm:: qualifiers inside Opm namespace
2021-05-18 10:09:45 +02:00
Joakim Hove
842e0a53a4
Merge pull request #3263 from akva2/move_ecldeck_param
...
changed: move Deck parameter to BlackoilModelParametersEbos
2021-05-18 08:19:19 +02:00
Joakim Hove
28129b87bb
Merge pull request #3250 from bska/activate-aqudata-move-semantics
...
Reduce Aquifer Data Copying
2021-05-18 08:08:00 +02:00
Joakim Hove
ee91333402
Merge pull request #3261 from joakim-hove/wellstate-msw1
...
Reorder variables and remove .reserve() calls
2021-05-18 07:54:32 +02:00
Bård Skaflestad
15116bf2a9
Reduce Aquifer Data Copying
...
This commit switches to using 'map<>::insert_or_assign()' as the
primary interface for collecting dynamic aquifer data. In turn,
this activates move semantics for the substructures and reduces the
number of times the data is copied.
Insert_or_assign requires the key, so provide this value--i.e., the
aquifer ID--as part of the AquiferInterface.
2021-05-17 23:24:52 +02:00
Arne Morten Kvarving
8d1a8126ea
changed: move Deck parameter to BlackoilModelParametersEbos
...
it is used there. now eclbasevanguard.hh includes
BlackoilModelParametersEbos, instead of the other way around.
2021-05-15 14:42:50 +02:00
Joakim Hove
2ac7b5e4bf
Reorder variables and remove .reserve() calls
2021-05-15 08:49:14 +02:00