OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-19 05:53:28 -06:00
Code Issues Packages Projects Releases Wiki Activity
939 Commits 24 Branches 102 Tags 82 MiB
954ebfa837
Commit Graph

709 Commits

Author SHA1 Message Date
Bård Skaflestad
30cb6eaf7f Document public interface of compr_quant_general module 
This is Doxygen-style reference documentation only.
 2012-10-15 16:08:17 +02:00
Bård Skaflestad
f35663130a Document public interface of cfs_tpfa_residual module 
This is Doxygen-style reference documentation only.
 2012-10-15 15:21:27 +02:00
Bård Skaflestad
d3f85ea60c Merge remote-tracking branch 'upstream/master' into ert 
Conflicts:
	Makefile.am
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am

This brings ert branch up-to-date with current Github master branch.
 2012-10-12 00:43:51 +02:00
Atgeirr Flø Rasmussen
ca15ce6eec Fix comment. 2012-10-10 14:12:38 +02:00
Atgeirr Flø Rasmussen
89eee7e220 Bugfix: order of function arguments. 
Order of arguments for computePhaseFlowRatesPerWell() was wrong.
This fix was done previously for SimulatorCompressibleTwophase,
but the incompressible sim was ignored.

Also added an ASSERT that may help catch some misuse.
 2012-10-10 14:09:09 +02:00
Atgeirr Flø Rasmussen
c8498b76b6 Merge pull request #59 from kristinf/dev 
sign error in total_produced

Looks correct.
 2012-10-10 04:49:06 -07:00
kristinf
a740bcfe5f sign error in total_produced 2012-10-09 15:23:56 +02:00
Atgeirr Flø Rasmussen
31d17a0dcd Whitespace cleanup. 2012-10-09 12:21:17 +02:00
Atgeirr Flø Rasmussen
76259dcd0f Improve docs and give more info on error. 2012-10-09 09:54:54 +02:00
Atgeirr Flø Rasmussen
36721602b2 Add timing of topological sort. 2012-10-09 09:54:26 +02:00
Atgeirr Flø Rasmussen
256a5496b1 Merge branch 'master' into reorder_tof 2012-10-08 16:16:05 +02:00
Atgeirr Flø Rasmussen
9e90dcebe5 Fix sign of production rate controls. 
In the Wells struct, production rate control targets must be negative
(and injection rate control targets are always positive).
In the WellsGroup classes, there are separate variables for injection
and production, and all rates are positive. Therefore, upon adding or
modification of a production rate control, the negated value must
be used.
 2012-10-08 14:27:56 +02:00
Atgeirr Flø Rasmussen
a635140500 Merge branch 'master' into reorder_tof 2012-10-08 13:52:59 +02:00
Bård Skaflestad
d6154d8961 Clone wells object when constructing from existing. 
This installs a measure of safety on the part of the interface in that
the caller is free to dispose of the wells object upon returning from
the WellsManager constructor.
 2012-10-05 10:15:06 +02:00
Halvor Møll Nilsen
044c13e9fb Added constuctor to WellManager which used Wells struct. 2012-10-05 10:14:55 +02:00
Bård Skaflestad
e5c5a64a4a New function clone_wells() 
Used to create a deep copy (clone) of an existing Wells object.

While here, add test case for common Wells object operations.
 2012-10-05 10:14:44 +02:00
Atgeirr Flø Rasmussen
108589a286 Merge branch 'master' into reorder_tof 2012-10-05 09:20:37 +02:00
Bård Skaflestad
24504875ea Reference <grid.h> from canonical location. 
The header was removed from this directory upon import from the
preexisting "opmtransport" repository.
 2012-10-05 00:56:12 +02:00
Bård Skaflestad
4d488c98a7 Unequivocally exclude MATLAB timing printing. 
It is not actually needed and prevents building when symbol
MATLAB_MEX_FILE is defined.
 2012-10-05 00:53:59 +02:00
Atgeirr Flø Rasmussen
6f31f059d7 Merge branch 'master' into reorder_tof 2012-10-03 10:05:53 +02:00
Atgeirr Flø Rasmussen
a9783eefc7 Add explanatory comment. 2012-10-02 15:46:33 +02:00
Atgeirr Flø Rasmussen
5acbf00b14 Update compressible transport solver for new src convention. 
Namely, that inflowing transport sources are water *surface* volumes,
not water *reservoir* volumes.
 2012-10-02 14:37:18 +02:00
Atgeirr Flø Rasmussen
4f276a8870 Bugfix: size of vector for A should be np*np. 2012-10-02 14:35:28 +02:00
Atgeirr Flø Rasmussen
017663cc5b Change interface for (blackoil) computeInjectedProduced(). 
Also use new computeInjectedProduced() and computeTransportSource()
functions in SimulatorCompressibleTwophase.
 2012-10-02 11:12:23 +02:00
Atgeirr Flø Rasmussen
17c1be6541 Modified functions dealing with transport source. 
In preparation for switching to new convention for inflow
sources in the compressible case: source being surface volumes,
not reservoir volumes.
 2012-10-01 16:40:47 +02:00
Atgeirr Flø Rasmussen
6fb248d403 Update WellState::perfPress() after pressure solve. 2012-10-01 16:40:10 +02:00
Atgeirr Flø Rasmussen
0eb54ca90a Added perfPress() to WellState. 2012-10-01 16:39:35 +02:00
Atgeirr Flø Rasmussen
78835b57b8 Merge branch 'master' into ert 2012-09-30 15:08:49 +02:00
Atgeirr Flø Rasmussen
f6b2306dab Work in progress: degree 2 quadratures. 
Also, changed quadrature degrees used to get exact quadratures for all terms.
 2012-09-28 14:44:04 +02:00
