Commit Graph

14505 Commits

Author SHA1 Message Date
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
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
139701b017 Merge pull request #3673 from bska/kw-regex-suffix
Support Regular Expression Suffix for Keyword Matching
2023-09-13 12:49:06 +02:00
Bård Skaflestad
5fc5c86815 Merge pull request #3675 from vkip/bflowijk
Adding support for the summary vectors BFLOW[I|J|K]
2023-09-13 11:54:25 +02:00
Bård Skaflestad
5fc87fa10c Support Regular Expression Suffix for Keyword Matching
This is mostly to have a general solution for matching region level
summary keywords which may reference a user-defined region set (FIP
keyword, e.g., FIPXYZ) through tags like

    RPR__XYZ -- Average pressure in region, FIPXYZ region set
    ROPR_XYZ -- Oil production rate in region, FIPXYZ region set
    RODENXYZ -- Average oil density in region, FIPXYZ region set

The initial approach introduced in commit cfbafc236 was limited to
selected keywords.

To this end, add a new data member

    std::string ParserKeyword::m_matchRegexSuffix

and introduce a new member function

    bool ParserKeyword::matchesDeckNames()

which matches a candidate keyword string against the m_deckNames,
and, if applicable, as a regular expression against m_deckNames when
appended m_matchRegexSuffix.
2023-09-13 11:11:32 +02:00
Kai Bao
0f2a02dc40 Merge pull request #3676 from akva2/add_missing_initialization
fixed: initialize data in ConditionalStorage
2023-09-13 10:59:52 +02:00
Arne Morten Kvarving
9f0ea44f9c fixed: initialize data in ConditionalStorage 2023-09-13 10:04:40 +02:00
Vegard Kippe
42434dd038 Adding support for the summary vectors BFLOWI|J|K 2023-09-13 09:15:03 +02:00
Bård Skaflestad
b1672210ba Merge pull request #3669 from steink/well_control_access
Utility functions for manipulation of well-controls
2023-09-12 13:33:53 +02:00
Bård Skaflestad
8cde088e19 Merge pull request #3665 from atgeirr/make-wconinjh-invalid-mode-a-warning
Allow invalid WCONINJH control mode
2023-09-12 13:29:03 +02:00
Atgeirr Flø Rasmussen
1e2f23ac03 Merge pull request #3672 from bska/remove-extra-semicolon
Remove Unnecessary Semicolons on Closing Braces
2023-09-11 17:54:20 +02:00
Atgeirr Flø Rasmussen
92a716fa18 Make it a warning instead of an error to specify an invalid control mode in WCONINJH.
Motivated by the need to accept deck output that contain this error,
that is generated by preprocessing tools.
2023-09-11 17:39:48 +02:00
Bård Skaflestad
1261cf2b5c Remove Unnecessary Semicolons on Closing Braces
These generate diagnostic messages from GCC at '-pedantic' levels.
2023-09-07 17:07:35 +02:00
Stein Krogstad
6ecabdbd7b Add access to injection controls 2023-09-07 13:48:09 +02:00
Stein Krogstad
703431ce61 Add functions to enable edit of prod controls 2023-09-07 13:48:09 +02:00
Bård Skaflestad
3411e1e0c6 Merge pull request #3651 from plgbrts/std-netw-gaslift
Adding item 6 (gas lift) to standard network keyword GRUPNET
2023-09-06 14:32:09 +02:00
Paul
ad076fc3c2 removed usage of Deckitem::to_bool() 2023-09-05 13:53:31 +02:00
Atgeirr Flø Rasmussen
5010643b0d Merge pull request #3654 from bska/tidy-multregt-scanner
Tidy Up MULTREGT Scanner Implementation File
2023-09-04 15:26:55 +02:00
Paul
ee8c0a28a1 changed a comment 2023-09-04 10:58:34 +02:00
Paul
bd878c2312 reverted file 2023-09-04 10:58:34 +02:00
Paul
75e6318474 rebase 2023-09-04 10:58:33 +02:00
Paul
f04bbefaee add gas-lift to standard network 2023-09-04 10:58:33 +02:00
Paul
d1eed2cd4d allow for wildcards 2023-09-04 10:58:32 +02:00
Paul
bf1b2dbef9 fixing unit test 2023-09-04 10:58:32 +02:00
Bård Skaflestad
53e2758649 Ignore Default Regions in MULTREGT
The MULTREGT keyword has an independent way of defining the default
region--the default value of item 6--and does not need the default
GRIDOPTS-base region protocol of the other *REG keywords.
2023-09-04 10:30:36 +02:00
Bård Skaflestad
f6676fcc1a Reorder MULTREGTScanner Implementation File
Mostly to group related functions and have the same order in the
declaration and the implementation files.  While here, replace an
'enum' with a strong enum since the type does not need to support
arithmetic operations.
2023-09-04 10:30:36 +02:00
Bård Skaflestad
383dbf27a9 Merge pull request #3653 from bska/identify-aqunum-cells
Add Method for Identifying Numerical Aquifer Cell IDs
2023-09-04 10:14:06 +02:00
Bård Skaflestad
b84c5f46bf Add Method for Identifying Numerical Aquifer Cell IDs
This commit adds a new, focused, member function

  NumericalAquifers::allAquiferCellIds()

