OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-02 04:26:55 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,097 Commits 24 Branches 102 Tags 84 MiB
2b4d64787b
Commit Graph

8097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tor Harald Sandve
4e9403b8f8 Correct the RESV calculation for unsaturated cases 
Make sure that the reservoar volumes always stays positive. i.e. we can
not remove more dissolved gas from the rate than the total volume amout
of gas.
 2018-03-23 15:23:47 +01:00
Tor Harald Sandve
975a9a6766 Fix intial fluid distribution in the well 
Solve the well equation in order to determine the initial fluid content
of the well used for the hydrostatic pressure calculation in the well.
 2018-03-23 12:56:19 +01: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
Tor Harald Sandve
7c9dab1a64 Add reportStep method in SimulatorReport and use it 2018-03-12 14:48:34 +01:00
Tor Harald Sandve
15aeac3f90 Add option for relaxed CNV tolerance 
Use a relaxed tolerance for individual cells (CNV) when iter >
max_strict_iter.

tolerance_cnv_relaxed_ is defauled to 1.0e9
This assure the same behaviour as current master, where CNV criterion is
ignored when iter > max_strict_iter

TODO: Test this with a stricter default ( <= 1.0)
 2018-03-12 08:23:57 +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
Kai Bao
ec8dc4f534 trying to fix a problematic situation when updateWellState 
for example, distr = 0 1 0, for rate control, F = 1 0 0, we will get a
zero F_target, then it is wrong to do the division with F_target.

It is okay when target = 0. When target != 0, the result is already very
wrong. Non-linear iteration can send us anywhere, not sure the best
solution for this kind of strange situation.
 2018-02-28 09:47:22 +01:00
Kai Bao
b71949b09e adding a test for polymer oil water 2018-02-28 08:39:38 +01:00
Kai Bao
635f6c7db2 trying to add the functionality to handle oil/water polymer 2018-02-28 08:39:38 +01:00
Atgeirr Flø Rasmussen
10887ddaca
Merge pull request #1183 from blattms/matrix-with-well-connections 
Add possibility to use matrix with well connections for preconditioner.
 2018-02-27 16:25:06 +01:00
Markus Blatt
44d31f9dcc Removed unused variable warning in addWellContributions. 2018-02-26 16:23:13 +01:00