OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-01 21:39:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,655 Commits 24 Branches 101 Tags 75 MiB
0f290e3f6e
Commit Graph

3655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
0f290e3f6e Separate non-neighbour and non-cartesian connections. 
The non-cartesian connections are required by the output facilities,
while the truly non-neighbour connections (meaning those not in the grid)
should be used by all other code.
 2016-05-24 11:54:17 +02:00
Atgeirr Flø Rasmussen
ad604bca89 Merge pull request #685 from GitPaean/well_refactoring_interface_refactoring 
Well interface refactoring
 2016-05-24 10:58:57 +02:00
Kai Bao
0ebd25f66a fixing the compilation error due to rebasing. 2016-05-23 15:42:05 +02:00
Kai Bao
d2d9bd8a80 moving depth difference calcualtion to init() for MultisegmentWells 
instead of recalculating them for each iterations.
 2016-05-23 15:11:52 +02:00
Kai Bao
c2bdaa1b92 fixing the calculation of volumeRatio. 
due to the wrong use of parenthesis.
 2016-05-23 15:11:52 +02:00
Kai Bao
879f127ae8 moving variableStateExtractWellsVars() from models to Well Models. 2016-05-23 15:11:52 +02:00
Kai Bao
fbe7143f54 using WellModel functions in BlackoilPolymerModel. 
reducing some repeated code.
 2016-05-23 15:11:52 +02:00
Kai Bao
846ff890de refactoring the interface of computeWellPotentials() 
to reduce the cost of makeConstantState when not calculating the
potentials.
 2016-05-23 15:11:52 +02:00
Kai Bao
19a256dce0 some pure cleaning up. 2016-05-23 15:11:52 +02:00
Kai Bao
f2b7f2a56c moving numWellVars from models to Wells. 2016-05-23 15:11:52 +02:00
Kai Bao
b3d1c0eabc initializing the pointers to be nullptr in the Wells classes 2016-05-23 15:11:52 +02:00
Kai Bao
4527034f29 removing variableStateInitials() from BlackoilMultiSegmentModel 
which is not helpful anymore.
 2016-05-23 15:11:52 +02:00
Kai Bao
a102e934ac removing baseSolveWellEq from BlackoilMultiSegmentModel 
to solve the different interfaces of computeWellConnectionPressures for
StandardWells and MultisegmentWells, a function
computeWellConnectionPressures was introduced for the models.
 2016-05-23 15:11:52 +02:00
Kai Bao
01328559e2 removing the updateWellState from the models. 2016-05-23 15:11:52 +02:00
Kai Bao
4e8099057e small cleaning up for BlackoilMultiSegmentModel_impl 2016-05-23 15:11:51 +02:00
Kai Bao
fcd541a1c1 removing the rebundant ms_wells_ in BlackoilMultiSegmentModel 2016-05-23 15:11:51 +02:00
Kai Bao
184bff95ba using well_model_ to represent the WellModel member 2016-05-23 15:11:51 +02:00
Kai Bao
06775ee02c Make BlackoilMultisegmentModel constructured from MultisegmentWells 
Instead of being coustructed based StandardWells and having a
MultisegmentWells member.
 2016-05-23 15:11:51 +02:00
Kai Bao
4254b48b57 unifying interface of a few functions of Wells classes 
updateWellControls()
updateWellState()
addWellControlEq()

The change of function computeWellConnectionPressures() is not done
completely. Should find a solution later.
 2016-05-23 15:11:51 +02:00
Kai Bao
be165a26e0 adding a few more members to the Wells classes. 
gravity, vfp_properties_ and depth_.

to further simplify the interfaces.
 2016-05-23 15:11:51 +02:00
Kai Bao
50385013fe adding variableWellStateInitials to MultisegmentWells 2016-05-23 15:11:51 +02:00
Kai Bao
7886e4b9d2 adding computeWellConnectionPressures to MultisegmentWells 2016-05-23 15:11:51 +02:00
Kai Bao
b4f4878901 fixing the errors from rebasing. 2016-05-23 15:11:51 +02:00
Kai Bao
60fb868727 adding updatePerfPhaseRatesAndPressures to MultisegmentWells 2016-05-23 15:11:51 +02:00
Kai Bao
508de4dc37 adding extractWellPerfProperties to MultisegmentWells 
removing extractWellPerfProperties in all the model classes.
 2016-05-23 15:11:51 +02:00
Kai Bao
718ba5470b adding const Wells* wells_ for MultisegmentWells 
for interface refactoring.
At the moment, both wells_ and wells_multisegment_ contain all the
wells.
 2016-05-23 15:11:51 +02:00
