OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
919 Commits 31 Branches 117 Tags
bfa52cc5f23c5c055b87af4594520adb91f35fc3
Commit Graph
919 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen bdcf0291e0 Fix error message. 2012-09-14 09:52:13 +02:00
Bård Skaflestad dfa5805784 Merge remote-tracking branch 'upstream/master' 2012-09-05 19:48:21 +02:00
Atgeirr Flø Rasmussen 026863c95d Merge branch 'master' into reorder_tof 2012-09-05 14:21:47 +02:00
Xavier Raynaud 680276debf Fixed documentation. 2012-09-05 14:07:51 +02:00
Atgeirr Flø Rasmussen 9c77d12f8d Merge branch 'master' into ert 
Conflicts:
	Makefile.am
	configure.ac
	examples/Makefile.am
	opm/core/GridManager.cpp
	opm/core/eclipse/EclipseGridParser.cpp
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am
 2012-09-05 13:36:19 +02:00
Xavier Raynaud 3eda90b7e6 Merge remote-tracking branch 'upstream/master' 2012-09-05 13:35:48 +02:00
Xavier Raynaud 1d98e043a5 Fixed source term (measured at reservoir conditions). 2012-09-05 13:34:25 +02:00
Atgeirr Flø Rasmussen fa2fc1e914 Merge branch 'master' into reorder_tof 2012-09-05 12:32:38 +02:00
Bård Skaflestad 16676433b7 Merge remote-tracking branch 'upstream/master' 2012-09-05 11:46:54 +02:00
Atgeirr Flø Rasmussen 0f91bc6a34 Massive whitespace cleanup: entire fluid subdir. 2012-09-05 11:28:54 +02:00
Xavier Raynaud 32e1ae249d Merge remote-tracking branch 'upstream/master' 2012-09-05 10:11:02 +02:00
Xavier Raynaud 3d01a60099 Changed solvegravity interface. Fixed bug. 2012-09-05 10:10:02 +02:00
Xavier Raynaud 8c68fd0373 Add initial guess in root solver for gravity residual. 2012-09-04 15:13:55 +02:00
Xavier Raynaud 55793cc909 Use same search interval in computation of flux and gravity residuals. 2012-09-04 15:01:14 +02:00
Xavier Raynaud ff78e358f0 Removed unappropriate conversion from water saturation to complete saturation. 2012-09-04 14:22:56 +02:00
Xavier Raynaud 876d23942c Use porevolume of last step in computation of gravity residual. 2012-09-04 14:21:51 +02:00
Bård Skaflestad abd8973382 Merge remote-tracking branch 'upstream/master' 2012-09-04 13:58:43 +02:00
Atgeirr Flø Rasmussen f68c289e9d Merge branch 'master' into nonuniform_fluid_tables 
Conflicts:
	opm/core/fluid/BlackoilPropertiesFromDeck.cpp
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
 2012-09-04 13:34:30 +02:00
Atgeirr Flø Rasmussen 23ae62f8dc Constified some local variables. 2012-09-04 13:15:26 +02:00
Atgeirr Flø Rasmussen 0f9d572f9a Fix stride bug in WellReport::push(). Use convert::to(). 2012-09-04 13:12:06 +02:00
Atgeirr Flø Rasmussen 14aab769f2 Fix stride bug in SGAS/SWAT init. 2012-09-04 13:06:13 +02:00
Atgeirr Flø Rasmussen 7c7609698f Added proper Doxygen tags. 2012-09-04 12:52:17 +02:00
Atgeirr Flø Rasmussen 0101e1f575 Updated doc to match new parameter names. 
New parameters are (default):
    pvt_tab_size (200)
    sat_tab_size (200)
    threephase_model ("simple") [also accepts "stone2"].
 2012-09-04 11:49:05 +02:00
