Commit Graph

1606 Commits

Author SHA1 Message Date
Bård Skaflestad
a31f1cefd5
Merge pull request #4705 from totto82/guardAgainstinvalidRegions
Add guard against invalid satnum, pvtnum, imbnum, eqlnum
2023-06-26 14:29:01 +02:00
Tor Harald Sandve
40bd07a3b5 Add guard against invalid satnum, pvtnum, imbnum, eqlnum 2023-06-26 13:11:19 +02:00
Tor Harald Sandve
bf5413d853 Use sqrt of numerical_limit epsilon instead of zero to check for non zero saturations
The reason is to make it more robust in terms of numerical noise.
2023-06-26 13:04:49 +02:00
Arne Morten Kvarving
90821b5a45 add some timing blocks 2023-06-19 11:55:34 +02:00
Bård Skaflestad
59e0d9904e
Merge pull request #4707 from svenn-t/ppcwmax
Equilibration with PPCWMAX
2023-06-16 15:15:33 +02:00
Svenn Tveit
264ac8e0c0 std::tuple to pair and revert unnecessary changes.
Minor changes according to review comments as well.
2023-06-15 15:03:03 +02:00
Bård Skaflestad
ea07e8429f Chase Upstream API Update
The eval_assign() and eval() member functions of UDQConfig now take
a 'const Schedule&' parameter.
2023-06-14 09:54:21 +02:00
Svenn Tveit
745d8b5a97 Accommodate for PPCWMAX in SWATINIT equilibration 2023-06-14 08:35:14 +02:00
Atgeirr Flø Rasmussen
005bd49fb4 Do not set pressure diff to zero when not necessary.
With zero threshold pressure and zero pressure difference, the existing code will
set the pressure diff explicitly to zero. This will also set any derivatives to
zero as well, which may disconnect the corresponding matrix rows.
2023-06-11 13:48:45 +02:00
Bård Skaflestad
9d75915e4b Prepare for Revised Implementation of WBPn
This initial commit changes the API of the CollectDataToIORank
class' handling of WBPn values from collecting a set cell pressures
into communicating pre-computed WBPn values through the new
WellBlockAveragePressures container class.  This is in preparation
of moving the WBPn calculation to the simulator side for greater
parallelism.  For now we do not compute any of the actual WBPn
values.  That will be the subject of follow-up commits.

