OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-27 09:40:59 -06:00
Code Issues Packages Projects Releases Wiki Activity
12,936 Commits 24 Branches 102 Tags 84 MiB
29842ff9a2
Commit Graph

8186 Commits

Author SHA1 Message Date
Joakim Hove
d57a8514a2
Merge pull request #3323 from joakim-hove/remove-segment-pressure-drop 
Remove segment pressure drop as separate variable
 2021-05-31 14:08:38 +02:00
Arne Morten Kvarving
92dd2a1075 pass doubles by value, not reference 2021-05-31 11:44:08 +02:00
Arne Morten Kvarving
c76803b913 changed: make bhp template hidden and use explicit instantations 
this to avoid includes in headers.
 2021-05-31 11:42:29 +02:00
Arne Morten Kvarving
ef635d42af VFPHelpers: put in separate compile unit 2021-05-31 11:42:29 +02:00
Arne Morten Kvarving
4c4a612cc5 changed: remove unused functions from VFPHelpers 2021-05-31 11:42:29 +02:00
Joakim Hove
2d67d085ef Remove segment pressure drop as separate variable 2021-05-31 09:10:33 +02:00
Markus Blatt
1ea70da7e6
Merge pull request #3321 from blattms/fix-cuda-only-compilation 
Fixes compilation with CUDA but without OpenCL.
 2021-05-31 08:53:54 +02:00
Bård Skaflestad
5793f91ae0
Merge pull request #3313 from totto82/fix_ginj_reduction 
fix reduction rate for injection groups
 2021-05-29 17:17:27 +02:00
Joakim Hove
db49c8aeef
Merge pull request #3309 from joakim-hove/wellrates-at 
Make sure all wells are added to the well_rates map
 2021-05-29 07:53:45 +02:00
Markus Blatt
7c17db3d06 Fixes unused variable warnings for CUDA only. 2021-05-28 16:26:46 +02:00
Markus Blatt
6ffde47096 Fixes compilation with CUDA but without OpenCL. 
Using statements should not be in namespaces anyway...
 2021-05-28 16:26:46 +02:00
Bård Skaflestad
bd9b9a7118 Prepare to Save/Restore Richer Set of Aquifer Values 
This commit adds logic to communicate more dynamic aquifer values
between the simulation and I/O layers.  In particular, we ensure
that we allocate the 'aquFet' and 'aquCT' substructures of the
dynamic aquifer data as appropriate and that we collect this
information on the I/O rank as part of the restart output process.
We furthermore make the 'ParallelRestart' facility aware of dynamic
aquifer data in preparation of loading these values from the restart
file.
 2021-05-28 14:47:17 +02:00
Bård Skaflestad
d3437d77b1
Merge pull request #3317 from joakim-hove/fix-unused 
Remove unused variable
 2021-05-28 14:14:27 +02:00
Bård Skaflestad
e695c356c5
Merge pull request #3310 from joakim-hove/disable-color-coding 
Check that stdout is connected to tty before applying color coding
 2021-05-28 13:09:08 +02:00
Bård Skaflestad
f7b0d599c8
Merge pull request #3314 from akva2/eclproblem_typetag_split 
eclproblem: split in typetag and typetag independent parts
 2021-05-28 11:47:37 +02:00
Arne Morten Kvarving
d65a9a5f70 changed: do not set the ebos well model as default type 
rather, only set it where we want to use it. this avoids including
eclwellmanager.hh and eclpeacemanwell.hh unnecessarily in
simulator objects (where BlackoilWellModel is used).
 2021-05-28 11:28:43 +02:00
Joakim Hove
953de0c6b9 Remove unused variable 2021-05-28 11:14:19 +02:00
Joakim Hove
3fae970e7e
Merge pull request #3316 from joakim-hove/segment-use-well-index2 
Segment use well index2
 2021-05-28 10:48:13 +02:00
