OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-14 18:02:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,646 Commits 31 Branches 117 Tags
c4e0bc238501cf8d7da7ae01a67d4c5fd403fc82
Commit Graph
9646 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Thune c4e0bc2385 Moving findOverlapRowsAndColumns() to a separate file. 2019-06-20 11:00:51 +02:00
Kai Bao 1593d431ce Merge pull request #1897 from alfbr/well-logging 
Moved well test messages from debug to log and prt
 2019-06-20 10:47:04 +02:00
Atgeirr Flø Rasmussen 841f92afc7 Merge pull request #1896 from alfbr/time-reports 
Adding time and date to time step report
 2019-06-20 10:31:48 +02:00
Alf Birger Rustad 671b2d9a47 Moved well test messages from debug to log and prt 2019-06-20 09:57:24 +02:00
Kai Bao f4efd464f4 Merge pull request #1883 from totto82/fix_inj 
Upwinding for MSW
 2019-06-19 12:50:16 +02:00
Joakim Hove 3f89b95440 Merge pull request #1877 from joakim-hove/summary-bcast 
Summary bcast
 2019-06-19 10:55:26 +02:00
Atgeirr Flø Rasmussen e4ef759d97 Merge pull request #1892 from akva2/fix_flexible_no_mpi 
fixed: build with dune 2.6 without MPI
 2019-06-19 10:08:25 +02:00
Joakim Hove 2950faece0 Extract the Summary::eval() call from the output call 2019-06-19 09:51:46 +02:00
Tor Harald Sandve a7f718a368 Some clean-up adressing PR comments 2019-06-19 09:13:38 +02:00
Alf Birger Rustad d8b4bbb0be Adding time and date to time step report 2019-06-18 14:01:08 +02:00
Arne Morten Kvarving 181d3cea6b fixed: build with dune 2.6 without MPI 2019-06-18 13:39:13 +02:00
Joakim Hove e114d4a46d Merge pull request #1888 from joakim-hove/summarystate-well-init 
Use the shared SummaryState instance when initializing well rates
 2019-06-17 18:50:11 +02:00
Tor Harald Sandve 5c7cfd8c21 fix scaling of gas injector 2019-06-17 08:40:44 +02:00
Tor Harald Sandve 22af6e563c fix upwinding for injector 2019-06-17 08:40:44 +02:00
Tor Harald Sandve c39cec55fe fix control eq inj 2019-06-17 08:40:44 +02:00
Joakim Hove 7f1970af3c Use the shared SummaryState instance when initializing well rates 2019-06-17 07:49:55 +02:00
Joakim Hove 24e3afc544 Merge pull request #1887 from joakim-hove/remove-unused-args 
Remove unused arguments from write task
 2019-06-14 16:05:56 +02:00
Joakim Hove e5d2d70ee5 Remove unused arguments from write task 2019-06-14 14:44:06 +02:00
Andreas Lauser cc876bef08 Merge pull request #1886 from totto82/outputSummaryEbos 
Let the output writer determine what to write in ebos
 2019-06-14 14:42:15 +02:00
Tor Harald Sandve ba3598a6ae Let the output writer determine what to write in ebos 2019-06-14 13:57:41 +02:00
Atgeirr Flø Rasmussen 66972b39ed Merge pull request #1760 from GitPaean/testing_standardWellV 
replacing StandardWell with StandardWellV, then renaming StandardWellV to be StandardWell.
 2019-06-14 06:22:38 +02:00
Kai Bao ab839896b6 using createConstantZero instead of createBlank 
the content for createBlank is not initialized, which causes undefined
behavoir.
 2019-06-13 15:05:12 +02:00
Kai Bao 4c105d7672 copying invertMatrix for DynamicMatrix 
the reason is to make sure for blackoil cases, the same algorithm will
be used to invert the D matrix for the well model. As a result, it will
reduce the burden to test the PR.

Whether we will keep this algorithm for 4 X 4 matrix will be addressed
as a separate issue.
 2019-06-13 14:49:04 +02:00
Kai Bao 310741a54f fixing a small bug related to EvalWell 2019-06-13 14:49:04 +02:00
Kai Bao 4449f0c172 adding updateConnectionRatePolyMW to StandardWell 2019-06-13 14:49:04 +02:00
Kai Bao 2256395957 adding updateExtraPrimaryVariables to StandardWell 2019-06-13 14:49:04 +02:00
Kai Bao 94057a53f9 adding checkConvergenceExtraEqs to StandardWell 2019-06-13 14:49:04 +02:00
Kai Bao 4f7b899290 fixing the compilation problem due to rebasing 
and also some small cleaning up
 2019-06-13 14:49:04 +02:00
Kai Bao 3dcec6a436 removing StandardWellV 2019-06-13 14:49:04 +02:00
Kai Bao 33de77e595 incorporate the staticSize template parameter for DynamicEvaluation 2019-06-13 14:49:04 +02:00
Kai Bao ad0e294e52 using StandardWellV as the default StandardWell model 2019-06-13 14:49:04 +02:00
Markus Blatt 2f28bb3758 Merge pull request #1878 from atgeirr/flexible-solver-revision 
Small fixes for the FlexibleSolver system.
 2019-06-13 11:21:54 +02:00
Tor Harald Sandve edbc28f46c Merge pull request #1879 from andlaus/mebos 
add `mebos`, a multiplexed ebos variant
 2019-06-13 11:03:38 +02:00
Atgeirr Flø Rasmussen 078678206a Changes to support latest Dune version. 2019-06-12 10:40:55 +02:00
Joakim Hove 8eea015870 Merge pull request #1874 from joakim-hove/summary-eval 
Call Summary::eval() and ::add_timestep separately
 2019-06-11 21:31:54 +02:00
Andreas Lauser ca8ea76818 add mebos, a multiplexed ebos variant 
`mebos` works similarly as `flow`, but in contrast to `flow`, `mebos`
only creates the deck in the common code path whilst the
'EclipseState' and the other higher-level parser objects are always
created internally by the vanguard. this approach avoids code
duplication and the worst effects of parser API creep.

to avoid having to compile non-trivial compile units multiple times,
the actual code of the variants is moved into `ebos_$VARIANT.{hh,cc}`
files and the respective compile units are each put into a small
static library whilst the main function of said libraries are invoked
by either the multiplexed or the respective specialized simulator's
`main()`. This is also somewhat similar of how `flow` works, with the
difference that `mebos` uses the blackoil variant to determine the
parameters it needs to know for parsing the deck instead of
introducing a "fake" type tag for this. The rationale is to reduce
compile time compared to the "fake type tag" approach and -- to a
lesser extend -- avoid unnecessary copy-and-pasting of code. In
particular, this means that for the vast majority of cases, only one
place needs changed in the code for all `ebos` variants if, for
example, the parser API requires further objects in the future.
 2019-06-11 10:27:47 +02:00
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
Joakim Hove 1790910269 Call Summary::eval() and ::add_timestep separately 2019-06-06 12:14:46 +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