Commit Graph

11804 Commits

Author SHA1 Message Date
Bård Skaflestad
e4129cf826
Merge pull request #3080 from totto82/add_unit_gas_oil_ratio_rate
add unit gas oil ratio rate for output of drsdt
2022-08-11 11:29:26 +02:00
Tor Harald Sandve
189a043c6d add unit gas oil ratio rate for output of drsdt 2022-08-10 15:42:50 +02:00
Atgeirr Flø Rasmussen
7e8a91b81f Enable using WPIMULT in ACTIONX. 2022-08-04 09:19:44 +02:00
Bård Skaflestad
eb7476e0cf
Merge pull request #3089 from atgeirr/add-missing-include
Add <cstddef> include for std::size_t.
2022-08-01 00:05:10 +02:00
Atgeirr Flø Rasmussen
f96290e1df Add <cstddef> include for std::size_t. 2022-07-31 21:24:30 +02:00
Bård Skaflestad
9af8c785b2
Merge pull request #3085 from akva2/cleanup_schedule
Cleanup Schedule.hpp usage
2022-07-30 00:42:06 +02:00
Arne Morten Kvarving
e82ec7a274 clean up includes in Schedule.hpp 2022-07-29 18:37:57 +02:00
Markus Blatt
6561138236
Merge pull request #3067 from GitPaean/fixing_multiple_wpimult
fixing multiple WPIMULT records
2022-07-29 10:24:50 +02:00
Markus Blatt
26886bf4fa
Merge pull request #3087 from akva2/small_buildsys_fixes
Small buildsystem fixes
2022-07-28 09:03:48 +02:00
Bård Skaflestad
9ec5680915
Merge pull request #3086 from akva2/remove_unused
remove unused file
2022-07-28 00:58:29 +02:00
Arne Morten Kvarving
0b0f9cab33 remove faulty brace 2022-07-27 18:08:52 +02:00
Arne Morten Kvarving
90f27b58cd fixed: use proper case in find_package_handle_standard_args 2022-07-27 18:08:52 +02:00
Arne Morten Kvarving
1012e15711 remove unused file 2022-07-27 17:51:17 +02:00
Arne Morten Kvarving
ec57a4d10b changed: remove include of Schedule.hpp in header
and deal with the consequences
2022-07-27 17:13:45 +02:00
Markus Blatt
92ebef3bc9
Merge pull request #3084 from akva2/cleanup_stream_includes
clean up stream includes
2022-07-27 17:08:28 +02:00
Markus Blatt
5532176af4
Merge pull request #3083 from akva2/cleanup_deck
changed: remove include of Deck.hpp in header
2022-07-27 17:06:26 +02:00
Markus Blatt
c5b0cd6f61
Merge pull request #3082 from akva2/clean_eclipsestate
changed: remove include of EclipseState.hpp in header
2022-07-27 17:03:17 +02:00
Arne Morten Kvarving
068bff1ebc clean up stream includes 2022-07-27 16:05:01 +02:00
Arne Morten Kvarving
5e7191c79e changed: remove include of Deck.hpp in header
and deal with the consequences
2022-07-26 18:42:39 +02:00
Arne Morten Kvarving
ef6d448077 changed: remove include of EclipseState.hpp in header
and deal with the consequences
2022-07-26 16:03:52 +02:00
Arne Morten Kvarving
10dcb8945f
Merge pull request #3081 from Diullei/patch-1
Fix eclipse SOLWNUM json file
2022-07-25 08:33:08 +02:00
Diullei Gomes
cf0eb66009
Fix eclipse SOLWNUM json file property name 2022-07-24 11:11:29 +02:00
Bård Skaflestad
247547355c
Merge pull request #3074 from OPMUSER/NNC
Update NNC
2022-07-14 14:13:12 +02:00
OPMUSER
1ea89ab140 Update NNC
Remove erroneous warning messages:

  NNC: invalid value '' in record 1 for item 12
  In file: RON-P50-A01-OPM.DATA, line 3387
  NNC(FACE1): not supported use 1* - will continue

For NNC(FACE1) and NNC(FACE2) by deleting the default "" value in the JSON file.

Client model had hundreds of these messages.
2022-07-14 18:20:39 +08:00
Bård Skaflestad
5cca4b0be0
Merge pull request #3071 from OPMUSER/MINPORV
Support MINPORV
2022-07-12 14:12:34 +02:00
OPMUSER
a8a1d140d5 Update EclipseGrid and JSON Definitions
Update EclipseGrid with checks for MINPVFIL. For JSON definitions: remove MINPVFIL check in MINPV and MINPORV, and all checks from MINPVFIL.
2022-07-12 11:07:10 +08:00
OPMUSER
4fe559ba3c Remove C++ Code and Place Conditions in JSON Files
Remove the C++ code checks and instead place the logic in the keyword JSON files. This is a cleaner approach.
Note we force that only one of the keywords is allowed in the deck to avoid confusion on what cut-off is actually being applied.
2022-07-11 15:02:10 +08:00
OPMUSER
a5cfafe4de Support MINPORV
Add support for MINPORV, which is an alias for MINPV. Also added additional checks, such that only one of MINPV, MINPORV and MINPVFIL can be active in the deck
2022-07-11 14:05:34 +08:00
Markus Blatt
bad915fdf5
Merge pull request #3069 from bska/decouple-box-from-grid
Decouple Opm::Box From EclipseGrid
2022-07-06 15:15:51 +02:00
Kai Bao
96ab0e036d addressing some reviewing comments for PR#3067 2022-07-06 14:32:59 +02:00
Bård Skaflestad
a79ee15082 Decouple Opm::Box From EclipseGrid
This commit switches to constructing Box instances from a GridDims
and two call-back functions instead of taking an EclipseGrid
directly.  The two call-back functions are a predicate for active
cells and a translation from Cartesian to active cell indices
respectively.

