Commit Graph

209 Commits

Author SHA1 Message Date
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
Andreas Lauser
7c3020822a properly create state.temperature in the FullyImplicitCompressiblePolymerSolver class 2016-02-22 15:16:44 +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
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
Andreas Lauser
651bd91482 use the error macros from opm-common 2015-10-12 15:24:59 +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
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
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
Atgeirr Flø Rasmussen
383322b760 Fix signed/unsigned comparisons. 2015-06-23 13:24:31 +02:00
Kai Bao
d2602cc73f Merge branch 'Adding_PLYSHLOG_RELATED' into Adding_SHRATE_RELATED
Conflicts:
	opm/polymer/PolymerProperties.hpp
2015-06-23 10:27:25 +02:00
Kai Bao
5cdc677672 cleaning up commented codes and adding a few comments. 2015-06-22 15:44:14 +02:00
Kai Bao
39986c3363 adapting to the new refactoring in opm-autodiff#406.
replacing addWellEq() with seperated functions, which make the
incoropration of the shear-thinning much natural and easier.
2015-06-22 15:38:31 +02:00
Kai Bao
9cd52ca631 Merge branch 'adaptation_split_addWellEq' into Adding_PLYSHLOG_RELATED
Conflicts:
	opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp
2015-06-22 12:59:19 +02:00
Kai Bao
04a72bd325 Merge branch 'master' into Adding_PLYSHLOG_RELATED 2015-06-22 12:57:26 +02:00
Kai Bao
78775cd33e parameter order change of addWellContributionToMassBalanceEq().
To follow the corresponding change in opm-autodiff.
2015-06-22 12:48:22 +02:00
Liu Ming
3898ecde96 Fix parameter errors. 2015-06-22 15:43:01 +08:00
Kai Bao
4807a90c35 moving the shear-thinning application out of the addWellEq()
So we still use the addWellEq() from the Base Class, without making a
new addWellEq() function in the BlackoilPolymerModel class.
2015-06-19 15:17:59 +02:00
Kai Bao
60494ac531 changing to adapt to the change in the autodiff. 2015-06-18 16:56:39 +02:00
Kai Bao
f3c98bc95a Merge branch 'master' into Adding_PLYSHLOG_RELATED
Conflicts:
	opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp
2015-06-18 15:45:31 +02:00
Atgeirr Flø Rasmussen
2319420f06 Move polymer code extraAddWellEq -> addWellContributionToMassBalanceEq. 2015-06-18 14:34:52 +02:00
Atgeirr Flø Rasmussen
32590ec072 Use solver_param_ from base class. 2015-06-18 11:09:57 +02:00
Atgeirr Flø Rasmussen
2b6163b5ff Use the base class model_param_ and avoid recreating it. 2015-06-17 12:51:39 +02:00
Kai Bao
6745a2fb0a Merge branch 'master' into Adding_PLYSHLOG_RELATED 2015-06-10 15:15:25 +02:00
Kai Bao
df3c6cb8d1 using Water Position instead of assuming it is 0. 2015-06-10 14:40:46 +02:00
Kai Bao
81d9fe7a55 moving function computeShearMultLog to class PolymerProperties 2015-06-10 13:48:03 +02:00
Atgeirr Flø Rasmussen
8d47acd6bf Satisfy interface requirements of SimulatorBase.
This is done with dummy types since the class in question
(SimulatorFullyImplicitCompressiblePolymer) does not use
a Model/Solver split.
2015-06-10 13:22:43 +02:00
Kai Bao
e44ef196ac moving the intersection calculation to seperate point2D class.
under the namespae Opm::detail
2015-06-10 13:10:45 +02:00
Kai Bao
3e449a31d6 adjusting some spaces related to brackets.
No functions change.
2015-06-09 12:29:49 +02:00