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

4202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joakim Hove
6c8cba9d19 Merged upstream/master 2014-02-04 21:42:07 +01:00
Joakim Hove
c1986572c4 Merge pull request #484 from flikka/refactor-wellsmanager 
Refactor wellsmanager
 2014-02-03 01:02:35 -08:00
Kristian Flikka
74cb703238 Removed WELTARG commented code, moved wellperf_data into createWellsFromSpecs function 2014-02-03 09:22:28 +01:00
Kristian Flikka
57a779167b Extracted well controls setup to separate function 2014-02-03 09:07:58 +01:00
Kristian Flikka
d390dc2725 Extracted well specification and completion data setup to a function 2014-02-03 08:58:54 +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
Joakim Hove
cf181333f1 Merge pull request #482 from joakim-hove/wellsmanager-rates 
Wellsmanager: use new parser for WCONINJE and WCONPROD
 2014-01-31 03:56:36 -08:00
Joakim Hove
4a36a72cdb Using well->hasInjectionControl() to check whether a particular control is available. 2014-01-30 16:37:20 +01:00
Joakim Hove
af79c27b9e Implemented WCONPROD support from Parser::Schedule object. 2014-01-30 15:55:17 +01: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
Joakim Hove
d176de0075 Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates 
Conflicts:
	opm/core/wells/WellsManager.cpp
 2014-01-30 09:50:09 +01:00
Joakim Hove
59bd79af58 Implemented well injector properties from opm-parser::Well. 2014-01-30 08:02:13 +01:00
Joakim Hove
827b7099bc Added namespace prefix to enum. 2014-01-30 08:00:45 +01:00
Joakim Hove
4cbc4668fa Merge pull request #480 from flikka/wells-manager-COMPDAT 
Wells manager compdat
 2014-01-29 05:42:53 -08:00
Kristian Flikka
fabcb45d4c Removed print statement 2014-01-29 12:30:03 +01:00
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