Commit Graph

14307 Commits

Author SHA1 Message Date
Bård Skaflestad
35a99be016 Merge pull request #3597 from bska/use-algorithm-for-keyword-list
Use Algorithm Instead of Raw Loop
2023-07-10 16:06:26 +02:00
Bård Skaflestad
f0d0a87606 Use Algorithm Instead of Raw Loop
Mostly for maintainability.
2023-07-10 14:39:16 +02:00
Bård Skaflestad
264cd13138 Merge pull request #3594 from bska/smry-emit-phase-densities
Add Summary Output of Fluid Densities at Block and Segment Levels
2023-07-10 13:58:47 +02:00
Bård Skaflestad
7f80ae8e2a Add Summary Output of Segment Level Fluid Densities
In particular, recognize the summary vectors

  - SDENx -- Phase density of phase 'x' (segment conditions)
  - SDENM -- Fluid mixture density without flowing fraction exponents
  - SMDEN -- Fluid mixture density with flowing fraction exponents
2023-07-07 16:26:58 +02:00
Bård Skaflestad
6dae660cc9 Add Summary Output for Block Level Phase Densities
In particular, recognize block level summary vectors

    BxDEN, BDENx

for the phase densities of phase 'x' (O, G, W).
2023-07-07 16:26:58 +02:00
Bård Skaflestad
3e6a5cfc2d Push Block Level Unit Conversion to Summary Output
The 'BLOCK_VARIABLES' test was doing manual unit conversion and
there's no need for that.
2023-07-07 13:56:18 +02:00
Bård Skaflestad
2f164e84b2 Merge pull request #3596 from bska/fix-rseg-item-description
Revise Description of Item 7 in RSEG
2023-07-06 12:58:23 +02:00
Bård Skaflestad
6590ea2e78 Merge pull request #3595 from blattms/warn-operations-empty-regions
Issue warning for operations on empty regions.
2023-07-06 12:58:02 +02:00
Bård Skaflestad
8fc1389de0 Revise Description of Item 7 in RSEG
This item is the depth of the node segment, not the depth change
relative to the top segment.  Rename the associate variables
accordingly.
2023-07-06 12:02:45 +02:00
Markus Blatt
267e1b07bd Issue warning for operations on empty regions.
If the user did not set MULTNUM but has e.g.
```
MULTIREG
PORV    0.8     2 /
PORV    0.8     7 /
PORV    0.8   3 /
PORV    0.8   8 /
PORV    1   4 /
PORV    1   9 /
/
```

he at least gets a warning like
```
Warning: MULTNUM region 2 has no active cells when processing operation MULTIREG on keyword PORV.
Please check whether this is on purpose or you missed defining the region properly.
In file /path/to/model/porvmultsny.inc, line 1
```

This should aid him with detecting possible errors.
2023-07-05 17:32:36 +02:00
Markus Blatt
98fe4e4d29 Merge pull request #3524 from verveerpj/fix-table-error-msgs
Fix table-related error messages
2023-07-05 15:12:59 +02:00
Bård Skaflestad
13e4394b45 Merge pull request #3593 from bska/smry-phase-densities
Add Transport Protocol for Segment Level Phase Densities
2023-07-05 12:10:29 +02:00
Bård Skaflestad
e7226d4ca8 Add Transport Protocol for Segment Level Phase Densities
This commit adds the requisite backing storage and parser support
for capturing and transporting simulator-level calculation of phase
and mixture density value for purpose of summary file output.  To
this end, make 'SegmentQuantity' into a template on a set of defined
items and make SegmentPhaseQuantity into a specialisation of this
template.  Add a new specialisation, SegmentPhaseDensity, which
holds phase densities (oil, gas, water), and fluid mixture densities
with and without flowing fraction exponents.

These will be used to transport the values needed to output segment
level summary vectors

    SDENx -- Phase density of phase 'x' (O, G, W)
    SDENM -- Fluid mixture density without flowing fraction exponents
    SMDEN -- Fluid mixture density with flowing fraction exponents
2023-07-05 11:31:10 +02:00
Bård Skaflestad
784faa2b05 Merge pull request #3592 from bska/adjust-smry-whitespace
Group Block Level Summary Vectors by Phase
2023-07-05 11:23:49 +02:00
Bård Skaflestad
5f3e6f9084 Group Block Level Summary Vectors by Phase
Mostly to aid future maintenance.  While here, also re-indent the
other unit tables and add a type alias (UnitTable) to avoid spelling
out the 'unordered_map<>' type repeatedly.
2023-07-05 10:57:53 +02:00
Markus Blatt
c2cc368f42 Merge pull request #3591 from bska/more-segment-smry-vecs
Add More Segment Level Summary Vectors
2023-07-05 10:24:19 +02:00
Bård Skaflestad
5b6f064804 Add More Segment Level Summary Vectors
In particular, add support for

   SxFT  - Cumulative flow of phase 'x'
   SxFV  - Free flow velocity of phase 'x'
   SxHF  - Free flow holdup fraction of phase 'x'
   SxVIS - Phase viscosity of phase 'x'

