Commit Graph

5423 Commits

Author SHA1 Message Date
Roland Kaufmann
205a2e3351 Remove superfluous tags file 2012-09-12 12:55:03 +02:00
Xavier Raynaud
4db4d715de Last saturation is stored in a mutable variable. 2012-09-10 11:03:59 +02:00
Halvor M. Nilsen
594eca3633 Added lines which is need to compile with PROFILING. Did not check if code brakes. 2012-09-08 11:11:23 +02:00
Bård Skaflestad
0c092be788 Merge remote-tracking branch 'upstream/master' 2012-09-05 19:48:21 +02:00
Xavier Raynaud
55486d3c03 Fixed source term (measured at reservoir condition). 2012-09-05 13:38:30 +02:00
Xavier Raynaud
7f1a1d7e24 Merge remote-tracking branch 'upstream/master' 2012-09-05 13:35:48 +02:00
Xavier Raynaud
938fc0f0d4 Fixed comment line. 2012-09-05 12:34:17 +02:00
Bård Skaflestad
8b209c088f Merge remote-tracking branch 'upstream/master' 2012-09-05 11:46:54 +02:00
Xavier Raynaud
7721defbd3 Fixed/Added documentation comments. 2012-09-05 11:45:54 +02:00
Xavier Raynaud
5f27612b05 Merged from upstream. 2012-09-05 11:11:06 +02:00
Xavier Raynaud
7fb671ffbf Changed computation of polymer production. Added functionalities for compressible case. 2012-09-05 11:09:45 +02:00
Bård Skaflestad
36e017d48d Honour initialisation order requirement.
Introduced in change-set 85cde6f721a4.
2012-09-05 10:27:37 +02:00
Xavier Raynaud
38bcaeb362 Changed solvegravity interface. Fixed bug. 2012-09-05 10:10:02 +02:00
Xavier Raynaud
8e089dd80d Use porevolume instead of porosity, as argument for the transport solver. 2012-09-05 09:11:05 +02:00
Xavier Raynaud
fa84128ddc Fixed bug. 2012-09-05 09:07:47 +02:00
Atgeirr Flø Rasmussen
a6d3e2eef4 Merge branch 'master' into nonuniform_fluid_tables
Conflicts:
	Makefile.am
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
	opm/core/fluid/SaturationPropsFromDeck.hpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
	opm/core/fluid/blackoil/SinglePvtDead.cpp

This merge combines three more-or-less orthogonal features
for saturation tables: the option to use StoneII or Simple
three-phase behaviour, the option to fit a spline or not,
and finally setting the number of samples used (if spline
fitting).

