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

4122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristian Flikka
bca4242da9 Updated COMPDAT i,j,k indices, and removed the old commented part 2014-01-29 11:58:14 +01:00
Kristian Flikka
3cdd27c3a9 Changed data file not not have same perforation multiple times, as the old system doesn't support this 2014-01-29 11:58:13 +01:00
Kristian Flikka
b6afe67357 Compdat extraction from new CompletionXXX classes 2014-01-29 11:58:13 +01:00
Kristian Flikka
9f127099cf Added an extra data file with an extra well 2014-01-29 11:58:13 +01:00
Joakim Hove
bfbc62655d Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-01-29 11:02:21 +01:00
Joakim Hove
6d79bcda34 Merge remote-tracking branch 'upstream/master' into wellsmanager-rates 2014-01-29 11:01:14 +01:00
osae
f8696edd7b RV is back in business - a second attempt. 2014-01-29 08:56:07 +01:00
osae
841acacf78 RV is back in business. 2014-01-29 08:42:33 +01:00
Joakim Hove
8c8ba4e113 Merge pull request #479 from flikka/update-phase-enum 
Updated Namespace of PhaseEnum from opm-parser
 2014-01-28 12:20:05 -08:00
Kristian Flikka
07feb6509d Updated Namespace of PhaseEnum from opm-parser 2014-01-28 21:11:51 +01:00
osae
fa470063ca Saturation table scaling and hysteresis. 
This commit implements some additional scaling keywords.  This includes
the ISWL-family that provide hysteresis behaviour via alternative
scaling of the tables.  The old parser has been somewhat extended for
testing purposes.  The commit also includes a slight refactoring of the
SatFunc-family where a new base class has been introduced.
 2014-01-28 16:36:55 +01:00
Markus Blatt
64585b355f Corrects required version and make Eigen3 download work. 
At least on Debian requiring version 3.1 of Eigen3 is not sufficient
according to issue #25 the minimum version is 3.1.2. This patch fixes
the required version. In addition it skips the REQUIRED option passed
to find_package(Eigen3) to make the git download work.

Fixes #25.
 2014-01-24 15:35:20 +01:00
Atgeirr Flø Rasmussen
a3da7335ca Merge pull request #475 from rolk/475_dunedef 
Alias probed CMake variables to names that DUNE require
 2014-01-24 06:12:34 -08:00
Roland Kaufmann
fc231e8978 Declare a need to know if BOOST is available 
Note that the variable HAVE_DUNE_BOOST is not set by FindBoost,
but by OpmAliases.
 2014-01-24 13:58:48 +01:00
Roland Kaufmann
981fe79429 Declare a need to know if UMFPACK is available 
Note that the variable HAVE_UMFPACK is not set by FindSuiteSparse,
but by OpmAliases.
 2014-01-24 13:58:48 +01:00
Roland Kaufmann
60c54705c0 Create aliases for probed variables 
Headers from other libraries (notably DUNE) require definitions of
other variables than our probe process set (e.g. HAVE_UMFPACK instead
of HAVE_SUITESPARSE_UMFPACK_H). This module sets those aliases for
compatibility.
 2014-01-24 13:58:47 +01:00
Atgeirr Flø Rasmussen
ad899fcc10 Now checks for missing TOPS or DEPTHZ in DXV etc. initialization. 2014-01-24 13:55:16 +01:00
Atgeirr Flø Rasmussen
1d1dc493e8 Merge pull request #448 from andlaus/prevent_multiple_package_detections 
OpmFind.cmake: prevent multiple calls to the same module in the same run
 2014-01-24 04:39:27 -08:00
Atgeirr Flø Rasmussen
e4e4968d90 Merge pull request #462 from totto82/wetgas 
Added pvt functionality for wetgas
 2014-01-24 04:36:51 -08:00
Joakim Hove
1148e6b86e WellType is determined from well->isProducer() instead of looking for WCONINJE / WCONPROD keywords. 2014-01-24 12:00:58 +01:00
Tor Harald Sandve
06fbc93fef Fixing comments 
The comment now currently say 1/Bg
 2014-01-24 10:14:33 +01:00
Atgeirr Flø Rasmussen
926dfe295b Merge pull request #450 from andlaus/add_message_type 
cmake: make sure all calls to message() exhibit a type
 2014-01-24 00:36:51 -08:00
Joakim Hove
4891a09d6a Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-01-24 08:59:22 +01:00
Joakim Hove
c1ff5b2974 Merge pull request #460 from flikka/wells-manager-parser-integrate 
Migrating WELSPECS part of WellsManager constructor
 2014-01-23 07:12:17 -08:00
