OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,061 Commits 9 Branches 35 Tags
45b080b5be17b3f99199cafc06cb99fa3ea908e3
Commit Graph
4061 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 45b080b5be Merge pull request #489 from atgeirr/fix-more-warnings 
Fix more warnings found by clang
 2014-02-05 18:26:57 +01:00
Atgeirr Flø Rasmussen 91c1131aff Merge pull request #487 from atgeirr/fix-warnings 
Fix some warnings
 2014-02-05 18:26:43 +01:00
Atgeirr Flø Rasmussen d2e1eb8d02 Merge pull request #485 from atgeirr/fix-initial-call-eclipsewriter 
Fix SimulatorTimer-related bug in EclipseWriter.
 2014-02-05 18:25:29 +01:00
Atgeirr Flø Rasmussen 54b0c90a07 Merge pull request #488 from atgeirr/fix-eclipsewriter-for-clang 
Fix eclipsewriter for clang
 2014-02-05 18:24:31 +01:00
Atgeirr Flø Rasmussen a9bcbd64db Fix unused argument warning and wrong behaviour. 
The class WarnAndContinueOnError should write warnings irrespective
of the status of the OPM_VERBOSE symbol.
 2014-02-05 15:07:17 +01:00
Atgeirr Flø Rasmussen 6100f1758f Fix variable shadowing warning. 2014-02-05 15:05:26 +01:00
Atgeirr Flø Rasmussen 9396d8b3ed Fix unused argument warnings. 2014-02-05 15:04:56 +01:00
Atgeirr Flø Rasmussen 9d0dd9c961 Removed unused argument from buildTracerHeadsFromWells(). 2014-02-05 15:03:35 +01:00
Atgeirr Flø Rasmussen 2250d7bb95 Suppressed some unused parameter warnings. 2014-02-05 14:46:22 +01:00
Atgeirr Flø Rasmussen 8ad4dd172f Moved explicit template instantiation inside namespace. 
Clang requires this to happen inside the namespace of the class
(which is in the anonymous namespace) and issues an error diagnostic.
 2014-02-05 14:44:58 +01:00
Atgeirr Flø Rasmussen 543230c8cf Suppress warnings in unimplemented functions. 
This prevents warnings from functions that are right now just
a throw statement. Also cleaned up a few whitespace issues nearby.
 2014-02-05 14:27:51 +01:00
Atgeirr Flø Rasmussen 708f9a2fa3 Fix initialisation warning. 2014-02-05 13:05:33 +01:00
Joakim Hove 42f3dec6d0 Merge pull request #486 from osae/fixCmake 
Added SatFuncBase.hpp to CMakeLists_files.cmake
 2014-02-05 12:52:39 +01:00
osae 25b5f23f37 Added SatFuncBase.hpp to CMakeLists_files.cmake 2014-02-05 12:22:50 +01:00
Atgeirr Flø Rasmussen a2b7f0a4e4 Fix SimulatorTimer-related bug in EclipseWriter. 
Since writeTimeStep() now gets called also before the first timestep is done,
the EclipseWellTotal::update() method was in error, always calling
SimulatorTimer::stepLengthTaken(). That method cannot be called if the
timer's currentStepNum() is 0, so that is checked for and intercepted.
The total rate in that case is of course zero.
 2014-02-05 11:28:40 +01:00
Bård Skaflestad 1513712e6b Merge pull request #481 from atgeirr/fix-summary-output 
Fix summary output, now contains output for all steps.
 2014-01-31 11:49:58 -08:00
Atgeirr Flø Rasmussen 93632eb092 Merge pull request #476 from andlaus/fix_eigen3_version 
Corrects required version and make Eigen3 download work.
 2014-01-31 05:49:57 -08:00
Atgeirr Flø Rasmussen 5ea54d7a4a Merge pull request #478 from osae/endscale 
Saturation table scaling and hysteresis.
 2014-01-31 05:48:56 -08:00
Atgeirr Flø Rasmussen 3ddfeac9de Merge pull request #483 from bska/fix-test-fallout 
Fix fallout from PR #474
 2014-01-31 05:47:51 -08:00
osae a186c0fb9c Removed blanks from strings. 2014-01-31 14:35:35 +01:00
Bård Skaflestad dedbe9272c Fix fallout from PR #474 
The check introduced in PR #474 (commit ad899fc) means all decks
must supply valid depth data.  Update test decks accordingly to
restore "make test".
 2014-01-31 14:24:02 +01:00
Atgeirr Flø Rasmussen f1ae040aef Removed erroneous comment. 2014-01-31 14:07:30 +01:00
Bård Skaflestad b63f73ac3a Merge pull request #474 from atgeirr/throw-missing-tops-depthz 
Check for missing TOPS or DEPTHZ in DXV/DYV/DZV initialization.
 2014-01-31 04:52:32 -08:00
Atgeirr Flø Rasmussen 9f253eb9ae Add summary output of bottom hole pressures. 2014-01-30 14:18:09 +01:00
Atgeirr Flø Rasmussen 445800f738 Fix summary output, now contains output for all steps. 
Previously, the summary output was rewritten for each step,
leaving only the last step's data in the summary data file.
 2014-01-30 11:36:31 +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
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
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
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
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
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
Bård Skaflestad 15211bc445 Merge pull request #454 from joakim-hove/wellmanager 
Refactoring of well controls
 2014-01-09 03:44:11 -08:00