Commit Graph

12728 Commits

Author SHA1 Message Date
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
b0c7062eb4
Merge pull request #3274 from totto82/fixDuneFem2
fix building with dunefem
2021-05-19 08:00:27 +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
Tor Harald Sandve
89e5b6758b fix building with dunefem 2021-05-18 15:31:57 +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
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
Arne Morten Kvarving
5fa02055d4 split eclalternativeblackoilindices to separate file 2021-05-18 10:09:45 +02:00
Arne Morten Kvarving
6df23090bc ecloutputblackoilmodule: remove unused methods
furthermore, they do not compile as there are duplicate
entries in switch statements.
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
b7700d1077
Merge pull request #3259 from akva2/ecltracer_vanguard_separate
ecltracermodel: split in typetag dependent and typetag-independent parts
2021-05-18 08:15:40 +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
Bård Skaflestad
4386f521a1
Merge pull request #3265 from akva2/ecloutputblackoilmodule_cleanups
Some small cleanups in ecloutputblackoilmodule
2021-05-17 22:36:18 +02:00
Arne Morten Kvarving
0a8f3213ae ecloutputblackoilmodule: use tracer info from EclipseState
to reduce reliance on typetag dependent type
2021-05-17 21:27:11 +02:00
Arne Morten Kvarving
8cab13c08a ecloutputblackoilmodule: use empty() instead of size() 2021-05-16 22:12:03 +02:00
Arne Morten Kvarving
638490d6ff ecloutputblackoilmodule: use std::array 2021-05-16 00:00:42 +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
Bård Skaflestad
00b6a9102b
Merge pull request #3260 from verveerpj/keyword_validation_small_improvement
Simplify the error message on invalid item values for keywords with only a single record
2021-05-15 12:19:14 +02:00
Joakim Hove
2ac7b5e4bf Reorder variables and remove .reserve() calls 2021-05-15 08:49:14 +02:00
Peter Verveer
ad0b62ab1c Simplify the message for keywords with only a single record 2021-05-14 15:12:12 +02:00
Arne Morten Kvarving
30414bf0ff ecltracermodel: split in typetag dependent and typetag-independent parts
this allows using explicit template instantation to only
compile this code per grid, not per simulator object
2021-05-14 14:06:18 +02:00
Joakim Hove
fcba55080f
Merge pull request #3243 from akva2/small_cleanups
Small cleanups in WellInterface
2021-05-14 09:12:11 +02:00
Joakim Hove
3ed51c28f9
Merge pull request #3256 from akva2/eclthresholdpressure_vanguard_separate
eclthresholdpressure: split in typetag dependent/independent parts
2021-05-14 09:07:36 +02:00
Bård Skaflestad
9b936390bf
Merge pull request #3258 from akva2/janitoring
quell warnings in serial build
2021-05-14 00:23:13 +02:00
Arne Morten Kvarving
eaa09a3905 quell warnings in serial build 2021-05-13 22:40:39 +02:00