Commit Graph
8434 Commits
Author SHA1 Message Date
Bård Skaflestad 137ef7a17b Sat-Func Initializers: Use RawTableEndPoints for KRGR
This commit reimplements the findKrgr helper function in terms of
the RawTableEndPoints aggregate.  In particular, this commit aims to
underscore the fact that KRGR is the relative permeability of gas at
the displacing saturation

    1 - Socr - Swco

This fact is hopefully more apparent in this revised than the
existing implementation since we now rely explicitly on evaluating
the 'KrgColumn' at an index derived from looking up that saturation
value in the pertinent saturation column.
2020-04-29 13:33:51 +02:00
Bård Skaflestad c8048021d1 Sat-Func Initializers: Use RawTableEndPoints for KRWR
This commit reimplements the findKrwr helper function in terms of
the RawTableEndPoints aggregate.  In particular, this commit aims to
underscore the fact that KRWR is the relative permeability of water
at the displacing saturation

    1 - Socr - Sgco

This fact is hopefully more apparent in this revised than the
existing implementation since we now rely explicitly on evaluating
the 'KrwColumn' at an index derived from looking up that saturation
value in the pertinent saturation column.
2020-04-29 13:33:51 +02:00
Bård Skaflestad 58764a6ec6 Sat-Func Initializers: Use RawTableEndPoints for KRORW
This commit reimplements the findKrorw helper function in terms of
the RawTableEndPoints aggregate.  In particular, this commit aims to
underscore the fact that KRORW is the relative permeability of oil
in the Oil/Water system at the displacing saturation

    1 - Swcr - Sgco

This fact is hopefully more apparent in this revised than the
existing implementation since we now rely explicitly on evaluating
the 'KrowColumn' at an index derived from looking up that saturation
value in the pertinent saturation column.
2020-04-29 13:33:51 +02:00
Bård Skaflestad b17b4c1375 Sat-Func Initializers: Use RawTableEndPoints for KRORG
This commit reimplements the findKrorg helper function in terms of
the RawTableEndPoints aggregate.  In particular, this commit aims to
underscore the fact that KRORG is the relative permeability of oil
in the Oil/Gas system at the displacing saturation

    1 - Sgcr - Swco

This fact is hopefully more apparent in this revised than the
existing implementation since we now rely explicitly on evaluating
the 'KrogColumn' at an index derived from looking up that saturation
value in the pertinent saturation column.
2020-04-29 13:33:51 +02:00
Bård Skaflestad 3817524f52 Sat-Func Initializers: Adjust Whitespace and Fix a Variable Name
The name 'max_krw' reflects the actual value better than the
existing name 'krwr'.
2020-04-29 13:33:51 +02:00
Bård Skaflestad f6cfadd62f Sat-Func Initializers: Use Precalculated Endpoints Where Possible 2020-04-29 13:33:51 +02:00
Bård Skaflestad af34e083c2 Sat-Func Initializers: Include <algorithm> and <iterator>
Needed to bring in declarations of std::distance, std::reverse, and
std::upper_bound.
2020-04-29 13:33:51 +02:00
Bård Skaflestad 2984cca164 Sat-Func Properties: Provide All Raw Endpoints to All Initializers
This is in preparation of fixing the initializers for the KR*R
properties.  The default values here generally depend on critical
and connate saturations of other phases extracted from the raw input
table values.  This commit therefore creates an aggregate structure

    RawTableEndPoints

that collects the connate gas and water saturations, the full set of
critical saturations, and the maximum gas and water saturations from
all input tables (meaning for all regions and drainage/imbibition
regime designators).  Each *Endpoint() function furthermore gets a
new parameter of this type to preserve a uniform signature.

