Atgeirr Flø Rasmussen
4f39cdc9c9
Merge pull request #1439 from GitPaean/silencing_warning_extra_
...
silencing warning related to extra ; from BlackoilAmg
2018-04-04 14:32:18 +02:00
Atgeirr Flø Rasmussen
482c63e274
Merge pull request #1446 from GitPaean/removing_flowmainpolymer
...
Removing flowmainpolymer
2018-04-04 14:30:37 +02:00
Joakim Hove
024472b773
Merge pull request #1445 from joakim-hove/missing-LGR-features
...
Mark LGR related keywords as unsupported
2018-04-03 14:35:44 +02:00
Atgeirr Flø Rasmussen
b9c5d26cdc
Merge pull request #1447 from akva2/fix_tests_data
...
setup-opm-data -> setup-opm-tests
2018-04-03 13:16:42 +02:00
Arne Morten Kvarving
b7f791c623
setup-opm-data -> setup-opm-tests
2018-04-03 12:40:45 +02:00
Atgeirr Flø Rasmussen
b9d7b69bd6
Merge pull request #1444 from akva2/missing_data_to_tests
...
fixed: missing opm-data -> opm-tests references
2018-04-03 12:31:47 +02:00
Kai Bao
87b3cccd7f
removing WPIMULT from MissingFeatures
2018-04-03 11:11:25 +02:00
Kai Bao
7eaaae3906
removing FlowMainPolymer.hpp
2018-04-03 11:08:25 +02:00
Joakim Hove
5629b9b422
Mark LGR related keywords as unsupported
2018-04-03 09:40:36 +02:00
Arne Morten Kvarving
067d4cd259
fixed: missing opm-data -> opm-tests references
2018-04-03 08:26:37 +02:00
Arne Morten Kvarving
701fcbeb12
Merge pull request #1436 from akva2/data_to_tests
...
Use opm-tests
2018-03-27 14:57:00 +02:00
Arne Morten Kvarving
dfe2f17dee
use opm-tests
2018-03-27 11:14:23 +02:00
Joakim Hove
1d7735fc82
Merge pull request #1443 from stefoss23/RemoveMessageContainer
...
Made changes to comply w/ removal of MessageContainer.
2018-03-26 13:04:38 +02:00
Steinar Foss
a931901374
Made changes to comply w/ removal of MessageContainer.
2018-03-26 12:13:55 +02:00
Andreas Lauser
550c4b5bd5
Merge pull request #1442 from crayxt/patch-1
...
Fix a typo.
2018-03-26 10:32:38 +02:00
Baurzhan Muftakhidinov
02e8b6e021
Fix a typo.
2018-03-24 21:07:03 +05:00
Kai Bao
90e69b59cf
silencing warning related to extra ; from BlackoilAmg
2018-03-14 12:02:07 +01:00
Atgeirr Flø Rasmussen
6f18f7115f
Merge pull request #1438 from GitPaean/fixing_testtest_multmatrixtransposed
...
fixing test_multmatrixtransposed
2018-03-13 13:32:17 +01:00
Kai Bao
f098579e0b
fixing test_multmatrixtransposed
2018-03-13 12:58:44 +01:00
Andreas Lauser
4a6ab7ac76
Merge pull request #1434 from andlaus/tasklets
...
tasklets mop-up
2018-03-13 12:15:57 +01:00
Andreas Lauser
a42ece61ed
BlackoilModelEbos: set the default output directory to the empty string
...
an empty string is interpreted as "write the output files into the
same directory as the input". this is the current 'flow' default
behavior, plain ebos uses "." as the default location for output,
i.e., the current directory from which the simulator is run from.
2018-03-12 15:17:39 +01:00
Andreas Lauser
71d353326a
move the old "ThreadHandle" mechanism back to opm-simulators
...
this class is only used by the legacy simulators, `flow` uses the
`EclWriter` class provided by eWoms. In turn, this class uses the
new-and-shiny "tasklet" mechanism.
2018-03-12 15:17:39 +01:00
Atgeirr Flø Rasmussen
79bc265de8
Merge pull request #1431 from GitPaean/silencing_warning_from_opm_common_pr_348
...
adding POLYMW to the injectorType determination
2018-03-10 13:19:37 +01:00
Kai Bao
b0edfd2f04
adding POLYMW to the injectorType determination
...
just to silence a warning resulting from OPM/opm-common#348 .
2018-03-09 14:40:49 +01:00
Atgeirr Flø Rasmussen
14645fb1b8
Merge pull request #1429 from akva2/remove_repo_update_data
...
changed: remove repos from regression data update script
2018-03-09 14:15:24 +01:00
Atgeirr Flø Rasmussen
1380564256
Merge pull request #1425 from totto82/fix_enable_storage_term_false
...
Bugfix. enableStorageCache=false
2018-03-09 14:13:10 +01:00
Atgeirr Flø Rasmussen
cef255b212
Merge pull request #1430 from atgeirr/fix-boost-dyn-link
...
Leave BOOST_TEST_DYN_LINK setting to the build system.
2018-03-09 14:12:09 +01:00
Atgeirr Flø Rasmussen
42c41efa4e
Leave BOOST_TEST_DYN_LINK setting to the build system.
2018-03-09 12:56:51 +01:00
Atgeirr Flø Rasmussen
8070e9d229
Merge pull request #1397 from blattms/system-amg-rebased
...
Add support for CPR (and variants) for flow_ebos
2018-03-09 12:46:27 +01:00
Arne Morten Kvarving
a7d1544585
changed: remove repos from regression data update script
2018-03-09 09:35:15 +01:00
Atgeirr Flø Rasmussen
d4096f43f7
Merge pull request #1427 from GitPaean/fixing_trans_pvto_test
...
fixing test_transmissibilitymultipliers
2018-03-08 08:48:38 +01:00
Atgeirr Flø Rasmussen
717a9180e5
Merge pull request #1422 from blattms/resort-to-split-operator
...
If requested use matrix with well contributions only for the preconditioner.
2018-03-07 14:33:09 +01:00
Markus Blatt
e27fa72aee
Use extended sparsity pattern also of we add well contributions to the preconditioner.
2018-03-07 13:54:21 +01:00
Kai Bao
75e6bcefbb
fixing test_transmissibilitymultipliers
...
due to the change of the PVTO table policy from the parser
2018-03-07 10:01:34 +01:00
Arne Morten Kvarving
a6794063c8
Merge pull request #1424 from akva2/adjust_ecl
...
adjustments for eclipse support in opm-common
2018-03-06 15:35:00 +01:00
Tor Harald Sandve
0c4ae5991f
Use advanceTimeLevel() and updatedFailed() methods from model
2018-03-06 13:18:03 +01:00
Arne Morten Kvarving
690ca2cd26
adjustments for eclipse support in opm-common
2018-03-06 09:09:58 +01:00
Markus Blatt
01b25f27ed
Allow to add well contributions to both matrix and preconditioner matrix.
...
matrix_add_well_contributions=true will add to both the preconditioner matrix
and the matrix of the linear operator. preconditioner_add_well_contributions=true
will only add the contributions to the preconditioner matrix.
2018-03-05 16:48:10 +01:00
Markus Blatt
dc86d972d2
Removed hack to access StandardWell::addWellContributions.
2018-03-05 16:48:03 +01:00
Tor Harald Sandve
5f33a1a1bc
Bugfix. enableStorageTerm=false
...
Shift intensiveQuantities each timestep
2018-03-05 14:53:59 +01:00
Atgeirr Flø Rasmussen
13b7a4a426
Merge pull request #1423 from andlaus/fix_icc
...
Fix icc
2018-03-05 09:20:46 +01:00
Andreas Lauser
999653783b
do not name exception objects if they are not used
...
ICC rightfully produces a warning here...
2018-03-03 13:31:17 +01:00
Andreas Lauser
732d86613e
do not mess around with GCC's optimizations
...
generally, this is a bad idea because GCC is very good at determining
which optimizations should be enabled or not and also, this may
interfere with some compilers. (e.g., it produces a warning on icc)
2018-03-03 13:31:17 +01:00
Markus Blatt
12d2114bd7
Add well contribution to preconditioner matrix and always use old operator approach for wells.
...
It turned out that applying the well part of the full matrix has to be
done after the application of the non-well interactions. Otherwise we
screw up the ordering so much that convergence suffers a lot.
Kudos got Atgeirr for inspiration based on his testing.
2018-03-02 20:57:43 +01:00
Markus Blatt
f07874cf42
Cleanup code.
...
Removed unused boolean switch in WellModelMatrixAdapter and removed commented code.
2018-03-02 20:57:10 +01:00
Markus Blatt
af3c45dd6a
Do not add additional entries to matrix when not adding well contributions.
2018-03-02 20:55:58 +01:00
Atgeirr Flø Rasmussen
b276aaa16b
Changes made to test variations of matrix vs matrixless(ish) operator.
2018-03-02 14:22:59 +01:00
Atgeirr Flø Rasmussen
0db0e83843
Merge pull request #1414 from GitPaean/hack_to_fix_weird_well_rate_situation
...
trying to fix a problematic situation when updateWellState
2018-02-28 16:00:42 +01:00
Atgeirr Flø Rasmussen
320ae1b229
Merge pull request #1416 from GitPaean/support_oil_water_polymer
...
trying to add the functionality to handle oil/water polymer
2018-02-28 12:30:37 +01:00
Kai Bao
56caffab67
fixing comments for PR#1416
2018-02-28 10:26:54 +01:00