Commit Graph

8139 Commits

Author SHA1 Message Date
Markus Blatt
458cd8768f Rely less on implicit includes of header files 2018-08-01 15:20:45 +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
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
Andreas Lauser
ccd0da2e4c use a raw pointer to specify the auxiliary module for wells
this is necessiated by the replacement of `std::shared_ptr` by raw
pointers for the eWoms auxiliary equation infrastructure. Note that by
default `flow` will *not* create an auxiliary equation module because
it modifies the operator that is used by the linear solver instead.
2018-07-09 12:14:43 +02:00
Atgeirr Flø Rasmussen
2e789173ab
Merge pull request #1528 from akva2/improve_ref_data_script
changed: improve reference data update script
2018-07-04 16:25:22 +02:00
Arne Morten Kvarving
35d10a61b8 changed: improve reference data update script
- separate code and data
- no prt files for any tests
2018-07-04 10:49:18 +02:00
Kai Bao
a154d89197
Merge pull request #1501 from totto82/wtest
Implement WTEST support
2018-07-04 10:45:27 +02:00
Tor Harald Sandve
4a2780d161 split close wells from close connection 2018-07-03 15:13:30 +02:00
Tor Harald Sandve
a5f5581441 Fix more minor issues based on review 2018-07-03 14:07:53 +02:00
Tor Harald Sandve
8c819e1380
Merge pull request #1527 from OPM/revert-1525-addTestForEhystr
Revert "Add  test for cases with Carlson’s hysteresis model"
2018-06-29 14:08:41 +02:00
Tor Harald Sandve
e509d9187a
Revert "Add test for cases with Carlson’s hysteresis model" 2018-06-29 14:07:39 +02:00
Andreas Lauser
6e5793b674
Merge pull request #1525 from totto82/addTestForEhystr
Add  test for cases with Carlson’s hysteresis model
2018-06-29 14:03:29 +02:00
Tor Harald Sandve
6606bb75b2 Minor fix based on code review 2018-06-29 13:33:56 +02:00
Atgeirr Flø Rasmussen
2b4d64787b
Merge pull request #1520 from atgeirr/add-acceptance-test-for-PORV
Add PORV acceptance test running Norne.
2018-06-28 14:21:19 +02:00
Tor Harald Sandve
d769e7649a Name completion and connection consistently 2018-06-28 13:47:10 +02:00
Tor Harald Sandve
834f680587 Add support for COMPLUMP in WECON and WTEST 2018-06-28 13:28:30 +02:00
Tor Harald Sandve
0f4038342d add update data for wecon_wtest
and fix filename inconsistency
2018-06-28 10:16:29 +02:00
Tor Harald Sandve
22755cc257 Add support for combination of multi-segmented wells and WTEST 2018-06-28 10:16:29 +02:00
Tor Harald Sandve
3e53ed6386 implement WTEST support 2018-06-28 10:16:29 +02:00
Joakim Hove
7568ec0f90
Merge pull request #1519 from joakim-hove/completion-refactor
Completion refactor
2018-06-28 09:58:51 +02:00
Tor Harald Sandve
b1e03d5196
Merge pull request #1523 from atgeirr/fix-currentDateTime
Cast argument for milliseconds() call to an integer.
2018-06-28 07:51:53 +02:00
Atgeirr Flø Rasmussen
8d6fefbd29
Merge pull request #1524 from andlaus/correct_timekeeping
flow: fix the time held by the simulator object
2018-06-27 15:34:01 +02:00
Tor Harald Sandve
f2ba643bc9 Add test case with Carlson’s hysteresis model where drainage curve (=0) or imbibition curve (=1) is used for the wetting phase 2018-06-27 15:28:25 +02:00
Andreas Lauser
c794028bcf flow: fix the time held by the simulator object 2018-06-27 12:13:50 +02:00
Atgeirr Flø Rasmussen
53e46ca017 Cast argument for milliseconds() call to an integer.
Apparently required by boost::posix_time::milliseconds.
2018-06-27 11:11:27 +02:00
Atgeirr Flø Rasmussen
a287d877da Add PORV acceptance test running Norne. 2018-06-26 14:24:08 +02:00
Joakim Hove
514cdc574c Completion refactor 2018-06-26 12:30:54 +02:00