Commit Graph

12589 Commits

Author SHA1 Message Date
Kai Bao
2d24abb630 removing numerical aquifer keywords from unsupported list
AQUNUM, AQUCON
2021-05-10 22:48:56 +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
Bård Skaflestad
4e830980e7
Merge pull request #3206 from akva2/wellgrouphelpers_comp_unit
WellGroupHelpers: make templates private
2021-05-04 11:33:58 +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
Bård Skaflestad
9c897dc38c
Merge pull request #3193 from joakim-hove/global-well-info
Add class GlobalWellInfo and use it from WellState
2021-05-03 17:43:37 +02:00
Bård Skaflestad
9ae3329c5f
Merge pull request #3202 from totto82/item9notSupported
add throw for unsupported positive item 9 in EQUIL
2021-05-03 15:13:14 +02:00
Markus Blatt
6e3970fa46
Merge pull request #3199 from akva2/no_compile_twice
fixed: do not build test_parallelwellinfo.cpp twice
2021-05-03 13:56:40 +02:00
Joakim Hove
8a78dc1c59 Add class GlobalWellInfo and use it from WellState 2021-05-03 13:28:28 +02:00
Tor Harald Sandve
f71f0932c9 add throw for unsupported positive item 9 in EQUIL 2021-05-03 13:03:08 +02:00
Joakim Hove
1329a73546
Merge pull request #3194 from bska/fix-well-model-test
Well Model Test: Supply Valid 'ecl_index' Values
2021-05-03 10:12:47 +02:00
Bård Skaflestad
ff2caa5675 Well Model Test: Supply Valid 'ecl_index' Values
The WellInterface::initCompletions() member function needs these.
2021-04-30 17:05:20 +02:00
Arne Morten Kvarving
ed1b36e836 fixed: do not build test_parallelwellinfo.cpp twice
mark the parallel test NO_COMPILE and specify the binary
2021-04-30 17:01:11 +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
a200853148 anonymize unused parameters to quell warnings 2021-04-30 13:09:25 +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
Bård Skaflestad
704bc51251
Merge pull request #3183 from totto82/refactorWellStateTarget
Remove code duplication between STW and MSW
2021-04-30 11:14:39 +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
Arne Morten Kvarving
801365547c flow headers: use forwarding 2021-04-29 12:40:31 +02:00
Arne Morten Kvarving
bce4590404 ebos headers: use forwarding 2021-04-29 12:36:38 +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
Tor Harald Sandve
398b284c03
Merge pull request #3094 from bska/wellpi-shut-wells
Compute Well-Level PI For Shut Wells
2021-04-28 09:03:57 +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
a446e9619c
Merge pull request #3188 from joakim-hove/actionx-record-correct-time
Record the correct simulation time in ActionState
2021-04-27 14:07:53 +02:00
Joakim Hove
590c9443ec Record the correct simulation time in ActionState 2021-04-27 11:44:03 +02:00
Joakim Hove
e1d117c59f Extract group state and create WGState to manage well & group state 2021-04-27 10:55:38 +02:00
Arne Morten Kvarving
2574634c5f
Merge pull request #3187 from totto82/bump_master
Bump version number
2021-04-27 10:13:05 +02:00