Interfaces have changed, the most top-level one being
that BlackoilPropertiesFromDeck::init() now also takes
a ParameterGroup argument.
2012-09-04 11:42:31 +02:00
Xavier Raynaud
845c100dcd Fixed order of arguments in function call. 2012-09-04 11:39:17 +02:00
Xavier Raynaud
612a1ffc63 Fixed bug. 2012-09-03 16:46:02 +02:00
Xavier Raynaud
27dea09311 Added initializations in constructor. 2012-09-03 16:45:50 +02:00
Xavier Raynaud
76e517516f Added missing initialization of gravity in constructor. 2012-09-03 14:55:19 +02:00
Xavier Raynaud
8752f14015 Added executable example for compressible with polymer. 2012-09-03 13:52:59 +02:00
Xavier Raynaud
e1a5c1dc94 Removed redundant header file include. 2012-09-03 12:55:10 +02:00
Xavier Raynaud
8bf900f1bf Update surface volume in transport solver. 2012-09-03 12:52:25 +02:00
Xavier Raynaud
708c56bb94 Simplified computation of adsorbed mass of polymer. 2012-09-03 12:49:04 +02:00
Xavier Raynaud
a335e1b149 Added Simulator for compressible polymer. Not tested. 2012-08-31 10:38:50 +02:00
Xavier Raynaud
8b40a4a68f Fixed comments. 2012-08-30 15:58:14 +02:00
Xavier Raynaud
99fe7bf46e Fixed preprocessor flag names in some header files. 2012-08-30 15:31:28 +02:00
Xavier Raynaud
92def1d514 Cleaned up ownership (private vs public) in class definition. 2012-08-30 09:09:23 +02:00
Xavier Raynaud
eb52ee58c1 Added gravity transport solver functionality. Not tested. 2012-08-29 13:49:02 +02:00
Xavier Raynaud
becf485795 Changes to avoid compilator warning. 2012-08-29 13:48:19 +02:00
Xavier Raynaud
a13f3cf43b Fixed examples/Makefile.am. 2012-08-29 13:47:05 +02:00
Xavier Raynaud
928513b561 Added compressible polymer transport solver. Not yet done. 2012-08-28 16:42:26 +02:00
Xavier Raynaud
a9456704e1 Removed private configuration options. 2012-08-28 15:29:27 +02:00
Atgeirr Flø Rasmussen
77270f4a25 Added class SinglePvtDead, add parameter 'props_use_spline' to simulators.
Recall that the class that used to be called SinglePvtDead has
been renamed to SinglePvtDeadSpline. If 'props_use_spline' is true,
that class is used (this is the default), which makes a monotone
spline that is uniformly, densely sampled. The new class simply
uses linear interpolation in the input tables.
2012-08-27 16:48:21 +02:00
Bård Skaflestad
21be5b1387 Merge remote-tracking branch 'upstream/master' 2012-08-27 15:37:07 +02:00
Xavier Raynaud
9a271a6038 Added (fluid) compressible pressure solver for polymer. 2012-08-27 13:16:10 +02:00
Atgeirr Flø Rasmussen
ba042c7241 Minor revision, mostly whitespace cleanup and comments. 2012-08-27 09:48:06 +02:00
Bård Skaflestad
aeb878cfa1 Merge remote-tracking branch 'upstream/master' 2012-08-24 20:44:05 +02:00
Halvor Møll Nilsen
5004f3c4b9 Corrected typing pointed out by atgeirr in respose to pullrequest 2012-08-24 20:31:13 +02:00
Halvor Møll Nilsen
423b5074b5 added writing of reorder iterations for each cell 2012-08-24 20:31:13 +02:00
Atgeirr Flø Rasmussen
ac1ec3e9ac Merge remote-tracking branch 'upstream/master'
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-24 13:31:05 +02:00
Halvor Møll Nilsen
0ed597fee9 Corrected typing pointed out by atgeirr in respose to pullrequest 2012-08-24 12:52:41 +02:00
Halvor Møll Nilsen
7f3cbc476a Merge remote-tracking branch 'upstream/master'
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-24 12:26:27 +02:00
Xavier Raynaud
72658ac91c Simplified code: Only one occurence of residual evaluation. 2012-08-23 17:18:19 +02:00
Xavier Raynaud
51e0512989 Removed non-used members in class ResidualEquation. 2012-08-23 16:51:51 +02:00
Xavier Raynaud
6ad3e6c050 Merged branches: profiling -> default. 2012-08-23 15:02:56 +02:00
Atgeirr Flø Rasmussen
def904c6d6 Use the start-of-timestep pore volume in transport solver.
This is to improve consistency with other solvers, and relates
to the expression that is converted into a finite difference when
discretising:
  (phi s) - (phi s)^0 = phi^0(s - s^0) + (phi - phi^0)s
                        ^^^^^
The above marks the spot where we now use phi^0 instead of phi.
2012-08-23 14:58:32 +02:00
Xavier Raynaud
52a19192cb Added PROFILING preprocessor flag. 2012-08-23 14:58:26 +02:00
Atgeirr Flø Rasmussen
cf3511663c Fixed solveGravity(): now properly modifies surfacevolume.
Also:
  - solveGravity() interface changed to take surface volume as a parameter,
  - gravity vector is now given in initGravity() instead of
    solveGravity(), for consistency with the incompressible solver.
2012-08-23 14:45:23 +02:00
Atgeirr Flø Rasmussen
638eee501b Added compressible 2-phase simulator, to replace sim_wateroil.cpp. 2012-08-23 14:07:11 +02:00