Commit Graph
32 Commits
Author SHA1 Message Date
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
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
Arne Morten Kvarving 781d1430fb changed: use a C++11 initializer list instead of repeated inserts 2015-09-14 11:26:25 +02:00
Arne Morten Kvarving 2b396e0ccb changed: put the voigt tensor helper functions in a shared source
they were duplicated in 3 source files
2015-09-14 11:26:25 +02:00
Joakim Hove bb18fe0208 Added ParseMode argument 2015-07-27 15:00:25 +02:00
Arne Morten Kvarving 75deda9092 changed: replace C99-style VLAs with std::vector 2015-06-16 14:50:53 +02:00
Bård Skaflestad e80688951d Upscaling utilities: Use raw property vectors where appropriate
We need access to the raw, unconverted property vectors to use the
existing algorithm for defining (e.g.,) capillary pressure ranges.
This subtle point was missed during the initial transition to using
the opm-parser module for input handling.
2014-10-20 11:15:50 +02:00
Atgeirr Flø Rasmussen 009bf57f29 Revert "Restore upscaling utility results" 2014-10-20 10:23:29 +02:00
Bård Skaflestad 876d1d5a5e Upscaling utilities: Use raw property vectors where appropriate
We need access to the raw, unconverted property vectors to use the
existing algorithm for defining (e.g.,) capillary pressure ranges.
This subtle point was missed during the initial transition to using
the opm-parser module for input handling.
2014-10-15 15:19:35 +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
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 0854692caa Replace the ASSERT and ASSERT2 macros by assert 2013-09-03 13:55:37 +02:00
Lars Vingli Odsæter f21b43879b Set default number of smoothing steps for linear solver to 1
The default solver fastAMG use only one smoothing step anyway
2013-07-15 11:51:33 +02:00
Lars Vingli Odsæter 4222e9407d Update documentation of options for linsolver_type 2013-07-04 14:18:49 +02:00
Lars Vingli Odsæter d1e27c0ffa Merge branch 'master' of https://github.com/OPM/opm-upscaling 2013-07-04 14:12:51 +02:00
Lars Vingli Odsæter 44b88faee3 Set fast AMG solver to default for upscaling applications
Change default value of linsolver_type to 3 (fast AMG) and
linsolver_prolongate_factor to 1.0.
2013-07-04 14:08:05 +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
Håvard Berland eb45f1e34d remove debugging statement 2012-11-25 21:35:23 +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
Roland Kaufmann c4d99e3ea1 Specify namespace of math functions to avoid name clashes
In the 4.6.x range of GNU compilers, the cmath header include math.h, adding
isinf() and isnan() to the global namespace as well as std. When used in if
statements, there is then an ambiguity between the std version which returns
bool and the global function which returns int; for more details see:
<http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48891>

If we qualify the functions explicitly with their namespace, this error goes
away.
2012-06-27 15:04:41 +02:00
Bjørn Spjelkavik f49c249b35 Use common files from Opm instead of Dune. #3 2012-02-07 12:20:50 +01:00
Kari B. Skjerve 2f31cfa8d0 changed linsolver_tolerance to 1e-12, added check on swir/swor 2012-01-24 13:07:04 +01:00
Kari B. Skjerve 2cc6eef240 Anisotropic input 2011-12-23 13:03:56 +01:00
Kari B. Skjerve 1810dfc754 added relative permeability upscaling in viscous limit (not testet,
checked in due to structural changes in repo)
2011-12-12 12:12:10 +01:00