Commit Graph

12696 Commits

Author SHA1 Message Date
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
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
Arne Morten Kvarving
f5fa602abb eclthresholdpressure: 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-13 21:09:38 +02:00
Joakim Hove
138caade06
Merge pull request #3257 from akva2/wellstateblackoil_comp_unit
Put WellStateFullyImplicitBlackoil in separate compile unit
2021-05-13 13:36:04 +02:00
Arne Morten Kvarving
7c29453512 cosmetics
do not indent for namespace
2021-05-13 12:04:43 +02:00
Arne Morten Kvarving
861899de2e changed: put WellStateFullyImplicitBlackoil in separate compile unit 2021-05-13 12:01:03 +02:00
Markus Blatt
af68511a63
Merge pull request #3223 from akva2/ecltransmissibility_vanguard_separate
Separate eclctransmissibility.hh into typetag dependent/independent code
2021-05-13 09:33:59 +02:00
Joakim Hove
7d97869d35
Merge pull request #3253 from akva2/wellstate_compile_unit
Put WellState in separate compile unit
2021-05-13 09:30:32 +02:00
Arne Morten Kvarving
80a05ceb33 cosmetics
- do not indent for namespace
- move constructors and destructors to top
- use public/protected/private order
2021-05-13 00:38:08 +02:00
Arne Morten Kvarving
2c1a6ae8cb replace typedef with using statements 2021-05-13 00:38:08 +02:00
Arne Morten Kvarving
6ef5e239b2 sort alphabetically 2021-05-13 00:38:08 +02:00
Arne Morten Kvarving
a032c5a80e changed: put WellState in separate compile unit 2021-05-13 00:38:08 +02:00
Bård Skaflestad
993c973340
Merge pull request #3247 from akva2/cleanup_vanguard
Some small cleanups
2021-05-12 17:20:51 +02:00
Bård Skaflestad
be0908a3f8
Merge pull request #3251 from akva2/keyword_validation_rebuilds
Avoid full simulator rebuilds when updating keyword validation lists
2021-05-12 16:47:40 +02:00
Arne Morten Kvarving
ca1a799e95 changed: put partially supported keywords in separate compile unit
avoid triggering full simulator rebuilds when updating
this list
2021-05-12 14:29:33 +02:00
Arne Morten Kvarving
306593af3b changed: put unsupported keywords in separate compile unit
avoid triggering full simulator rebuilds when updating
this list
2021-05-12 14:29:33 +02:00
Bård Skaflestad
4f5b1defea
Merge pull request #3249 from goncalvesmachadoc/patch-4
Remove COPYREG and add RPTSOL
2021-05-12 14:27:14 +02:00
Arne Morten Kvarving
7ff44d9093 ecltransmissibility: separate from typetag
this allows using explicit template instantation to only
compile this code per grid, not per simulator object
2021-05-12 12:10:29 +02:00
Cintia Goncalves Machado
5c51d4dea4
Remove COPYREG and add RPTSOL
Remove COPYREG (https://github.com/OPM/opm-simulators/issues/3234) and add RPTSOL (https://github.com/OPM/opm-simulators/issues/3248) as non-critical missing keyword
2021-05-12 12:04:01 +02:00
Joakim Hove
77f3b93b88
Merge pull request #3241 from joakim-hove/wellcontainer-initializer-list
Add initializer_list based WellContainer constructor
2021-05-12 11:15:53 +02:00
Arne Morten Kvarving
b053cb4161 unique_ptrs are default initialized to nullptr 2021-05-12 11:08:12 +02:00
Arne Morten Kvarving
924fdec296 use type alias 2021-05-12 11:07:38 +02:00
Arne Morten Kvarving
e8f69223e6 changed: use constexpr value and ifs
to disable code compile time instead of having
runtime conditionals
2021-05-12 10:52:37 +02:00
Arne Morten Kvarving
1568479d3d fix function name
Frations -> Fractions
2021-05-12 10:50:46 +02:00
Markus Blatt
ba9f4c5b50
Merge pull request #3219 from akva2/eclcpgrid_vanguard_separate
Separate eclcpgridvanguard.hh into typetag dependent/independent code
2021-05-12 10:47:44 +02:00
Bård Skaflestad
5cafd7268e
Merge pull request #3242 from bska/fix-debug-builds
Restore Debug Builds
2021-05-12 09:39:32 +02:00
Joakim Hove
66c56bb8c3 Add initializer_list based WellContainer constructor 2021-05-12 09:18:58 +02:00
Arne Morten Kvarving
9758cd4f92 replace typedefs with using statements 2021-05-12 09:06:37 +02:00
Arne Morten Kvarving
ab4772aba8 fixed: use Scalar type from TypeTag 2021-05-12 09:02:29 +02:00
Arne Morten Kvarving
d5cdbf38d6 remove Opm:: prefix for symbols
we are already in the Opm:: namespace
2021-05-12 08:57:07 +02:00
Arne Morten Kvarving
9de5d077f6 remove unused modestring array 2021-05-12 08:47:49 +02:00
Arne Morten Kvarving
539c83687c changed: (re)move unnecessary includes 2021-05-12 08:47:22 +02:00
Bård Skaflestad
57d45011af Restore Debug Builds
This was broken in commit b5580f39f (PR #3222) which removed the
'start_perf_next_well' symbol but did not update every use location.
2021-05-12 08:37:19 +02:00