Commit Graph

588 Commits

Author SHA1 Message Date
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
Liu Ming
f762684564 computing adsorption using last time step's value of cmax, fix the
bug that the front cells' concentrations is negative.
2014-01-20 16:25:30 +08:00
Liu Ming
5ac5df6b86 fix bug when compute the adsorption term in mass balance equation. 2014-01-14 15:33:32 +08:00
Liu Ming
6f6a986595 fix the bug when compute the adsorption term in the mass conservation
equation.
2014-01-14 12:59:45 +08:00
Liu Ming
65764ce6f2 add a private member cmax_ to store the max concentration for per cell. 2014-01-10 17:53:54 +08:00
Liu Ming
97f5c5ace5 fix bug when computing the maxconcentration that the cell experienced. 2014-01-10 17:20:08 +08:00
Liu Ming
139bfb7e62 refactor well controls use new well controls gourp. 2014-01-10 14:15:24 +08:00
Liu Ming
7243418cc5 Merge remote-tracking branch 'opm/master' into adsorption 2014-01-10 13:38:40 +08:00
Bård Skaflestad
62579932fa Merge pull request #46 from joakim-hove/use-well-controls-api
Using the well_controls_get_xxx() functions.
2014-01-09 03:44:15 -08:00
Joakim Hove
a2fd7307b8 Using the well_controls_get_xxx() functions. 2014-01-09 12:06:26 +01:00
Liu Ming
689a3505b7 change residual norm from l2 to lp(p can be infinity). 2014-01-09 16:29:38 +08:00
Liu Ming
391287283d mistake use of typename. 2014-01-03 15:35:00 +08:00
Liu Ming
ff91428fe0 fix bug: check bhp vector is not empty. 2014-01-03 15:27:48 +08:00
Liu Ming
cf28164a5a new simulator for fully implicit compressible twophase
polymer works.
2013-12-27 15:48:04 +08:00
Liu Ming
c37539b3ab add well controls for polymer, but rate control just for
water phase and oil phase.
2013-12-24 17:31:11 +08:00
Liu Ming
7a874427af remove fullyincomp twophase solver from cmake file list,
because they are handled in opm/autodiff.
2013-12-17 23:53:58 +08:00
Liu Ming
2985dc7cce make the simulator read from deckfile
make it much more gerenal.
2013-12-17 23:49:09 +08:00