Commit Graph

719 Commits

Author SHA1 Message Date
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
Liu Ming
ac764bd8a8 let sim_poly_fi2p_comp_ad works as the same way as sim_poly_fibo_ad.
- move time iteration to simulator class
 - add EclipseWriter and output Eclipse binaries.
 - add DeckConstPtr for polymer inflow.
2014-10-29 13:23:50 +08:00
Liu Ming
3102c4dab2 use WellStateFullyImplicitBlackoil instead of WellState. 2014-10-29 10:25:06 +08:00
Liu Ming
d44e8e6d9f remove unnecessary referencer. 2014-10-28 16:29:22 +08:00
Liu Ming
a23e4ca63b remove historical and un-used files. 2014-10-28 14:28:34 +08:00
Liu Ming
c0a61c9655 due to the new timer, simulator class should not do time iteration once again. 2014-10-28 13:31:35 +08:00
Liu Ming
5242d6bbf7 move time iterations to Simulator class and pass deck to create polymer inflows.
This should solve the issues: write the final state to eclipse binaries.
2014-10-28 13:14:44 +08:00
Liu Ming
5535dd99cc source term should be '-' not '+' to mass balance equation... 2014-10-27 14:10:40 +08:00
Liu Ming
ba6fef4fbd pass wells manager from sim_poly_fibo to Simulator class, instead of directly
create it in Simulator class, since polymer inflow need deck and wells.
2014-10-24 14:04:57 +08:00
Liu Ming
61c76c4294 use std::unique_ptr instead of boost::scoped_ptr. 2014-10-20 17:29:59 +08:00
Atgeirr Flø Rasmussen
3c29b12f1f Merge pull request #71 from qilicun/use_plmixpar
use PLMIXPAR instead of TLMIXPAR.
2014-10-20 09:17:22 +02:00
Liu Ming
6b3b90500f Merge remote-tracking branch 'opm/master' into bo_polymer
Conflicts:
	opm/polymer/PolymerProperties.hpp
2014-10-20 13:51:37 +08:00
Liu Ming
88a1ec6e9f fix bugs: polymer head should be dp*trans. 2014-10-20 13:44:12 +08:00
Atgeirr Flø Rasmussen
23ea7cbd11 Merge pull request #69 from qilicun/fix_bugs
PLYVISC and PLYADS should not just have only one row.
2014-10-17 12:21:58 +02:00
Liu Ming
89120ed57f output parameters for debugging and remove double loop of timer. 2014-10-16 16:55:36 +08:00
Liu Ming
6a051b7e4e adapte the API changes of PolymerProperties class. 2014-10-16 10:03:13 +08:00
Liu Ming
ddfb030b57 Merge remote-tracking branch 'opm/master' into bo_polymer 2014-10-16 10:00:37 +08:00
Liu Ming
f1f0fa9c29 resize and use ADB::null() to initialize. 2014-10-16 09:59:59 +08:00
Liu Ming
d99a0ff7a1 use PLMIXPAR instead of TLMIXPAR. 2014-10-15 09:47:43 +08:00
Atgeirr Flø Rasmussen
7d2b18d758 Merge pull request #70 from andlaus/use_TLMIXPAR_keyword
use the TLMIXPAR keyword directly
2014-10-14 14:10:03 +02:00
Andreas Lauser
7c122c18d3 use the TLMIXPAR keyword directly
instead of using a table class. This is because the keyword is not a
table...
2014-10-14 12:29:31 +02:00