dr-robertk
93f48d6ad9
Merge pull request #647 from GitPaean/wells_refactoring_onlytemplate_function
...
Moving more well related functions to StandardWells
2016-04-16 12:37:42 +02:00
Robert Kloefkorn
da0e725eb8
BackupRestore: remove all specializations for BlackoilState. This is now covered by
...
SimulationDataContainer.
2016-04-15 12:21:47 +02:00
Kai Bao
adb140a788
fixing the running of flow_multisegment
2016-04-14 16:05:19 +02:00
Kai Bao
75b73a893e
putting Vector and ADB to be inside StandardWells and wellhelpers
2016-04-14 16:05:19 +02:00
Kai Bao
19734f2103
adding extractWellPerfProperties to StandardWellsSolvent
...
to fix the flow_solvent running.
2016-04-14 16:05:19 +02:00
Kai Bao
5da57973fe
adding updateWellState and updateWellControls to StandardWells
2016-04-14 16:05:18 +02:00
Kai Bao
376c940f09
moving updatePerfPhaseRatesAndPressures to StandardWells
2016-04-14 16:05:18 +02:00
Kai Bao
c398a6e424
puting computeWellFlux in StandardWells
2016-04-14 16:05:18 +02:00
Kai Bao
e9e1b9fda8
adding extractWellPerfProperties to StandardWells
...
It causes problem for the flow_multisegment. So the version in
BlackoilModelBase is kept for now.
On the other hand, it is few of functions that will be both required by
the standard wells and multisegment wells.
Some decision will be made later on how to put this function.
2016-04-14 16:05:18 +02:00
Kai Bao
c8b66821d5
adding computeWellConnectionDensitesPressures to StandardWells class.
2016-04-14 16:05:18 +02:00
Kai Bao
5d99fac207
adding StandardWellsSolvent for Solvent model.
2016-04-14 16:05:18 +02:00
Kai Bao
bca23d34c1
making StandardWells non-templated
...
we will focus on template functions instead.
2016-04-14 16:05:18 +02:00
Kai Bao
266f6f2df5
adding computePropertiesForWellConnectionPressures to StandardWells
...
tested with flow. Not sure how other flow siblings work.
2016-04-14 16:05:18 +02:00
Kai Bao
3bcfc905bd
makding StandardWells a template based on SolutionState and WellState
...
may need to be adjusted later.
2016-04-14 16:05:18 +02:00
Atgeirr Flø Rasmussen
be67e0f7a5
Update include file locations.
2016-04-14 11:32:08 +02:00
Pål Grønås Drange
fd9f67ae55
Using API get3DProperties()
2016-04-12 14:47:50 +02:00
Pål Grønås Drange
77fc26475b
Using new EclipseState API, made ->s into .s
2016-04-12 14:47:50 +02:00
Atgeirr Flø Rasmussen
ff549195ab
Rename opm-autodiff -> opm-simulators.
2016-04-08 14:58:07 +02:00
Robert Kloefkorn
e80ad5a9fe
Merge remote-tracking branch 'upstream/master' into PR/async-output
2016-04-08 13:07:44 +02:00
Robert Kloefkorn
b3a313bfec
ThreadHandle: added documentation and use std::unique_ptr to store object pointers.
2016-04-08 11:12:09 +02:00
Kai Bao
23ba5fa398
removing the StandardWells definition inside BlackoilModelBase
...
and some other tiny cleaning up.
2016-04-07 10:45:13 +02:00
Kai Bao
624516ed3c
creating separate files for class StandardWells
2016-04-06 16:42:04 +02:00
Atgeirr Flø Rasmussen
cebc393caf
Merge pull request #635 from GitPaean/wells_refactoring
...
A first step towards Wells refactoring
2016-04-06 16:08:18 +02:00
Robert Kloefkorn
ec45b5547d
cleanup.
2016-04-06 15:39:57 +02:00
Robert Kloefkorn
7e6a6fb20a
ThreadHandle: cleanup and docu.
2016-04-06 15:26:47 +02:00
Kai Bao
84cc1ed81d
correcting the determination of wells_active_.
2016-04-06 14:36:51 +02:00
Kai Bao
2bd83aae73
making the constructors of WellOps and StandardWells explicit.
2016-04-06 14:10:17 +02:00
Atgeirr Flø Rasmussen
37c4bd16b1
Adapt code to dune-cornerpoint -> opm-grid renaming.
2016-04-06 13:29:47 +02:00
Kai Bao
9972dae32a
updating for the comments.
...
implement wells(), localWellsActive() and wellsActive() for the
BlackoilModelBase and its derived classed.
2016-04-06 12:54:01 +02:00
Kai Bao
4ad5d81296
fixing wrong codes from the rebase process and cleanup.
2016-04-06 12:54:01 +02:00
Kai Bao
8a52dd743b
making StandardWells a simple class.
2016-04-06 12:54:01 +02:00
Kai Bao
3947ff5b1d
moving localWellsActive and wellsActive to StandardWells
...
maybe later it can be something general for different types of wells.
2016-04-06 12:54:01 +02:00
Kai Bao
48483b23c7
update BlackoilSolventModel to fix the compilation.
2016-04-06 12:54:01 +02:00
Kai Bao
23288ce2e5
fixing the compilation after updated with master branch.
2016-04-06 12:54:01 +02:00
Kai Bao
5910c0db7c
recovering the buidling for flow_multisegment
2016-04-06 12:54:01 +02:00
Kai Bao
bef4b8c077
moving the wellOps to the StandardWells class.
2016-04-06 12:54:01 +02:00
Kai Bao
8367eaacb3
first attempt to introduce StandardWells struct.
...
To replace the const Wells struct in BlackoilModelBase.
Only testing with Flow for the moment. Will update other Flow siblings
later.
2016-04-06 12:54:00 +02:00
Robert Kloefkorn
54ea243c5f
SimulatorFullyImplicitBlackoilOutput: added threaded asynchronous output.
2016-04-06 11:10:01 +02:00
Tor Harald Sandve
e5254f3779
Adapt to changes interface of extractWellPerfProperties
...
The BlockoilmultisegmentModel is updated to account for changes in the
extractWellPerfProperties() interface.
2016-04-05 09:13:29 +02:00
Tor Harald Sandve
764d8a1c3f
Remove leftovers from a merge process going wrong
2016-04-05 09:03:22 +02:00
Tor Harald Sandve
89e540cb2c
Pass solutionState as first parameter
...
output parameters go last...
2016-04-05 08:57:07 +02:00
Tor Harald Sandve
925d0becf3
Fix to make flow_solvent run decks without solvent
2016-04-05 08:57:07 +02:00
Tor Harald Sandve
541475b2db
Implement computePropertiesForWellConnectionPressures for solvent model
...
The solvent specify part of computeWellConnectionPressures is factored
out to computePropertiesForWellConnectionPressures in order to reuse
the computeWellConnectionPressures from the base model.
2016-04-05 08:57:07 +02:00
Tor Harald Sandve
9cd0383d36
Factor out computation of properties for well connection pressures
...
Computation of properties used in computeConnectionPressureDelta
is factored out to computePropertiesForWellConnectionPressures
The motivation is to be able to use a modified version of
computePropertiesForWellConnectionPressures in the solvent model
2016-04-05 08:57:07 +02:00
Tor Harald Sandve
7b81facfb0
Make use of extractWellPerfProperties to avoid code duplication
...
The following changes are done in order to remove the duplicated code in
assemble().
- extractWellPerfProperties takes SolutionState as input (only used in
the solvent model)
- the computation of effective parameters is moved to computeAccum()
With these changes the solvent model can use assemble() from the base
model.
2016-04-05 08:53:09 +02:00
Atgeirr Flø Rasmussen
0e7e45c129
Merge pull request #627 from totto82/well_potentials
...
Compute well potentials
2016-04-04 15:11:19 +02:00
Atgeirr Flø Rasmussen
cf6ed11f46
Merge pull request #626 from qilicun/adapt-changes
...
adapt changes to relpermDiagnostics.
2016-04-04 15:04:50 +02:00
Tor Harald Sandve
a2bff9149a
Remove unused argument from computeWellPotentials()
2016-04-04 15:03:59 +02:00
Tor Harald Sandve
e4b52a457f
Only calculate well potentials for cases with well groups
2016-04-04 09:03:13 +02:00
Tor Harald Sandve
bd81bda57b
Remove well_perforation_pressure_diffs fr WellStateFullyImplicitBlackoil
...
- Calculate the well perforatino pressure difference based on bhp and
perforation pressures instead of storing it in
WellStateFullyImplicitBlackoil
2016-04-04 08:35:59 +02:00