Commit Graph

554 Commits

Author SHA1 Message Date
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
Liu Ming
6d5b90df54 modified the simulator more general. 2013-12-17 20:28:32 +08:00
Liu Ming
970fe665d8 add the bhp well controls. 2013-12-17 17:36:43 +08:00
Atgeirr Flø Rasmussen
0ff823f88c Merge pull request #45 from xavierr/master
Fixed build
2013-12-16 03:07:32 -08:00
Xavier Raynaud
2a20e6ebd1 Fixed build. 2013-12-16 11:43:52 +01:00
Xavier Raynaud
5725438b17 Merge remote-tracking branch 'source/master' 2013-12-16 11:39:12 +01:00
Atgeirr Flø Rasmussen
d3453c4ded Merge pull request #44 from qilicun/fix_eff_relperm
fix derivative of effective relperm respect to concentration.
2013-12-16 01:55:59 -08:00
Liu Ming
c2cdc7ec17 add dead poro volume functionality. 2013-12-12 22:46:29 +08:00
Liu Ming
2eaf24decf fix errors for debugging. 2013-12-12 21:58:25 +08:00
Liu Ming
25160d019a add adsorption term for polymer equation.
rewrite some function for simplify.
2013-12-12 21:24:47 +08:00
Liu Ming
0558184439 modify the function for the polymer term. 2013-12-12 20:29:40 +08:00
Liu Ming
720e7ebbef fix derivative of effective relperm respect to concentration. 2013-12-12 17:44:00 +08:00
Xavier Raynaud
542762abb6 Merge remote-tracking branch 'source/master' 2013-12-12 09:51:29 +01:00
Liu Ming
a7db4f3cf0 add adsorption and effective relperm functions. 2013-12-11 22:52:11 +08:00
Liu Ming
11ea882ed8 remove some output commits.
get values from command line for exapmes.
2013-12-11 18:27:05 +08:00
Liu Ming
a358da7afa fix the polymer source bug,
warnning: water initial saturation should not bt zero when
running this simulator.
2013-12-10 20:36:30 +08:00
Liu Ming
6fc24236df fix FullyImplicitTwophasePolymersolver constructor problem.
add some input commits for debugging.
2013-12-09 22:57:44 +08:00
Liu Ming
fb12565ddf make PolymerState return numPhases. 2013-12-09 20:34:23 +08:00
Liu Ming
e226b5d95e Simulator for fullyimplicit two phase flow with polymer 2013-12-09 20:33:05 +08:00
Liu Ming
080116c66b Add fully implicit solver for incomp two phase with polymer
and the polymer properties based on AD.
2013-12-06 23:35:13 +08:00
Liu Ming
eded8f735c chang include header from opm/autodiff to opm/polymer/fullyimplicit 2013-12-06 22:25:22 +08:00
Liu Ming
f6acccd396 incompressible two phase fully implicit simulator. 2013-12-06 22:13:29 +08:00
Bård Skaflestad
525f055475 Merge pull request #37 from atgeirr/bump-version
Bump version number and label.
2013-10-21 06:16:49 -07:00
Bård Skaflestad
741a9653ed Merge pull request #32 from andlaus/fix_headers
make headers autonomously includable and fix a few harmless clang warnings
2013-09-24 02:39:07 -07:00
Andreas Lauser
44e0848127 make headers autonomously includable and fix a few harmless clang warnings 2013-09-10 19:41:49 +02:00
Bård Skaflestad
9bed84b63f Merge pull request #31 from andlaus/adapt_exception_code
Adapt exception code
2013-09-09 03:46:53 -07:00
Andreas Lauser
4859e77c79 explicitly include <iostream> in files which use std::cout or std::cerr 2013-09-05 12:39:11 +02:00
Andreas Lauser
05af2ab6ff Replace MESSAGE by OPM_MESSAGE 2013-09-03 15:43:58 +02:00
Andreas Lauser
7e8d941a6f Replace THROW by OPM_THROW 2013-09-03 15:43:58 +02:00
Andreas Lauser
6a6d0c9b28 Replace the ASSERT and ASSERT2 macros by assert 2013-09-03 15:43:51 +02:00
Andreas Lauser
8ce809c400 Add exception handlers to all unit tests, tutorials and examples 2013-09-03 15:43:51 +02:00
Roland Kaufmann
85f60ad092 Merge pull request #30 from rolk/030_cmake
CMake rollup in anticipation of the 2013.09 release
2013-08-28 11:53:26 -07:00
Roland Kaufmann
fb0aab35d4 Compatibility module for dunecontrol-driven clients
If a client generated with duneproject/built with dunecontrol has a
dependency to opm-polymer, the macros defined in this file is expected
to exist and will be called to search for the opm-polymer library.

All that is done here is to use the pkg-config helper module and
import the configuration that was written by the CMake system (which
even may have been called earlier in the same dunecontrol "session")
2013-08-10 23:22:24 +02:00
Roland Kaufmann
a6aab48b2c Library to pick up configuration from pkg-config files
Pkg-config files are written as part of the CMake configuration, and
these can be imported into AutoTools-driven projects to get the correct
compiler and linker options that has been probed.
2013-08-10 23:20:07 +02:00
Roland Kaufmann
d85f70cf4d Remove AutoTools files that searches for libraries
These are now superceded by CMake equivalents, and will over time
diverge from the main tree as they are no longer maintained.
2013-08-10 23:19:59 +02:00