Atgeirr Flø Rasmussen
279d1950dd
Merge pull request #1550 from andlaus/generic_output_dir
...
adapt to the rename of the EclOutputDir parameter to OutputDir in eWoms
2018-08-15 21:34:18 +02:00
Arne Morten Kvarving
6642df7a8c
Merge pull request #1549 from akva2/use_builtin_analysis
...
changed: use the built-in analysis in the comparison programs
2018-08-15 08:09:55 +02:00
Arne Morten Kvarving
1e574b8c2f
changed: use the built-in analysis in the comparison programs
2018-08-14 11:07:29 +02:00
Andreas Lauser
ca2428cf13
adapt to the rename of the EclOutputDir parameter to OutputDir in eWoms
2018-08-14 10:37:24 +02:00
Arne Morten Kvarving
975cf0bae8
Merge pull request #1547 from akva2/no_remove
...
changed: do not remove the result path in regression tests
2018-08-14 09:14:50 +02:00
Arne Morten Kvarving
b1b5759d7f
changed: do not remove the result path in regression tests
...
in particular this leads to issues with tests sharing
result dir
2018-08-09 08:24:41 +02:00
Atgeirr Flø Rasmussen
11b987b97d
Merge pull request #1544 from joakim-hove/use-opm-pack
...
Relocate restart data file in tests
2018-08-08 13:27:01 +02:00
Arne Morten Kvarving
ffd3c6d270
Merge pull request #1546 from andreatlonn/master
...
Updated the files with the new test.
2018-08-08 09:56:25 +02:00
Andrea T. Lonn
0084d1d369
Updated the files with the new test.
2018-08-07 16:21:37 +02:00
Arne Morten Kvarving
eb126f3c53
Merge pull request #1543 from andreatlonn/master
...
Updated the files with the new tests.
2018-08-07 14:01:33 +02:00
Andrea T. Lonn
41ead55163
Changed the names of the tests to match the new names in opm-test.
2018-08-07 09:22:04 +02:00
Andrea T. Lonn
919b43cd1f
Updated the files with the new tests.
2018-08-07 09:22:04 +02:00
Joakim Hove
8e71e3878f
Relocate restart data file in tests
2018-08-06 08:01:55 +02:00
Atgeirr Flø Rasmussen
63e6e88f50
Merge pull request #1541 from akva2/avoid_deck_assignment
...
changed: avoid use of the assignment operator for the Deck class
2018-08-03 12:22:54 +02:00
Bård Skaflestad
b087cf54af
Merge pull request #1495 from blattms/red-black-ilu
...
Added support for red black ilu
2018-08-01 18:52:07 +02:00
Markus Blatt
8482b435eb
Added clarifying comment on definedness of const_cast
2018-08-01 18:06:45 +02:00
Markus Blatt
f850f04c93
Prevent unnecessary copies of vectors using references.
2018-08-01 15:22:07 +02:00
Markus Blatt
458cd8768f
Rely less on implicit includes of header files
2018-08-01 15:20:45 +02:00
Arne Morten Kvarving
3082281bc8
changed: avoid use of the assignment operator for the Deck class
2018-08-01 13:02:40 +02:00
Atgeirr Flø Rasmussen
b4bdea1d3f
Merge pull request #1535 from akva2/remove_unnecessary_includes
...
Remove unnecessary includes
2018-07-30 16:40:57 +02:00
Bård Skaflestad
6a3199dbe8
Merge pull request #1540 from andlaus/remove_FluidSystems_namespace
...
adapt to the fluid system naming convention change in opm-material
2018-07-27 21:06:23 +02:00
Andreas Lauser
ac2bc410f3
adapt to the fluid system naming convention change in opm-material
...
note that almost the only thing which is affected is legacy code.
2018-07-27 12:54:02 +02:00
Markus Blatt
019835b123
Added support for red-black ordering to ILUn.
2018-07-20 14:43:40 +02:00
Markus Blatt
865a690243
Allow usage of red-black ILU0.
...
We introduced two runtime parameters for this: ilu_redblack and
ilu_reorder_spheres. If the last one is false, we try to preserve
the ordering within in the colors. Otherwise we try to achieve a D2
(alternative diagonal) ordering.
2018-07-20 14:43:40 +02:00
Markus Blatt
41e5779ae3
Extended test for the reordering
2018-07-20 14:43:40 +02:00
Markus Blatt
190272e21d
Added two alternatives for reordering based on colors
2018-07-20 14:43:40 +02:00
Markus Blatt
3953b20215
Also return the number of vertices for each color from Welsh-Powell-Algorithm.
2018-07-20 14:43:40 +02:00
Markus Blatt
a1650a58f4
Added Welsh Powell graph coloring
2018-07-20 14:43:40 +02:00
Markus Blatt
43c1714478
Added various other variants of MILU.
...
These versions are inspired by the ones used in SuperLU and the enums
to choose them have simuilar names, but without leading S (MILU_1-MILU_3).
The following variants are supported (chosen by the enum MILU_VARIANT):
ILU: plain ILU
MILU_1: lump diagonal with dropped row entries.
MILU_2: lump diagonal with the sum of the absolute values of the dropped row
entries.
MILU_3: if diagonal is positive add sum of dropped row entrires. Otherwise substract them.
MILU_4: if diagonal is positive add sum of dropped row entrires. Otherwise do nothing
2018-07-20 14:43:40 +02:00
Markus Blatt
63058559bc
Added various other variants of MILU.
...
These versions are inspired by the ones used in SuperLU and the enums
to choose them have simuilar names, but without leading S (MILU_1-MILU_3).
The following variants are supported (chosen by the enum MILU_VARIANT):
ILU: plain ILU
MILU_1: lump diagonal with dropped row entries.
MILU_2: lump diagonal with the sum of the absolute values of the dropped row
entries.
MILU_3: if diagonal is positive add sum of dropped row entrires. Otherwise substract them.
MILU_4: if diagonal is positive add sum of dropped row entrires. Otherwise do nothing
2018-07-20 14:42:46 +02:00
Markus Blatt
59b99d9ef9
Fixed unused variable warnings in test_milu
2018-07-20 14:42:46 +02:00
Markus Blatt
e0a138e23c
[MILU] Add dropped elements only to diagonal.
...
We did add the dropped matrix blocks to the diagonal blocks,
but this is not MILU where oone only modifies the diagonal.
With this patch we fix this behaviour and now only modify the
diagonal of the diagonal block.
2018-07-20 14:42:46 +02:00
Markus Blatt
397fc78405
Add additional MILU test.
2018-07-20 14:42:46 +02:00
Markus Blatt
0bae240a42
Allow user to choose modified ILU0 decomposition.
...
Using the parameter ilu_milu=true|false (default=false) the user can now choose
to use the modified ILU0 decomposition. If selected values will
not be dropped for nonzero entries but added to the diagonal of U.
This approach will result in A*e = L*U*e for vector e with all entries
beging 1.
2018-07-20 14:42:46 +02:00
Markus Blatt
5333a2430f
Be verbose only when compiled with -DDEBUG
2018-07-20 14:42:46 +02:00
Markus Blatt
e1e289dc1e
Added MILU0 decomposition
2018-07-20 14:42:46 +02:00
Arne Morten Kvarving
285fb3b648
Merge pull request #1538 from andreatlonn/master
...
Added the test for BASE_MODEL_1.DATA.
2018-07-20 14:16:53 +02:00
Andrea T. Lonn
7426b5db11
Added the test for BASE_MODEL_1.DATA.
2018-07-20 13:35:54 +02:00
Arne Morten Kvarving
4a23d44f11
Merge pull request #1516 from andreatlonn/master
...
I have included the regression test for SPE1CASE1 using flow.
2018-07-13 11:16:56 +02:00
Andrea T. Lonn
383a0b7964
Included my tests in update_reference_data.sh
2018-07-13 10:21:04 +02:00
Andrea T. Lonn
101a3b1805
Included a new test and updated update_reference_data.
2018-07-13 09:24:10 +02:00
Andrea Tronstad Lønn (ST MSU DYN)
2c7344f558
I have included the regression test for SPE1CASE1 using flow.
2018-07-13 09:17:01 +02:00
Arne Morten Kvarving
735cd7d402
Merge pull request #1533 from andlaus/no_global_transmissibility
...
flow: do not set the ExportGlobalTransmissibility property anymore
2018-07-12 12:56:14 +02:00
Arne Morten Kvarving
1b44ba751a
FlowMainEbos: only need the interface for blackoil newton iterations
2018-07-12 11:39:31 +02:00
Arne Morten Kvarving
57ddd9dc05
FlowMainEbos: remove unused includes
2018-07-12 10:12:13 +02:00
Arne Morten Kvarving
ab4d0e63af
BlackOilModelEbos: remove unused include
2018-07-12 10:12:13 +02:00
Andreas Lauser
7f8120d609
flow: do not set the ExportGlobalTransmissibility property anymore
...
this has not been required anymore since the output code was moved to
the ebos core.
2018-07-11 13:49:17 +02:00
Arne Morten Kvarving
4fe6ac5bab
Merge pull request #1531 from andlaus/better_well_API
...
use a raw pointer to specify the auxiliary module for wells
2018-07-10 13:26:33 +02:00
Joakim Hove
27cca66c3d
Merge pull request #1532 from joakim-hove/actionx-missing-feature
...
Mark keyword ACTIONX as not supported
2018-07-10 10:59:55 +02:00
Joakim Hove
b4fa06f305
Mark keyword ACTIONX as not supported
2018-07-10 09:37:25 +02:00