Liu Ming
|
61c76c4294
|
use std::unique_ptr instead of boost::scoped_ptr.
|
2014-10-20 17:29:59 +08: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 |
|
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 |
|
Liu Ming
|
54c8014453
|
PLYVISC and PLYADS should not just have only one row.
|
2014-10-14 16:28:11 +08:00 |
|
Liu Ming
|
6d76151b6d
|
use std::unique_ptr instead of std::shared_ptr for polymerInflowInterface.
|
2014-10-11 16:38:59 +08:00 |
|
Liu Ming
|
b18f13bd7f
|
fix phaseIdx problem and make the function more readable.
|
2014-10-10 17:06:05 +08:00 |
|
Liu Ming
|
dce2047e41
|
fix bugs caused by canonical phase index and active phase index.
residual_ and rq_ resize at a proper position.
|
2014-10-10 15:42:49 +08:00 |
|
Liu Ming
|
ddb7b8833f
|
if deck has_polymer, rq_ should resize to store polymer equation.
|
2014-10-10 10:17:40 +08:00 |
|
Liu Ming
|
d457211cf2
|
make sure polymer position is the last.
|
2014-10-10 10:11:04 +08:00 |
|
Liu Ming
|
c2d6347271
|
make some tricks for initialing polymer_inflow, this maybe wrong, but now no bugs.
|
2014-10-09 14:23:36 +08:00 |
|
Liu Ming
|
73c2032974
|
fix some bugs.
|
2014-10-09 10:04:17 +08:00 |
|
Liu Ming
|
be927741b8
|
create a blackoil+polymer simulator.
|
2014-10-08 14:46:43 +08:00 |
|
Liu Ming
|
f3553d73c7
|
since time iteration was moved to the Simulator class, pass PolymerInflowInterface
as a shared_ptr.
|
2014-10-08 14:45:42 +08:00 |
|
Liu Ming
|
e56ba2afae
|
modify them, let them adapt to polymer simulator.
|
2014-10-08 13:54:45 +08:00 |
|
Liu Ming
|
9c72ca40c8
|
add concentration and maxconcentration for PolymerBlackoilState.
|
2014-10-08 11:22:25 +08:00 |
|
Liu Ming
|
4250d4eda5
|
use phase pressure to compute fluidRecipeFVF().
|
2014-10-08 10:23:10 +08:00 |
|
Liu Ming
|
9beaf4e03b
|
add well rate contribution to polymer mass balance equation.
|
2014-09-30 15:22:50 +08:00 |
|
Liu Ming
|
9db24a22d2
|
let PolymerBlackoilState return rs() and rv().
|
2014-09-29 16:39:50 +08:00 |
|
Liu Ming
|
617f439318
|
add polymer properties and functions.
|
2014-09-29 16:38:48 +08:00 |
|
Liu Ming
|
979c2dc0f7
|
use Newton iteration solver interface from opm-autodiff, prepare for CPR supporting.
|
2014-09-26 14:54:57 +08:00 |
|
Liu Ming
|
ca70d67d83
|
some changes, mostly of them are API changes from opm-autodiff and opm-parser.
|
2014-09-26 14:06:01 +08:00 |
|
Liu Ming
|
1cb1e8475a
|
add PhasePresence, make muOil() function happy.
|
2014-09-26 14:05:17 +08:00 |
|
Liu Ming
|
8620ce2641
|
use std::shared_ptr instead of boost::scoped_ptr.
|
2014-09-26 14:03:55 +08:00 |
|
Liu Ming
|
e22398c098
|
make Opm::DerivedGeology as a direct arguement for simulator.
|
2014-09-25 16:40:01 +08:00 |
|
Liu Ming
|
fb0f4f7a92
|
comment header files and function for incompProps.
|
2014-09-25 16:28:35 +08:00 |
|
Liu Ming
|
ca6baf7c73
|
use phase pressure to compute FVF and density.
|
2014-09-25 15:14:40 +08:00 |
|
Liu Ming
|
12f1342870
|
use phasePress to compute viscosity, density.
|
2014-09-25 14:23:21 +08:00 |
|
Liu Ming
|
219f46a406
|
update compurePressure().
|
2014-09-25 11:24:59 +08:00 |
|
Liu Ming
|
aa30b4567c
|
add phaseCondition for new API of class BlackoilAdInterface
|
2014-09-25 11:16:56 +08:00 |
|
Liu Ming
|
d5f8cbeec0
|
move all the output functions to anonymous namespace and clean up unused functions.
|
2014-09-24 15:44:21 +08:00 |
|
Liu Ming
|
9a41199bd4
|
Merge remote-tracking branch 'opm/master' into fim
Conflicts:
cmake/Modules/Findopm-autodiff.cmake
|
2014-09-23 16:04:15 +08:00 |
|
Joakim Hove
|
42e6020b9e
|
Merge pull request #67 from andlaus/table_improvements
adapt the the table related API changes of opm-parser
|
2014-09-19 15:28:04 +02:00 |
|
Andreas Lauser
|
9fbf4b2b3b
|
adapt the the table related API changes of opm-parser
|
2014-09-17 13:28:39 +02:00 |
|
Atgeirr Flø Rasmussen
|
8ee9cf1342
|
Merge pull request #62 from bska/062_cmake
Synchronise build system with OPM-Core
|
2014-06-17 08:37:29 +02:00 |
|
Bård Skaflestad
|
e6c09f6dd5
|
Merge pull request #61 from andlaus/enable_property_modifiers
use the EclipseState instead of the raw deck
|
2014-06-11 22:47:08 +02:00 |
|
Andreas Lauser
|
0dfa8680f7
|
use the EclipseState instead of the raw deck
this is needed to enable property modifiers...
|
2014-06-07 18:45:46 +02:00 |
|
Bård Skaflestad
|
de9fdc254c
|
Merge pull request #60 from andlaus/implement_multi-region_pvt_tables
fix a pretty simple compile issue
|
2014-06-06 14:38:30 +02:00 |
|
Andreas Lauser
|
67b5cb263e
|
fix a pretty simple compile issue
This was caused by the new multi-region PVT support in opm-core.
|
2014-06-05 14:39:11 +02:00 |
|
Bård Skaflestad
|
64aa6566ae
|
Merge pull request #59 from andlaus/move_to_opm-parser
move the code away from EclipseGridParser to opm-parser
|
2014-06-04 00:25:12 +02:00 |
|
Andreas Lauser
|
3a6d989d5e
|
move the code away from EclipsGridParser to opm-parser
|
2014-04-26 11:13:59 +02:00 |
|
Atgeirr Flø Rasmussen
|
55f5b0a10e
|
Merge pull request #52 from qilicun/read_plyshear
make PolymerProperties handle PLYSHEAR keyword.
|
2014-04-15 08:18:49 +02:00 |
|
Atgeirr Flø Rasmussen
|
d574166f31
|
Merge pull request #56 from bska/fallout-from-refactoring
Implement low-level init() routines
|
2014-04-15 08:02:30 +02:00 |
|
Bård Skaflestad
|
4c0e0c8361
|
Implement low-level init() routines
These are needed by the initialisation routines of the refactored
opm-core (PR OPM/opm-core#518) that introduces support for parallel
grids.
|
2014-04-14 23:52:50 +02:00 |
|