Commit Graph
4672 Commits
Author SHA1 Message Date
Andreas Lauser 7ce561095c EclipseWriter: don't convert the unit inside the rate() function
because if that is done, the integration for the production total is
wrong because the time step length is days and not seconds.

Note that the conversion now uses Opm::unit::convert::to(<>,
1/conversionFactor) instead of simply multiplying with the conversion
factor. I still think this obfuscates things more than it helps, but
[at] bska will hopefully want it this way...
2014-09-22 14:16:41 +02:00
Andreas Lauser 6659070eac EclipseWriter: clarify a comment 2014-09-22 14:15:57 +02:00
Atgeirr Flø Rasmussen 0bb2fdeee4 Merge pull request #655 from atgeirr/disable-thirdparty-warnings
Refactor disabling of third-party warnings
2014-09-22 08:46:56 +02:00
Atgeirr Flø Rasmussen 9afe054c25 Remove include guards from warning suppression headers.
They are intended to temporarily change compiler state, and may be
included multiple times in a single compilation unit.
2014-09-20 10:36:10 +02:00
Atgeirr Flø Rasmussen 170f8171d6 Remove header generation, add define for warning suppression.
Thanks to @akva2 for original patch.
2014-09-20 10:36:10 +02:00
Atgeirr Flø Rasmussen a47e6775bd Honor SILENCE_EXTERNAL_WARNINGS in suppression headers. 2014-09-20 10:36:10 +02:00
Atgeirr Flø Rasmussen c838f34dc6 Add new headers. 2014-09-20 10:36:10 +02:00
Atgeirr Flø Rasmussen 1dd215834b Refactor third-party warning suppression.
Use header files from opm/core/utility/platform_dependent instead of
build-system generated ones for suppressing warnings from dune or Eigen.
2014-09-20 10:36:10 +02:00
Atgeirr Flø Rasmussen 763c9de6ef Add disabling and reenabling header files.
The files check for compiler versions to avoid using incompatible
pragmas. Only enabled for gcc >= 4.6 and clang.
2014-09-20 10:36:10 +02:00
Joakim Hove cb3b1c18fe Merge pull request #652 from andlaus/table_improvements
adapt the the table related API changes of opm-parser
2014-09-19 15:27:29 +02:00
Andreas Lauser 88df84157d blackoil fluids test: add section markers to make EclipseState happy
this is necessary because tables now must be queried using
EclipseState instead of directly. This implies that EclipseState can
be instantiated in the first place...

TODO (?): allow EclipseState instatiation for decks without a grid.
2014-09-19 15:27:12 +02:00
Andreas Lauser c7dfd096aa SatFuncBase.hpp: convert DOS line endings to unix ones
i.e. \r\n -> \n
2014-09-19 14:40:52 +02:00
Andreas Lauser bd0bfc172b adapt the the table related API changes of opm-parser 2014-09-19 14:40:35 +02:00
Atgeirr Flø Rasmussen 81101fe292 Merge pull request #653 from atgeirr/fix-warnings
Avoid release mode warnings.
2014-09-18 12:43:02 +02:00
Atgeirr Flø Rasmussen 6d1cfc0fb2 Avoid release mode warnings.
Variables only used in asserts have been removed, their content used
directly in the assert() instead.
2014-09-18 11:31:03 +02:00
Bård Skaflestad e056289200 Merge pull request #651 from andlaus/EclipseWriter_use_deck_pressure_units
use the same units for pressure output as for pressure input from the deck
2014-09-10 13:30:09 +02:00
Andreas Lauser 38eed1875a EclipseWriter: replace /= by unit::convert::to()
as insisted on by [at] bska
2014-09-10 11:41:26 +02:00
Andreas Lauser 5dd00f93c3 use the same units for pressure output as for pressure input from the deck
before, the output was always metric, regardless of whether the deck
used metric or field units...
2014-09-09 18:58:34 +02:00
Joakim Hove 5541f1553a Merge pull request #650 from andlaus/rename_getCF
rename getCF() to getCompletionFactor()
2014-09-07 07:21:32 +02:00
Andreas Lauser 9a44720e32 rename getCF() to getConnectionTransmissibilityFactor() 2014-09-06 22:28:21 +02:00
Atgeirr Flø Rasmussen 2b83e3bbe2 Merge pull request #649 from andlaus/change_threephase_model_default
change the default of the "threephase_model" parameter from "simple" to ...
2014-09-03 14:56:10 +02:00
Andreas Lauser da25fb699d change the defaults for pvt_tab_size and sat_tab_size to -1
this causes the code to use linear instead of spline
interpolation. thanks to @atgeirr for pointing this out..
2014-09-03 14:42:43 +02:00
Andreas Lauser 8a8c71bc63 change the default of the "threephase_model" parameter from "simple" to "gwseg"
Using "simple", the Norne deck aborts with an exception.