which returns a vector of those Cartesian/global cells that have
been marked as defining the model's numerical aquifers through the
AQUNUM keyword.  We intend to use this to identify those NNCs that
go to numerical aquifers--or between numerical aquifer cells--as
those may need special treatment when processing the MULTREGT
keyword.
2023-09-04 08:52:08 +02:00
Kai Bao
3ab1f65485 Merge pull request #3640 from vkip/top_segment_perfdepth
Avoid top segment perforation depth outside perforated grid cell.
2023-09-01 23:55:37 +02:00
Vegard Kippe
7d7d15e331 Removing unused include 2023-09-01 16:01:20 +02:00
Vegard Kippe
1728d9d310 Addressing test failure in MulgisegmentWellTests + slight change to avoid modifying Connection.cpp 2023-09-01 15:59:28 +02:00
Vegard Kippe
57a70082bc Updated comment 2023-09-01 15:59:28 +02:00
Vegard Kippe
4f74385dc0 Avoid connection depths outside perforated cell. 2023-09-01 15:59:27 +02:00
Tor Harald Sandve
263070f9b4 Merge pull request #3657 from hakonhagland/gecon2
Implement support for GECON keyword
2023-09-01 15:06:36 +02:00
Tor Harald Sandve
1d048e43d2 Merge pull request #3648 from totto82/fix_waghystr
avoid negative C factor
2023-09-01 15:03:02 +02:00
Atgeirr Flø Rasmussen
8dab1ea48a Merge pull request #3642 from bska/parser-accept-registered-long-keywords
Recognise Extension Keywords Whose Names Exceed Size Limits
2023-09-01 12:42:14 +02:00
Bård Skaflestad
f14621aeba Recognise Extension Keywords Whose Names Exceed Size Limits
This commit adds targeted support for identifying keywords whose
names exceed the maximum compatibility keyword length limit.  This,
in turn, enables seamless recognition of extension keywords such as

  STRESSEQUILNUM

without compromising the parser's ability to identify long keyword
names that match existing keywords in the first eight characters.
For example, the input string 'GUIDERATE' will still match the
keyword 'GUIDERAT' (without the trailing 'E') and will not be
accidentally treated as a SUMMARY section request to output a group
level UDQ vector.
2023-08-30 15:27:06 +02:00
Bård Skaflestad
e179bf87dd Split Keyword Recognition Into Two Parts
The 'base' checks that the input string looks like a valid keyword
and, if so, matches the string against the builtin set of known
keywords.  The full keyword recognition process additionally
includes those keywords that match against keyword collections,
typically the SUMMARY section "meta" keywords in the *_PROBE files.

We will use the 'base' recognition separately to introduce support
for extension keywords with long--more than eight character--names.
2023-08-30 15:27:06 +02:00
Bård Skaflestad
d3a68ff861 Merge pull request #3628 from GitPaean/filtration_summary_keywords
Filtration summary keywords
2023-08-30 13:31:54 +02:00
Kai Bao
63a2c77063 optimizing filtration summary keyword output evaluation 2023-08-29 22:29:41 +02:00
Tor Harald Sandve
0fad30d7cb Fix three phase check in waghystr model. Also check for oil phase 2023-08-29 12:39:46 +02:00
Håkon Hægland
612e4c0e9c Move template implementation to header file 2023-08-29 10:36:54 +02:00
Håkon Hægland
7d1f1b103e Move template implementation to header file 2023-08-29 10:28:42 +02:00
Kai Bao
48b759178c fixing the parallel running and testing related to filtrate 2023-08-29 09:08:45 +02:00
Kai Bao
2d35b1e20c adding support for the filtrate summary keywords 2023-08-29 09:08:45 +02:00
Kai Bao
b2eb44423a adding some OPM-specific Well and Connection Summary keywords
for the development of the filtration modeling during the water
injection.
2023-08-29 09:08:45 +02:00