Commit Graph

11370 Commits

Author SHA1 Message Date
Joakim Hove
303ac7fef4
Merge pull request #2566 from joakim-hove/support-viscref
Remove VISCREF from MissingFeatures
2020-04-27 12:47:06 +02:00
Joakim Hove
750070fbd7 Remove VISCREF from MissingFeatures 2020-04-27 10:30:50 +02:00
Tor Harald Sandve
33afb332fa use nupcol to avoid oscilation between group controls 2020-04-27 10:29:00 +02:00
OPMUSER
c62318387d Update Missing Features with HMMULTSG
HMMULTSG
2020-04-25 18:19:31 +02:00
OPMUSER
04295871f4 Update MissingFeatures.cpp
Missing features fixed typo SCPDIMS to SCDPDIMS, and added RWGSALT.
2020-04-25 18:19:31 +02:00
Bård Skaflestad
19461e6b83
Merge pull request #2563 from atgeirr/add-json-param-printout
Add logging of linear solver parameter tree.
2020-04-25 14:13:11 +02:00
Tor Harald Sandve
a046977946 Fix GCONSALE
1) Only check GCONSALE limits at the end of a timestep. NB. The simulator still throws if some of the limits are violated
2) BUGFIX: don't remove gas consumption twice
2020-04-24 16:10:07 +02:00
Atgeirr Flø Rasmussen
a720bf9942 Add logging of linear solver parameter tree. 2020-04-24 14:52:04 +02:00
Joakim Hove
0773d07df5
Missing features (#2562)
Updates to the list of missing features
2020-04-24 13:08:55 +02:00
Atgeirr Flø Rasmussen
c4e020c179
Merge pull request #2556 from totto82/test_atg
Fix how the group reduction works
2020-04-24 11:13:22 +02:00
Tor Harald Sandve
e9476e116e make sure the current_rate is added at the right level 2020-04-23 20:54:59 +02:00
Atgeirr Flø Rasmussen
196d6c95ec
Merge pull request #2530 from bska/equil-subdiv-fipcalc
Equilibration: Add Experimental Support for Horizontal Subdivision
2020-04-23 16:50:41 +02:00
Tor Harald Sandve
3b479af9c4 Fix the fix on how the group reduction works 2020-04-23 09:45:16 +02:00
Atgeirr Flø Rasmussen
0df3a96fa6 Fix how group rate reductions work. 2020-04-23 09:39:03 +02:00
Bård Skaflestad
b288602dfc Equilibration: Add Experimental Support for Horizontal Subdivision
This commit adds a very early, alpha-quality implementation of the
"horizontal subdivision" strategy (N < 0) of the EQUIL directive.
This in turn enables more accurate derivations of the initial fluids
in place.

Interactions with SWATINIT are completely untested, and the initial
Rs/Rv derivations in this context are possibly incomplete.  More
work is likely needed in this area, but this does at least enable
more widespread testing.
2020-04-22 20:10:19 +02:00
Bård Skaflestad
4b04a36a2f Initial State Calculator: Prune Unneeded Steps and Variables
In particular, remove unneeded function parameters and don't form a
per-cell PVT zero-based index when we're not going to use the
values.
2020-04-22 20:10:19 +02:00
Bård Skaflestad
f0ed53a6f1 Vertical Extent: Prune Unneeded 'cellcount' Parameter
The purpose of this function is to determine the vertical extent of
a set of cells.  Counting the number of cells in the region is not
its responsibility.
2020-04-22 20:10:19 +02:00
Bård Skaflestad
6292855bd5 Initial State Calculator: Refactor Cell Loop
This commit splits out the per-cell initial state derivation to two
separate helper functions, equilibrateCellCentres() and cellLoop().
The latter manages the per-cell assignments to pertinent data
members and calls an arbitrary "equilbration method" that is
provided as a callback and which calculates per-cell phase
pressures, phase saturations and mixing ratios (Rs/Rv).

In turn, the equilibrateCellCentres() uses the cellLoop() to affect
the existing equilibration procedure within a cell using values at
the depths of the cell centres only.
2020-04-22 20:10:19 +02:00
Joakim Hove
2696160f56
Merge pull request #2520 from akva2/extra_tests
add norne and norne_parallel as ExtraTests
2020-04-22 13:35:25 +02:00
Joakim Hove
0d78d7e80e
Merge pull request #2554 from joakim-hove/update-missing
Update missing
2020-04-22 13:34:55 +02:00
Joakim Hove
192d5f7cc1 Add build/ to .gitignore 2020-04-22 13:22:54 +02:00
Alf Birger Rustad
9f74869fbb Enable update data for the tests. 2020-04-22 11:40:12 +02:00
Alf Birger Rustad
70cc7767bb Added the remaining group tests that are correct. 2020-04-22 11:26:23 +02:00
Markus Blatt
e61e2bd399
Merge pull request #2551 from akva2/fix_test_dir
fixed: use PROJECT_BINARY_DIR, not CMAKE_BINARY_DIR
2020-04-21 11:16:00 +02:00
OPMUSER
9d32980821 Added the Water Vaporization keywords to Missing-Features
Added the following Water Vaporization keywords to Missing-Features: PRESALT, PVTGW, PVTGWO, SALTPVD, SALTSOL, and VAPWAT
2020-04-21 16:39:51 +08:00
OPMUSER
4906a3e69e Added ADSORP and CPR to Missing-Features
Added ADSORP and CPR  to Missing-Features
2020-04-21 16:30:54 +08:00
Arne Morten Kvarving
16a1ddfe5e fixed: use PROJECT_BINARY_DIR, not CMAKE_BINARY_DIR
tests fail to execute in super-build otherwise
2020-04-21 08:50:51 +02:00
OPMUSER
048d21fdab Update MissingFeatures.cpp
Changed DIFFMTHT- to DIFFMTH-
2020-04-21 14:29:03 +08:00
OPMUSER
a8dba1a726 Update Missing-Features keywords
Added GECONT, changed RIVRDIM to RIVRDIMS, added RPTSOL, RSSPEC, changed SCPDIMS to SCDPDIMS,
2020-04-21 14:05:46 +08:00
Bård Skaflestad
7180f0a885
Merge pull request #2549 from goncalvesmachadoc/patch-2
Remove BDENSITY
2020-04-20 19:30:35 +02:00
Cintia Goncalves Machado
2ac17103f8
Remove BDENSITY 2020-04-20 17:44:40 +02:00
Bård Skaflestad
c72efc3f56
Merge pull request #2548 from alfbr/fix-test
Reduced maximum time step on four MSW tests.
2020-04-20 16:47:42 +02:00
Alf Birger Rustad
f8507e8293 Reduced maximum time step on four MSW tests. 2020-04-20 14:06:25 +02:00
Joakim Hove
36647c7978
Merge pull request #2546 from joakim-hove/rename-embedded-python-switch
Rename config variable for Python
2020-04-20 11:16:09 +02:00
Bård Skaflestad
9625d0b48c
Merge pull request #2531 from GitPaean/msw_keywords
adding the summary output for several pressure drop values for MSW
2020-04-17 20:54:49 +02:00
Bård Skaflestad
7550e3a04d
Merge pull request #2547 from alfbr/group-tests
Added 9_1A through 9_2A tests.
2020-04-17 18:23:56 +02:00
Atgeirr Flø Rasmussen
92d404de96
Merge pull request #2541 from joakim-hove/group-controls-update
Check availability for group control separately for inj/prod
2020-04-17 16:40:31 +02:00
Kai Bao
954e5e769a addressing comments from OPM/opm-common#1695 2020-04-17 14:34:48 +02:00
Joakim Hove
3189ee3a8a Rename config variable for Python 2020-04-17 14:09:56 +02:00
Alf Birger Rustad
b69076a021 Added 9_1A through 9_2A tests. 2020-04-17 13:58:54 +02:00
Joakim Hove
6260bb7851 Update api for checking availability for group control 2020-04-17 13:03:56 +02:00
Joakim Hove
745be42682
Merge pull request #2536 from joakim-hove/add-pyaction-test
Add PYACTION / UDQ testcase
2020-04-17 11:40:27 +02:00
Joakim Hove
e04e77fa30 Add PYACTION / UDQ testcase 2020-04-17 11:39:43 +02:00
Joakim Hove
bd27513548
Merge pull request #2544 from joakim-hove/missing-keywords
Add keywords to the list of missing features
2020-04-17 11:37:25 +02:00
Joakim Hove
11d65f41d2 Add keywords to the list of missing features 2020-04-17 08:56:10 +02:00
Kai Bao
251c09a288 adding the several pressure drop values to WellState for MSW
segpress_ and segrates_ are renamed to help the name style.
2020-04-17 00:38:38 +02:00
Joakim Hove
c39c6b05eb
Merge pull request #2538 from atgeirr/support-schedule-exit
Stop simulating if the schedule has set an exit condition.
2020-04-16 17:33:41 +02:00
Atgeirr Flø Rasmussen
a1091bd718 Stop simulating if the schedule has set an exit condition.
The program will return the value set in the EXIT keyword.
2020-04-16 15:42:17 +02:00
Atgeirr Flø Rasmussen
88525f7c39
Merge pull request #2516 from hakonhagland/refactor_flow_run
Refactor main() in flow.cpp.
2020-04-16 13:28:03 +02:00
Håkon Hægland
8f1c12b2eb
Merge pull request #2 from atgeirr/afr-mods
Make Main a non-template class again, simplify.
2020-04-16 11:53:53 +02:00