Note: SPE1 and SPE9 still seem to work fine with this but there might
be small differences so that the reference solutions of the Jenkins
server might need to be updated...
2014-09-03 13:37:52 +02:00
Atgeirr Flø Rasmussen dfb7483e1e Merge pull request #648 from bska/fix-peaceman
effectiveRadius: Fix Numerator Formula
2014-09-02 15:46:36 +02:00
Atgeirr Flø Rasmussen 6c0f90b8cc Merge pull request #647 from totto82/fix_init
Fix initialization
2014-09-02 15:42:24 +02:00
Bård Skaflestad 9591aec757 effectiveRadius: Fix numerator formula
We must take the square root of the permeability ratios, not use them
as is.  This was lost in the refactorisation commit 96cf137.

Pointy hat: @bska.
2014-09-02 15:12:50 +02:00
Tor Harald Sandve a7ecde25ce Include goc and woc in the span for the phase pressure calculation 2014-09-02 14:49:09 +02:00
Tor Harald Sandve e44b045260 Remove fix for GOC and WOC above/below reservoir 2014-09-02 14:49:09 +02:00
Atgeirr Flø Rasmussen a8bce79f15 Merge pull request #645 from bska/fix-out-of-bounds-indexing
effectiveExtent: Fix out-of-bounds indexing
2014-09-01 13:39:40 +02:00
Bård Skaflestad 7f874c0d64 effectiveExtent: Fix out-of-bounds indexing
Commit 96cf137 introduced support for Peaceman index calculation
that honoured general completion directions (X,Y,Z).  This was
accomplished through a permutation index that reordered the
permeability and geometric extent components according to a local
coordinate system along the completion.

In a complete breakdown of logic, however, the d-component extent
vector was indexed as though it were a d-by-d matrix.  This commit
restores sanity to the processing.