Kristian Flikka
6d970ef189 Removes the WELSPECS usage in WellsManager constructor. Step 1 in rewrite of constructor 2014-01-22 15:22:32 +01:00
Bård Skaflestad
ed5f199f5b Merge pull request #459 from akva2/fix_openmp_pragmas 
fix some openmp pragma's
 2014-01-21 07:39:06 -08:00
Arne Morten Kvarving
60d4a02c0b fix some openmp pragma's 2014-01-21 14:33:14 +01:00
Kristian Flikka
3c74e4bb9e Merged from upstream/opm-parser-integrate 2014-01-21 13:05:59 +01:00
Bård Skaflestad
adf421a9ed Merge pull request #457 from atgeirr/fix-uint 
Portability fix: 'uint' is nonstandard.
 2014-01-15 04:57:47 -08:00
Atgeirr Flø Rasmussen
48f3161a3c Portability fix: 'uint' is nonstandard. 2014-01-15 12:25:50 +01:00
Bård Skaflestad
806be98a95 Merge pull request #456 from rolk/456_blddoc 
Document modules and structures in the build system
 2014-01-15 01:07:13 -08:00
Roland Kaufmann
e79a65bb81 Terminology instead of Notation as section header 
Notation implies that we are going to be given symbols which
represents values or such (which arguably could be true since the
path is a particular value, and from programming we are used to
multi-letter symbols perhaps also with whitespace, but it's a
stretch), but Terminology is more accurate, as this section
describes fits the definition better: it is a vocabulary of
technical terms.

Hat tip: @bska
 2014-01-15 09:08:00 +01:00
Roland Kaufmann
d5a3db50c5 Document modules and structures in the build system 
Give a brief description of each of the modules that comprises the build
system, and the suffices that is used to form a virtual structure of
variables for each project.
 2014-01-14 21:14:17 +01:00
Joakim Hove
2e64991de8 Renamed Parser->parse() -> Parser->parseFile() to follow opm-parser change. 2014-01-11 08:03:42 +01:00
Tor Harald Sandve
829de25a5a Phase pressure is used for surface volumes calculations 2014-01-10 16:07:02 +01:00
Tor Harald Sandve
292b74e189 Change the extrapolation in the livegas pvts 
The special extrapolation for pressure values above
the maximum table value is removed to sync with Mrst
 2014-01-10 16:07:02 +01:00
Tor Harald Sandve
ed9e4e376a Initialization using the RV keyword 
The initial Rv value is specified using the RV keyword in the Parser.
The Rv values are used in the computation of the initial surface
volumes.
 2014-01-10 16:07:02 +01:00
Tor Harald Sandve
598c7a0cb8 Added pvt functionality for wetgas 
The pvt interface is extended to handle wet-gas systems:
1. rvSat is added as a function in the PVT interface
2. SinglePvtLiveGas computes the pvt values and its derivatives
3. The old rbub variable is changed to rsSat for clearity
4. The new interface is tested in test_blackoilfluid with data from
liveoil.DATA and wetgas.DATA
 2014-01-10 16:07:02 +01:00
Kristian Flikka
2a35d3057c Changed phaseUsageFromDeck to use eclipseState 2014-01-10 13:43:02 +01:00
Joakim Hove
824c7768de Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 
Conflicts:
	CMakeLists_files.cmake
 2014-01-10 13:04:00 +01:00
Bård Skaflestad
15211bc445 Merge pull request #454 from joakim-hove/wellmanager 
Refactoring of well controls
 2014-01-09 03:44:11 -08:00
Kristian Flikka
bc8ad56db1 Changed new WellsManager constructor to take in EclipseStateConstPtr instead of SchedulePtr 2014-01-08 16:10:55 +01:00
Joakim Hove
43faea6678 Comparing well names protects againts NULL. 2014-01-08 16:10:43 +01:00
Joakim Hove
dee5c880ea Removed commented out code. 2014-01-08 15:58:11 +01:00
Joakim Hove
c3b4a95d82 Removed access to internal variabel cpty. 2014-01-08 11:32:00 +01:00
Kristian Flikka
43fd5e23ab New constructor for WellsManager that also takes the new parser as argument. New test comparing old and new 2014-01-07 16:10:45 +01:00
Kristian Flikka
593dcf3cd7 Merge from joakim/wellmanager 2014-01-07 16:09:35 +01:00
Joakim Hove
28658347db Using && instead of &= in the functions comparing wells and well_controls. 2014-01-06 19:22:39 +01:00
Joakim Hove
6725740f71 Removed explicit (struct WellControls *) cast to align with the rest of the code. 2014-01-06 19:09:36 +01:00
Joakim Hove
86c9acad5b Removed temoporary file opm/core/well_control_type.h. 2014-01-06 19:09:01 +01:00