Atgeirr Flø Rasmussen
4af2b4a915
Silence some recently introduced warnings.
2016-04-21 10:29:09 +02:00
Joakim Hove
1f64f79f6d
Merge pull request #657 from pgdr/eclipsegrid-is-input
...
Using getInputGrid API from Parser
2016-04-20 15:50:33 +02:00
Atgeirr Flø Rasmussen
07fec302f4
Cherry-pick Atgeirr's Remove Deck parameter patch
...
Remove Deck parameter from GridInit constructor.
Possible because we now use the EclipseGrid-taking
overload of processEclipseFormat() for CpGrid.
2016-04-20 15:30:45 +02:00
Kai Bao
be55efa484
fixing the compilation and running resulting from PR648
2016-04-20 14:42:56 +02:00
Kai Bao
e67e31171d
adding one line comment for WellModel in BlackoilModelBase
2016-04-20 14:26:13 +02:00
Kai Bao
350a38164e
fixing the compilation and running of flow_multisegment
2016-04-20 14:26:13 +02:00
Kai Bao
b82e917b0d
improving the initSolvent in StandardWellsSolvent
2016-04-20 14:26:13 +02:00
Kai Bao
ebe60bc5d7
puting WellModel before Implementation in the template.
2016-04-20 14:26:13 +02:00
Kai Bao
5bce482086
fixing the compilation and running of flow_solvent
2016-04-20 14:26:13 +02:00
Kai Bao
b464e4fb4a
adding WellModel as template class for BlackoilModelBase
...
the compilation and running of flow are recovered.
Conflicts:
opm/autodiff/BlackoilModelBase_impl.hpp
2016-04-20 14:26:13 +02:00
Tor Harald Sandve
18434e54ad
Query the compute_well_potential parameter only once
...
-- and fix some comments
2016-04-20 08:32:57 +02:00
Pål Grønås Drange
18f6672df0
Using getInputGrid API from Parser
2016-04-19 17:03:41 +02:00
Tor Harald Sandve
e9b097cbf4
Only compute well potential if needed
...
A boolen user parameter is added to controll the computation of well
potential.
This is a temporary fix to assure that no extra computation time is used
on well potential calculation if it is not needed. The long term fix
will require a more thorough revising of the well group implementation.
2016-04-19 16:24:28 +02:00
Tor Harald Sandve
84972ac21e
Fix bhp/thp logic in well potential calculation
...
Pick the most restrictive bhp (not the one that gives the largest
potential flow)
2016-04-19 15:58:05 +02:00
Tor Harald Sandve
4867e14f88
Fixes after rebase
...
-- remove some leftovers from merge process
-- start using stdWells()
2016-04-19 09:41:25 +02:00
Tor Harald Sandve
b216302895
Adapt to usage of stdWells()
2016-04-19 09:21:16 +02:00
Tor Harald Sandve
cc48e8a17e
Add support for THP in well potential calculations
2016-04-19 09:21:15 +02:00
Tor Harald Sandve
18246263e9
Move computation of well potentials from simulator class ot model class
...
- the computation of well potentials in the model class calculates the
well potentials using computeWellFlux()
- in this way the well potential calculations also handle well where
some perforations are closed by the simulator due to cross-flow.
- the well potentials pr perforation and phase is stored in the well
state.
2016-04-19 09:21:15 +02:00
Andreas Lauser
4baf0f6acf
Merge pull request #654 from andlaus/nested_ad
...
Fix build
2016-04-18 11:01:39 +02:00
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
Andreas Lauser
0405953a64
adapt code w.r.t. the removal of the tags for Opm::Evaluation
2016-04-15 18:49:29 +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