OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 10:40:21 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,609 Commits 24 Branches 101 Tags 97 MiB
b837dd71b4
Commit Graph

9609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
b837dd71b4 Small fixes for the FlexibleSolver system. 2019-06-11 09:55:05 +02:00
Atgeirr Flø Rasmussen
2c5ef367dd
Merge pull request #1852 from atgeirr/flexible-linear-solver 
Flexible linear solver
 2019-06-06 14:21:51 +02:00
Atgeirr Flø Rasmussen
d5c3c93c7d Use overloading instead of template specialization. 
This seems to be necessary for older compilers.
 2019-06-06 10:36:17 +02:00
Atgeirr Flø Rasmussen
72ae444566 Fixes for Dune < 2.6. 
The PreconditionerFactory requires 2.6, so this is addressed by
simply not using that code at all for Dune < 2.6. No FlexibleSolver
etc.
 2019-06-06 09:10:43 +02:00
Atgeirr Flø Rasmussen
8ae671eb86
Merge pull request #1871 from totto82/fix_segfault 
fix segfault when no well report is registred
 2019-06-06 08:57:56 +02:00
Atgeirr Flø Rasmussen
38a61fa0c0 Add <config.h> include, clean up comments. 2019-06-05 15:57:45 +02:00
Atgeirr Flø Rasmussen
c21fd6f26d Add and use PreconditionerFactory class. 
This replaces the makePreconditoner() function. The main advantage
is that it is extensible, making it easy to for example add new
preconditioners to the factory at runtime. It supports both parallel
and serial preconditioners.
 2019-06-05 15:12:52 +02:00
Atgeirr Flø Rasmussen
d44b974dc8 Bugfix: ensure the matrix passed to parallel preconditioner is ok. 
Done with the makeOverlapRowsInvalid() approach.
 2019-06-05 15:12:33 +02:00
Kai Bao
809a78780e
Merge pull request #1876 from bska/fipnum-supported-kw 
Remove FIPNUM From List of Unsupported Keywords
 2019-06-05 14:07:43 +02:00
Bård Skaflestad
123b578bdd Prune Additional Supported Keywords 
Support for

    AQUCT, AQUTAB, COMPLUMP

was introduced quite some time ago.
 2019-06-05 13:41:31 +02:00
Bård Skaflestad
0760442ac1 Remove FIPNUM From List of Unsupported Keywords 
We've supported the keyword--both in the deck reader (parser) and in
the simulator--for a long time.
 2019-06-05 12:42:26 +02:00
Atgeirr Flø Rasmussen
d42c5426b2
Merge pull request #1872 from totto82/eval_friction2 
Make calculateFrictionFactor evalution  + critical bugfix in MSW friction model
 2019-06-05 11:19:28 +02:00
Joakim Hove
47f4e750d2
Merge pull request #1865 from joakim-hove/use-shared-summarystate 
Use shared summarystate
 2019-06-04 09:49:56 +02:00
Atgeirr Flø Rasmussen
08cec09293
Merge pull request #1845 from blattms/abort-on-unknown-keywords-v2 
Abort if flow is run with unknown keywords.
 2019-06-03 15:42:02 +02:00
Tor Harald Sandve
9d6f20b172
Merge pull request #1870 from andlaus/ebos_cleanups 
Ebos cleanups
 2019-06-03 14:32:17 +02:00
Bård Skaflestad
f9a6b68b1e
Merge pull request #1873 from totto82/output_grid 
output .INIT and .GRID also on restart
 2019-06-03 13:24:40 +02:00
Tor Harald Sandve
2df734f00e output .INIT and .GRID also on restart 2019-06-03 12:21:34 +02:00
Bård Skaflestad
6c0e5fb5a1
Merge pull request #1833 from tskille/run-regressionTest 
run compareECL once, checking all files in one go
 2019-06-03 11:50:50 +02:00
Atgeirr Flø Rasmussen
866db1c66d Revise json file for test after changing expected structure. 2019-06-03 11:42:30 +02:00
Atgeirr Flø Rasmussen
84a8143bad Improved parameter hierarchy and const-correctness. 2019-06-03 11:42:30 +02:00
Atgeirr Flø Rasmussen
a76b19d95a Make FlexibleSolver feature-complete. 
In particular:
 - Add parallel solvers and preconditioners.
 - Add the update() interface to preconditioners, and use it with CPR.
 2019-06-03 11:42:30 +02:00
Halvor Møll Nilsen
ec498086a6 Add flexible solver and preconditioner infrastructure. 
Also use it in flow_blackoil_dunecpr.cpp. Adds new command-line parameter,
--linear-solver-configuration-json-file, to read linear solver config from
JSON-format file at runtime.
 2019-06-03 11:42:30 +02:00