The last three of these were added to the RFT file in 802a401a8,
but are also useful in the summary output file.  In the interest of
avoiding duplicate logic, refactor the existing segment-related
quantity calculation/extraction in terms of callbacks.
2023-06-30 16:42:53 +02:00
Bård Skaflestad
4fb2a3557b Merge pull request #3313 from GitPaean/support_cake_filteration
A simple cake model to simulate formation damage due to suspended solids in injection water
2023-06-30 15:51:41 +02:00
Kai Bao
508c123eed addressing the reviewing comments for PR #3313 2023-06-30 11:35:25 +02:00
Kai Bao
39608fa1ed re-organizing the filter cake related
to address the reviewing comments and improve the code.
2023-06-29 11:42:26 +02:00
Tor Harald Sandve
d07d8675ae Merge pull request #3574 from totto82/fixSalinity
BUGFIX: Use salinity values when salt concentration (BRINE) is not considered
2023-06-29 09:00:28 +02:00
Bård Skaflestad
b76b22b697 Merge pull request #3583 from blattms/file-trailing-ws-error
trim trailing and leading whitespace of paths in INCLUDE
2023-06-28 21:36:33 +02:00
Bård Skaflestad
17f740dab1 Merge pull request #3588 from atgeirr/silence-vsprintf-warning
Fix warning from external code.
2023-06-28 21:34:40 +02:00
Bård Skaflestad
7e31d9605f Merge pull request #3589 from blattms/file-line-unknown-keyword
Provide file and line for errors because of unknown keywords.
2023-06-28 21:26:08 +02:00
Markus Blatt
b5f7d9e3f8 Provide file and line for errors because of unknown keywords.
```
Error: Unknown keyword: KEY6

Error: Unrecoverable errors while loading input: Problem with keyword
In <memory string> line 0
Unknown keyword: KEY6
```
does not tell the user where his/her error is.

This is now changed to
```
Error: Unknown keyword: KEY6

Error: Unrecoverable errors while loading input: Problem with keyword NE6
In /path/to/include/grid/file.inc line 7
Unknown keyword: KEY6
```
which gives the user a greater chance of finding out what is wrong.
2023-06-28 18:59:25 +02:00
Markus Blatt
2fa51c6edb Also cater for trailing/leading ws for GDFILE/IMPORT keywords.
By trimming the strings.
2023-06-28 16:48:55 +02:00
Tor Harald Sandve
adfe24dbcd Merge pull request #3482 from totto82/bc_schedule
BC in Schedule
2023-06-28 16:27:09 +02:00
Atgeirr Flø Rasmussen
0b930bc45c Fix warning from external code. 2023-06-28 16:10:13 +02:00
Bård Skaflestad
c9b1f01c23 Merge pull request #3586 from bska/fix-msim-report-step
Fix MSIM UDQ Configuration Lookup
2023-06-28 15:24:52 +02:00
Bård Skaflestad
928f37735c Merge pull request #3582 from vkip/num_pressure_points_equil_default
Changing default value for number of pressure points used in equilibration
2023-06-28 14:53:57 +02:00
Tor Harald Sandve
bf9ca70ff6 Cleanup based on review 2023-06-28 14:07:33 +02:00
Tor Harald Sandve
4b36741f33 Rename BC to BCPROP and add error message for BC 2023-06-28 14:07:33 +02:00
Tor Harald Sandve
c7a7e80698 splitt BC into BCCON in grid section and BC in Schedule 2023-06-28 14:07:33 +02:00
Tor Harald Sandve
ff58ca550f Support BC in Schedule section 2023-06-28 14:07:33 +02:00
Vegard Kippe
0cb4d90494 Changing default value for number of pressure points used in equilibration to be consistent with current implementation. 2023-06-28 14:01:14 +02:00
Bård Skaflestad
ec87ad1f61 Fix MSIM UDQ Configuration Lookup
The MSIM 'report_step' is a one-based index so we must subtract
one before looking up the pertinent Schedule information.
2023-06-28 13:42:16 +02:00
Bård Skaflestad
d6ed5f754c Merge pull request #3581 from vkip/constexpr_parseritem_defaults
Let int and float parser items have constexpr default values
2023-06-28 13:35:59 +02:00
Vegard Kippe
68173b49a4 Let int and float parser items have constexpr default values 2023-06-27 20:13:04 +02:00
Kai Bao
aafafba4b1 draft version of handling keyword WINJCLN 2023-06-27 15:50:54 +02:00
Kai Bao
781f7f2a96 revising FilterCake class for downstream use 2023-06-27 15:50:54 +02:00
Kai Bao
a335542424 adding accessing function for FilterCake for Connection 2023-06-27 15:50:54 +02:00
Kai Bao
e2a70bfabd fixing the Well and Connection comparison operator
taking into consideration of the parameters related to filter cake
2023-06-27 15:50:54 +02:00
Kai Bao
3bc451ad94 parsing WINJFCNC 2023-06-27 15:50:54 +02:00
Kai Bao
5e1b398550 parsing the keywor WINJDAM 2023-06-27 15:50:54 +02:00
Kai Bao
e94c1aa386 WIP in supporting the keyword WINJDAM 2023-06-27 15:50:54 +02:00
Kai Bao
5710164a7b adding keywords WINJDAM WINJCLN WINJFCNC to keyword_list 2023-06-27 15:50:53 +02:00
Kai Bao
7fc41b99aa adding the definition of keyword WINJCLN 2023-06-27 15:50:53 +02:00
Kai Bao
951e747f32 adding keyword definition for keyword WINJFCNC 2023-06-27 15:50:53 +02:00
Kai Bao
4096468ab3 adding keyword definition WINJDAM 2023-06-27 15:50:53 +02:00
Markus Blatt
4129543457 Trim trailing and leading whitespace from path in INCLUDE directive.
Just like the other simulator. This prevents hard to find input errors
of useers.
2023-06-27 15:34:27 +02:00