Commit Graph

554 Commits

Author SHA1 Message Date
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
Liu Ming
31ddb2f098 let shear vef return derivative. 2014-03-26 16:02:39 +08:00
Atgeirr Flø Rasmussen
cd6a51cb29 Merge pull request #55 from joakim-hove/remove-old-WellsManager
Removed deprecated Wellsmanager constructor
2014-03-25 23:28:30 +01:00
Joakim Hove
b398ce3b3d Removed Wellsmanager constructor which used old EclipseGridParser instance. 2014-03-25 19:12:19 +01:00
Liu Ming
7a193dca1e return the value by linear interpolation. 2014-03-21 14:34:46 +08:00
Liu Ming
9204434a4d make the member functions return a const reference. 2014-03-19 09:23:20 +08:00
Atgeirr Flø Rasmussen
da91603cb5 Merge pull request #54 from andlaus/more_compile_fixes
More compile fixes
2014-03-18 15:36:36 +01:00
Andreas Lauser
8e5b442b17 fix all remaining CLang warnings
this time, I've rebuild the whole module and it seems to work...
2014-03-18 13:15:59 +01:00
Andreas Lauser
a6f4365344 remove forgotten reference to unused attribute "_gravity"
for some reason Clang compiled last time. I've got no idea why...
2014-03-18 13:13:05 +01:00
Atgeirr Flø Rasmussen
bdcdcdc063 Merge pull request #53 from andlaus/compile_fixes
Compile fixes
2014-03-18 12:52:59 +01:00
Andreas Lauser
3cce559d52 adapt to the SimulatorTimer renames of opm-core 2014-03-18 12:44:33 +01:00
Andreas Lauser
911e55c5e6 fix a few harmless CLang warnings
i.e. rename class to struct in two forward declarations and remove an
unused private attribute...
2014-03-18 12:44:33 +01:00
Liu Ming
1e41e58ce7 makd PolymerProperties handle PLYSHEAR keyword. 2014-03-18 13:25:52 +08:00
Liu Ming
06bed8d945 fix copyright statement. 2014-03-17 10:54:29 +08:00
Liu Ming
84fab85860 Remove opm/autodiff/ files, fix header files. 2014-03-14 14:12:26 +08:00
Liu Ming
010676ad30 add license statement. 2014-03-03 10:20:44 +08:00
Liu Ming
979d503b7d Add license and documentation. 2014-02-25 09:52:10 +08:00
Liu Ming
e63e318d40 apply PVT function changes. 2014-02-20 16:58:02 +08:00
Liu Ming
f01c4dac10 fix eigen bug when compute the capPress. 2014-01-27 16:53:45 +08:00
Liu Ming
075e16dc36 add capillary pressure for incom solver. 2014-01-27 16:26:48 +08:00
Liu Ming
c4d567c5e4 add capPress functionality for PEDs, just use phase pressure to compute
laplace term, all the properties are computed by reference pressure
 which maybe oil pressure in OPM.
2014-01-27 14:48:26 +08:00
Liu Ming
0055ae1def output watercut for incomp polymer solver. 2014-01-23 08:48:42 +08:00
Liu Ming
b9d3b8b1c4 add computeinjecprod function for incomp solver. 2014-01-22 17:07:28 +08:00
Liu Ming
4d2f2fb6a5 using last time step's cmax value when computing adsorption for inconp solver 2014-01-22 16:59:51 +08:00
Liu Ming
12318fe754 output watercut by using utilities.cpp/computeInjectedProduced function. 2014-01-22 14:17:04 +08:00
Liu Ming
8987a4c1d7 write max concentration to PolymerBlackoilState. 2014-01-21 13:45:02 +08:00