Note that we currently calculate the complete set of these endpoints
for each call to satfunc::init(), but may choose to expose this
structure to the caller at a later time in order to reduce the
overhead of these repeated calculations.
2020-04-29 13:33:51 +02:00
Bård Skaflestad 6615030fab Sat-Func Region Apply: Remove 'ACTNUM' Pointer
We always call these functions on all active cells so there's no
need to have checks for ACTNUM-like cell subsets.
2020-04-29 13:33:51 +02:00
Bård Skaflestad a4fc7ab05d Sat-func Region Apply: Split Region ID Check out to Helper
Mostly to reduce cognitive load when reading the *Apply() functions'
implementations.
2020-04-29 13:33:51 +02:00
Bård Skaflestad 8f64405ace Reduce Saturation Function Initialization API
The individual property initialization functions aren't used
directly anymore.  Put them in an anonymous namespace in the
implementation file so that no client can take their address.  This
is in preparation of adding TOLCRIT support.
2020-04-29 13:33:51 +02:00
Markus Blatt eeb63d8694 Merge pull request #1758 from blattms/mark-openmp-as-prereq
Mark OpenMP as prerequisite for opm-common
2020-04-29 12:57:02 +02:00
Joakim Hove 8201728973 Merge pull request #1760 from joakim-hove/python-package-path
Python files should go in $PREFIX/dist-packages on debian
2020-04-29 10:49:20 +02:00
Joakim Hove 512c2e4c1e Python files should go in $PREFIX/dist-packages on debian 2020-04-29 10:03:08 +02:00
Joakim Hove 6be2217935 Merge pull request #1757 from joakim-hove/remove-unused-function
Remove unused function from Group output data
2020-04-28 17:18:54 +02:00
Joakim Hove 9956492730 Remove unused function from Group output data 2020-04-28 16:17:43 +02:00
Joakim Hove ad536b718b Merge pull request #1754 from blattms/find-zoltan-only-with-mpi
[CMake] Find Zoltan only if MPI is available.
2020-04-28 14:50:08 +02:00
Markus Blatt a87e6f281d Quietly searcg for OpenMP in opm-common-prereqs.cmake 2020-04-28 12:58:39 +02:00
Markus Blatt bb185a23ce Mark OpenMP as prerequisite for opm-common
to automatically trigger find_package(OpenMP) in downstream
modules (e.g. Dumux)
2020-04-28 11:35:16 +02:00
Joakim Hove f7bbf92e3a Merge pull request #1752 from joakim-hove/remove-keywords
Suggestion: Remove unsupported E300 keywords
2020-04-27 19:21:15 +02:00
Bård Skaflestad a89d053cae Merge pull request #1743 from bska/grppot-eff-fac-aware
Summary Output: Make Group Potentials Aware of Efficiency Factors
2020-04-27 16:55:08 +02:00
Joakim Hove 1758439c03 Merge pull request #1753 from blattms/fix-openmp-for-newer-cmake-master
Use OpenMP::OpenMP_CXX taget when linking libopmcommon
2020-04-27 16:08:35 +02:00
Markus Blatt b6dd398c32 Find Zoltan only if MPI is available.
Otherwise we experience compilation errors if OPM is configured with
deactivated MPI and activated and found dune-alugrid (cpmpile error
that mpi.h is not found). This commit fixes this for me.
2020-04-27 16:00:49 +02:00
Markus Blatt 0ebe62a1d5 Use OpenMP::OpenMP_CXX target when linking libopmcommon
This should allow downstream to automatically use the correct
compile and linke flags for CMake > 3.9. For older versions
we fall back to the old approach.

