Commit Graph
29 Commits
Author SHA1 Message Date
Arne Morten Kvarving e41517a68e bump required dune version to 2.6
remove compatiblity code for older versions
2020-02-06 16:29:35 +01:00
Jørgen Kvalsvik d3f08246b0 Get CornerpointChopper.hpp; remove shared_ptrs
opm-parser no longer exposes shared_ptr or shared_ptr aliases.
2016-10-20 15:35:20 +02:00
Bård Skaflestad ba0174ccd6 Upscaling Examples: Centralise ECLIPSE File Parsing
This commit moves the parseEclipseFile() function from the
upscale_relperm.cpp example to the RelPermUpscalerHelper class[%].
This, in turn, enables using the same implementation in most
relevant example utilities.

While here, also call the centralised {get,set}VoigtValue()
functions rather than local implementations.

[%] Suggested by: Arne Morten Kvarving
2016-04-20 10:12:14 +02:00
Bård Skaflestad 17fe369853 Upscaling Examples: Spring cleaning
Mostly:
  - Sort headers
  - Re-indent to fix white-space
  - Remove long-disabled code
2016-04-19 17:51:08 +02:00
Bård Skaflestad 4b461fa7f5 Extra Keywords: Use Reference Rather Than Pointer API
This commit switches function addNonStandardUpscalingKeywords() to
using a reference to a modifiable Parser rather than ParserPtr.
While here, also switch to using std::make_shared<>() when
constructing the parser object.
2016-04-18 13:59:25 +02:00
Bård Skaflestad 9fe93eea71 Examples: Adjust White-space and Sort Includes
No functional changes.
2016-04-18 13:59:25 +02:00
Atgeirr Flø Rasmussen 71bb454e50 Use new include paths. 2016-03-31 17:22:13 +02:00
Bård Skaflestad 3a7573370a Chase ParseMode -> ParseContext Renaming in Examples 2016-03-17 10:34:59 +01:00
Jørgen Kvalsvik a5c9b39c8f Change Deck access methods/types to references
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.

https://github.com/OPM/opm-parser/pull/677
2016-02-16 16:52:28 +01:00
Jørgen Kvalsvik 30fe95e3d0 Improve includes from opm-parser
Adopting to opm-parser PR#661, add previously missing includes.

http://github.com/OPM/opm-parser/pull/661
2016-01-26 13:36:12 +01:00
Joakim Hove bb18fe0208 Added ParseMode argument 2015-07-27 15:00:25 +02:00
Atgeirr Flø Rasmussen 886c463d9f Convert all upscaling programs to new pinch behaviour.
This means that PINCH must be used in the input deck,
whereas before, z_tolerance was available as a program
parameter (but only for some programs). A benefit is that
all programs will now uniformly accept PINCH in the input
decks.
2014-08-20 14:15:17 +02:00
Andreas Lauser 731dc9e687 add possibility to use ad-hoc upscaling keywords
this is currently just "RHO", an non-standard addition for
opm-upscaling and needs to be added to the Eclipse parser manually
before it is set loose on the deck file...
2014-05-19 12:03:11 +02:00
Andreas Lauser e138bd461d convert the module away from EclipseGridParser to opm-parser 2014-05-19 12:03:11 +02:00
Kari B. Skjerve 6ff5b05135 Added computations for net (NTG usage) 2013-10-17 14:56:48 +02:00
Bård Skaflestad f99c233f30 Provide explicit definition of EclipseGridInspector
This file uses the "EclipseGridInspector" directly, and should not
rely on indirect includes to provide a valid definition of the
class.
2013-10-08 19:32:36 +02:00
Arne Morten Kvarving 24e2dff7c4 fixed: MPI handling across all apps
we need to call mpi_init when compiled against mpi (in particular mpich)
even if running with a single node.

this fixes this across all apps in a uniform way (the dune-intended approach)
2013-10-08 13:44:56 +02:00
Andreas Lauser 1908e1bf8f Add exception handlers to all unit tests, tutorials and examples 2013-09-03 14:59:13 +02:00
Andreas Lauser 33e6552704 replace Dune and boost classes by their C++-2011 equivalents
that is, provided that they are available in GCC 4.4. This basically boils
down to Dune::array and boost::array.
2013-07-30 21:14:36 +02:00
Markus Blatt b9638d6f34 Changed std::tr1 occurences to boost.
std::tr1 might not be supported by all compilers and will eventually
be dropped by others. Using boost instead makes this more
portable.
2013-07-04 16:30:08 +02:00
Bård Skaflestad a486d15a6e Disable build kluge that is no longer pertinent
The <have_boost_redef.hpp> header was introduced (commit
OPM/opm-core@82369f9) as a work-around for a particular interaction
in the Autotools-based setup of OPM-Core and the Dune core modules.
Notably, Dune's "Enable" trick for Boost failed on some older
Autoconf systems.  Now that we're using CMake, however, that kluge
is no longer needed because OPM-Core always

  #define HAVE_BOOST 1

i.e., as an explict true/false value.

Therefore, we need no longer include <have_boost_redef.hpp> .  The
header will be removed at a later time.
2013-06-20 23:24:33 +02:00
Andreas Lauser c4f0bb5680 change namespace from 'Dune' to 'Opm'
everything still compiles.
2013-02-05 16:05:02 +01:00
Bård Skaflestad 70a908c0fa Override Dune-ISTL's HAVE_BOOST symbol.
Use OPM-Core's `have_boost_redef.hpp' facility to effect the symbol
overriding.  Using Boost in OPM-Uscaling is non-optional.
2012-07-12 15:38:20 +02:00
Bjørn Spjelkavik f49c249b35 Use common files from Opm instead of Dune. #3 2012-02-07 12:20:50 +01:00
Håvard Berland f0cc9bb9a7 Output min and max coordinates in x,y and z-directions in upscale_avg 2011-05-16 14:25:30 +02:00
Håvard Berland 89044d7f73 Follow up change in EclipseGridParser with regard to unit handling
upscale_avg should be unit-agnostic, so we ask EclipseGridParser
not to convert from SI.
2011-02-07 19:31:23 +01:00
Atgeirr Flø Rasmussen e8c4755527 Fixed uint->size_t issues, added ignore for executables. 2010-11-05 13:03:29 +01:00
Håvard Berland 680d5fb32c fix compile errors and some warnings 2010-11-04 21:59:27 +01:00
Håvard Berland 4b538aeeb4 Add Statoils facade code for singlephase upscaling
Extends singlephase upscaling code to relative permeability
in capillary limit, and to conductivity upscaling based on Archie's law
2010-11-04 13:19:47 +01:00