Commit Graph

14756 Commits

Author SHA1 Message Date
Bård Skaflestad
006b65e054 Prevent Duplicate Inlet Segments
If one WELSEGS keyword does not redefine every existing segment,
then we risk adding the same inlet segment multiple times.  If that
happens, we get a segment structure for which there might appear to
be multiple inlet segments on the same branch which is not possible
in a tree structure.  This commit prevents that situation by only
adding the new segment number if it is not already listed in
'm_inlet_segments'.
2023-10-02 13:20:56 +02:00
Svenn Tveit
4769fa7bd6 Fix errors when Scalar = float 2023-09-29 08:27:52 +02:00
Svenn Tveit
6d300b8d13 Ensure that default reference state is used.
Throw error if STCOND is not default or classes are instantiated with (T, P) other than reference values.
2023-09-29 08:27:51 +02:00
Svenn Tveit
34024bfabe Update unit tests with new reference state.
New reference state (T, P)=(288.71 K, 101325.0 Pa) =(15.56 C, 1 atm).
2023-09-29 08:25:24 +02:00
Svenn Tveit
e690d06b54 Update enthalpy to same reference state.
New reference state (T, P) = (288.71 K, 101325.0 Pa) = (15.56 C, 1 atm).
2023-09-29 08:25:24 +02:00
Atgeirr Flø Rasmussen
8ff141a592
Merge pull request #3692 from hnil/more_timing
More timing
2023-09-28 15:40:33 +02:00
Markus Blatt
f66b713d0c
Merge pull request #3693 from akva2/buildsystem_cleanups
Some buildsystem cleanup
2023-09-28 12:23:46 +02:00
Bård Skaflestad
da793e23fc
Merge pull request #3689 from bska/reg-cache-global-ix
Match Connection-to-Region in Terms of Global Cell Indices
2023-09-28 11:48:56 +02:00
hnil
b6a0821992 added timing on co2store evaluation and new timing macros 2023-09-28 10:42:20 +02:00
Bård Skaflestad
ae2f052b37 Match Connection-to-Region in Terms of Global Cell Indices
The simulator reports data::Connection objects tied to global
Cartesian cell indices whence using the 'active_index' leads to
match failures and incorrect rate attribution at the region level.
In one field case we got region level rates and cumulatives, e.g.,
ROPR and ROPT, of zero reported to the summary file when the
expected values should be non-zero.
2023-09-28 10:36:43 +02:00
Markus Blatt
e3fd90f965
Merge pull request #3680 from bska/support-truncated-region-names-revised
Match Region Sets by Unique Prefix
2023-09-28 10:16:08 +02:00
Bård Skaflestad
9342040dbe Match Region Sets by Unique Prefix
This commit switches the region set tag matching algorithm to using
unique prefixes.  This enables the parser to recognise that the
summary vector

    ROPR_UNI

should match up with the user defined region set 'FIPUNIT'.  In the
current master sources, the above summary vector would produce a
diagnostic message saying that the region set 'FIPUNI' (without the
final 'T') does not exist.

We add a prefix-to-canonical region set name translation table to
the FieldProps class and funnel all FIP-like requests through this
translation table.  In the case of non-unique prefixes-e.g., FIPUNIT
and FIPUNIX, we currently elect to have the last keyword entered in
the simulation model "win".  This behaviour may be altered in the
future if deemed appropriate/necessary.
2023-09-26 15:31:20 +02:00
Arne Morten Kvarving
9d8826c2e5 fixed typo in status message 2023-09-26 14:53:45 +02:00
Arne Morten Kvarving
4041f9cc69 remove prereqs file for opm-vertex
this module is defunct and has been defunct for
10 years by now.
2023-09-26 14:53:45 +02:00
Arne Morten Kvarving
ca864e4be9 changed: remove generation of .pc files
this has been broken for a long time, yielding files
containing cmake target names in the linker lines.
2023-09-26 14:53:45 +02:00
Bård Skaflestad
b8816b474b
Merge pull request #3690 from vkip/msw_no_conn
Allow multi-segment wells with no grid connections
2023-09-26 13:53:08 +02:00
Vegard Kippe
30a92cca1e Updated after review input 2023-09-26 13:30:43 +02:00
Vegard Kippe
776597e00b Allow multi-segment wells with no grid connections - warning is already issued. 2023-09-26 13:30:43 +02:00
Bård Skaflestad
53301b78d4
Merge pull request #3687 from bska/more-summary-vectors
Support More Summary Vectors
2023-09-25 12:44:32 +02:00
Bård Skaflestad
ad9ebd730d Support More Summary Vectors
In particular, add support for outputting the following vectors

  - WOGR  -- Well level oil/gas ratio
  - WWGRH -- Well level water/gas ratio (observed rates)
  - FPRH  -- Field level average pressure (hydrocarbon volume)
  - FHPV  -- Field level total hydrocarbon pore-volume
