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
Joakim Hove
f13b7ffc40 Merge pull request #493 from flikka/wellsmanager-group-refactor 
Adding support for creation of groups from "new style" Wells and Groups (new parser)
 2014-02-14 13:54:24 +01:00
Kristian Flikka
a5144288a3 Removed the previously introduced getAndUnRootChild method 2014-02-14 13:46:54 +01:00
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
Joakim Hove
6dd82d7191 Merge pull request #470 from andlaus/parser-integrate_blackoil_properties_from_deck 
add variants of all methods which take a deck of the new parser to the BlackOilPropertiesFromDeck
 2014-02-12 16:15:35 +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
Andreas Lauser
3163865b2e add back a newline which went MIA 
this confused the heck out of us during review. thanks to @bska for
stumbling over it...
 2014-02-12 15:06:46 +01:00
Andreas Lauser
0addefc311 add variants of all methods which take a deck of the new parser to the BlackOilPropertiesFromDeck 2014-02-12 15:06:46 +01:00
Joakim Hove
4c16af4ab8 Merge pull request #467 from andlaus/parser-integrate_rock_properties 
add variants of all methods which take a deck of the new parser to the rock properties
 2014-02-11 18:13:07 +01:00
Joakim Hove
5f8f8b6a66 Merge pull request #468 from andlaus/parser-integrate_pvt_properties 
add variants of all methods which take a deck of the new parser to the PVT properties
 2014-02-11 18:11:24 +01:00
Joakim Hove
ce38c8eee8 Merge pull request #465 from andlaus/parser-integrate_satfunc 
add variants of all methods which take a deck of the new parser to the saturation functions
 2014-02-11 18:08:39 +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
Andreas Lauser
88541d8762 make the saturation functions work with opm-parser 2014-02-10 14:50:37 +01:00
Andreas Lauser
7f9e689547 more typos 
thanks to @bska
 2014-02-10 14:49:58 +01:00
Andreas Lauser
927530a26a handle the ROCK keywords using the new opm-parser utility class 2014-02-10 14:49:58 +01:00
Andreas Lauser
a107613687 use the (new) RocktabTable class for rock compressibility 
thanks to @bska for pointing this out
 2014-02-10 14:49:58 +01:00
Andreas Lauser
dada2366cd add variants of all methods which take a deck of the new parser to the rock properties 2014-02-10 14:49:58 +01:00
Andreas Lauser
ec4423cab7 remove needless inclusion of <iostream> 
thanks to @bska for catching this one...
 2014-02-10 14:40:37 +01:00
Andreas Lauser
4542a43dbf add variants of all methods which take a deck of the new parser to the PVT properties 2014-02-10 14:40:37 +01:00
Joakim Hove
3e3542dabe Merge pull request #471 from andlaus/parser-integrate_grid_management 
add variants of all methods which take the new parser to the grid manager
 2014-02-10 13:35:25 +01:00
Joakim Hove
a8dc720a25 Merge pull request #469 from andlaus/parser-integrate_phase_usage_from_deck 
git add variant of phaseUsageFromDeck() which takes a deck of the new parser
 2014-02-10 13:30:39 +01:00
Andreas Lauser
099d6ee797 rename "createGrDecl" to "createGrdecl" 2014-02-07 19:35:28 +01:00
Andreas Lauser
71ab7bd335 add back blank line as requested by @bska 2014-02-07 19:35:28 +01:00
Andreas Lauser
96a7730d8c add variants of all methods which take the new parser to the grid manager 2014-02-07 19:35:28 +01:00
Andreas Lauser
2537ed0a0d git add variant of phaseUsageFromDeck() which takes a deck of the new parser 2014-02-07 19:35:28 +01:00
Joakim Hove
0b44f76333 Merge remote-tracking branch 'upstream/opm-parser-integrate' into opm-parser-integrate 2014-02-07 09:23:39 +01:00
Joakim Hove
1548346476 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-07 09:23:22 +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
Atgeirr Flø Rasmussen
995064635f Merge pull request #492 from flikka/initialize-bug 
Initializing do_hyst_ to false, this caused random segfaults in sim_fibo...
 2014-02-06 23:38:59 +01:00
Kristian Flikka
5cc903bbe0 Initializing do_hyst_ to false, this caused random segfaults in sim_fibo_ad 2014-02-06 21:17:36 +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