Atgeirr Flø Rasmussen 03f6f43160 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
Atgeirr Flø Rasmussen e9c4c2499c Documented parameters. 2012-09-03 15:09:55 +02:00
Atgeirr Flø Rasmussen 4e1647bb62 Formatting fixes. 2012-09-03 15:07:03 +02:00
Atgeirr Flø Rasmussen 489501b49b Documented new constructor. Fixed layout. 2012-09-03 14:16:54 +02:00
Atgeirr Flø Rasmussen c2d41a6639 Whitespace cleanup and adding a check for #phases <= 3. 2012-09-03 14:04:52 +02:00
Atgeirr Flø Rasmussen 913054c473 Added more checks in 3-phase init code. 2012-09-03 13:54:50 +02:00
Atgeirr Flø Rasmussen c409fcccce Merge remote-tracking branch 'hnil/master' 2012-09-03 13:40:33 +02:00
Bård Skaflestad ca428559ab Merge remote-tracking branch 'upstream/master' 2012-09-03 13:27:50 +02:00
Atgeirr Flø Rasmussen 109ba09d9d Merge branch 'master' into nonuniform_fluid_tables 2012-09-03 13:12:11 +02:00
Xavier Raynaud a8cb519d4e Fixed comment. 2012-09-03 12:26:22 +02:00
Xavier Raynaud 0701daa4dc Improve documentation. 2012-09-03 11:29:48 +02:00
Halvor Møll Nilsen 2dede29f20 Introduced posibility to change number of sample points for pvt. 
Did change the PVTW calculation so derivatives are exact.
Extended the test functions for pvt and relperm
 2012-08-31 17:01:07 +02:00
Xavier Raynaud b4a4e297a8 Added functionality to compute porosity for compressible fluid. 2012-08-29 10:54:21 +02:00
Halvor Møll Nilsen 6852be422c Added new SatFuncSimple fluid. 
Introduced a simple fluid which has no problem with strange black oil behavior.
Intended for testing, but for now it is used in SaturationPropsFromDeck.
 2012-08-28 16:41:06 +02:00
Halvor Møll Nilsen 94c04f343d Added param initializer on fluids with param to addjust table length. 
Moved internal class SatFunc to SatFuncStone2.
 2012-08-28 14:27:14 +02:00
Xavier Raynaud 9aa349b1e5 Corrected comment. 2012-08-28 13:12:54 +02:00
Atgeirr Flø Rasmussen 7a79bd1872 Enable choice of spline-smoothed saturation props (or not). 2012-08-27 17:56:01 +02:00
Atgeirr Flø Rasmussen 214546ece9 Merge branch 'master' into reorder_tof 2012-08-27 17:02:50 +02:00
Atgeirr Flø Rasmussen d9cff689b4 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 bf70195448 Merge remote-tracking branch 'upstream/master' 2012-08-27 15:37:07 +02:00
Xavier Raynaud 22372710b8 Merge remote-tracking branch 'atgeirr/master' 2012-08-27 13:32:55 +02:00
Xavier Raynaud af8a6fa7da Changed private->protected and added virtual to make class derivation. 2012-08-27 13:19:04 +02:00
Atgeirr Flø Rasmussen 5182fef48d Switch loop ordering for better cache performance. 2012-08-27 13:17:27 +02:00
Halvor Møll Nilsen cf9b9cdf20 Started work on supporting 3 phases for wellreport. 2012-08-27 12:22:32 +02:00
Halvor Møll Nilsen 9ef6014964 Addes support for initialisation of three phases using SWOF and SGOF 2012-08-27 12:20:03 +02:00
Atgeirr Flø Rasmussen 931dcc4a3d Implemented rudimentary solveMultiCell(). 
Simply calls solveSingleCell() once for each cell in block.
 2012-08-27 11:26:51 +02:00
Atgeirr Flø Rasmussen 9bb76d74cc Fixed bug in matrix multiplication (matrix has Fortran element order). 2012-08-27 11:19:22 +02:00