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

4127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristian Flikka
9b6430f907 Added building of WellsCollection group structure from new opm-parser objects 2014-02-14 13:43:25 +01:00
Kristian Flikka
501467a1e3 Added an else to avoid unnecessary checking. 2014-02-14 09:01:21 +01:00
Kristian Flikka
15a7255f30 Changed the WellCollection addChild functions to be more specific, and strict 2014-02-13 16:00:39 +01:00
Kristian Flikka
663eb5a56d Extracted common functionality from the three create functions 2014-02-12 15:45:06 +01:00
Kristian Flikka
36348a8f8a Create WellsGroupInterface from opm-parser Well/Group objects 2014-02-12 15:39:57 +01:00
Kristian Flikka
a8136610e0 Fixed copyright section 2014-02-11 14:21:15 +01:00
Kristian Flikka
6a1183dc33 Added support for creation of WellsGroup objects from new parser Well and Group objects 2014-02-11 14:12:36 +01:00
Atgeirr Flø Rasmussen
ae4c6eab18 Merge pull request #490 from blattms/make-arbitrary-sibling-possible 
[cmake] Makes arbitrary build subdirectories possible.
 2014-02-06 23:39:57 +01:00
Joakim Hove
88305651bc Merge pull request #491 from flikka/handle-welopen 
Removed WELOPEN from constructor, added throwing on non OPEN/SHUT status...
 2014-02-06 17:42:10 +01:00
Kristian Flikka
8cdaf7d05d Removed WELOPEN from constructor, added throwing on non OPEN/SHUT statuses 2014-02-06 16:31:35 +01:00
Markus Blatt
61b3a4618c [cmake] Do not use find_package in config mode for opm-parser. 
Currently opm-parser does not create opm-parser-config.cmake files. Therefore
building with duncontrol fails as it sets opm-parser_DIR. With this patch
we force CMake to always use module mode for finding which fixes this.
 2014-02-06 13:29:01 +01:00
Markus Blatt
786aa125f2 Removed printf debugging messages 2014-02-06 13:21:23 +01:00
Markus Blatt
00b802dd41 [cmake] Support more arbitrary sibling/subdir build directories for opm-parser. 2014-02-06 13:17:43 +01:00
Markus Blatt
6c0438ab81 Whitespace change that replaces introduced tab with spaces. 2014-02-06 12:41:10 +01:00
Markus Blatt
322da86bb1 [cmake] Makes arbitrary build subdirectories possible. 
Instead of guessing the suffix or subdir of the build directory,
we now simply compare PROJECT_{BINARY,SOURCE]_DIR to detect it.
By this e.g. opm-core/opm-parallel is a possible build directory, too.
 2014-02-06 11:03:59 +01:00
Joakim Hove
e1f104ccdd Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-05 23:06:54 +01:00
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
Joakim Hove
4ecd1dbe0e Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-05 15:58:56 +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
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