Commit Graph

32 Commits

Author SHA1 Message Date
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
Bård Skaflestad
3a7573370a Chase ParseMode -> ParseContext Renaming in Examples 2016-03-17 10:34:59 +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
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
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
Markus Blatt
b1a516cbf1 To get rid off the whitespace changes, I moved the code in main to a new methods upscale. 2012-11-19 16:15:26 +01:00
Markus Blatt
56c00513d2 Cornerpoint grid does initiate mpi calls when compiled with MPI support.
Therefore upscale_perm needs to initialise MPI. This is now done in the DUNE way.
2012-11-19 15:29:34 +01:00
Markus Blatt
74ec1b66ec Make number of iterations, prolongation factor, and number of smoothing adjustable 2012-11-19 13:44:21 +01:00
Markus Blatt
6de11bb38e Update upscale_perm.cpp and /SteadyStateUpscaler to new init method. 2012-11-19 13:09:42 +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
51d764b93e cleanup in version strings that has not been updated since svn-times 2011-06-24 14:13:40 +02:00
Håvard Berland
35a3176693 Backed out changeset 076a86d8b803, it segfaults
The use of setPermeability did not work for upscale_perm as it did for
upscale_relperm. Deep down in ReservoirPropertyCommon it says
'use with caution', there might be something to it
2011-06-07 08:05:23 +02:00
Håvard Berland
e0da114593 Implement feature for truncating permeability values from above
Enabled by default at 100 Darcy (should be sufficient, but might
bite when someone uses this program for something else than
permeability upscaling)
2011-06-06 11:08:58 +02:00
Håvard Berland
c578c908eb Allow tweaking of linear solver parameters in upscale_perm
Code copied from upscale_relperm.cpp
2011-06-03 13:02:06 +02:00
Håvard Berland
7a9988f6de cleanup in documentation 2011-03-31 21:49:09 +02:00
Håvard Berland
cd061a6d4f specify minperm unit in usage() 2010-11-24 08:11:32 +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
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