Joakim Hove
d2510714e0 Check that stdout is attached to terminal before applying color 2021-05-28 10:20:10 +02:00
Arne Morten Kvarving
cbd7cfe8b6 split eclproblem in typetag dependent and typetag independent classes 2021-05-28 08:54:10 +02:00
Arne Morten Kvarving
122ac87c55 GasLiftStage2: no longer a need to template on TypeTag 2021-05-28 08:24:07 +02:00
Arne Morten Kvarving
775177d73a GasLiftStage2: use GasLiftSingleWellGeneric 2021-05-28 08:24:07 +02:00
Arne Morten Kvarving
8f14e51c9e GasLiftStage2: use WellInterfaceGeneric 
to lessen typetag dependence
 2021-05-28 08:24:07 +02:00
Joakim Hove
a1b45b06e4 Use well index for segment acceleration pressure loss 2021-05-28 07:32:30 +02:00
Joakim Hove
960de96d75 Use well index for segment hydrostatic pressure drop 2021-05-28 07:32:30 +02:00
Joakim Hove
ee1a1c6afc Use well index for segment friction pressure drop 2021-05-28 07:32:29 +02:00
Joakim Hove
92e31b4ee3 Use well index for segment pressure drop 2021-05-28 07:32:29 +02:00
Arne Morten Kvarving
168fc070e9 GasLiftStage2: remove unused simulator param 2021-05-27 21:52:42 +02:00
Arne Morten Kvarving
09ec1e4088 GasLiftStage2: pass comm 2021-05-27 21:52:42 +02:00
Arne Morten Kvarving
865a039ca4 GasLiftStage2: remove unused member nonlinear_iteration_idx_ 2021-05-27 21:52:42 +02:00
Arne Morten Kvarving
26530e60e4 GasLiftStage2: pass schedule 2021-05-27 21:52:42 +02:00
Arne Morten Kvarving
f034ca981e GasLiftStage2: pass summary state 2021-05-27 21:52:42 +02:00
Arne Morten Kvarving
b7d90de9cc GasLiftStage2: drop unused ebos_simulator_ member 2021-05-27 21:52:42 +02:00
Bård Skaflestad
b16eaf72f1
Merge pull request #3240 from akva2/wellinterface_fluidsystem_split 
Split out FluidSystem dependent code from WellInterface
 2021-05-27 21:09:07 +02:00
Bård Skaflestad
57cf8c2c98
Merge pull request #3311 from joakim-hove/segpress-fix 
Bug in wellstate handling for pressure drop in MSW wells?
 2021-05-27 20:11:00 +02:00
Bård Skaflestad
66443c63fb
Merge pull request #3299 from akva2/gasliftstage2_break_circular 
GasLiftStage2: drop circular dependency for BlackoilWellModel
 2021-05-27 18:31:44 +02:00
Tor Harald Sandve
e1ace15602
Merge pull request #3302 from totto82/useRatesAsPotforPress 
use rates for potentials for pressure controlled controled wells
 2021-05-27 16:33:22 +02:00
Joakim Hove
dac62bbab3 WellState::well_rates is only updated by well owner 2021-05-27 15:03:24 +02:00
Joakim Hove
509fe67ff5 Make sure all wells are added to the well_rates map 2021-05-27 15:03:24 +02:00
Arne Morten Kvarving
0f7967f86a cosmetics: do not indent for namespace 2021-05-27 14:22:14 +02:00
Arne Morten Kvarving
3aa2b38832 changed: split out FluidSystem only dependent code from WellInterface 
this allows using explicit template instantation to only build
this code once for each FluidSystem
 2021-05-27 14:22:14 +02:00
Tor Harald Sandve
06595c6dfc fix reduction rate for injection groups 2021-05-27 13:16:28 +02:00
Joakim Hove
abadb7aba5 Fix access to segment pressure drop vectors 2021-05-27 11:40:29 +02:00
Joakim Hove
5ac53f8106 Use well index for segment rates 2021-05-27 10:45:33 +02:00
Joakim Hove
34ef516472 Use well index for segment pressure 2021-05-27 10:45:33 +02:00
Joakim Hove
3025bf3280 Use std::nullopt instead of {} 2021-05-27 10:45:33 +02:00
Bård Skaflestad
d94cc2cc30
Merge pull request #3040 from totto82/fixZeroRateVFP 
Avoid division by small rate in divisor in VFP table fraction WFR/GFR.
 2021-05-27 00:44:07 +02:00
