Commit Graph
100 Commits
Author SHA1 Message Date
Joakim Hove 9b2de5bbf9 Merge pull request #3293 from joakim-hove/wellcontainer-bhp
Use WellContainer<double> for bhp/thp/temperature
2021-05-26 07:26:41 +02:00
Joakim Hove c400b6eeef Merge pull request #3290 from joakim-hove/wellcontainer-rsrv
Use WellContainer<double> for RS / RV
2021-05-26 07:22:51 +02:00
Joakim Hove 96d180d79c Merge pull request #3287 from joakim-hove/wellcontainer-perf
Wellcontainer perf
2021-05-26 07:22:20 +02:00
Joakim Hove 987fcc3b61 Use WellContainer<double> for bhp/thp/temperature 2021-05-25 11:25:07 +02:00
Joakim Hove b8ccdaa106 Merge pull request #3295 from joakim-hove/wellstate-reorder
Assemble all non-wellcontainer WellState members
2021-05-25 11:02:01 +02:00
Joakim Hove b948162962 Assemble all non-wellcontainer WellState members 2021-05-25 07:47:31 +02:00
Joakim Hove b34c161805 Use WellContainer<double> for RS / RV 2021-05-24 10:01:00 +02:00
Joakim Hove ab5c937268 Use well index for PerfPhaseRates 2021-05-24 09:25:19 +02:00
Joakim Hove 89a712603f Use well index for misc perforation data 2021-05-24 09:14:36 +02:00
Joakim Hove d6151e2f00 Use well index for perf water throughput 2021-05-24 09:14:36 +02:00
Joakim Hove 2f901f1012 Use well index when iterating over brine perforation rates 2021-05-24 09:14:36 +02:00
Joakim Hove f9e142dc8d Use well index when iterating over polymer perforation rates 2021-05-24 09:14:36 +02:00
Joakim Hove 5437cfa37a Use well index when iterating over solvent perf rates 2021-05-24 09:14:36 +02:00
Joakim Hove 8e0ed53207 Add method WellContainer::well_index() 2021-05-24 09:14:36 +02:00
Joakim Hove da94a16d3e Merge pull request #3288 from joakim-hove/actionx-event
Make sure well potentials are recalculated for ACTIONX wells
2021-05-22 19:09:00 +02:00
Joakim Hove 80cdcbb4aa Merge pull request #3283 from joakim-hove/merge-wellstate
Merge wellstate
2021-05-21 17:37:35 +02:00
Joakim Hove a3082f66ed Make sure well potentials are recalculated for ACTIONX wells 2021-05-21 16:05:11 +02:00
Joakim Hove 23180e06d2 Rename WellStateFullyImplicitBlackoil -> WellState 2021-05-21 15:07:21 +02:00
Joakim Hove fc3c044a4e Remove WellState as base class 2021-05-21 14:57:38 +02:00
Joakim Hove 3dcb0742d0 Moved init and initSingleWell and removed WellState.cpp 2021-05-21 14:57:38 +02:00
Joakim Hove e26e3950b6 Move rates and perf pressure 2021-05-21 14:57:38 +02:00
Joakim Hove 7b5c085bb5 Move bhp / thp / temperatur api 2021-05-21 14:57:38 +02:00
Joakim Hove 4418fcc477 Move phase access 2021-05-21 14:57:38 +02:00
Joakim Hove 7cb7b0eb82 Moved well status routines 2021-05-21 14:57:38 +02:00
Joakim Hove 0f8dec5224 Move parallelWellInfo() 2021-05-21 14:57:38 +02:00
Joakim Hove 40e8632f24 Move resetConnectionFactors() 2021-05-21 14:57:38 +02:00
Joakim Hove a891a44756 Move wellIsOwned() 2021-05-21 14:57:38 +02:00
Joakim Hove 7695abfe25 Move wellMap() and numWells() accessors 2021-05-21 14:57:38 +02:00
Joakim Hove 6ac9e722fc Move reportConnections 2021-05-21 14:57:38 +02:00
Joakim Hove 5b86ecd3e2 Move WellState::report to WellStateFullyImplicitBlackOil 2021-05-21 14:57:38 +02:00
Joakim Hove 9c4b8df02d Do not install wellstate.hpp 2021-05-21 14:57:38 +02:00
Joakim Hove 506a349085 Use wellcontainer2 (#3255)
Use WellContainer<> to manage members in WellState
2021-05-20 16:16:12 +02:00
Joakim Hove e5ab36e0f1 Merge pull request #3277 from joakim-hove/segment-index
Segment index
2021-05-20 10:01:07 +02:00
Joakim Hove db731ac1ad Use well local indices when iterating over segments 2021-05-20 08:17:19 +02:00
Joakim Hove 1e9a5195e9 Add rst_ prefix to restart variables 2021-05-20 07:47: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
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
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
Joakim Hove 2ac7b5e4bf Reorder variables and remove .reserve() calls 2021-05-15 08:49:14 +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
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
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
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
Joakim Hove 66c56bb8c3 Add initializer_list based WellContainer constructor 2021-05-12 09:18:58 +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
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
Joakim Hove 21751d87fc Remove unused getXXXXOffset() methods 2021-05-10 10:07:05 +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
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
Joakim Hove 4c9709c5f0 Merge pull request #3210 from joakim-hove/mapunits-supported
The MAPUNITS keyword is supported
2021-05-05 16:14:14 +02:00
Joakim Hove fe9a627aa3 Store the number of connections in separate vector 2021-05-05 11:30:33 +02:00
Joakim Hove 24285009a8 The MAPUNITS keyword is supported 2021-05-05 08:12:40 +02:00
Joakim Hove 8a78dc1c59 Add class GlobalWellInfo and use it from WellState 2021-05-03 13:28:28 +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
Joakim Hove 8bae5e0127 Add class ALQState to manage the ALQ state in the WellState 2021-04-28 09:33:06 +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
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
Joakim Hove a68589eb9a WellState will internalize PhaseUsage member 2021-04-27 00:11:04 +02:00
Joakim Hove 29673a168d Use std::array<> in PhaseUsage 2021-04-26 19:03:22 +02:00
Joakim Hove 979279b31c Call endEpisode() for WellModel and Aquifer model 2021-04-26 14:14:58 +02:00
Joakim Hove 5a4190bbea Add json dump to GroupState 2021-04-26 11:51:07 +02:00
Joakim Hove 43f42ab7d7 Merge pull request #3162 from totto82/addSwitchEvent
Use the event for swithing between producer and injector
2021-04-23 08:17:47 +02:00
Joakim Hove 7fecd9f433 Create new class GroupState to maintain runtime state of groups 2021-04-21 13:07:57 +02:00
Joakim Hove c8db0d1090 Assign number of phases in WellState constructor 2021-04-21 13:07:57 +02:00
Joakim Hove 763503d13c Merge pull request #3134 from GitPaean/using_pinched_grid_numerical_aquifers
Using pinched grid for numerical aquifers
2021-04-21 13:03:58 +02:00
Joakim Hove 7131647362 Use Well.insert_index() instead of maintaining extra counter 2021-04-21 10:34:57 +02:00
Joakim Hove ed2fb11084 Avoid superfluos code to reset globalIsProductionGrup to false 2021-04-21 09:04:55 +02:00
Joakim Hove 48b10e2029 Merge pull request #3157 from joakim-hove/rst-test-norne
Add test which loads a restart case for norne and runs one timestep
2021-04-15 14:37:31 +02:00
Joakim Hove 289e0ea938 Handle closed connections when loading connection data from restart 2021-04-14 07:59:55 +02:00
Joakim Hove 914c18d4f1 Add test which loads a restart case for norne and runs one timestep 2021-04-13 22:10:40 +02:00
Joakim Hove 7d825ba9d0 Rename function wellToState -> loadRestartData 2021-04-13 21:02:36 +02:00
Joakim Hove c939ca90e6 Throw exception in not implemented function 2021-04-13 11:44:51 +02:00
Joakim Hove 061b5c2395 Merge pull request #3062 from joakim-hove/enable-actionx-test
Enable new test udq_actionx/ACTIONX_M1
2021-04-13 09:28:32 +02:00
Joakim Hove 138e3b2af3 Report cell volume removed due to MINPV/MINPVV 2021-04-12 21:44:42 +02:00
Joakim Hove e1fe527719 Change output to indicate start of time step 2021-04-10 13:37:12 +02:00
Joakim Hove 1d5a245b95 Use value object for endpoints 2021-04-07 10:40:48 +02:00