Commit Graph

47 Commits

Author SHA1 Message Date
Arne Morten Kvarving
75deda9092 changed: replace C99-style VLAs with std::vector 2015-06-16 14:50:53 +02:00
Jørgen Kvalsvik
5cc6677a4d Makes MPI_Send use the correct buffer size.
In the case of both phases being upscaled, only one of the tensors were sent,
i.e. the send-buffer was 3 doubles short. This causes program output to always
be wrong in the MPI version.
2015-06-01 12:24:07 +02: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
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
fa1f87c98d Postpone incorporation of user-supplied surface tension to the end
Zero or negative user-supplied surface tension made the code
crash. Kr(Sw) is indifferent to this value, so it is
a valid fix to postpone the multiplication of surface-tension
to the vector of pressure data to the end of the code,
right before it is printed.
2012-11-25 22:08:12 +01:00
Atgeirr Flø Rasmussen
b4bf9876a6 Made argument order for init() consistent.
Related to issue #9.
2012-11-19 12:15:26 +01:00
Markus Blatt
f8bc5a37ab Merged AMG optimization changes with latest version of master 2012-09-26 21:36:48 +02:00
Markus Blatt
cd6ff80fd2 - Added the possibility to set the factor used to scale the prolongation
- Added the possibility to set the number of iterations A.M() make no sense for large matrices.
- Added the possibility to set the number of smoother steps to use.
- Added upscaling_relperm binaries for anisotropic criterion and for different smoothers:
  upscale_relperm: default criterion with ILU0 smoother
  upscale_relperm_aniso: Use settings for anisotropic problems with ILU0 smoother
  upscale_relperm_ssor: default criterion with SSOR smoother
  upscale_relperm_aniso_ssor: default criterion with SSOR smoother
  upscale_relperm_bgs: default criterion with Block Gauss-Seidel smoother
  upscale_relperm_aniso_bgs: default criterion with block Gauss-Seidel smoother
2012-09-25 14:31:58 +02:00
Lars Vingli Odsæter
38165f3ab7 Renamed macro USEMPI to HAVE_MPI in upscale_relperm.cpp so that the parallel implementation can be built in the DUNE setting 2012-07-16 08:23:34 +02: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
Kari B. Skjerve
6ce00bc0a4 cleaning up unnecessary output in upscale_relperm.cpp 2012-06-14 13:37:45 +02:00
Kari B. Skjerve
36209a8245 Comment sign for Eclipse output changed (from // to --) 2012-05-24 12:57:56 +02:00
Kari B. Skjerve
b22ba1d224 Changed input and output to be more aligned with Eclipse. 2012-05-09 16:18:57 +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
b907f3c6ac Changed number of significant numbers in output to 4 2012-01-25 14:32:24 +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
1361539489 Preserve minimum and maximum pressure points (to preserve min and max
saturations). Also changed linsolver_tolerance to 1-12.
2012-01-24 11:11:23 +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
a427a2840e decrease saturationThreshold in upscale_relperm with factor 10
Avoids some visible minor output changes that we prefer not to see
2011-06-24 14:03:44 +02:00
Håvard Berland
65c02051a7 Increase maxPerm to 100 Darcy by default 2011-06-07 08:06:54 +02:00
Håvard Berland
13adc9087b Truncate permeability values to maximum 20 Darcy (adjustable via option) 2011-06-03 14:28:55 +02:00
Håvard Berland
e3328a19c4 replace all uints by 'unsigned int's 2011-05-26 10:47:57 +02:00
Håvard Berland
a6f7372de6 more cleanup; old commented-out code (pre-OPM) removed 2011-03-01 08:11:20 +01:00
Håvard Berland
2c59466971 Cleanup; remove commented out code and fix indendation 2011-03-01 08:06:35 +01:00
Håvard Berland
3ba1abe13f hg backout of changeset 1fc8598d32fb
(it had the wrong commit message and should not have been
committed either)
2011-02-28 19:40:34 +01:00
Håvard Berland
ed043a5dfe some fixes, still a rough script for deb-making 2011-02-23 23:25:18 +01:00
Atgeirr Flø Rasmussen
929d06f524 Modified programs to account for parser changes. A summary:
- Code using the ...Upscaler classes must supply an SI-converted parser.
 - Code manipulating arrays of PERMX values (for example) must take care
   to use the non-converted values, as it is usually written with millidarcies.
2011-02-04 11:18:12 +01:00
Håvard Berland
d5edccb576 fabs is probably smarter to use than abs on floats. 2010-11-07 21:07:55 +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