2023-09-22 10:44:44 +02:00
Bård Skaflestad
44cd3eafe2
Merge pull request #3679 from bska/rsmry-udef-regset
Support Region Set Tags For All Region Level Summary Vectors
2023-09-22 10:39:51 +02:00
Bård Skaflestad
fb37bf5db5
Merge pull request #3682 from bska/region-avgpress-hcvol
Emit Region Level Average Pressure Weighted by HC Volume
2023-09-22 10:39:00 +02:00
Bård Skaflestad
e366a940bf
Merge pull request #3688 from bska/wpix-smry-vectors
Add Support for WPIx Summary Vectors
2023-09-22 10:38:24 +02:00
Vegard Kippe
1594680f35 Take default UDQ value from UDQPARAM 2023-09-21 21:13:47 +02:00
Bård Skaflestad
ecbfd4e9c4 Support Region Set Tags For All Region Level Summary Vectors
This commit switches the existing, somewhat spotty, support for
matching region set tags on region level summary vector keywords.
We leverage the recent support for 'deck_name_regex_suffix' keys in
the JSON keyword model to extend the keyword matching algorithm to
also account for these region set tags.

There is a potential for false positives here, but we'll use this
as an initial proof-of-concept implementation.
2023-09-21 18:26:36 +02:00
Markus Blatt
4f52acdc0f
Merge pull request #3685 from bska/multregt-multiple-regsets
Accumulate Total Multiplier From All Region Sets
2023-09-21 17:37:26 +02:00
Vegard Kippe
cadbcda982 Fixed 1-based indexing in segment summary vector lookup 2023-09-21 13:22:52 +02:00
Vegard Kippe
33a27e4e88 Facilitate UDA for WSEGVALV item 4 2023-09-21 13:20:52 +02:00
Bård Skaflestad
ca7fbea637 Accumulate Total Multiplier From All Region Sets
If multiple records, from different region sets and region
IDs--e.g., both regions 1/2 in 'M' (MULTNUM) and regions 2/3 in 'F'
(FLUXNUM) applies to the same connection as might be the case in

    MULTREGT
      1 2  0.5  1*  'NNC'  'F' /
      2 3  0.1  1*  'NNC'  'M' /
    /

then the total multiplier value is the product of the values from
each record.

This commit revises the region set loop to accumulate the total
multiplier value instead of "just" returning the first match.
2023-09-21 13:04:09 +02:00
Bård Skaflestad
7dd3c344cd Emit Region Level Average Pressure Weighted by HC Volume
The simulator already calculates the requisite values, but due to
the requisite summary keyword RPRH not being listed among the known
region level vectors the output layer did not write the values to
the summary file.  This commit adds the requisite table entry.
2023-09-21 11:53:13 +02:00
Bård Skaflestad
d225901733 Add Support for WPIx Summary Vectors
We calculate these, for now, as

   WPIx = WOPR / (WBPx - WBHP)

