539 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andreas Lauser	206d7b56e4	pass the deck to the output writer	2015-03-26 17:33:20 +01:00
Atgeirr Flø Rasmussen	62e8146424	Merge pull request #96 from qilicun/updates ... Updates FIBOPOLYMER simulator based on flow simulator.	2015-03-24 20:29:46 +01:00
Liu Ming	f23f5fac8e	rename sim_poly_fibo_ad to flow_polymer.	2015-03-24 17:06:32 +08:00
Liu Ming	d791888430	Merge remote-tracking branch 'remotes/opm/master' into updates ... Conflicts: opm/polymer/fullyimplicit/FullyImplicitBlackoilPolymerSolver_impl.hpp	2015-03-24 16:56:19 +08:00
Liu Ming	0d0ff9d961	use std::move(), solving conflicts.	2015-03-24 16:41:32 +08:00
Liu Ming	b4d834508c	Updates FIBOPOLYMER simulator based on flow simulator. ... Rename sim_poly_fibo_ad to flow_polymer.	2015-03-24 15:07:25 +08:00
Atgeirr Flø Rasmussen	7f90315f48	Merge pull request #93 from atgeirr/fix-compile-error ... Adapt to API change for AutoDiffBlock class.	2015-03-20 10:55:05 +01:00
Atgeirr Flø Rasmussen	aff268dbdb	Adapt to API change for AutoDiffBlock class.	2015-03-16 16:49:12 +01:00
Bård Skaflestad	f2b928932a	Merge pull request #92 from atgeirr/fix-compile-error ... Follow API change in BlackoilPropsAdInterface.	2015-03-09 10:25:53 +01:00
Atgeirr Flø Rasmussen	9d56234602	Follow API change in BlackoilPropsAdInterface.	2015-03-09 09:56:55 +01:00
Atgeirr Flø Rasmussen	8a95f10ea7	Merge pull request #91 from atgeirr/adapt-api-change ... Adapt to API change in WellsManager.	2015-02-18 13:16:12 +01:00
Atgeirr Flø Rasmussen	22f8fd2271	Adapt to API change in WellsManager.	2015-02-17 13:53:01 +01:00
Atgeirr Flø Rasmussen	d4c640fde8	Merge pull request #90 from chflo/opm-166 ... OPM-166: opm-core method thresholdPressures signature has changed	2015-02-17 10:47:03 +01:00
chflo	8870da536d	OPM-166: opm-core method thresholdPressures signature has changed	2015-02-17 10:12:37 +01:00
Bård Skaflestad	945104f39b	Merge pull request #89 from qilicun/fix_polymer_inflow ... Change PolymerInflow constructor interface.	2015-01-26 23:29:55 -06:00
Liu Ming	74332085dc	change PolymerInflow constructor interface due to commit 6628941c9c9d781db9ec8e3ac05a3a8dc49dcf21 in opm-parser.	2015-01-27 12:24:26 +08:00
Atgeirr Flø Rasmussen	8b859f2fcc	Merge pull request #88 from qilicun/fix_wellstate ... Adapte to FIBO wellstate API changes in opm-autodiff.	2015-01-19 10:25:56 +01:00
Liu Ming	6a3bfba846	Adapte to FIBO wellstate API changes in opm-autodiff.	2015-01-19 11:29:32 +08:00
Atgeirr Flø Rasmussen	a20f0291a1	Merge pull request #81 from qilicun/wpolymer_schedule ... add new polymerInflow constructor, get polymer injection rate from schedule section	2014-12-12 09:38:34 +01:00
Joakim Hove	59438c624a	Merge pull request #87 from andlaus/remove_strict_parsing ... adapt to the removal of the "strict parsing" concept	2014-12-11 13:20:12 +01:00
Andreas Lauser	47fe10e8fb	adapt to the removal of the "strict parsing" concept	2014-12-09 14:20:26 +01:00
Liu Ming	f9892f20d7	Add rough conversation testing for polymer equation.	2014-12-09 10:33:20 +08:00
Atgeirr Flø Rasmussen	c19348841d	Merge pull request #86 from bska/cmake_086 ... Synchronise build system with OPM core	2014-12-08 16:54:04 +01:00
Atgeirr Flø Rasmussen	f31ff4fc56	Merge pull request #80 from akva2/fix_debian_packaging ... update packaging	2014-12-08 10:30:51 +01:00
Liu Ming	4d1f364a40	fix cmax issues.	2014-12-08 13:45:30 +08:00
Liu Ming	953cddce98	Merge branch 'fix_cmax' into wpolymer_schedule	2014-12-08 10:02:38 +08:00
Liu Ming	601767306a	fix cmax issue, which affect Nodesorption results.	2014-12-08 10:00:27 +08:00
Liu Ming	d2892833b4	fix wrong implementation.	2014-12-08 09:54:16 +08:00
Liu Ming	93994a3e53	simplify the implementation.	2014-12-08 09:52:57 +08:00
Liu Ming	d9605b94e7	Merge remote-tracking branch 'opm/master' into fix_cmax	2014-12-08 09:15:01 +08:00
Liu Ming	d0f75da59e	Merge remote-tracking branch 'remotes/origin/wpolymer_schedule' into wpolymer_schedule	2014-12-08 09:09:03 +08:00
Atgeirr Flø Rasmussen	0065ae67d5	Merge pull request #83 from andlaus/fix_typo ... fix typo	2014-12-04 08:55:31 +01:00
Andreas Lauser	c3d73e6de8	fix typo	2014-12-03 17:03:25 +01:00
Liu Ming	28b2fab7b7	fix gcc4.8 compile issue and remove whitespace.	2014-12-03 17:28:55 +08:00
Liu Ming	242ec598c8	Merge remote-tracking branch 'opm/master' into wpolymer_schedule	2014-12-03 16:56:38 +08:00
Atgeirr Flø Rasmussen	e280b45373	Merge pull request #82 from andlaus/temperature_dependent_PVT ... allow temperature dependent PVT properties	2014-12-02 15:36:05 +01:00
Liu Ming	cca03d5421	delete commented line.	2014-11-21 09:29:09 +08:00
Andreas Lauser	d36d7e81cb	allow temperature dependent PVT properties ... this has the nice side effect that non-uniform temperature fields also become supported as long as they are "impressed" externally...	2014-11-20 19:25:18 +01:00
Liu Ming	9303e41966	add new polymerInflow constructor, get polymer injection rate from schedule section.	2014-11-20 16:32:02 +08:00
Atgeirr Flø Rasmussen	7844931b41	Merge pull request #78 from qilicun/add_config ... add config.h	2014-11-19 08:56:27 +01:00
Liu Ming	63d68ecd62	add config.h	2014-11-19 08:44:54 +08:00
Atgeirr Flø Rasmussen	a56a68e8d2	Merge pull request #75 from akva2/debian_packaging ... update debian packaging	2014-11-18 11:54:33 +01:00
Atgeirr Flø Rasmussen	2884074bb0	Merge pull request #76 from qilicun/fix_jenkins ... Fix jenkins	2014-11-18 07:58:52 +01:00
Liu Ming	c605a22c14	add config.h	2014-11-18 09:47:51 +08:00
Liu Ming	a43fa424a6	remove not-used files, these files belong to Incompressible flow, not ... supported by autodiff.	2014-11-18 09:33:38 +08:00
Liu Ming	674284d382	fix header gard!	2014-11-18 09:29:27 +08:00
Atgeirr Flø Rasmussen	aa189ff910	Merge pull request #73 from qilicun/bo_polymer ... Fully implicit Two phase polymer solver and blackoil polymer solver	2014-11-17 13:02:11 +01:00
Liu Ming	4ce5661d9e	compute cmax every time step.	2014-11-17 17:23:04 +08:00
Liu Ming	9a5c889656	adapt to API changes of opm-autodiff.	2014-11-14 13:16:22 +08:00
Liu Ming	58bdc701e3	since two phase polymer simulator support EclipseWriter, need to remove historical ... files for outputing water cut.	2014-10-29 13:38:15 +08:00