Commit Graph
72 Commits
Author SHA1 Message Date
Arne Morten Kvarving 0c78a3e1b9 remove unused variable 2023-05-31 09:36:30 +02:00
Arne Morten Kvarving 33d67a642a CpChop: remove use of sstream 2023-01-02 13:22:18 +01:00
Joakim Hove cc00c1444f Downstream of filesystem reorganisation in opm-common 2021-12-14 13:26:53 +01:00
Joakim Hove 98fc9388f5 Update deck access api 2021-11-19 07:42:16 +01:00
Arne Morten Kvarving 0eefc75864 changed: use std::random instead of boost::random
also use lambdas instead of bind
2020-02-17 14:56:43 +01:00
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
Arne Morten Kvarving bfbf727c92 fixed: avoid unnecessary assignments 2019-07-10 10:02:21 +02:00
Arne Morten Kvarving bfff52244f cpchop: add option to disable randomness in subsamples
useful for regression test purposes
2018-08-01 11:34:59 +02:00
Arne Morten Kvarving e638c281fb fixed: make sure we get a non-empty interval for the random numbers
if not, the generator throws
2018-08-01 10:15:32 +02:00
Arne Morten Kvarving e3ddc5b184 changed: relocate the remaining files in opm/core/utility
move to opm/common/utility/numeric# On branch master
2018-01-30 14:07:04 +01:00
Arne Morten Kvarving b2d29b7209 adjust for changed ParameterGroup namespacing 2017-04-28 15:35:33 +02: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
Andreas Lauser 8af1929965 adapt to the removal of the unit system of opm-core
the one which is in opm-parser is now a drop-in replacement.
2016-10-10 17:31:02 +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
Atgeirr Flø Rasmussen 71bb454e50 Use new include paths. 2016-03-31 17:22:13 +02: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
Bård Skaflestad 4a3544e3af Upscaling utilities: Don't hard-code numeric conversion factor
This commit replaces the hard-coded conversion factor from mD to
m**2 (metres squared) with an expression based on the Units.hpp
facility of module opm-core.

Note: This may introduce slight changes to the upscaling result due
to reduced rounding error in the unit conversions.
2014-10-20 11:15:50 +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 85e6d32704 Upscaling utilities: Don't hard-code numeric conversion factor
This commit replaces the hard-coded conversion factor from mD to
m**2 (metres squared) with an expression based on the Units.hpp
facility of module opm-core.

Note: This may introduce slight changes to the upscaling result due
to reduced rounding error in the unit conversions.
2014-10-15 15:19:35 +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 9b212aedeb cpchop example: fix indentation
at least for editors which use the "wrong" width for tabs. *grrr*
2014-05-19 12:03:36 +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 a2cbd38e0d Added support for SWCR and SOWCR in UpscalerBase and cpchop 2014-03-11 15:03:57 +01:00
Arne Morten Kvarving bc5afd6f95 default to FastAMG with dune 2.3 2013-11-11 15:50:42 +01:00
Kari B. Skjerve 2bc77e9c73 Added forgotten if on NTG output 2013-10-10 11:10:34 +02:00
Kari B. Skjerve e32aa72bc9 Added funtions for upscaling net porosity and NTG in UpscalerBase
Added upscaling of NTG and net porosoty in cpchop
2013-10-10 11:10:34 +02:00
Bård Skaflestad 347c302126 Allocate sufficiently large storage arrays for endpoints
This fixes an index-out-of-bounds error reported in PR #93.
2013-10-09 22:39:49 +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
Arne Morten Kvarving 13b31ab432 fixed: Init, not init 2013-10-07 12:03:28 +02:00
Arne Morten Kvarving 9d61d3de69 fixed: cpchop execution with MPI enabled libraries 2013-10-07 11:43:45 +02:00
Håvard Berland f7c657e498 initialize Pc{min,max}candidate at declaration 2013-09-11 22:49:03 +02:00
Håvard Berland 4a0cf52e8a Avoid theoretical possibility of Pcmin being used uninitialized 2013-09-11 15:23:48 +02:00
Andreas Lauser 92bf62f0b7 Replace THROW by OPM_THROW 2013-09-03 15:00:29 +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
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
Atgeirr Flø Rasmussen fbdf8bf3c2 Program upscale_singlephase promoted to examples.
Was tests/not-unit/upscaling_test.cpp.
Also fix a copyright notice.
2013-03-22 01:05:37 +01:00
Atgeirr Flø Rasmussen 976706487d Adapted some include paths to changes in opm-core. 2013-03-12 12:15:28 +01: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
Kari B. Skjerve 7d8b4222ce Fixed output header 2012-03-29 15:11:41 +02:00
Kari B. Skjerve 341133ba52 porosity comp also when not upscaling perm 2012-03-09 15:16:55 +01:00
Bjørn Spjelkavik f49c249b35 Use common files from Opm instead of Dune. #3 2012-02-07 12:20:50 +01:00
Atgeirr Flø Rasmussen bdfe8c8884 Removed "uint" linuxism, changed isnan() and friends into std::isnan() etc. 2011-12-06 10:43:34 +01:00
Kari B. Skjerve 155fe8d685 Changed output for dips. Added option for azimuth displacement 2011-08-30 14:48:01 +02:00
Kari B. Skjerve 07779105ad Added capillary pressure upscaling option 2011-08-15 13:26:46 +02:00
Kari B. Skjerve 9f3abcb74e added saturation endpoint option to cpchop 2011-07-05 14:22:57 +02:00