OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,506 Commits 9 Branches 35 Tags
ad2a237657a3696842c5f2aea2d89be11896f81d
Commit Graph

242 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
ad2a237657 Added method WachspressCoord::adjacentFaces(). 2012-10-29 15:14:34 +01:00
Atgeirr Flø Rasmussen
1b31b207fe Added class WachspressCoord. 2012-10-29 14:55:44 +01:00
Atgeirr Flø Rasmussen
3288c7d505 Made constructor explicit, improve comment. 2012-10-29 12:56:04 +01:00
Atgeirr Flø Rasmussen
3a61778066 Reinstate disabled test. Assert more. 2012-10-18 10:51:12 +02:00
Atgeirr Flø Rasmussen
dcee95ec96 Fix support for velocity interpolation in 2d. 2012-10-17 21:30:53 +02:00
Atgeirr Flø Rasmussen
f9efd72ecc Fix output in case of LAPACK error. 
Make copy of matrix before calling dgesv, since it will overwrite it.
 2012-10-17 12:40:43 +02:00
Atgeirr Flø Rasmussen
30797cae1d Implement setupFlux() method. 
Also fix bug related to face orientation in cartToBaryWachspress().
 2012-10-17 11:16:42 +02:00
Atgeirr Flø Rasmussen
ab910f3778 Finished VelocityInterpolationECVI constructor. 
Untested so far.
 2012-10-16 20:19:17 +02:00
Atgeirr Flø Rasmussen
121bb79f91 New abstract class VelocityInterpolationInterface. 
Also, two initial subclasses: VelocityInterpolationConstant
and VelocityInterpolationECVI. The latter is still a work in
progress.
 2012-10-16 11:07:05 +02:00
Bård Skaflestad
31174cf727 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
f5359936e0 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
Bård Skaflestad
6fd5c36cc9 Remove a derelict statement inherited from original implementation. 
Disabled by default, this statement attempted to pass a std::istream to
function std::fclose() which is meaningless and should not be enabled at
any time--even for a MATLAB-related build.
 2012-10-05 00:55:14 +02:00
Atgeirr Flø Rasmussen
0669a2dd8b Add explanatory comment. 2012-10-02 15:46:33 +02:00
Atgeirr Flø Rasmussen
8c24c40a2a Bugfix: size of vector for A should be np*np. 2012-10-02 14:35:28 +02:00
Atgeirr Flø Rasmussen
490b8c01d1 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
84a87990ff 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
0ceff04194 Merge branch 'master' into ert 
Conflicts:
	Makefile.am
 2012-09-26 09:07:57 +02:00
Roland Kaufmann
f10d10e33e Add volumetic unit liter 
For simulating laboratory experiments, liter is a more suitable base
unit than gallons or barrels.
 2012-09-20 15:14:51 +02:00
