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
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
Bård Skaflestad
9139e3c2f1
Merge pull request #3213 from akva2/no_opm_in_opm
...
fixed: do not use Opm:: prefix when inside namespace Opm
2021-05-05 16:15:50 +02:00
Arne Morten Kvarving
a4c0af09d9
fixed: do not use Opm:: prefix when inside namespace Opm
2021-05-05 11:59:18 +02:00
Joakim Hove
fe9a627aa3
Store the number of connections in separate vector
2021-05-05 11:30:33 +02:00
Tor Harald Sandve
bc9034e325
remove unused calculateBhpWithTHPTarget
2021-05-05 09:51:43 +02:00
Joakim Hove
24285009a8
The MAPUNITS keyword is supported
2021-05-05 08:12:40 +02:00
Bård Skaflestad
6b02180ca3
Merge pull request #3208 from akva2/fix_gaslift_impl_include
...
fixed: do not include headers into Opm namespace
2021-05-04 18:04:35 +02:00
Arne Morten Kvarving
a0e4bb9e52
fixed: do not include headers into Opm namespace
2021-05-04 14:35:41 +02:00
Arne Morten Kvarving
d4b67e9af0
TargetCalculator: move to separate compile unit
...
use explicit instantation to avoid some templates being
instanced a lot of places in a lot of objects.
2021-05-04 08:42:02 +02:00
Arne Morten Kvarving
a61c453a2a
WellGroupHelpers: make templates private
...
use explicit template instantation. to avoid rebuilding
this code over and over (minor), and to avoid includes in headers.
2021-05-04 08:21:32 +02:00
Arne Morten Kvarving
1ec65b14b8
FractionCalculator: make member a const reference
2021-05-04 08:14:07 +02:00
Bård Skaflestad
c0b68ea117
Merge pull request #3205 from akva2/relperm_compile_unit
...
RelpermDiagnostics: make templates private
2021-05-04 00:19:24 +02:00
Arne Morten Kvarving
0e2c61856f
RelpermDiagnostics: make templates private
...
use explicit template instantation. to avoid rebuilding
this code over and over (minor), and to avoid includes in headers.
2021-05-03 20:39:37 +02:00
Joakim Hove
8a78dc1c59
Add class GlobalWellInfo and use it from WellState
2021-05-03 13:28:28 +02:00
Bård Skaflestad
aa1df1352f
Merge pull request #3197 from akva2/move_to_comp_units
...
Move to separate compilation units
2021-04-30 16:50:54 +02:00
Bård Skaflestad
7be6e5bbf1
Merge pull request #3196 from akva2/use_forwarding
...
Use forwarding where possible in some headers
2021-04-30 16:00:41 +02:00
Arne Morten Kvarving
cf06a322ec
countGlobalCells: put non-template code in separate compile unit
2021-04-30 15:09:23 +02:00
Bård Skaflestad
f273e06c66
Merge pull request #3198 from akva2/janitoring
...
Remove some unused members and quell some warnings
2021-04-30 15:08:48 +02:00
Arne Morten Kvarving
e0a6e56588
WellGroupHelpers: use forwarding
2021-04-30 13:29:00 +02:00
Arne Morten Kvarving
d4a0d2962f
ParallelWellInfo: use forwarding
2021-04-30 13:24:06 +02:00
Arne Morten Kvarving
17963b07c1
ParallelRestart: use forwarding
2021-04-30 13:18:44 +02:00
Arne Morten Kvarving
e74b3249e9
WGState: forward struct as struct
2021-04-30 13:09:25 +02:00
Arne Morten Kvarving
3c77b97cae
MultisegmentWellContribution: remove unused members
2021-04-30 13:09:25 +02:00
Arne Morten Kvarving
5dd5f5a8f4
FractionCalculator: remove unused summary_state member
2021-04-30 11:02:50 +02:00
Arne Morten Kvarving
8ff32b594a
TargetCalculator: remove unused wellstate member
2021-04-30 11:02:50 +02:00
Tor Harald Sandve
70150ab212
Remove code duplication between STW and MSW
2021-04-30 09:27:35 +02:00
Arne Morten Kvarving
541ebdde13
phaseUsageFromDeck: move to separate compile unit
2021-04-29 13:00:23 +02:00
Arne Morten Kvarving
0cb0971673
ParallelFileMerger: move to separate compile unit
2021-04-29 12:57:27 +02:00
Arne Morten Kvarving
b30fc4eac1
ExtractParallelGridInfoToISTL: use forwarding
2021-04-29 12:50:19 +02:00
Arne Morten Kvarving
238109b0e9
FlowMainEbos: use forwarding
...
also remove unnecessary includes
2021-04-29 12:47:27 +02:00
Arne Morten Kvarving
bbfda699d3
KeywordValidation: use forwarding
2021-04-29 12:46:49 +02:00
Arne Morten Kvarving
5fb5f79318
readDeck: use forwarding
2021-04-29 12:43:51 +02:00
Bård Skaflestad
dae6b61370
Merge pull request #3189 from joakim-hove/alqstate
...
Add class ALQState to manage the ALQ state in the WellState
2021-04-28 11:52:40 +02:00
Bård Skaflestad
eb8e270b50
Merge pull request #3190 from akva2/fix_missing_include
...
fixed: include <cstring> for strlen
2021-04-28 11:03:55 +02:00
Joakim Hove
8bae5e0127
Add class ALQState to manage the ALQ state in the WellState
2021-04-28 09:33:06 +02:00
Arne Morten Kvarving
f004b59217
fixed: include <cstring> for strlen
2021-04-28 09:01:09 +02:00
Bård Skaflestad
a6c374a27c
Compute Well-Level PI For Shut Wells
...
This commit includes the shut wells in 'wells_ecl_' and expands the
PI/II value calculation to apply to those shut wells too. With this
in place we are able to run cases that have a 'WELPI' keyword before
the well opens, even at the very first report step.
2021-04-27 14:51:18 +02:00
Bård Skaflestad
6e9d2bd89e
Initialise More Data Members at Construction Time
...
In particular, apply explicit default constructors to most data
members and push initialisation to initialiser list if convenient.
While here, also split long lines and apply const in more places.
Finally, reset well- and connection-level PI values to zero in
WellState::shutWell(). This is in preparation of including shut
wells in BlackoilWellModel's internal state.
2021-04-27 14:50:37 +02:00
Joakim Hove
1de5c9539c
Merge pull request #3174 from joakim-hove/use-groupstate2
...
Use groupstate2
2021-04-27 14:15:49 +02:00
Joakim Hove
e1d117c59f
Extract group state and create WGState to manage well & group state
2021-04-27 10:55:38 +02:00
Bård Skaflestad
1f14c6ddef
Forward Potential Rates to Next Report Step
...
These are used as part of calculating the BHP/THP when computing new
potential rates in models that feature VFP tables and must therefore
be properly initialised in the next report step's well state object.
2021-04-27 07:58:21 +02:00
Joakim Hove
42a6505cf1
Merge pull request #3179 from joakim-hove/groupstate-dump
...
Add json dump to GroupState
2021-04-27 07:52:11 +02:00
Bård Skaflestad
6cbe5ae8f4
Merge pull request #3178 from joakim-hove/wellstate-internalize-pu
...
WellState will internalize PhaseUsage member
2021-04-27 06:33:18 +02:00
Bård Skaflestad
266197fd75
Merge pull request #3186 from akva2/include_headers
...
fixed: include required headers where needed
2021-04-27 06:31:34 +02:00
Joakim Hove
a68589eb9a
WellState will internalize PhaseUsage member
2021-04-27 00:11:04 +02:00
Arne Morten Kvarving
a4c5429341
fixed: include required headers where needed
2021-04-26 22:39:32 +02:00
Joakim Hove
29673a168d
Use std::array<> in PhaseUsage
2021-04-26 19:03:22 +02:00
Tor Harald Sandve
12880be916
Merge pull request #3159 from totto82/updateWellTargetFix
...
get bhp from thp without solving
2021-04-26 13:15:30 +02:00
