Commit Graph

488 Commits

Author SHA1 Message Date
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
Kai Bao
2b5f7c2b5c correcting the typo when reading PLYROCK table.
PlymaxTable was used instead.
2015-10-24 13:19:36 +02:00
paean
956b8fc633 silencing a shadowing warning related to shrate. 2015-10-19 07:53:27 +02:00
Andreas Lauser
651bd91482 use the error macros from opm-common 2015-10-12 15:24:59 +02:00
Atgeirr Flø Rasmussen
0054c90e45 Merge pull request #146 from atgeirr/refactor-getconvergence
Refactor getConvergence()
2015-10-06 10:27:39 +02:00
Joakim Hove
1a0358d85a Using TableContainer. 2015-10-04 09:00:01 +02:00
Atgeirr Flø Rasmussen
058e4326ca Remove unused functions. 2015-10-01 10:47:13 +02:00
Atgeirr Flø Rasmussen
b885c8e454 Add "Polymer" material and disable custom getConvergence(). 2015-09-30 14:49:15 +02:00
Atgeirr Flø Rasmussen
b324606084 Update to work with AutoDiffBlock::M now being AutoDiffMatrix. 2015-09-08 09:57:17 +02:00
Atgeirr Flø Rasmussen
6c00cddb35 Whitespace fix.
Made as a separate commit in order to make the next commit diff understandable.
2015-09-08 09:36:42 +02:00
Joakim Hove
86dfd557a0 Using TableManager to get tables. 2015-09-01 13:02:15 +02:00
Kai Bao
d9cb0066df correcting the determination of out-of-table-range velocity
comparing the location to the line instead of comparing the velocity
value directly.
2015-08-17 18:17:23 +02:00
Atgeirr Flø Rasmussen
834d607d57 Update to match changes in opm-autodiff.
BlackoilModelBase now requires an EclipseState constructor argument.
Also silenced two minor warnings.
2015-07-10 12:57:30 +02:00
Kai Bao
c88b1d6a8b adapting to the change in autodiff#408 2015-06-24 14:23:25 +02:00
Kai Bao
f00f7c38b6 using size_t to avoid signed/unsigned comparison. 2015-06-23 14:39:04 +02:00
Kai Bao
1f36eaa27e constructing vector directly instead of using std::copy. 2015-06-23 14:33:02 +02:00
Kai Bao
8f51065abf using .data() instead of obtaining the address of first element. 2015-06-23 14:19:35 +02:00
Kai Bao
46edf7bb90 minor formatting for spaces for one if statement. 2015-06-23 14:02:57 +02:00
Kai Bao
c026503e91 more documents for BlackoilPolymerModel construction function. 2015-06-23 14:01:19 +02:00
Kai Bao
2100f10411 Merge branch 'master' into Adding_SHRATE_RELATED 2015-06-23 13:33:05 +02:00
Kai Bao
638c2da394 Merge branch 'master' into Adding_SHRATE_RELATED 2015-06-23 13:31:20 +02:00