Kai Bao
4180fea951 refactoring the construcor of MultisegmentWells 
MultisegmentWells is initialized with Wells structure.
 2016-05-23 15:11:51 +02:00
Kai Bao
7d0d50eb53 changing reservoir related members to pointers for MultisegmentWells 2016-05-23 15:11:51 +02:00
Kai Bao
66cd66e61b change reservoir related members to be pointers in StandardWells 
to fullfil the requirement of interface design.
 2016-05-23 15:11:51 +02:00
Kai Bao
89a8f133fd adding variableWellStateIndices to MultisegmentWells 
to remove the using of stdWells() in BlackoilMultiSegmentModel
The code is copied from StandardWells, better solution need to be
exploited.
 2016-05-23 15:11:50 +02:00
Kai Bao
a8742a9348 introduce perforation densities and pressdiffs to MultisegmentWells 
to reduce dependence on StandardWells.
 2016-05-23 15:11:50 +02:00
Kai Bao
25fbd20acf adding a few member variables for MultisegmentWells 
and reduce the number of parameters of the related functions by using
the new introduced member variables.
 2016-05-23 15:11:50 +02:00
Kai Bao
bd03eff5a5 making two functions in StandardWells protected. 
computePropertiesForWellConnectionPressures
computeWellConnectionDensitesPressures
 2016-05-23 15:11:50 +02:00
Kai Bao
1f2442fe80 reducing paramter list for more functions in StandardWells 
computeWellFlux
updateWellState
updateWellControls
addWellControlEq
computeWellPotentials
 2016-05-23 15:11:50 +02:00
Kai Bao
a35c3e7468 removing parameters for extractWellPerfProperties 2016-05-23 15:11:50 +02:00
Kai Bao
75c64b67d1 fixing the compilation from the rebase. 2016-05-23 15:11:50 +02:00
Kai Bao
0667fceb35 reducing the number of arguments of computeWellConnectionPressures 
and computeWellConnectionDensitesPressures.

These functions need to be renamed.
 2016-05-23 15:11:50 +02:00
Kai Bao
18a530f9be removing paramters in computePropertiesForWellConnectionPressures 2016-05-23 15:11:50 +02:00
Kai Bao
22b5157bf2 adding a few fluid related members to StandardWells 
to reduce the number of the public function arguments.
 2016-05-23 15:11:50 +02:00
Atgeirr Flø Rasmussen
d1da78b5b2 Merge pull request #692 from GitPaean/fixing_volumeratio_calculation 
fixing application of rs and rv to the volumeRatio calculation.
 2016-05-23 10:02:37 +02:00
Atgeirr Flø Rasmussen
7dbd197650 Merge pull request #684 from totto82/liveoilsolvent2 
Changes needed to run Model 2 with co2
 2016-05-20 15:08:48 +02:00
Kai Bao
6f2a0c47a2 fixing application of rs and rv to the volumeRatio calculation. 
the use of parenthesis is wrong according to Cramer's rule
 2016-05-20 14:52:24 +02:00
Joakim Hove
02da9a60f3 Merge pull request #691 from joakim-hove/solidify-restart-test 
Some checks for file open and file has keyword.
 2016-05-19 21:14:24 +02:00
Atgeirr Flø Rasmussen
bd774ed06c Merge pull request #679 from qilicun/log_simulation_messages 
write simulation details to log file.
 2016-05-19 15:09:39 +02:00
Joakim Hove
cb4c25ca3d Merge pull request #680 from pgdr/introducing-nnc 
Introducing NNC output
 2016-05-19 13:44:31 +02:00
Pål Grønås Drange
2620dda8c3 Moved NNC to GeoProps, populating NNC at update 
* FlowMain now gets NNC by `geoprops_->nnc()`
* Refactored update()
* Moved big chunk of unused code to new private method pinchProcess_
* Reordered logic to unite the NNC logic
 2016-05-19 13:33:09 +02:00
Pål Grønås Drange
973914931d Introducing NNC output 
* Compute NNC by face2cell information from a grid
* Pass NNC information to EclipseWriter
* Made NNC respect ECLIPSE input data
* nncStructure() is now exportNncStructure()
 2016-05-19 13:23:18 +02:00
Tor Harald Sandve
cc2a7d8767 Cleanup in updateState in the solvent model 2016-05-19 12:38:44 +02:00
Tor Harald Sandve
0730ffcb69 BUGFIX. Wrong uses of parenthesis in Cramer's rule 2016-05-19 11:28:36 +02:00
Tor Harald Sandve
bd0ad6aa5b Adapt to changes related to hydroCarbonState 2016-05-19 11:25:27 +02:00