Markus Blatt
ca744231b1
Removes unused member istlSolver_ and method to get it from BlackoilModelEbos
...
It is not used since quite some time and tends to confuse me.
2020-04-28 16:46:17 +02:00
Bård Skaflestad
02923a6dee
Merge pull request #2571 from alfbr/group-tests2
...
Activate a bunch of group tests.
2020-04-28 15:44:12 +02:00
OPMUSER
163ce3b613
Update Missing Features with PERMFACT
2020-04-28 13:39:40 +02:00
Alf Birger Rustad
a8566de64d
Fix typos.
2020-04-28 10:40:39 +02:00
Atgeirr Flø Rasmussen
8b77d68d9c
Merge pull request #2572 from bska/prune-unused
...
Remove Unused 'currentControl' Variable
2020-04-28 08:09:17 +02:00
Bård Skaflestad
9756edce50
Remove Unused 'currentControl' Variable
2020-04-27 21:29:10 +02:00
Alf Birger Rustad
75f5b1c2e1
Update the data.
2020-04-27 21:16:04 +02:00
Alf Birger Rustad
a8d80366d1
Activate a bunch of group tests.
2020-04-27 18:22:19 +02:00
Atgeirr Flø Rasmussen
14bde098ce
Merge pull request #2570 from blattms/fix-prec-factory-dune-master
...
Complete future-proofing ILU usage in the preconditioner factory.
2020-04-27 16:37:27 +02:00
Atgeirr Flø Rasmussen
06e5e6b6ac
Merge pull request #2565 from totto82/avoidOscNupcol
...
use nupcol to avoid oscillation between group controls
2020-04-27 16:02:32 +02:00
Atgeirr Flø Rasmussen
6684cd7cb3
Merge pull request #2564 from totto82/fixGCONSALE
...
Fix GCONSALE
2020-04-27 15:59:29 +02:00
Markus Blatt
f03b56c261
Complete future-proofing ILU usage in the preconditioner factory.
...
SeqILU0/SeqILU0 are removed in master and one should use SeqILU
2020-04-27 15:52:43 +02:00
Bård Skaflestad
a7a3aec72d
Merge pull request #2567 from alfbr/update-wsegsicd
...
Intended to update WSEGSICD test
2020-04-27 14:11:03 +02:00
Alf Birger Rustad
2d6fe6a3bf
Just a couple of trivial clean-ups.
2020-04-27 13:50:40 +02:00
Bård Skaflestad
87d58a08b1
Merge pull request #2553 from alfbr/add-group-tests
...
Added the remaining group tests that are correct.
2020-04-27 13:43:19 +02:00
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