Tor Harald Sandve
0d28dfff17 fix cutoff value bug in haalandFormula 2019-06-03 11:28:15 +02:00
Tor Harald Sandve
779dbd39dd make calculateFrictionFactor Evaluation 2019-06-03 11:24:56 +02:00
Andreas Lauser
44a396d1c8 add ebos_plain to the ebos debug extensions 2019-06-03 11:20:41 +02:00
Andreas Lauser
f5e26df6af ebos: tell the parser not to bail out if it encounters superfluous records 
this makes slightly incorrect decks usable with `ebos`. since the
common `flow` variants use a different code path to parse the deck,
they are unaffected. (as far as I can see, the only variant which
might be affected is `flow_ebos_oilwater_polymer_injectivity` and even
for it `flow`'s multiplexing code will abort the run before the
vanguard is even called.)
 2019-06-03 11:20:41 +02:00
Andreas Lauser
c315a9a473 ebos: make it possible to disable aquifiers 
for now, disabling aquifers is an experimental feature...
 2019-06-03 11:20:41 +02:00
Torbjørn Skille
0d916193b2 updated run-regressionTest.sh, added support for ignore_extra 2019-06-03 11:17:32 +02:00
Andreas Lauser
ef74025523 ebos: tone down the warning in the startup message slightly 
The intend is to make the purpose of `ebos` clearer: while it can be
used in production, the stability guarantees are somewhat lower than
for `flow` and testing is a bit less rigorous (most of the time).
 2019-06-03 11:11:41 +02:00
Andreas Lauser
c86470e768 tracer model: fix a few output messages 
fixes some typos, adds better wording and fixes some duplication
issues on parallel runs.
 2019-06-03 11:11:41 +02:00
Andreas Lauser
b699f40cee fix "checking conservativeness" debug message for parallel runs 2019-06-03 11:11:41 +02:00
Andreas Lauser
c0a2fdf5c6 fix a few harmless compiler warnings 2019-06-03 11:11:41 +02:00
Andreas Lauser
18d989c394 ebos: replace tabs with spaces and remove trailing white space 
for some reason this keeps creping back in...
 2019-06-03 11:11:41 +02:00
Tor Harald Sandve
8f60a5f9fc
Merge pull request #1841 from andlaus/remove_isSubstep 
EclProblem: remove the isSubstep parameter from writeOutput()
 2019-06-03 10:41:12 +02:00
Tor Harald Sandve
4c4921c6b2 fix segfault when no well report is registred 2019-06-03 09:22:04 +02:00
Atgeirr Flø Rasmussen
2cc22f99cb
Merge pull request #1868 from andlaus/sparse_matrix_adapter_from_linear_solver 
set the SparseMatrixAdapter property in the linear solver type tag
 2019-05-31 20:40:10 +02:00
Atgeirr Flø Rasmussen
2d0cd0ecfe
Merge pull request #1869 from GitPaean/adding_comment_getsegmentrateupwinding 
adding some comments about getSegmentRateUpwinding()
 2019-05-31 20:37:16 +02:00
Kai Bao
8fd1a8b7da assert pressure derivative in getSegmentRateUpwinding is zero 2019-05-31 12:51:50 +02:00
Kai Bao
5aacda1880 adding some comments about getSegmentRateUpwinding() 2019-05-31 11:22:35 +02:00
Andreas Lauser
e36ae88ab9 set the SparseMatrixAdapter property in the linear solver type tag 
this is necessary because after OPM/ewoms#513, the
`SparseMatrixAdapter` property will be "owned" by the linear solver
and because ISTLSolverEbos does not build on top of
`Ewoms::ParallelBaseBackend`.
 2019-05-31 10:55:13 +02:00
Kai Bao
8796935f7c
Merge pull request #1867 from GitPaean/fixing_resv_prediction 
not trying to update RESV target for prediction producers
 2019-05-31 09:25:15 +02:00
Kai Bao
c5983eeec5 not trying to update RESV target for prediction producers 2019-05-30 11:58:23 +02:00
Andreas Lauser
80238d9940
Merge pull request #1863 from totto82/fix_init 
Make it possible to restart without computing initial conditions
 2019-05-29 12:23:40 +02:00
Atgeirr Flø Rasmussen
ff2965e346
Merge pull request #1862 from GitPaean/fixing_multisegment_wells_cleaning_up_restarting_test_1 
adding function updateUpwindingSegments() for MSW
 2019-05-29 10:09:08 +02:00
Atgeirr Flø Rasmussen
f3b21f8ead
Merge pull request #1861 from totto82/fixFPRP 
Fix FPRP output
 2019-05-29 09:59:46 +02:00
Joakim Hove
b129a10362 Use shared SummaryState in BlackoilWellModel 2019-05-29 07:52:17 +02:00
Joakim Hove
6edba5d94e Use shared SummaryState in eclwellmanager 2019-05-29 07:45:58 +02:00
Joakim Hove
a0aa7fcc2b Use shared SummaryState when instantiating WellsManager 2019-05-29 07:44:23 +02:00
Joakim Hove
a5eb002ad8
Merge pull request #1864 from joakim-hove/fixup-controls 
Fixup: Use ProductionControls and InjectionControls
 2019-05-29 07:44:09 +02:00
Joakim Hove
c6af5f11b6 Fixup: Use ProductionControls and InjectionControls 2019-05-29 07:12:15 +02:00