Kai Bao
fbe7143f54
using WellModel functions in BlackoilPolymerModel.
...
reducing some repeated code.
2016-05-23 15:11:52 +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
1f2442fe80
reducing paramter list for more functions in StandardWells
...
computeWellFlux
updateWellState
updateWellControls
addWellControlEq
computeWellPotentials
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
Tor Harald Sandve
01c782dbf3
Remove primalvariable_ and use hydroCarbonState instead
...
the hydrocarbonstate is stored in the reservoir state and
used instead of the primalvariable_
The initial hydrocarbonstate is computed using
initHydroCarbonState(...);
2016-05-13 09:04:48 +02:00
Kai Bao
8236a32aee
sliencing a few shadowing warnings.
2016-05-06 17:59:00 +02:00
Kai Bao
13acc8ee03
moving computeWellConnectionPressures to StandardWells
...
the results look okay, while the running for flow_solvent needs further
investigation even the results with flow_solvent actually look okay.
With two different version of
computePropertiesForWellConnectionPressures, flow_solvent produces the
same results. This is something needs further investigation.
The current implementation requires a copy of
computeWellConnectionPressure in StandardWells and StandardWellsSolvent.
That means probably we need to introduce the asImpl() for the Wells.
2016-04-29 10:07:10 +02:00
Kai Bao
dcca0b0b76
moving addWellControlEq to StandardWells
2016-04-29 10:07:10 +02:00
Kai Bao
eb278c3c9a
moving addWellFluxEq() to StandardWells
...
Conflicts:
opm/autodiff/BlackoilModelBase_impl.hpp
2016-04-29 10:07:10 +02:00
Kai Bao
a72f04a564
fixing the compilation and running of flow_polymer
2016-04-20 14:26:13 +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
c120313f09
renaming visc parameters to mu_w for better readability
2016-04-14 15:09:03 +02:00
Kai Bao
104f6053f1
removing blank spaces and replacing the tab with spaces by retab
2016-04-14 14:57:26 +02:00
Kai Bao
30774d8309
correcting buggy visc pointer usage in effective viscosity calculation
2016-04-14 14:52:00 +02:00
Kai Bao
666f91505d
using effective polymer viscosity for polymer mobility calculation.
2016-04-14 13:45:21 +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
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
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
723da3e618
recovering the flow_polymer
2016-04-06 12:54:01 +02:00
Atgeirr Flø Rasmussen
6549658622
Merge pull request #624 from GitPaean/polymer_linearsolver
...
making the interleaved solver works for blackoil polymer simulator.
2016-03-31 15:39:54 +02:00
Atgeirr Flø Rasmussen
3aa5158842
Merge pull request #619 from kjellkongsvik/Move_OutputWriter_to_opm-output
...
Refactored to use OutputWriter from opm-output
2016-03-31 09:44:09 +02:00
Kai Bao
b39b9a85a2
making the interleaved solver works for blackoil polymer simulator.
...
The CPR solver does not work yet. An error will be thrown if people
specify to use CPR linear solver.
2016-03-30 16:19:56 +02:00
Joakim Hove
18c07d5d66
Replaced SimulatorState -> SimulationDataContainer
2016-03-29 10:48:36 +02:00
Kjell W. Kongsvik
ea9e572a65
Refactored to use OutputWriter from opm-output
...
As OutputWriter has been deleted from opm-core
Only changes in includes
2016-03-17 14:45:30 +01:00
Atgeirr Flø Rasmussen
7bfa8f405e
Fix bug in overriding method.
2016-02-29 11:18:51 +01:00
Bård Skaflestad
1237251ee4
Merge pull request #599 from joakim-hove/state-updates
...
PolymerState changes
2016-02-24 07:31:37 -06:00
Joakim Hove
7ddd1c1c80
PolymerState changes
...
- The PolymerState class will derive from SimulatorState, instead of
containing a TwoPhaseState instance.
- The Polymer calculation methods take PolymerState& input argument
instead of TwoPhaseState&
2016-02-22 18:42:13 +01:00
Andreas Lauser
7c3020822a
properly create state.temperature in the FullyImplicitCompressiblePolymerSolver class
2016-02-22 15:16:44 +01:00
Jørgen Kvalsvik
19e41bd246
Change Deck access methods/types to references
...
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.
https://github.com/OPM/opm-parser/pull/677
2016-02-19 11:55:19 +01:00
Robert Kloefkorn
743fad877a
remove unused typedef.
2016-02-16 10:25:57 +01:00
Robert Kloefkorn
4111797822
BlackoilModelBase: added parameter singlePrecision and print residual to large at right
...
place.
2016-02-12 12:14:02 +01:00
Tor Harald Sandve
dee96db6b2
Cleaning and adding comments
2016-02-12 10:42:26 +01:00
Tor Harald Sandve
c85f10046c
Density and viscosity as inputs instead of computed in computeMassFlux
...
Density and viscosity are given as input instead of calculated inside
computeMassFlux. This allow for modifying the properties prior to
calling computeMassFlux which avoids code duplication in the solvent
implementation.
2016-02-12 10:42:26 +01:00
Jørgen Kvalsvik
850f0884f1
Improve includes from opm-parser
...
Adopting to opm-parser PR#661, add previously missing includes.
OPM/opm-parser#661
2016-01-26 13:32:34 +01:00
Jørgen Kvalsvik
087710df7d
Fixes includes wrt opm-parser PR-656
...
Several files stopped compiling due to relying on opm-parser headers doing
includes. From opm-parser PR-656 https://github.com/OPM/opm-parser/pull/656
this assumption is no longer valid.
2016-01-20 15:11:30 +01:00
Joakim Hove
24601480e3
Using new Table api.
2016-01-08 13:57:38 +01:00
Joakim Hove
833f5d053f
Avoid using Deck.
...
Removed incorrect use of Deck for polymer and solvent properties.
2016-01-08 13:57:37 +01:00
Atgeirr Flø Rasmussen
b420cccfc3
Add warning about simulating without WPOLYMER.
...
Warning was in the main() of flow_polymer.cpp,
but will disappear from there after refactoring.
2015-12-18 13:58:13 +01:00
Tor Harald Sandve
e3393c5ee9
Handle combination of threshold_pressure and nnc
...
The nncs threshold pressures are calculated and appended to the face
threshold pressures
2015-12-08 11:03:05 +01:00
Andreas Lauser
e0a1abba09
adapt to the "mutable geology" changes from opm-autodiff
2015-11-26 12:20:15 +01:00
Atgeirr Flø Rasmussen
e3a5e1682d
Adapt to refactored/renamed NonlinearSolver (was NewtonSolver).
2015-11-18 10:19:32 +01:00
Atgeirr Flø Rasmussen
b918f20771
Add model() and relativeChange() methods.
2015-11-13 13:58:41 +01:00
Atgeirr Flø Rasmussen
bbf1862023
Update for new surfaceDensity() interface.
2015-11-13 13:30:01 +01:00
Atgeirr Flø Rasmussen
b2bf88e689
Silence warning about missing initializer.
2015-11-13 13:29:32 +01:00
Kai Bao
0936917610
removing some white spaces.
2015-10-24 13:23:25 +02:00