Commit Graph

4224 Commits

Author SHA1 Message Date
Bård Skaflestad
c68667458e Defer searching for opm-parser
The "opm-parser" module is expected to become dependent upon the ERT
library.  Defer searching for the parser module until we've
established whether or not ERT is availble.

Suggested by: @andlaus
2014-03-03 15:05:53 +01:00
Bård Skaflestad
a18a6c4148 Merge pull request #504 from atgeirr/allow-no-spline-new-parser
Allow direct interpolation of props with new parser.
2014-03-03 11:00:26 +01:00
Atgeirr Flø Rasmussen
55d0055d84 Merge pull request #503 from bska/503_cmake
[CMake] Propagate Boost.Iostreams to all modules
2014-03-03 10:45:01 +01:00
Atgeirr Flø Rasmussen
0eb32276fb Allow direct interpolation of props with new parser.
After transitioning to use the new parser, the SinglePvtDead class was never
used even when the 'samples' argument used to control usage was zero or negative.
The resulting construction of SinglePvtDeadSpline objects was then failing.

This change adds a new constructor to SinglePvtDead, and restores the ability
to control spline usage with the samples argument.
2014-03-03 09:17:11 +01:00
Bård Skaflestad
d9db5da62e Restore C++-11 checks
While reformatting the parser-prereqs file I accidentally replaced
the feature search 'CXX11Features' with 'CXX10Features'.  This
commit fixes that blunder.
2014-02-28 22:07:27 +01:00
Bård Skaflestad
90ebf7b56d Fix mis-merge.
In propagating the requirements for opm-benchmarks to the other
modules I accidentally removed the 'opm-parser' prerequisite (see
commit 86439d6 for details).  This commit restores that prerequisite.
2014-02-28 20:00:44 +01:00
Bård Skaflestad
47d0956d64 Depend on Boost.Iostreams
The benchmark library uses Boost::iostreams to do decompression. Since
we only scan for the Boost dependency once, this submodule is added to
all of the projects in order to have a coherent dependency on Boost.
2014-02-28 19:13:46 +01:00
Bård Skaflestad
9fcd3d8181 Reformat prerequisite file according to convention
This commit makes a few adjustments to the white-space of file
'opm-parser-prereqs.cmake' to honour the conventions of the other
*-prereqs.cmake files within the OPM project's module suites.

No functional changes.
2014-02-28 19:06:42 +01:00
Bård Skaflestad
514240d0eb Uniformly raise Boost version requirement to 1.44
Commit 70505ff raised opm-core's "Boost" requirement to version 1.44
in order to reflect the requirements of the opm-parser module.  This
commit propagates that requirement to all other known modules.
2014-02-28 18:29:19 +01:00
Roland Kaufmann
ac61cde15f Depend on Boost::iostreams
The benchmark library uses Boost::iostreams to do decompression. Since
we only scan for the Boost dependency once, this submodule is added to
all of the projects in order to have a coherent dependency on Boost.
2014-02-28 18:22:33 +01:00
Roland Kaufmann
54fbd6b190 Provide dependency information for opm-benchmarks 2014-02-28 18:21:33 +01:00
Atgeirr Flø Rasmussen
384e76bc10 Merge pull request #502 from OPM/opm-parser-integrate
Integrate new parser
2014-02-27 15:30:59 +01:00
Joakim Hove
167767e5aa Merge pull request #498 from andlaus/use_timemap_in_simulatortimer
SimulatorTimer: make it possible to base it on opm-parser's TimeMap
2014-02-27 14:35:16 +01:00
Andreas Lauser
20e21b7892 SimulatorTimer: make it possible to base it on opm-parser's TimeMap
Since SimulatorTimer is a fairly shallow shim if using the TimeMap, it
can also be removed relatively easily. Having said this, that would
trigger _many_ changes in _a lot_ of places and I'm not motivated at
all to fight that battle as long as the old parser needs to be
supported. I thus decided that the best way is to add a "wrapper mode"
to SimulationTimer...
2014-02-27 12:56:23 +01:00
Joakim Hove
77bf601d6b Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-26 23:16:10 +01:00
Joakim Hove
5a6883c71b Merge pull request #500 from flikka/add-WGRUPCON
Add handling of WGRUPCON to new-parser friendly WellsManager constructor
2014-02-26 12:28:41 +01:00
Kristian Flikka
7e29a9ea45 Add handling of WGRUPCON to new-parser friendly WellsManager constructor 2014-02-24 15:24:33 +01:00
Bård Skaflestad
2a2d6264ed Merge pull request #497 from atgeirr/no-spline-default
Make linear interpolation default for saturation and some pvt properties.
2014-02-21 11:16:29 +01:00
Atgeirr Flø Rasmussen
a953ba8659 Make linear interpolation default for saturation properties.
This includes relative permeability and capillary pressure functions.
The default has been to make a monotone spline from the given table
values and use a fine, uniform sampling of that. Now the default
is to use the tables as-is. It is still possible to use the spline
approach. For example in the class BlackoilPropertiesFromDeck one
may pass nonzero values for the 'pvt_tab_size' and 'sat_tab_size'
parameters, corresponding to how fine the spline will be sampled.
2014-02-21 09:54:47 +01:00
osae
dbe6d2911d Endpoint scaling and hysteresis for gwseg.
Activation of eps and hysteresis treatment for gwseg. Also some
additional initialization.
2014-02-18 13:49:35 +01:00
Joakim Hove
f3cbaafb65 Merge pull request #494 from flikka/removeold-from-WellsManager
Removed old EclipseGridParser from WellsManager constructor, WGROUPCON s...
2014-02-14 15:37:48 +01:00
Kristian Flikka
8eaea50e17 Removed old EclipseGridParser from WellsManager constructor, WGROUPCON still missing 2014-02-14 15:36:32 +01:00
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