Tor Harald Sandve
cccece4104 use rates for potentials for pressure controlled (bhp or thp) controled wells 2021-05-26 13:54:14 +02:00
Joakim Hove
d83b06c74b
Merge pull request #3301 from joakim-hove/simplify-comm 
Communicate well rates by directly iterating over container
 2021-05-26 10:16:47 +02:00
Joakim Hove
86c75ee4fe
Merge pull request #3298 from akva2/no_opm_in_opm 
fixed: do not use Opm:: prefix when inside namespace Opm
 2021-05-26 10:15:46 +02:00
Tor Harald Sandve
97d9de4339 Avoid division by small rate in divisor in VFP table fraction WFR/GFR. 
A threshold of 1e-12 is used to "define" small rate
 2021-05-26 10:03:28 +02:00
Joakim Hove
122a6ec7b3 Communicate well rates by driectly iterating over container 2021-05-26 07:27:41 +02:00
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
Arne Morten Kvarving
378efd0ff9 GasLiftStage2: drop circular dependency for BlackoilWellModel 2021-05-25 12:57:24 +02:00
Arne Morten Kvarving
7993e045c4 BlackoilWellModel: drop type alias GLiftWellState 2021-05-25 12:57:24 +02:00
Arne Morten Kvarving
da41f27e8f GasLiftStage2: drop type alias GLiftWellState 2021-05-25 12:57:24 +02:00
Arne Morten Kvarving
d55df4330e fixed: do not use Opm:: prefix when inside namespace Opm 2021-05-25 12:06:06 +02:00
Joakim Hove
987fcc3b61 Use WellContainer<double> for bhp/thp/temperature 2021-05-25 11:25:07 +02:00
Joakim Hove
b948162962 Assemble all non-wellcontainer WellState members 2021-05-25 07:47:31 +02:00
Atgeirr Flø Rasmussen
001648c8fb Make constants used in subclasses protected. 2021-05-24 11:24:14 +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
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
Bård Skaflestad
3ef04a3335
Merge pull request #3286 from akva2/gasliftsinglewell_typetag_split 
GasLiftSingleWell: split typetag independent code to separate class
 2021-05-21 12:26:54 +02:00
Atgeirr Flø Rasmussen
dee7030784
Merge pull request #3273 from akva2/clang_cleanups 
Quell various clang warnings
 2021-05-21 09:22:31 +02:00
Arne Morten Kvarving
1614767362 GasLiftSingleWell: split typetag independent code to separate class 2021-05-21 09:09:10 +02:00
Bård Skaflestad
3dbab3b7d6
Merge pull request #3284 from akva2/gasliftsinglewell_cleanup 
Some small cleanups in GasLiftWellState
 2021-05-20 17:26:56 +02:00
Joakim Hove
506a349085
Use wellcontainer2 (#3255) 
Use WellContainer<> to manage members in WellState
 2021-05-20 16:16:12 +02:00
Arne Morten Kvarving
82d125d1c0 GasLiftSingleWell: drop undefined symbols 2021-05-20 14:17:34 +02:00
Arne Morten Kvarving
e8603dfea3 drop type alias GasLiftSingleWell::GLiftWellState 2021-05-20 14:12:41 +02:00
Arne Morten Kvarving
28b9f04721 remove empty _impl file 2021-05-20 12:17:24 +02:00
Arne Morten Kvarving
09cbfb4cde remove unnecessary includes 2021-05-20 12:17:24 +02:00
Arne Morten Kvarving
31cb01ae24 no reason for GasLiftWellState to be typetag dependent 2021-05-20 12:17:24 +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
Bård Skaflestad
91dae1aa6f
Merge pull request #3269 from akva2/small_cleanups 
Some small cleanups
 2021-05-19 23:50:01 +02:00
Bård Skaflestad
e3e4c2e96a
Merge pull request #2980 from totto82/cleanUpPot 
Only compute potentials at beginTimeStep after an event
 2021-05-19 19:10: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