While here, also split a number of very long lines for readability.
2023-06-09 13:25:43 +02:00
Tor Harald Sandve
bbd65d8968
Merge pull request #4688 from plgbrts/equil-fix
Fix water evaporation initialization for two-phase gas-water system
2023-06-07 09:46:28 +02:00
Paul
2a668ec938 fix water evaporation initialization fo two-phase gas-water system 2023-06-06 10:39:26 +02:00
Tor Harald Sandve
b99fbe0a97
Merge pull request #4620 from hakonhagland/wvfpdp
Add support for WVFPDP
2023-06-05 09:14:10 +02:00
Bård Skaflestad
d1fd5539af
Merge pull request #4675 from totto82/fixInitRv
Fix rvw and rv initialization
2023-06-02 16:11:58 +02:00
Tor Harald Sandve
4dcc655f4d Fix rvw and rv initialization 2023-06-02 15:27:03 +02:00
Håkon Hægland
6d4959854e Undo last commit 2023-06-02 09:25:34 +02:00
Håkon Hægland
0a48f683ab Rearrange order of header includes 2023-06-02 09:25:34 +02:00
Håkon Hægland
69a0d1e20e Add support for WVFPDP 2023-06-02 09:25:34 +02:00
Arne Morten Kvarving
9fa5f9d36d added: set vappars in fluidsystem/pvt at start of report step
to properly handle vappars updates in SCHEDULE
2023-06-01 11:05:21 +02:00
Tor Harald Sandve
c70dea53a8
Merge pull request #4647 from totto82/initRVW
initialize trivial rvw if no table is given
2023-05-31 15:13:08 +02:00
Arne Morten Kvarving
3ca1102d6f remove unused lambda capture 2023-05-31 09:35:16 +02:00
Arne Morten Kvarving
0f010daaf8 remove unused variables 2023-05-31 09:35:16 +02:00
Arne Morten Kvarving
d81d528207 anonymize unused parameters 2023-05-31 09:35:16 +02:00
Atgeirr Flø Rasmussen
8fac5efea0
Merge pull request #4662 from atgeirr/update-iq-1
Update timeIdx 1 intensive quantities if necessary.
2023-05-30 09:22:46 +02:00
Tor Harald Sandve
45d0679a19 remove duplicated code 2023-05-26 11:30:50 +02:00
Atgeirr Flø Rasmussen
ce0c75b8b6 Update timeIdx 1 intensive quantities if necessary. 2023-05-22 17:40:27 +02:00
Bård Skaflestad
9c13992e15
Merge pull request #4642 from totto82/outputTrappedHyst
take into account trapped saturation from hysteresis
2023-05-19 10:33:37 +02:00
Tor Harald Sandve
cd403e1ea0 initialize trivial rvw if no table is given 2023-05-11 12:50:24 +02:00
Tor Harald Sandve
c62e6ab5cd output temperature if TEMP is set in RPTRST or THERMAL is set in RUNSPEC 2023-05-11 11:56:02 +02:00
Tor Harald Sandve
3dad2c909b take into account trapped saturation from hysteresis 2023-05-10 14:05:00 +02:00
Atgeirr Flø Rasmussen
7311618f13 Improve formatting. 2023-04-25 14:43:20 +02:00
Atgeirr Flø Rasmussen
9ca6034388 Remove EclStrictParsing, replace with ParsingStrictness.
The new parameter takes the "high", "normal" (default), or "low" string.
Also implemented behaviour.
2023-04-25 12:03:13 +02:00
Markus Blatt
20e2058333
Merge pull request #4578 from blattms/support-editnncr
Support EDITNNCR keyword
2023-04-19 11:34:04 +02:00
Markus Blatt
20af10e2c6 Apply EDITNNCR information to tranmissibilities. 2023-04-12 14:24:47 +02:00
Markus Blatt
c693f0f50c Refactor applyEditNncToGridTrans for better reuse with EDINNCR. 2023-04-12 14:24:47 +02:00
Arne Morten Kvarving
f2983ac6af minimum dune version required is now 2.7 2023-04-12 09:41:23 +02:00
Bård Skaflestad
c52ab4ccd5
Merge pull request #4347 from atgeirr/afr_well_assemble_separate
Implement functionality to add well source terms to the residual separately
2023-03-31 11:10:01 +02:00
Bård Skaflestad
500a20aaf7
Merge pull request #4570 from hnil/protected_update
-- changed function to protected
2023-03-30 13:44:17 +02:00
Bård Skaflestad
f222fa1d8f Split 3D Vectors into Base and Extended Categories
The 'base' arrays are compatible in both name and interpretation to
those emitted in the 'SOLUTION' section from other simulators
whereas the 'extended' arrays are specific to Flow.  Tag extended
arrays as OPM_EXTENDED instead of AUXILIARY as the latter is
deprecated and will be removed at some point in the future.
2023-03-30 10:39:30 +02:00
Bård Skaflestad
0db9693e9f Retag XMFCO2 and YMFWAT Arrays as OPM_EXTENDED
While here, also switch to using std::transform() instead of a raw
loop.
2023-03-30 10:39:30 +02:00
Bård Skaflestad
359079dae9 Retag TEMP Array as OPM_EXTENDED When Needed
The AUXILIARY category is deprecated and will be removed at some
point.  As of right now, the OPM_EXTENDED category fills the same
role but with a more descriptive name.
2023-03-30 10:39:30 +02:00
Bård Skaflestad
54fc98bfb7 Add Support for Per-Phase RPTRST Density Keys
In particular the DENx (x = G, O, W) keys request that the G,O,W
phase densities per cell be output at a restart step.  These are
the per-phase counterparts to the existing 'DEN' key.
2023-03-30 10:39:30 +02:00
Bård Skaflestad
dc3454f56e
Merge pull request #4562 from totto82/thermalbc
add THERMAL boundary conditions which keeps constant temperature on the boundary
2023-03-30 10:29:48 +02:00
hnil
aeb11beda0 -- changed function to protected 2023-03-29 14:05:20 +02:00
Markus Blatt
ad160d3799
Merge pull request #4569 from hnil/correct_spelling
-- corrected spelling
2023-03-29 14:00:26 +02:00
hnil
389d011385 -- corrected spelling 2023-03-29 12:24:17 +02:00
Tor Harald Sandve
75bfe52611 add THERMAL boundary conditions which keeps constant temperature on the boundary 2023-03-28 12:06:13 +02:00
Tor Harald Sandve
0cfb40d660 compute rock fraction 2023-03-28 08:38:14 +02:00
Bård Skaflestad
599742feab Remove Unused Variables
While here, also include requisite headers.
2023-03-27 10:46:05 +02:00
Bård Skaflestad
8858d725a8
Merge pull request #4551 from totto82/outputGIPL
output gas in water to F(R)GIPL for gas-water systems
2023-03-27 09:58:45 +02:00