Atgeirr Flø Rasmussen
cf38936c99 Merge branch 'master' into reorder_tof 2012-09-27 11:19:56 +02:00
Atgeirr Flø Rasmussen
d83ab5856d Fix: forgotten multiply by cell volume in a quadrature. 2012-09-27 09:49:36 +02:00
Atgeirr Flø Rasmussen
04a76988d9 Add sink term contribution. 2012-09-26 15:15:04 +02:00
Atgeirr Flø Rasmussen
93094ebeec Fix argument order in call. 2012-09-26 14:21:00 +02:00
Atgeirr Flø Rasmussen
99a12a7edc Initial version of DG(1) for tof implemented. 
Basis functions, quadratures and velocity interpolation are basic versions,
not handling any higher than DG(1) for now. These are currently in helper
classes and functions. The code in the main solver class is written with
the aim of supporting DG(n) generally.
 2012-09-26 13:30:54 +02:00
Bård Skaflestad
fb8e79857c Add tentative implementation of surface-rate targets. 
Not tested at present.
 2012-09-26 10:14:45 +02:00
Atgeirr Flø Rasmussen
bbc5ed5c68 Merge branch 'master' into reorder_tof 2012-09-26 09:08:26 +02:00
Atgeirr Flø Rasmussen
6a01298312 Merge branch 'master' into ert 
Conflicts:
	Makefile.am
 2012-09-26 09:07:57 +02:00
Atgeirr Flø Rasmussen
1a227dbf86 Added skeleton of general order DG tof solver. 2012-09-26 08:58:03 +02:00
Atgeirr Flø Rasmussen
b9a2c14113 Add proper support for source terms. 
This fixes the problem with infinite tofs at sinks.
 2012-09-25 14:00:17 +02:00
Atgeirr Flø Rasmussen
ddf177b4c5 Merge branch 'master' into reorder_tof 2012-09-25 10:13:46 +02:00
Atgeirr Flø Rasmussen
9f69e9fa51 Guard against input error. 
If no valid threephase_model is input, throw instead of crashing.
 2012-09-24 17:09:50 +02:00
Atgeirr Flø Rasmussen
56e81968e3 Add support for new three-phase relperm option to BlackoilPropertiesFromDeck. 
New parameter option added: 'threephase_model' can now be 'gwseg'.
 2012-09-24 16:43:00 +02:00
Roland Kaufmann
ab21d44c9a Disable warning for using DUNE's FieldVector::size 
In DUNE 2.2 FieldVector::size changed from being a member to being a
method. A compatibility warning is issued if you include the relevant
headers.

This warning can be silenced for DUNE modules by using passing the
option --enable-fieldvector-size-is-method to ./configure. This patch
effectively does the same, but through a macro definition.
 2012-09-24 00:21:06 +02:00
Bård Skaflestad
271b0d800c Merge remote-tracking branch 'upstream/master' into fix-impedance-mismatch 2012-09-20 15:49:59 +02:00
Bård Skaflestad
b137eb0b65 Interpret `wells != 0 && wells->W == 0'' as `no wells''. 
The CompressibleTpfa class always passes a non-null `forces->wells'
object to the constructor, assembly, and reconstruction routines but
uses ``forces->wells->W == 0'' to signify a simulation model without
wells.  This is, arguably, an error in the CompressibleTpfa class but
one that does not require a lot of work to support in the
cfs_tpfa_residual module.

Insert the extra tests in an effort to honour the ``liberal in what you
accept, strict in what you produce'' principle.
 2012-09-20 15:48:48 +02:00
Bård Skaflestad
bdcd5236bd Don't crash on models without wells. 
The user will legitimately want to run models that do not specify wells
(e.g., using boundary conditions).  While we do not yet fully support
that configuration (no wells), we absolutely must not crash by
dereferencing null pointers or generating pointers into ::empty()
std::vector<>s.

This commit installs the required guards needed to avoid said failure
mode.
 2012-09-20 15:03:38 +02:00
Atgeirr Flø Rasmussen
e3388575d6 Fix treatment of WELOPEN keyword. 
Now you can actually shut and open wells with WELOPEN. The following
caveats apply:
 - this may interact improperly with group controls,
 - dynamic usage of WCONINJE/WCONPROD should not be mixed with WELOPEN.
 2012-09-20 14:35:03 +02:00
Atgeirr Flø Rasmussen
50a23c0f5d Support shut wells in compressible tpfa solver. 2012-09-20 14:34:33 +02:00
Atgeirr Flø Rasmussen
2017481a58 Improve diagnostic output if crossflow is detected. 2012-09-20 14:33:57 +02:00
Atgeirr Flø Rasmussen
8dc958044f Merge branch 'master' into ert 2012-09-18 09:18:40 +02:00
Atgeirr Flø Rasmussen
65447604ae Typo fix. 2012-09-14 20:56:08 +02:00
Atgeirr Flø Rasmussen
67b5f007fd Made initialization from SWAT/SGAS etc. more robust and general. 2012-09-14 10:40:36 +02:00
Atgeirr Flø Rasmussen
fa6b772972 Changed well initialization and property calculation. 
Bhp is now initialized to bhp target for bhp-controlled wells.
Mobilities and pvt properties are now calculated from
well perforation pressure and injection specifications for
injectors, producers still use cell properties as before.
 2012-09-14 09:53:11 +02:00
Atgeirr Flø Rasmussen
bdcf0291e0 Fix error message. 2012-09-14 09:52:13 +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
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
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
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
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
Atgeirr Flø Rasmussen
0a8ac1ddb5 Minor revision, mostly whitespace cleanup and comments. 2012-08-27 09:48:06 +02:00
Atgeirr Flø Rasmussen
3e9cc74922 Initial commit of tof computation by reordering. 2012-08-24 16:08:26 +02:00