Commit Graph

12647 Commits

Author SHA1 Message Date
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
Joakim Hove
817e81d3b7
Merge pull request #3235 from akva2/constexpr_micro_optim_wells
Small micro-optims in WellInterface
2021-05-12 06:55:22 +02:00
Joakim Hove
950247bf28
Merge pull request #3222 from joakim-hove/perforations-well-index
Perforations well index
2021-05-11 22:52:25 +02:00
Joakim Hove
b5580f39fa Let the perforation index run over the indices for one well 2021-05-11 22:38:11 +02:00
Joakim Hove
846809ec29 Rename mutable perfPhaseRates() 2021-05-11 18:48:05 +02:00
Bård Skaflestad
aea80db23a
Merge pull request #3238 from akva2/fix_equil_cart_mapper_regression
fix regression: do not unconditionally dereference equilCartMapper
2021-05-11 16:36:56 +02:00
Arne Morten Kvarving
c7c29483e7 fix regression: unconditional dereferences
equilGrid and equilCartesianMapper can only
be dereferenced on rank 0.
2021-05-11 15:21:50 +02:00
Arne Morten Kvarving
a192ccb417
Merge pull request #3232 from totto82/fixDuneFemBuild
explicity add gridView from Dune::Fem in collectDataToIORank
2021-05-11 13:24:14 +02:00
Arne Morten Kvarving
ceb9bb4311 changed: make has_brine contexpr
and use if constexpr to eliminate some code
2021-05-11 12:52:44 +02:00
Arne Morten Kvarving
f48ee17d59 changed: make has_foam contexpr
and use if constexpr to eliminate some code
2021-05-11 12:46:54 +02:00
Arne Morten Kvarving
73ccb42634 changed: make has_polymer contexpr
and use if constexpr to eliminate some code
2021-05-11 12:33:54 +02:00
Arne Morten Kvarving
a78c7e598d changed: make has_solvent and has_zFraction constexpr
and use if constexpr to eliminate some code
2021-05-11 12:28:10 +02:00
Bård Skaflestad
dc8bbc9e5a
Merge pull request #3218 from akva2/eclbase_vanguard_separate
eclbasevanguard: separate template and non-template parts
2021-05-11 11:01:51 +02:00
Tor Harald Sandve
f091781ee2 explicity add gridView from Dune::Fem in collectDataToIORank 2021-05-11 09:40:19 +02:00
Arne Morten Kvarving
bba700e7a2 changed: this is better kept a compile time error 2021-05-11 09:15:11 +02:00
Arne Morten Kvarving
3397cd6252 eclbasevanguard: split in template and non-template parts 2021-05-11 09:15:11 +02:00
Arne Morten Kvarving
5aa1b43e41 eclbasevanguard: pass parameters to updateOutputDir
to avoid typetag dependence in the code
2021-05-11 09:15:11 +02:00
Arne Morten Kvarving
6e3cce1fc4 eclbasevanguard: no reason for zoltanImbalanceTol to be a scalar
make it a double always
2021-05-11 09:15:11 +02:00
Arne Morten Kvarving
4dd5dc902b eclbasevanguard: no reason for externalSetupTime to be a scalar
make it a double always
2021-05-11 09:15:11 +02:00
Arne Morten Kvarving
dbf834518e eclbasevanguard: pass parameters to createParseContext
to avoid typetag dependence in the code
2021-05-11 09:15:11 +02:00
Arne Morten Kvarving
86bc095e3a eclbasevanguard: change canonicalDeckPath to std::string
makes use of filesystem an implementation detail
2021-05-11 09:15:11 +02:00
Joakim Hove
ec2327d2c3
Merge pull request #3231 from joakim-hove/fixup
Fix function argument
2021-05-11 09:04:33 +02:00
Joakim Hove
83f32729fc Fix function argument 2021-05-11 08:10:49 +02:00
Joakim Hove
b832b00ca3
Merge pull request #3221 from joakim-hove/distribute-events
Distribute events
2021-05-11 07:24:00 +02:00
Joakim Hove
c01f2fe074
Merge pull request #3226 from joakim-hove/wellstate-remove-unused
Remove unused getXXXXOffset() methods
2021-05-11 07:23:08 +02:00
Joakim Hove
df2f27ab43
Merge pull request #3230 from GitPaean/aquifer_keyowrds_supported
removing numerical aquifer keywords from unsupported keyword list
2021-05-11 07:22:55 +02:00
Kai Bao
2d24abb630 removing numerical aquifer keywords from unsupported list
AQUNUM, AQUCON
2021-05-10 22:48:56 +02:00
Tor Harald Sandve
55dfc84067
Merge pull request #3176 from totto82/refactorPrepareTimeStep
move solveWellEquation inside prepareTimeStep
2021-05-10 16:35:16 +02:00
Bård Skaflestad
38292aca72
Merge pull request #3225 from totto82/refactorAssembleWellEq
Avoid code duplication
2021-05-10 12:27:52 +02:00
Joakim Hove
21751d87fc Remove unused getXXXXOffset() methods 2021-05-10 10:07:05 +02:00
Tor Harald Sandve
80413e0794 add useInnerIteration method and move assembleWellEq to the well interface to avoid code duplication 2021-05-10 09:41:18 +02:00
Tor Harald Sandve
c87c2666d1
Merge pull request #3184 from totto82/fixZeroInit
Improve initialization of the well rates for trivial rates
2021-05-10 08:53:16 +02:00
Joakim Hove
f52398a32e Use WellContainer<Events> to manage per well events 2021-05-09 16:42:50 +02:00
Joakim Hove
0083022742 Add const T& overload to WellContainer 2021-05-09 15:54:20 +02:00
Joakim Hove
42101774a0
Merge pull request #3224 from joakim-hove/wellcontainer-doc
Add documentation to WellContainer<T> class
2021-05-09 14:46:18 +02:00
Joakim Hove
744039eb2f Add documentation to WellContainer<T> class 2021-05-09 11:57:54 +02:00
Bård Skaflestad
9d3cf25366
Merge pull request #3217 from akva2/adjust_enums
adjust to upstream enum changes
2021-05-07 21:48:19 +02:00
Markus Blatt
d462aee2f8
Merge pull request #3204 from akva2/collect_separate_compile_unit
CollectDataToIORank: move to separate compile unit
2021-05-07 08:55:47 +02:00
Tor Harald Sandve
62d902435a move solveWellEquation inside prepareTimeStep 2021-05-07 08:51:15 +02:00
Joakim Hove
045abb3f80
Merge pull request #3214 from joakim-hove/wellcontainer
Wellcontainer
2021-05-07 07:42:56 +02:00
Joakim Hove
36cc9e8567 Add small class WellContainer to manage well data in WellState 2021-05-06 15:46:52 +02:00
Joakim Hove
66932936b3
Merge pull request #3215 from joakim-hove/consume-events
Use mutable WellGroupEvents instance to track events in WellState
2021-05-06 15:44:57 +02:00
Joakim Hove
a1f1d1047e Use mutable WellGroupEvents instance to track events in WellState 2021-05-06 14:02:03 +02:00
Tor Harald Sandve
2796a9862e
Merge pull request #3169 from totto82/alt_init
Initialize empty producers using mobility and transmissibility ratio
2021-05-06 11:10:23 +02:00
Tor Harald Sandve
687a2ca977 Improve initialization of the well rates for trivial rates
This also applies for rates with opposite direction.
2021-05-06 08:48:30 +02:00
Bård Skaflestad
a6c7453a24
Merge pull request #3212 from joakim-hove/num-connections
Store the number of connections in separate vector
2021-05-05 22:11:26 +02:00
Arne Morten Kvarving
a8627d1974 adjust to upstream enum changes 2021-05-05 22:06:06 +02:00
Bård Skaflestad
e73be1352b
Merge pull request #3211 from totto82/removeUnusedVFPcode
remove unused calculateBhpWithTHPTarget
2021-05-05 18:53:45 +02:00
Bård Skaflestad
f8e2aa74de
Merge pull request #3207 from akva2/targetcalc_comp_unit
TargetCalculator: move to separate compile unit
2021-05-05 18:53:07 +02:00