but it is possible that we may have to revise this definition,
especially for injectors.
2023-09-21 11:52:47 +02:00
Tor Harald Sandve
8ea35f2d0d
Merge pull request #3683 from svenn-t/h2store_updates
H2STORE updates
2023-09-21 09:19:57 +02:00
Bård Skaflestad
e5bd4129a1
Merge pull request #3686 from vkip/aquifer_celldepths_bugfix
Fixing segfault due to use of uninitialized grid properties
2023-09-19 14:46:01 +02:00
Svenn Tveit
cf4a905660 Fixed compilation warnings 2023-09-18 14:47:35 +02:00
Bård Skaflestad
ef88eb3737
Merge pull request #3681 from svenn-t/cskin
Implementation of CSKIN
2023-09-18 14:11:38 +02:00
Vegard Kippe
6755ff8328 Fixing segfault due to use of uninitialized grid properties 2023-09-18 11:43:33 +02:00
Svenn Tveit
44f6a915fc Check for negative CF before calclating it 2023-09-15 19:06:01 +02:00
Svenn Tveit
a89bac6fdb Test CSKIN with WPIMULT, WELPI and COMPDAT 2023-09-15 18:51:35 +02:00
Svenn Tveit
0f40d2c42c wpimult must be multiplied and not overwritten.
Mulitple WPIMULT and WELPI entries are cumulative on same connections.
2023-09-15 18:49:55 +02:00
Bård Skaflestad
6e0e302796
Merge pull request #3677 from vkip/numaqcell_depth
Ensure numerical aquifer cells get the correct depth
2023-09-15 13:04:33 +02:00
Markus Blatt
bbb46325f0
Merge pull request #3678 from bska/normalise-region-keywords-for-lookup
Normalise Region Level Summary Keywords for Lookup Purposes
2023-09-15 10:35:37 +02:00
Markus Blatt
644c0115a1
Merge pull request #3655 from bska/multregt-item-5
Implement NOAQUNNC Region Multiplier Behaviour in MULTREGT
2023-09-15 10:23:20 +02:00
Bård Skaflestad
07ddc15068 Calculate Multiplier Values for Non-Neighbouring Connections
This is intended as a possibly temporary measure for processing
explicitly assigned NNCs (keywords NNC/EDITNNC/EDITNNCR) along with
those NNCs arising from numerical aquifers, and for which there is
no associate face direction.

Add a set of unit tests to probe the implementation of all MULTREGT
connection behaviours as exhibited by MULTREGTScanner member
functions getRegionMultiplier() and getRegionMultiplierNNC().
2023-09-14 15:29:58 +02:00
Svenn Tveit
ea4aebda5d Test H2-brine PVTs 2023-09-14 12:31:59 +02:00
Svenn Tveit
a11becab76 H2STORE updates.
- Enables use with THERMAL. Note that enthalpy of H2 dissolution process is not included due to lack of published data on this (as far as I have seen).
- Enables use with DIFFCGAS and DIFFCWAT.
- Enables use with dynamic brine module.
- New H2 table made with Coolprop which includes enthalpy data.
2023-09-14 12:31:59 +02:00
Svenn Tveit
338ee8dd4a H2STORE is a OPM only keyword 2023-09-14 12:31:59 +02:00
Svenn Tveit
30cd8b8141 Test CSKIN input 2023-09-14 09:48:55 +02:00
Svenn Tveit
d410d8c232 Recalculate pressure equivalent radius when Kh=0.
Kh is calculated from grid block info and r0 must be consistent with that.
2023-09-14 08:51:01 +02:00
Svenn Tveit
f933b0e113 Implementation of CSKIN keyword.
To work with WPIMULT, the PI scaling factor had to be stored and applied to calculated CF.
2023-09-14 08:51:01 +02:00
Bård Skaflestad
9a3e8dba23 Normalise Region Level Summary Keywords for Lookup Purposes
Region level summary keywords may have suffixes which refer to user
defined region sets ('FIP*' keyword).  This commit prunes those
suffixes when performing function lookup, so that we do not get
false negatives.

To this end, introduce a new helper function

  EclIO::SummaryNode::normalise_region_keyword()

and use this both when determining the summary keyword type (rate,
cumulative, pressure &c) and when looking up evaluation functions
for region level summary vectors.  The new helper could arguably
have been integrated into the existing 'normalise_keyword()' helper
function, but that would have necessitated a different change
elsewhere in the code base.  For now, we keep this helper as a
separate function.
2023-09-13 18:00:01 +02:00