467 Commits

Author	SHA1	Message	Date
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
Atgeirr Flø Rasmussen	f90afe5d38	Remove const on return type.	2015-06-23 13:25:52 +02:00
Atgeirr Flø Rasmussen	383322b760	Fix signed/unsigned comparisons.	2015-06-23 13:24:31 +02:00
Kai Bao	afb8feaafe	formatting the blank lines and a bracket.	2015-06-23 13:04:48 +02:00
Kai Bao	9c3c0cffce	correcting copyright information.	2015-06-23 13:02:05 +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	3bd59ab7e4	correcting the marco in the Point2D.hpp file. ... the typo is resulted from a stash apply CONFLICT.	2015-06-10 14:14:03 +02:00
Kai Bao	81d9fe7a55	moving function computeShearMultLog to class PolymerProperties	2015-06-10 13:48:03 +02:00