OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,617 Commits 9 Branches 35 Tags 15 MiB
0eaf62c7e3
Commit Graph

1405 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
c2a7ce9a45 Moved writeECLData and writeVtkData to opm/core/io subdirs. 2013-03-08 08:06:18 +01:00
Atgeirr Flø Rasmussen
ee271caae1 Moved opm/core/vag_format/ -> opm/core/io/vag/ 2013-03-08 07:54:56 +01:00
Atgeirr Flø Rasmussen
25867007ed Moved opm/core/eclipse/* to opm/core/io/eclipse/*. 2013-03-07 22:59:06 +01:00
Atgeirr Flø Rasmussen
ac49972082 Remove more unused mex-interfaces. 2013-03-07 16:17:40 +01:00
Atgeirr Flø Rasmussen
d63d1e7121 Removed some unused mex-interfaces. 2013-03-07 15:18:10 +01:00
Atgeirr Flø Rasmussen
a72bacbd31 Fix error in doc. 2013-03-07 15:14:24 +01:00
Atgeirr Flø Rasmussen
203d136fc2 Make destructor of CompressibleTpfa virtual. 2013-03-07 15:14:01 +01:00
Atgeirr Flø Rasmussen
d9379d5662 Merge pull request #162 from bska/release-cleanup 
Release cleanup
 2013-02-25 07:22:43 -08:00
Bård Skaflestad
0eb32742d4 Include <cassert> to bring in declaration of assert() 2013-02-20 12:59:40 +01:00
Bård Skaflestad
b4fe38e3fd Reduce module prerequisites. 
There is no need to include <iostream> or <fstream> when all we need is
contained in the services defined by <istream> and <ostream>.
 2013-02-19 11:27:54 +01:00
Bård Skaflestad
a29e5db8e1 writeVector(): Avoid unneeded type conversion 
std::floor() returns a double so assigning it to an int introduces a
type conversion.  There is no need to do that.  In the process, do away
with the restriction that we only write entire lines.
 2013-02-19 11:27:54 +01:00
Bård Skaflestad
a39e5a1366 Use an integer type for "maxit_" counter. 
The "maxit_" counter is an upper limit on the number of non-linear
iterations in a single cell.  Declaring this as a "double" is counter
intuitive unless one expects the number to be *really* high.

Present since
  - Commit 93d4bd8 (TransportModelTwophase.hpp)
  - Commit e0d38cf (TransportModelTwophaseCompressible.hpp)
 2013-02-19 11:27:54 +01:00
Bård Skaflestad
11425efe81 Index into vectors using integers. 
This commit corrects an error that has been present since the
introduction of function wellsToSrc() in commit a50bb8f but was never
detected.  Although the conversion int->double->std::size_t is likely to
be loss-less, it is better to not introduce any more steps than are
actually needed.
 2013-02-18 11:49:52 +01:00
Roland Kaufmann
4dbc976cbd Merge branch 'cmake' 2013-02-12 00:18:19 +01:00
Arne Morten Kvarving
18a6f709b0 Update import of ERT-Eclipse headers to new location 2013-02-11 22:38:02 +01:00
Roland Kaufmann
f4350098ed Use precompiled headers to compile C++ modules 
On an average system this will cut around 15% of the total build time.
Unfortunately, including Boost headers in the precompiled header takes
longer time to generate and then read in each module, than just
including the necessary headers in each module.

Use Noel Llopis' list_precomp.py at
http://www.gamesfromwithin.com/wp-content/uploads/bin/list_precomp_py.txt
to analyse which headers are included the most and are candidates for
inclusion.
 2013-02-11 22:38:00 +01:00
Bård Skaflestad
4d6eca1847 Merge pull request #135 from atgeirr/doc-improvements 
Doc and comment improvements
 2013-02-06 01:26:29 -08:00
Atgeirr Flø Rasmussen
ab5183f1c3 Merge pull request #140 from bska/ert-cleanup 
Ert cleanup
 2013-02-05 23:44:36 -08:00
Atgeirr Flø Rasmussen
a80141092d Minor mod: removed text about low-level interfaces. 2013-02-06 08:42:02 +01:00
Arne Morten Kvarving
af388bb81c Update import of ERT-Eclipse headers to new location 2013-02-05 15:07:35 +01:00
Bård Skaflestad
edeb9d7551 Replace an assignment with intended equality test 
This corrects a latent error that has been present since the inception
of this module.
 2013-02-01 16:30:45 +01:00
Bård Skaflestad
089988aa16 Eliminate redundant explicit type conversion. 
The pointers in question are already type 'int *'.  There is no need to
explicitly convert them to that type too.
 2013-02-01 16:25:46 +01:00
Bård Skaflestad
cf922e73ce Eliminate release-mode build warning. 
The 'cbottom' variable is only used within an assert().  Don't define
the variable in release (i.e., "NDEBUG") mode.
 2013-02-01 16:15:35 +01:00
Bård Skaflestad
8f6be16ac3 Use portable method of zeroing vector of ints. 
The memset() technique is only applicable to platforms for which
numerical zero is represented by all bits zero.
 2013-02-01 16:06:39 +01:00
Atgeirr Flø Rasmussen
eeadbe60ce Merge pull request #121 from rolk/compgeo2d 
Compute (extra) geometry properties for 2D grids
 2013-01-31 00:19:55 -08:00
Atgeirr Flø Rasmussen
954b0b6e2b Minor fixes to top-level docs. 2013-01-29 14:02:49 +01:00
Atgeirr Flø Rasmussen
f23d14a309 Changed OpenRS->OPM in copyright notices and #include guards. 2013-01-29 13:42:24 +01:00
Atgeirr Flø Rasmussen
8995543467 Changed OpenRS->OPM in copyright notices and #include guards. 2013-01-29 13:29:44 +01:00
Atgeirr Flø Rasmussen
8e30215f16 Changed OpenRS->OPM in copyright notices and #include guards. 2013-01-29 13:17:01 +01:00
Atgeirr Flø Rasmussen
c6d07f76ab Remove info about low-level assembler routines. 2013-01-29 12:48:44 +01:00
Atgeirr Flø Rasmussen
6cbc7e3e60 Added some top-level docs: wells and pressure solvers. 2013-01-29 11:10:17 +01:00
Atgeirr Flø Rasmussen
2b2b877de2 Merge branch 'master' into doc-improvements 2013-01-29 10:14:55 +01:00
Bård Skaflestad
f46bd9b95a Bring ParameterGroup interface into scope. 
The constructor accepts a parameter::ParameterGroup reference and thus
needs a valid interface in scope.  Relying on header pollution is
unwise.
 2013-01-23 17:35:05 +01:00
Atgeirr Flø Rasmussen
b719bc8b1e Added evalFunc() method. 
This public method is not virtual, and implemented in the base class using calls to
the virtual methods. Not yet used by the DG solver.
 2013-01-23 09:51:30 +01:00
Atgeirr Flø Rasmussen
5bdaeeafa0 Refactored applyMinUpwindLimiter(). 2013-01-23 09:50:25 +01:00
Roland Kaufmann
ccf3edb00f Set size properties in grid when allocating structure 
There is little chance that the client want to set them otherwise since
that would make the structure inconsistent, and having all the clients
do the work is just needless duplicate labour.
 2013-01-21 23:15:55 +01:00
Roland Kaufmann
4fb25b91ef Compute properties for cells in 2D 2013-01-21 23:15:55 +01:00
Roland Kaufmann
701526596d Compute properties for edges in 2D 2013-01-21 23:15:55 +01:00
Roland Kaufmann
7d8511fdaf Prepare for processing two-dim. grid 
Allow a two-dimensional grid to be sent to compute_geometry() without
the assertion triggering. Route three-dimensional grids to the existing
implementation.
 2013-01-21 23:15:55 +01:00
Atgeirr Flø Rasmussen
940f1299a9 Add methods totalFlux() and minCornerVal(). 
Also started refactoring applyMinUpwindLimiter() using the
added methods.
 2013-01-21 14:55:27 +01:00
Atgeirr Flø Rasmussen
dc50e61a01 Use functionAverage() instead of direct coefficient access. 
This fixes the issue with limiters on multilinear basis.
 2013-01-21 11:09:43 +01:00
Atgeirr Flø Rasmussen
de66f358b0 Added functionAverage() method to DGBasis classes. 2013-01-21 11:09:07 +01:00
Atgeirr Flø Rasmussen
1113e65eec Refactored limiter functions. 
The two limiter functions were very similar, and were unified in a single
method, with a bool argument to choose method variety.
 2013-01-21 10:46:06 +01:00
Markus Blatt
8e72b758ed Finished customizability in terms of steps and prolongateFactor 2013-01-18 14:11:59 +01:00
Markus Blatt
2bf8c472a6 Merge remote-tracking branches 'origin/master' and 'upstream/master' 2013-01-18 13:48:55 +01:00
Bård Skaflestad
6fffbe97d5 Merge remote-tracking branch 'upstream/master' 2013-01-18 13:23:52 +01:00
Bård Skaflestad
a93532e1ce Opm::WellState::init(): Handle shut wells 
This is a minor bugfix to account for the presence of shut wells
(characterised by "ctrls[w]->current < 0").  The existing code would
lead to indexing outside the "ctrls" array in the context of a shut
well.
 2013-01-18 13:23:37 +01:00
Atgeirr Flø Rasmussen
c3f9e64c9c Complete separation of basis func classes. 
Also:
 - Add use_tensorial_basis parameter allowing run-time choice of basis.
 - Remove degree argument from solveTof() method, degree is instead obtained
   from parameters in constructors. Modified compute_tof* programs to match.
 2013-01-16 15:13:45 +01:00
Atgeirr Flø Rasmussen
fb060da933 Implement (empty) virtual destructor, make methods public. 2013-01-16 15:11:46 +01:00
Atgeirr Flø Rasmussen
564db5df87 Increased quadrature order in a term. 
This is for the benefit of bi/tri-linear basis functions, as stated
in the comments.
 2013-01-16 13:45:15 +01:00
Atgeirr Flø Rasmussen
33cc611ced Moved DG basis to separate classes in its own file. 
Also introduced interface (base) class and changed the api, not used yet by the tof solver.
 2013-01-16 13:38:02 +01:00
Atgeirr Flø Rasmussen
52c164040a Add methods addConstant() and multiplyGradient() to multilinear basis. 
Not tested yet, though.
 2013-01-15 20:44:28 +01:00
Atgeirr Flø Rasmussen
d822b92e1c Implement limiters with addConstant() and multiplyGradient(). 
This is instead of directly manipulating the coefficients, requiring
assumptions on the basis used.
 2013-01-15 13:52:44 +01:00
Atgeirr Flø Rasmussen
ae2016e063 Added addConstant() and multiplyGradient() methods. 
So far only to class DGBasisBoundedTotalDegree.
 2013-01-15 13:44:18 +01:00
Atgeirr Flø Rasmussen
b5a2556df7 Added class DGBasisMultilin. 
Multilinear DG1 basis functions added. Will not work with current limiter.
 2013-01-15 13:42:05 +01:00
Atgeirr Flø Rasmussen
4000eeaef6 Reduce source sum failure from error to warning. 
Should extend to sum over sources and boundaries before reinstating.
 2013-01-15 13:39:35 +01:00
Atgeirr Flø Rasmussen
a2f2fcdfbb Renamed class DGBasis -> DGBasisBoundedTotalDegree. 2013-01-15 13:37:39 +01:00
Atgeirr Flø Rasmussen
6e716db0f9 Do not require unnecessary high quadrature precision. 2013-01-15 13:33:55 +01:00
Atgeirr Flø Rasmussen
d670f37131 Added (disabled) extra output for debugging purposes. 
Enable by defining EXTRA_VERBOSE.
 2013-01-15 13:17:43 +01:00
Atgeirr Flø Rasmussen
b25f81cf58 Do not assume that the first basis function is the constant 1. 
Properly integrate b_i * porosity over the cell for all basis functions b_i.
 2013-01-15 13:10:09 +01:00
Atgeirr Flø Rasmussen
c6087791d4 Merge branch 'master' into dg-improvements 2013-01-08 16:01:52 +01:00
Atgeirr Flø Rasmussen
33e9952074 Added MinUpwindAverage limiter method, made it default. 2013-01-08 16:00:17 +01:00
Atgeirr Flø Rasmussen
9df613913e Documented new available limiting options in constructor doc. 2013-01-08 13:34:50 +01:00
Atgeirr Flø Rasmussen
67fc1074de Change constructor to take ParameterGroup argument. 
Also make tof to limit against >= 0.0, for case when upstream cell values go
below zero.

Disabled some debug output.
 2013-01-08 13:14:26 +01:00
Atgeirr Flø Rasmussen
d6596a87af Improvements to DG1 flux limiter. 
Skeleton in place for increased flexibility in methods and usage.
(So far behaviour choices are hardcoded, though.)
Added relative flux thresholding to existing limiter to avoid flux noise
strongly affecting solution. For example no-flow boundaries could be treated
as inflow boundaries and make the minimum upwind face limiter meaningless.
 2013-01-08 11:04:43 +01:00
Atgeirr Flø Rasmussen
86eb45bd88 Add methods sequence() and components(). 2013-01-08 11:04:07 +01:00
Atgeirr Flø Rasmussen
cf9fdbbd76 Simplify and correct implementation of limiter. 
Now we check all corners' tof values for the cell under consideration,
not just the inflow face corners'.
 2013-01-07 15:48:47 +01:00
Atgeirr Flø Rasmussen
7e49c1a475 Bugfix, again: it was correct to take the maximum, reinstating. 
There is a different problem that needs fixing, however:
Flux inaccuracies (for example on boundaries) may tag some
face as inflow face for a cell, even if it should have been
no-flow. This may let the cell avoid limiting, even though it
should have been limited according to the proper inflow faces.
 2013-01-07 15:10:43 +01:00
Atgeirr Flø Rasmussen
59441f188a Bugfix: take minimum of allowed slopes, not maximum. 2013-01-04 19:59:05 +01:00
Bård Skaflestad
21e62ecab9 Merge pull request #110 from atgeirr/dg-improvements 
Improvements for time-of-flight and tracer computations
 2013-01-03 08:25:11 -08:00
Atgeirr Flø Rasmussen
6c42a91a28 Doc improvement: fix wrong class name. 2013-01-03 15:52:50 +01:00
Atgeirr Flø Rasmussen
0b55ad6969 Doc improvement: use namespace for proper class ref. 2013-01-03 15:50:25 +01:00
Atgeirr Flø Rasmussen
27f75a3b46 Doc improvement: grid capability summary. 2013-01-03 15:45:27 +01:00
Atgeirr Flø Rasmussen
564b13d0c1 Added solveTofTracer() method. 2013-01-03 14:07:51 +01:00
Atgeirr Flø Rasmussen
0f861e64ed Limiter now works reasonably well. 
Case with no inflow faces should be checked.
 2012-12-20 18:03:08 +01:00
Bård Skaflestad
8f47facf82 Merge pull request #109 from atgeirr/dg-improvements 
DG time-of-flight improvements
 2012-12-19 09:09:33 -08:00
Atgeirr Flø Rasmussen
668aba9942 Added limiter for DG1, parameter 'use_limiter'. 
The limiter is experimental and unfinished, untested work in progress.
Limiter is therefore inactive by default.

Also fixed a minor bug: use_cvi_ was not initialized.
 2012-12-18 14:15:31 +01:00
Atgeirr Flø Rasmussen
d8de94a5da Bugfix: use sufficient quadrature order. 2012-12-18 14:12:56 +01:00
osae
d1aada8d81 Support for keywords ENPTVD and ENKRVD. 2012-12-17 14:02:30 +01:00
osae
cf5eab8794 Loop index. 2012-12-17 13:58:20 +01:00
Atgeirr Flø Rasmussen
b66920203d Ensure correct output in case of Lapack error. 
Make sure that we output the original values, since Lapack may overwrite those
used in the call.
 2012-12-17 11:07:40 +01:00
Atgeirr Flø Rasmussen
389a943f34 Bugfix: multiply by edge length in 2d face quadrature weights. 2012-12-14 13:17:36 +01:00
Atgeirr Flø Rasmussen
ff1bfc810a Implemented 2d quadrature rules for degree 1 and 2 (order 2 and 3). 
Also added cartesian 2d cell testcase.
 2012-12-14 12:22:56 +01:00
osae
7510ded183 Fixed loop index and added parameter check. 2012-12-07 14:52:00 +01:00
osae
d5edb42b31 Removed tabs. 2012-12-07 14:52:00 +01:00
osae
f41b82da3d Scaling of relperm functions - oil/water systems. 
opm/core/eclipse/EclipseGridParser.cpp
opm/core/eclipse/EclipseGridParser.hpp
- New keywords: ENDSCALE SCALECRS SWCR SWL SWU SOWCR KRW KRWR KRO KRORW

opm/core/eclipse/SpecialEclipseFields.hpp
- Parsers for ENDSCALE and SCALECRS.

opm/core/fluid/BlackoilPropertiesFromDeck.cpp
- Consistency check: ENDSCALE implemented for SatFuncSimple only.

opm/core/fluid/SatFuncGwseg.hpp
opm/core/fluid/SatFuncSimple.hpp
opm/core/fluid/SatFuncStone2.hpp
- Accomodate "default" values for scalable parameters.
- For SatFuncGwseg and SatFuncStone2 the associated functionality not
  yet supported and the variables are dummies to satisfy the compiler.

opm/core/fluid/SatFuncSimple.cpp
- Initialisation for scalable parameters.
- Evaluation of relperms: Use (1-so) for evaluation of oil-relperms.
  (For scaled arguments sw and so do not necessarily add to one.)
- TODO: SatFuncGwseg.cpp and SatFuncStone2.cpp for oil-water systems.

opm/core/fluid/SaturationPropsFromDeck.hpp
- Struct to accomodate cell-wise scaling factors.
- Two flags indicating scaling and method.
- Methods for parameter initialisation and scaled relperm computation.

opm/core/fluid/SaturationPropsFromDeck_impl.hpp
- Initialize scaling options and relevant cell-wise scaling factors.
- Relperm evaluation modified for possible end point scaling.
 2012-12-07 14:52:00 +01:00
Atgeirr Flø Rasmussen
91f9b3c2de Modify precision for quadrature depending on use of CVI method. 2012-12-06 10:18:57 +01:00
Atgeirr Flø Rasmussen
ec716fe1d8 No longer ignores boundary fluxes. 
This means that the class does expect source terms that are just that, and not
'transport source' terms that include boundary inflows (like the transport
solvers expect). This is also consistent with the behaviour of the DG version.
 2012-12-05 10:39:00 +01:00
Atgeirr Flø Rasmussen
980d6eb482 CellQuadrature works only for 3D, enforce it. 2012-12-04 20:56:05 +01:00
Atgeirr Flø Rasmussen
8132cb21b9 Adapt to moved [Cell|Face]Quadrature classes. 
Also fix a minor issue with potentially buggy error output after LAPACK failure.
 2012-12-04 16:11:05 +01:00
Atgeirr Flø Rasmussen
d347d86f82 Moved FaceQuadrature and CellQuadrature classes to their own files. 2012-12-04 16:10:07 +01:00
Atgeirr Flø Rasmussen
696d038ebc Bugfix: update prototype of no-ert writeECLData(). 2012-12-03 08:55:58 +01:00
Atgeirr Flø Rasmussen
26b3053989 Made saveEGRID() method available unconditionally. 
Will throw if called without ERT support, though.
 2012-11-26 14:01:06 +01:00
Atgeirr Flø Rasmussen
205f8c887b Changed interface of writeECLData(). 2012-11-26 10:51:20 +01:00
Atgeirr Flø Rasmussen
81c022e79a Make DataMap.hpp properly include its dependencies. 2012-11-26 10:50:09 +01:00
Atgeirr Flø Rasmussen
0526657355 Document function currentDateTime(). 2012-11-26 10:49:15 +01:00
Markus Blatt
c83038f518 Merge remote-tracking branch 'upstream/master' 2012-11-22 12:48:02 +01:00
Halvor Møll Nilsen
b6301d37e0 Corrected include statements after renaming files. 2012-11-16 16:24:54 +01:00
Halvor Møll Nilsen
0db443553b Continued renaming of transpormodels to transportsolver*reorder 2012-11-16 16:06:01 +01:00
Halvor Møll Nilsen
4224e1f463 Changed name of all TransportModels which was reorder solvers 2012-11-16 16:00:56 +01:00
Halvor Møll Nilsen
8d9fdbf03a Corrected spelling of implicit in filename and class name 2012-11-16 13:50:52 +01:00
Halvor Møll Nilsen
a69b10d90d Corrected error of name of impl hpp file. 2012-11-16 13:47:35 +01:00
Halvor Møll Nilsen
2003ea5887 Changes needed to for makeing a simulator using ImplicitTransport. Several changes in names to highlight what is reorder simulator classes 2012-11-16 13:38:03 +01:00
Halvor Møll Nilsen
aaa10cf17b Added wrapper in code in separate file. Continued to change ../simulator/SimulatorIncompTwophase.cpp 2012-11-15 15:01:12 +01:00
Halvor Møll Nilsen
a30e42b962 Changes to try to make naming and classes more consistent. This is a start to make devide models and tranport solvers so that VE models is more easely handled 2012-11-15 13:20:49 +01:00
Atgeirr Flø Rasmussen
3bf22a67b2 Merge pull request #97 from atgeirr/relax-function-call-semantics 
Remove unneeded assert.
 2012-11-14 23:55:43 -08:00
Atgeirr Flø Rasmussen
2b0e570842 Make explicit intention to do nothing on empty input. 2012-11-15 08:54:45 +01:00
Bård Skaflestad
0d1603d705 Derive 'start' from traditional linear index expression 
In particular, this replaces the opaque 'off'-based expression with one
that is easier to verify on inspection.
 2012-11-14 21:33:45 +01:00
Atgeirr Flø Rasmussen
e17d5e6499 Remove unneeded assert(). 
Function is safe to call with empty vectors.
 2012-11-14 15:30:25 +01:00
Atgeirr Flø Rasmussen
ebf9514686 Improve clarity of previous bugfix (no functional change). 2012-11-14 15:05:53 +01:00
Atgeirr Flø Rasmussen
0a6a723ae9 Fix bug in computing correct ZCORN indices for grid cell. 2012-11-14 14:31:51 +01:00
Bård Skaflestad
44f54cb712 Fix signed-vs-unsigned comparison warning 
The existing code compared the output of data->size(), which is a
std::vector<double>::size_type (typically std::size_t) and therefore an
unsigned integer type to the number 'grid.number_of_cells' which is a
(signed) 'int'.  This leads to an annoying warning when increasing the
warning level in GCC.

While here, also insert code to verify that the 'stride' is a positive
number lest the subsequent assignment loop reference (*data) elements
out of bounds.
 2012-11-07 17:23:45 +01:00
Bård Skaflestad
eb4bf0a373 Merge pull request #91 from joakim-hove/writeEclActive 
Write ecl active
 2012-11-07 06:40:00 -08:00
Joakim Hove
43adfaeda5 Added start_date_ property to the SimulatorTimer class 2012-11-07 14:53:26 +01:00
Joakim Hove
a3efb49de2 Added comments + make sure to only export active cells in writeEclData 2012-11-07 13:31:46 +01:00
Bård Skaflestad
d399b2d7cc Merge pull request #89 from atgeirr/gravity-in-wells 
Gravity in wells
 2012-11-07 03:53:04 -08:00
Atgeirr Flø Rasmussen
ae6c388546 Fix incorrect size in ecl_kw_alloc() call. 
Also, add more checks to ensure sanity.
 2012-11-06 20:45:49 +01:00
Atgeirr Flø Rasmussen
5ca3f98725 Update CompressibleTpfa wellbore gravity handling. 
Should now be in sync with cfs_tpfa_residual C interface. Simple well
gravity model implemented.
More flexibility in well gravity models would be a natural future extension.
 2012-11-06 19:28:22 +01:00
Atgeirr Flø Rasmussen
bbc80e4b83 Add HAVE_ERT guards to writeECLData.cpp. 2012-11-06 16:18:22 +01:00
Bård Skaflestad
69070133bd Merge branch 'master' into gravity-in-wells 2012-11-05 15:48:07 +01:00
Atgeirr Flø Rasmussen
51bbc85a26 Bugfix tof computations with multidimensional upwinding. 
Cell tof depends on downwind face tof in a more complicated way
with multidim upwinding, this was not done correctly.
 2012-11-05 14:26:00 +01:00
Bård Skaflestad
f466ae6a51 Account for gravity in well connection flux calculation 
We previously ignored effects of gravity in the calculation of the well
connection fluxes (i.e., perforation fluxes).  This commit includes
those effects where appropriate.
 2012-11-01 13:34:27 +01:00
Halvor Møll Nilsen
3267592e49 make geometry parallel 2012-10-31 16:21:31 +01:00
Markus Blatt
62a6c28832 Merge remote-tracking branch 'upstream/master' 2012-10-30 16:27:49 +01:00
Halvor Møll Nilsen
c8065f4fa5 Changed cmake to make build without ert for now. Small change in WellsManager.cpp 2012-10-30 14:51:12 +01:00
Halvor Møll Nilsen
c6a609bea6 Merge from upstream and corrected conflictes. 2012-10-30 13:38:55 +01:00
Halvor Møll Nilsen
72171c894e delete SatFuncEcl.cpp 2012-10-30 13:30:00 +01:00
Halvor Møll Nilsen
b9dde809ef changes to be able to use black oil properties even if rock do not match current grid 2012-10-30 13:28:22 +01:00
Halvor Møll Nilsen
2411522101 changes to be able to use black oil properties even if rock do not match current grid 2012-10-30 13:17:08 +01:00
Atgeirr Flø Rasmussen
3325d4ef39 Implemented multidimensional upwinding. 
The 'SMU' variant is chosen for its smoothness.
 2012-10-30 13:10:50 +01:00
Atgeirr Flø Rasmussen
69832375d2 Merge branch 'tof_utilities' into multidim_upwind 2012-10-30 10:25:23 +01:00
Bård Skaflestad
905cec9543 Merge branch 'master' into gravity-in-wells 2012-10-29 18:33:10 +01:00
Atgeirr Flø Rasmussen
020f452a28 Added parameters for controlling use of multidim upwinding. 
For now, you will simply get SPU even with use_multidim_upwind=true.
 2012-10-29 17:23:17 +01:00
Atgeirr Flø Rasmussen
4c1240c4c1 Remove helpers that moved to WachspressCoord. 2012-10-29 15:36:25 +01:00
Atgeirr Flø Rasmussen
62fa94ae2a Use class WachspressCoord in VelocityInterpolationECVI. 
Implementation of coordinates has been moved out of the ECVI class
and into its own.
 2012-10-29 15:33:04 +01:00
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
87169cfa86 Merge branch 'master', remote-tracking branch 'upstream/master' into tof_utilities 2012-10-29 08:46:26 +01:00
Atgeirr Flø Rasmussen
72f8da074e Add constructor taking file name to GridManager. 
Calls read_grid(). Grid fileformat not yet documented.
 2012-10-25 13:23:50 +02:00
Bård Skaflestad
2ec15ab74a Merge branch 'master' into gravity-in-wells 2012-10-25 10:44:17 +02:00
Atgeirr Flø Rasmussen
319fb8df50 Merge pull request #84 from bska/fix-equality-comparisons 
Fix well classification that was only correct by accident
 2012-10-25 01:08:48 -07:00
Bård Skaflestad
3e20f4ed2b Merge branch 'master' into gravity-in-wells 2012-10-24 22:43:25 +02:00
Roland Kaufmann
09f458f5ee Remove superfluous construction by std::make_pair 
Since we know the type of the components, we may just as well create the
pair directly! (Using make_pair invokes compiler bugs in GCC).
 2012-10-24 21:22:11 +02:00
Bård Skaflestad
c8dedfde06 Fix well classification that was only correct by accident 
Specifically, the tests

   if (!wells->type[self_index] == INJECTOR)
   if (!wells->type[self_index] == PRODUCER)

produced the expected results *only* because INJECTOR==0 and PRODUCER==1
in the WellType enumeration, thus (!INJECTOR == PRODUCER) and
(!PRODUCER == INJECTOR).

Installing the (much) more appropriate

    if (wells->type[self_index] != INJECTOR)
    if (wells->type[self_index] != PRODUCER)

is not only more readable, it is also future-proof and scales better if
we ever introduce new WellTypes (e.g., a MONITOR).
 2012-10-24 21:12:29 +02:00
Bård Skaflestad
672ff95ae8 Replace !(a==b) test with a more common a!=b test 2012-10-24 21:02:46 +02:00
Bård Skaflestad
d2ab445ba6 Merge branch 'master' into gravity-in-wells 2012-10-24 10:09:31 +02:00
Roland Kaufmann
359fdb1428 Make GCC 4.6.3 happy in C++0x mode 
It complains about not finding a match for the pair<> template class,
because the first parameter (this) is allegedly const. However, this
isn't a const method, so I suspect it is a compiler bug.

In order to move on, I slap on a harmless cast which will make this
particular compiler happy, and which should have no effects elsewhere,
but put it in a #if..#else..#endif macro to avoid warnings on others;
hopefully this also makes it easier to spot and remove in the future.
 2012-10-24 09:57:12 +02:00
Bård Skaflestad
b1f61d93c4 Merge branch 'master' into gravity-in-wells 2012-10-23 14:47:39 +02:00
Joakim Hove
564ba1c3aa Changed functions readKeyword and classifyKeyword to become static methods in class EclipseGridParser. 2012-10-21 21:51:13 +02:00
Bård Skaflestad
37d54be703 Merge branch 'master' into gravity-in-wells 2012-10-18 10:58:28 +02:00
Atgeirr Flø Rasmussen
3a61778066 Reinstate disabled test. Assert more. 2012-10-18 10:51:12 +02:00
Bård Skaflestad
011fe02f59 Merge branch 'master' into gravity-in-wells 2012-10-17 22:10:14 +02:00
Atgeirr Flø Rasmussen
dcee95ec96 Fix support for velocity interpolation in 2d. 2012-10-17 21:30:53 +02:00
Bård Skaflestad
a593efb1ea Merge branch 'master' into gravity-in-wells 2012-10-17 13:30:37 +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
Bård Skaflestad
beae475787 Don't compare floating point numbers for equality. 2012-10-16 21:48:38 +02:00
Atgeirr Flø Rasmussen
ab910f3778 Finished VelocityInterpolationECVI constructor. 
Untested so far.
 2012-10-16 20:19:17 +02:00
Bård Skaflestad
b400397389 Update documentation accompanying CompletionData structure. 
Specifically, the 'wdp' member is a scalar value at each well
connection.  Phase behaviour is incorporated through other means.
 2012-10-16 14:05:33 +02:00
Bård Skaflestad
1b63e27899 Rename CompletionData::gpot -> wdp . 
This is in preparation of implementing actual gravity support in
(compressible) well-pressure solution.
 2012-10-16 13:55:07 +02:00
Atgeirr Flø Rasmussen
7cf412340b Use new velocity interpolation interface. 
The class TransportModelTracerTofDiscGal now uses
VelocityInterpolationInterface, and acts as a factory
internally, choosing an interpolation method depending on
the parameter 'use_cvi'.
 2012-10-16 11:11:33 +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
7b793f98c6 Document public interface of compr_source module. 
This is Doxygen-style reference documentation only.
 2012-10-15 19:49:23 +02:00
Bård Skaflestad
efb381a9a1 Reformat to add Doxygen markup where appropriate 2012-10-15 19:15:31 +02:00
Bård Skaflestad
c414ddad5d 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
e2a7d65c94 Merge branch 'master' into gravity-in-wells 2012-10-15 15:22:13 +02:00
Bård Skaflestad
601d5f3999 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
db77953c39 Suppress warning about unused variable in !HAVE_ERT case. 2012-10-14 17:55:51 +02:00
Bård Skaflestad
3e95330e25 Merge branch 'ert' 2012-10-12 14:50:23 +02:00
Atgeirr Flø Rasmussen
863eae3368 Hook IMPORT keyword to function reading binary input. 
Make sure it compiles and links both with and without ert.
 2012-10-12 14:25:53 +02:00
Atgeirr Flø Rasmussen
89750d856a Merge remote-tracking branch 'bspj/master' into ertekrok 2012-10-12 13:05:31 +02:00
Bård Skaflestad
3a34c2a8dc Merge remote-tracking branch 'origin/ert' into ert 
Conflicts:
	Makefile.am
 2012-10-12 11:04:20 +02:00
Bård Skaflestad
1a0eeb47ba Merge remote-tracking branch 'upstream/ert' into ert 
Conflicts:
	Makefile.am
 2012-10-12 10:58:16 +02:00
Atgeirr Flø Rasmussen
27b8314521 Rename function argument and variable. 
rock_comp -> rock_comp_props
 2012-10-12 09:21:52 +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
Markus Blatt
edb3afc3a5 Merge branch 'master' of https://github.com/OPM/opm-core 2012-10-11 11:25:25 +02:00
Atgeirr Flø Rasmussen
6f4775df9c Improve comment. 2012-10-10 19:23:11 +02:00
Atgeirr Flø Rasmussen
38b62d23f5 Fix bug in GCONINJE input. 2012-10-10 14:16:11 +02:00
Atgeirr Flø Rasmussen
2ded7e7dfe Table interpolation for default values improved. 
If there were no non-defaulted elements in the table, we would crash.
Now, all defaulted elements get the value 0.0 instead.

The usage pattern was encountered for the capillary pressure column
of a SWOF table.
 2012-10-10 14:13:13 +02:00
Atgeirr Flø Rasmussen
0243aebcfa Fix comment. 2012-10-10 14:12:38 +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
Atgeirr Flø Rasmussen
d124a71ee6 Merge pull request #59 from kristinf/dev 
sign error in total_produced

Looks correct.
 2012-10-10 04:49:06 -07:00
Markus Blatt
49fa561528 Merge remote-tracking branch 'upstream/master' 2012-10-10 10:25:25 +02:00
kristinf
16dc071bca sign error in total_produced 2012-10-09 15:23:56 +02:00
Atgeirr Flø Rasmussen
ae04319fa3 Whitespace cleanup. 2012-10-09 12:21:17 +02:00
Atgeirr Flø Rasmussen
f761e73eae Improve docs and give more info on error. 2012-10-09 09:54:54 +02:00
Atgeirr Flø Rasmussen
d1be859828 Add timing of topological sort. 2012-10-09 09:54:26 +02:00
Atgeirr Flø Rasmussen
ca71fe5132 Merge branch 'master' into reorder_tof 2012-10-08 16:16:05 +02:00
Atgeirr Flø Rasmussen
9de3b03e69 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
52d97cfc1c Fix order of arguments in function call. 
Rate and fractional flow were switched in call
to computePhaseFlowRatesPerWell().
 2012-10-08 14:26:46 +02:00
Atgeirr Flø Rasmussen
43335dfce3 Merge branch 'master' into reorder_tof 2012-10-08 13:52:59 +02:00
Bård Skaflestad
e6ab4ec4c8 Add debugging assertions to check input in several routines. 2012-10-05 10:17:12 +02:00
Bård Skaflestad
fde2d25c86 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
e913456fa6 Added constuctor to WellManager which used Wells struct. 2012-10-05 10:14:55 +02:00
Bård Skaflestad
47ab22fce0 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
Markus Blatt
adf7b344f1 Merge remote-tracking branch 'upstream/master' 2012-10-05 10:11:59 +02:00
Atgeirr Flø Rasmussen
5b6dd72cc2 Merge branch 'master' into reorder_tof 2012-10-05 09:20:37 +02:00
Atgeirr Flø Rasmussen
2c8b47b143 Merge branch 'master' into ert 
Conflicts:
	Makefile.am
 2012-10-05 09:20:04 +02:00
Atgeirr Flø Rasmussen
b2ce32b329 Merge pull request #42 from bska/read-grid 
Grid Input Support
 2012-10-04 23:30:46 -07:00