Pointy hat: @bska.
2014-09-01 13:30:32 +02:00
Bård Skaflestad 3fbb201e52 Merge pull request #644 from atgeirr/fix-braces-warning
Use double braces for std::array init to avoid warning.
2014-09-01 10:27:27 +02:00
Atgeirr Flø Rasmussen c55a887904 Use double braces for std::array init to avoid warning.
Warning triggered at least using clang.
2014-09-01 10:09:27 +02:00
Atgeirr Flø Rasmussen 18304eb54d Merge pull request #643 from bska/ctf-horizontal
Introduce Support for Horizontal Completions and Net-To-Gross Ratios
2014-09-01 10:04:56 +02:00
Bård Skaflestad 96cf137e4c WellsManager: Support NTG and horizontal completions
This commit extends the feature set of the WellsManager to support
horizontal ("X" and "Y") completions and include the net-to-gross
ratio in the Peaceman index ("Completion Transmissibility Factor,
CTF") of a well completion.  The NTG factor is included if present
in the input deck represented by the "eclipseState".

There are two separate, though related, parts to this commit.  The
first part splits the calculation of Peaceman's "effective radius"
out to a separate utility function, effectiveRadius(), and
generalises WellsManagerDetail::computeWellIndex() to account for
arbitrary directions and NTG factors.  The second part uses
GridPropertyAccess::Compressed<> to extract the NTG vector from the
input if present while providing a fall-back value of 1.0 if no such
vector is available.

Note: We may wish to make the extraction policy configurable at some
point in the future.
2014-08-31 21:24:37 +02:00
Bård Skaflestad 8adeb5f56c Annotate namespace closing brace with namespace name 2014-08-29 12:31:35 +02:00
Bård Skaflestad c3375da14f Adjust white-space for readability
This is mostly just splitting long lines and aligning parameters where
appropriate.  No functional changes.
2014-08-29 12:22:26 +02:00
Bård Skaflestad b35362f1e9 createWellsFromSpecs: Assert three space dimensions
Method WellsManager::createWellsFromSpecs() is only supported in
three space dimensions.  Assert that we don't use anything else.
2014-08-29 12:18:59 +02:00
Bård Skaflestad fda49df8a8 createWellsFromSpecs: Use ref-to-const cart2active
This commit tightens the function header of method

    WellsManager::createWellsFromSpecs()

to accept a reference-to-const 'cartesian_to_compressed' map.  It
used to be a complete, copy-constructed object, so this is a slight
performance enhancement as we no longer need to copy a (somewhat)
large object on every call to the method.
2014-08-29 12:13:38 +02:00
Bård Skaflestad 97a8ee630e getCubeDim: Support arbitrary number of dimensions
This commit generalises the implementation of utility function
'getCubeDim' to support arbitrary number of space dimensions.  In
actual practice there's no change in features as we only really use
a compile-time constant (= 3) to specify the number of space
dimensions.
2014-08-29 11:39:24 +02:00
Bård Skaflestad 7933d87605 Merge pull request #638 from totto82/fix_GOC_below
Currectly handling GOC below and WOC above the reservoir
2014-08-29 09:27:56 +02:00
Bård Skaflestad 1a3f7b230f Merge pull request #639 from atgeirr/threshold-pressure
Threshold pressure function
2014-08-29 09:13:27 +02:00
Bård Skaflestad 9784df8024 Merge pull request #641 from atgeirr/fix-warnings
Fix warnings
2014-08-28 16:11:12 +02:00
Atgeirr Flø Rasmussen c76d554b69 Merge pull request #642 from bska/no-local-tags
Move local type tags out of individual tests.
2014-08-28 15:04:58 +02:00
Bård Skaflestad 1ce427433b Move local type tags out of individual tests.
This fixes build on GCC 4.4.
2014-08-28 15:00:49 +02:00
Atgeirr Flø Rasmussen 53cca66b5c Merge pull request #640 from bska/compressed-array-access
Add Facility for Accessing Active Subset of Global Data Array
2014-08-28 14:23:26 +02:00
Bård Skaflestad e77ebf8d22 Use less restrictive test predicate
This commit replaces uses of BOOST_REQUIRE_* with corresponding
BOOST_CHECK_* facilitites.  This allows greater test coverage if an
individual test fails.

Suggested by: [at] atgeirr
2014-08-28 14:15:57 +02:00
Atgeirr Flø Rasmussen e1be710526 Suppress unused argument warning.
The eclState argument was added in PR#634, and may be needed later.
Until then, this silences the warning generated.
2014-08-28 14:14:22 +02:00
Atgeirr Flø Rasmussen 5059f66bad Squash warnings by removing or commenting out unused parameters. 2014-08-28 14:14:22 +02:00
Atgeirr Flø Rasmussen d04fcbfd5b Fix: eclipseState no longer shadowed. 2014-08-28 14:14:22 +02:00
Bård Skaflestad 59205f2e65 Add missing 'not' in documentation. 2014-08-28 10:20:07 +02:00