This is intended to simplify working with nested boxes, such as
those that occur for local grid refinement.
2022-07-05 14:27:49 +02:00
Markus Blatt
7dd56d2bde
Merge pull request #3070 from bska/simplify-griddims-ijk
Streamline GridDims::getIJK()
2022-07-05 14:23:41 +02:00
Kai Bao
b87867d144 multple MPIMULT keywords within one report step is handled
and ScheduleTests is updated with tests
2022-07-05 10:52:25 +02:00
Bård Skaflestad
5377ff3442 Streamline GridDims::getIJK()
This commit switches the Cartesian -> IJK decomposition in GridDims
from K->J->I into the I->J->K order.  The latter is simpler.

While here, also consistently use 'std::size_t' instead of 'size_t'.
2022-07-04 15:06:07 +02:00
Bård Skaflestad
336f7a4159
Merge pull request #3064 from bska/refactor-numerical-aquifer-handling
Handle Active Cell/Numerical Aquifers In Constructor Body
2022-07-04 15:04:55 +02:00
Bård Skaflestad
c740b3705d Handle Active Cell/Numerical Aquifers In Constructor Body
The constructor did implicitly assume that no cell in a numerical
aquifer would be declared inactive in ACTNUM, and this restriction
still applies.  Moving numerical aquifer property and connection
processing into the constructor body enables using existing member
functions for non-neighbouring connections and removes a branch that
obscured the fact that we should have ACTNUM be as close to
finalised as possible before creating analytic aquifer connections.
2022-07-04 14:08:11 +02:00
Bård Skaflestad
c951d7ff6e
Merge pull request #3068 from goncalvesmachadoc/temp
fix Bug Temp
2022-07-04 14:06:11 +02:00
goncalvesmachadoc
99702cdf49 fixBugTemp 2022-06-30 13:44:09 +02:00
Kai Bao
ffa12e5d09 adding a test for WPIMULT to test new functionality
from this PR.
2022-06-30 13:30:36 +02:00
Kai Bao
3f025070fe fixing interpreting multiple WPIMULT records
During a report step, if there are multple records for a well has
defaulted connection and completion information, only the last record
will apply to that well.

But the following record is considered not to have defaulted connection
and completion information.

WMPIMUL
  'WEL' 0.8 0 0 0 /
/
2022-06-29 10:54:20 +02:00
Bård Skaflestad
1516b63a39
Merge pull request #3065 from blattms/ordered-map-truncate-key
Use only first 8 characters as fault name when comparing/searching.
2022-06-28 10:22:35 +02:00
Arne Morten Kvarving
fdc0ea3436
Merge pull request #3066 from akva2/janitoring
Some janitoring
2022-06-27 15:27:29 +02:00
Arne Morten Kvarving
114753c459 changed: add initializer
harmless and suppresses compiler diagnostics
2022-06-27 14:44:30 +02:00
Arne Morten Kvarving
e2c99a28e7 changed: remove unused lambda captures 2022-06-27 14:44:30 +02:00
Markus Blatt
80545120b6
Merge pull request #3063 from bska/ensure-correct-initial-actnum
Apply Generalised ACTNUM Handling to All Grid Types
2022-06-27 11:32:48 +02:00
Markus Blatt
35029e0313 Only use first 8 characters as fault names when comparing/searching.
Note this is currently done silently as the warnings will probably
need to go to the validation code in opm-simulators.
2022-06-27 11:14:41 +02:00
Markus Blatt
19c58e33c4 Document at least what OrderedMap class is all about. 2022-06-27 11:14:22 +02:00
Markus Blatt
d4cd92ee40 Support ignoring additional characters in key of OrderedMap.
At least for faults we should only look at the first 8 characters.
2022-06-27 11:14:22 +02:00
Bård Skaflestad
013b279682 Apply Generalised ACTNUM Handling to All Grid Types
Commit eca858335 introduced a more comprehensive way of forming the
initial ACTNUM array used when constructing the EclipseGrid from a
corner-point description.  This commit applies that strategy to all
known grid types.  As an additional benefit this will also cover one
special case that was not handled and would effectively discard the
work done in the generalised initial ACTNUM construction.

Add unit tests to exercise the ACTNUM handling for other grid types.
2022-06-24 14:01:17 +02:00
Markus Blatt
f18ee95574
Merge pull request #3058 from bska/copy-defaulted-pvt-tables
Treat All-Defaulted PVTW Record as Copy of Previous
2022-06-24 13:54:14 +02:00