Closes #1751
2020-04-27 12:54:18 +02:00
Bård Skaflestad 96a2350bf3 Summary Output: Make Group Potentials Aware of Efficiency Factors
As with all rate-like quantities, the *EFAC values affect the group
tree level above the level where the factor is applied
2020-04-27 10:56:48 +02:00
Joakim Hove 41803f5291 Remove unsupported E300 keywords 2020-04-27 10:33:45 +02:00
Joakim Hove 7468499855 Merge pull request #1750 from OPMUSER/master
Update to Water Vaporization Keywords to be Consistent
2020-04-27 09:40:25 +02:00
Bård Skaflestad 0eeb3243fb Merge pull request #1737 from joakim-hove/rsm-fixup
Small fixes to RSM output
2020-04-27 08:53:38 +02:00
OPMUSER 8a0e0c823c Add PVTGW, PVTGWO and RWGSALT
Will also add to Missing Features.
2020-04-27 13:45:35 +08:00
Joakim Hove fa70f4dce1 Use ESmry::loadData() to preload all summary vectors 2020-04-27 07:04:45 +02:00
Joakim Hove a92894f4d4 Small fixes to RSM output
- MAI -> MAY
- Update text header with simulation time and flow version
- Make sure the YEARS column is always the first column on page 1
2020-04-27 07:04:45 +02:00
OPMUSER 800d98c038 Update keyword_list.cmake with PERMFACT
Update keyword_list.cmake with PERMFACT
2020-04-27 12:51:55 +08:00
OPMUSER 297f90a88a Rename PERMRED to PERMFACT
As per TNO rename PERMRED to PERMFACT to match documentation.
2020-04-27 12:32:17 +08:00
Bård Skaflestad 67b2d5c185 Merge pull request #1748 from tskille/esmry_improvements
improved efficiency when opening summary files.
2020-04-26 23:03:02 +02:00
Torbjørn Skille 43f1739dfa improved efficiency when opening summary files.
> loading only arrays that is used (DIMENS, RESTART, KEYWORDS, NUMS and UNITS)
 > smspec file now only loading arrays once (twice before)
2020-04-26 18:24:01 +02:00
Bård Skaflestad a78aa78248 Merge pull request #1747 from akva2/fix_int_abs
fixed: do not use integer abs
2020-04-26 13:39:00 +02:00
Arne Morten Kvarving 751a1c28fa fixed: do not use integer abs 2020-04-26 12:32:27 +02:00
Bård Skaflestad 380f85ed7e Merge pull request #1732 from joakim-hove/welspecs-report-refactor
Welspecs report refactor
2020-04-26 00:09:26 +02:00
Joakim Hove 7a2539b1f2 Merge pull request #1742 from joakim-hove/pr-keywords
Add keyword PRVD
2020-04-25 21:39:36 +02:00
Joakim Hove c6b367e51e Merge pull request #1745 from bska/wellgraph-handle-dashed-names
Wellgraph: Quote Names to Transparently Handle Dashes
2020-04-25 21:20:14 +02:00
Bård Skaflestad 24ab7e5ff4 Wellgraph: Quote Names to Transparently Handle Dashes
This way, the dot(1) program won't generate errors like

    Badly delimited number 1_ splits into two tokens

when presented with a well name like 'INJE-1_N'.
2020-04-25 16:21:30 +02:00
Bård Skaflestad 775bce0b2f Merge pull request #1744 from atgeirr/add-wellgraph
Add 'wellgraph' utility program.
2020-04-25 14:24:50 +02:00
Atgeirr Flø Rasmussen 3d9a12efcb Add 'wellgraph' utility program. 2020-04-25 12:37:21 +02:00
Joakim Hove 7d2262e022 Merge pull request #1738 from joakim-hove/summary-YEARS
Summary years
2020-04-24 16:34:31 +02:00
Joakim Hove e0df1cd470 Add keyword PRVD 2020-04-24 14:51:46 +02:00
Joakim Hove 162fcfc73b Merge pull request #1740 from OPMUSER/master
Create HMMULTSG
2020-04-24 14:47:21 +02:00
Joakim Hove 6264bab6b0 Summary compare ESmry and ERsm - looser tolerance 2020-04-24 14:42:42 +02:00
OPMUSER 2189a7efcd Update keyword_list.cmake 2020-04-24 18:53:39 +08:00
OPMUSER 8dff4ecef1 Create HMMULTSG
Create HMMULTSG definition
2020-04-24 17:45:26 +08:00
Joakim Hove 5781350bd4 Unconditionally add YEARS to summary output 2020-04-24 10:19:53 +02:00