Atgeirr Flø Rasmussen
8fdebccef6 Improve diagnostic output if crossflow is detected. 2012-09-20 14:33:57 +02:00
Atgeirr Flø Rasmussen
9153c7f87b Merge branch 'master' into ert 2012-09-18 09:18:40 +02:00
Atgeirr Flø Rasmussen
4110e40b62 Typo fix. 2012-09-14 20:56:08 +02:00
Atgeirr Flø Rasmussen
a6fccb6790 Made initialization from SWAT/SGAS etc. more robust and general. 2012-09-14 10:40:36 +02:00
Atgeirr Flø Rasmussen
00bbfa06a8 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
Atgeirr Flø Rasmussen
064d408b20 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
3fa259496b Fix stride bug in WellReport::push(). Use convert::to(). 2012-09-04 13:12:06 +02:00
Atgeirr Flø Rasmussen
72e13ffd0d Fix stride bug in SGAS/SWAT init. 2012-09-04 13:06:13 +02:00
Atgeirr Flø Rasmussen
a07d894500 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
3e294a4a81 Formatting fixes. 2012-09-03 15:07:03 +02:00
Atgeirr Flø Rasmussen
055f2d5f19 Whitespace cleanup and adding a check for #phases <= 3. 2012-09-03 14:04:52 +02:00
Atgeirr Flø Rasmussen
e37f003cb5 Added more checks in 3-phase init code. 2012-09-03 13:54:50 +02:00
Atgeirr Flø Rasmussen
142f186b81 Merge remote-tracking branch 'hnil/master' 2012-09-03 13:40:33 +02:00
Atgeirr Flø Rasmussen
154571c768 Merge branch 'master' into nonuniform_fluid_tables 2012-09-03 13:12:11 +02:00
Xavier Raynaud
87dc7affc5 Fixed comment. 2012-09-03 12:26:22 +02:00
Xavier Raynaud
596c988126 Improve documentation. 2012-09-03 11:29:48 +02:00
Halvor Møll Nilsen
ed2aa9da38 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
4d800cad3d Added functionality to compute porosity for compressible fluid. 2012-08-29 10:54:21 +02:00
Atgeirr Flø Rasmussen
547dc1648c 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
Atgeirr Flø Rasmussen
80e54a93d0 Switch loop ordering for better cache performance. 2012-08-27 13:17:27 +02:00
Halvor Møll Nilsen
a6dcc52cba Started work on supporting 3 phases for wellreport. 2012-08-27 12:22:32 +02:00
Halvor Møll Nilsen
88d1d9762d Addes support for initialisation of three phases using SWOF and SGOF 2012-08-27 12:20:03 +02:00
Atgeirr Flø Rasmussen
8e5ef9ac0d Fixed bug in matrix multiplication (matrix has Fortran element order). 2012-08-27 11:19:22 +02:00
Atgeirr Flø Rasmussen
82204f2b3b Whitespace cleanup. 2012-08-23 08:59:09 +02:00
Atgeirr Flø Rasmussen
234d125266 Added computeSurfacevol() method. 
The method is called by the reordering transport solver after computing
new saturations in order to update the surface volumes.
 2012-08-23 08:57:48 +02:00
Halvor Møll Nilsen
064184bd0c Changed to extrapolation outside tables for pormult. Added facetags to the grid structure. Changed default fluid to Linear. 2012-08-14 09:36:19 +02:00
Bård Skaflestad
e690659bc5 Hook file into Doxygen. 
While here, doxygenise the information describing convert::to() and
convert::from(), and the prefixes as well.
 2012-07-18 11:00:50 +02:00
Bård Skaflestad
82369f9109 Add facility for overriding `HAVE_BOOST' from Dune. 
This is, at best, a work-around for an issue that presents when
earlier versions of Autoconf (e.g., 2.59) are used to process Dune's
DUNE_BOOST_BASE macro (introduced in dune-common@6480,
dune-istl@1492).  For reasons I've been unable to determine, the
HAVE_BOOST symbol just gets #define-d, not set to `ENABLE_BOOST' as
was intended.  Some kind of race condition?

Anyway, the Dune ISTL module uses statements such as

   #if HAVE_BOOST
     /* ... */
   #endif

to determine if particular software features should be enabled.
This breaks down if `HAVE_BOOST' is simply defined.  Following
commit fb614100, the symbol `OPM_HAVE_BOOST' is always defined (as a
Boolean state), so if we override ISTL's notion of `HAVE_BOOST', the
above construction continues to work.

We will, however, happily remove thise kluge if a better solution
arises in the core Dune modules.
 2012-07-12 14:20:59 +02:00
Andreas Lauser
6f69de969a opm-core: make it work nicely with clang 2012-07-05 12:42:49 +02:00
Bård Skaflestad
8947ef569f Mark return values as \return rather than \ret. 
Needed for Doxygen compliance.
 2012-07-02 12:55:28 +02:00
Joakim Hove
0e1dcb2c0d Using Opm::unit::convert for seconds -> days conversion. 2012-06-28 16:17:51 +02:00
Bård Skaflestad
ebf4b63aa4 Use a "const" DataMap object. 
As a fall-out, we can no longer use std::map<K,V>::operator[], because
that function cannot be applied to "const" objects.  Replace by .find().
 2012-06-28 14:42:04 +02:00