Commit Graph
8529 Commits
Author SHA1 Message Date
Andreas Lauser 46e41228b5 flow: call getConvergence() on the raw reservoir residual
i.e., the residual without the Schur complement for the wells being
applied. This hopefully fixes the issue pointed out by
[at]totto82.
2019-02-25 11:24:30 +01:00
Andreas Lauser f5e7ca9bb3 well model: fix application of Schur complements
using the eWoms API for wells, the Schur compliment was not applied at
all. If `BlackOilWellModel::linearize()` was made non-trivial, the
Schur complement was applied twice in `flow`. With this patch, we only
apply this using the eWoms API (in
`BlackOilWellModel::linearize()`). I could not observe a signficant
effect on the convergence behaviour of `flow` for the cases which I
tested (Norne and realization 5 of Model 2).
2019-02-25 10:51:30 +01:00
Joakim Hove 935642ba88 Merge pull request #1716 from joakim-hove/unsupported-keywords
The missing features check takes a ParseContext argument
2019-02-22 07:49:43 +01:00
Tor Harald Sandve f540a83542 Merge pull request #1733 from andlaus/hide_ebos_params
do not print the new core-ebos time step tuning parameters in the usage message
2019-02-20 13:53:22 +01:00
Andreas Lauser d1fa4e3248 do not print the new core-ebos time step tuning parameters in the usage message
they are not used by `flow`.
2019-02-20 10:51:24 +01:00
Joakim Hove 657c45be92 Merge pull request #1732 from joakim-hove/trivial-change
Remove unused ParameterGroup.hpp header file
2019-02-19 16:23:14 +01:00
Kai Bao 2d933f2303 Merge pull request #1695 from WesselDeZeeuw/BaseClassAquifer
Base class aquifer
2019-02-18 10:44:51 +01:00
WesselDeZeeuw 73faaf95b4 added aquiferConstants() 2019-02-18 09:19:26 +01:00
Arne Morten Kvarving 2bba0a395f fix initialization order 2019-02-18 09:19:26 +01:00
WesselDeZeeuw fd4bdd6492 Trying to fix the WReorder Warning 2019-02-18 09:19:26 +01:00
WesselDeZeeuw a72d61cb50 Base Class and AquiferCarterTracy and AquiferFetkovich implementation
Reordering of Aquifer Codes
2019-02-18 09:19:26 +01:00
Joakim Hove e20037167f Remove unused ParameterGroup.hpp header file 2019-02-17 12:44:28 +01:00
Arne Morten Kvarving 863dcf1328 Merge pull request #1728 from akva2/nnc_reg_test
add a regression test using NNCs
2019-02-14 10:22:55 +01:00
Arne Morten Kvarving b5f47e31c9 add a regression test using NNCs 2019-02-13 12:22:03 +01:00
Bård Skaflestad ded12a6059 Merge pull request #1723 from andlaus/externalSetupTime
flow: account for external setup costs
2019-02-12 09:10:14 -06:00
Markus Blatt 2575cf715c Merge pull request #1724 from blattms/strip-milu-debug-out
Remove bogus debug output printing in MILU.
2019-02-07 16:34:41 +01:00
Atgeirr Flø Rasmussen dbd8b323da Merge pull request #1721 from fgfuchs/parallel_well_logging
Correct Logging for Black Oil Well Model for parallel runs
2019-02-06 11:38:29 +01:00
Markus Blatt 29464cd832 Remove bogus debug output printing in MILU.
Somehow some standard output when running MILU () is still there and
it really clutters the output and and makes it unusable. This commit
removes it from flow.
2019-02-06 10:37:35 +01:00
Andreas Lauser 777fd61342 flow: account for external setup costs 2019-02-05 16:52:58 +01:00
Franz G. Fuchs 42f6f4d784 Correct Logging for Black Oil Well Model for parallel runs using DeferredLogger 2019-02-05 15:24:10 +01:00
Atgeirr Flø Rasmussen b471b89890 Merge pull request #1718 from andlaus/mea_culpa
Properly adapt to the new linear solver API used by eWoms
2019-02-01 15:45:45 +01:00
Andreas Lauser c379823dec Really adapt to the new linear solver API used by eWoms
I tested #1712 without deriving the `EclFlowProblem` type tag from
`FlowIstlSolver`, and it worked because the linear solver was still
`Opm::ISTLSolverEbos` because the linear solver is set via the
`LinearSolverSplice` a few lines down.

This time, I verified that the
`Ewoms::Linear::ParallelBiCGStabSolverBackend` was used if the
offending line was commented out. also, Norne worked fine with the
default solver as long as the Schur complement for the wells was done
explicitly.

Finally, the naming of the eWoms API is a bit inconsistent
(`setMatrix()` vs. `setResidual()`). any opinions here? I'm fine with
whatever.
2019-01-30 15:26:39 +01:00
Joakim Hove 13aeee109c The missing features check takes a ParseContext argument 2019-01-25 18:03:32 +01:00
Atgeirr Flø Rasmussen e39f68787f Merge pull request #1715 from atgeirr/fix-missing-virtual-destructor
Add virtual destructor to base class.
2019-01-21 21:58:15 +01:00
Atgeirr Flø Rasmussen 7c30ee46ce Merge pull request #1713 from fgfuchs/replace_well_switching_logger
Replace well switching logger
2019-01-21 21:56:56 +01:00
Atgeirr Flø Rasmussen 6b6daa228a Add virtual destructor to base class. 2019-01-21 15:05:05 +01:00
Atgeirr Flø Rasmussen 037367bb03 Merge pull request #1714 from akva2/janitoring
Some janitoring
2019-01-21 15:00:58 +01:00
Atgeirr Flø Rasmussen a00972dc0b Merge pull request #1712 from andlaus/fix_ebos_convergence
adapt to the new preparation procedure of ewoms linear solvers
2019-01-21 14:54:09 +01:00
Arne Morten Kvarving 3f79495593 convert to unix line endings 2019-01-21 12:41:52 +01:00
Arne Morten Kvarving fbc3491fe9 fixed: initializer list order 2019-01-21 12:41:36 +01:00
Franz G. Fuchs 7f1df40b74 fixed naming conventions, messages and comments 2019-01-21 08:26:28 +01:00
Franz G. Fuchs 26bc063a0c report rank only if size>1 2019-01-18 15:48:05 +01:00
Franz G. Fuchs 80747fc123 log rank 2019-01-18 15:16:59 +01:00
Franz G. Fuchs 129e7d181e replace well switching logger with deferred logger 2019-01-18 14:04:30 +01:00
Andreas Lauser 2563a58db8 adapt to the new preparation procedure of ewoms linear solvers 2019-01-18 09:05:24 +01:00
Bård Skaflestad a689973760 Merge pull request #1708 from blattms/warn-parallel-logging-fallout
Warn about parallel logging fallout only on request / Use uppercase logfiles

Fixes OPM/opm-common#606
2019-01-17 16:13:25 +01:00
Kai Bao 1a5d38ec9c Merge pull request #1711 from akva2/fix_update_fetkovich
fixed: spurious white space
2019-01-17 12:34:42 +01:00
Arne Morten Kvarving fd7db0b94a fixed: spurious white space 2019-01-17 11:29:54 +01:00
Markus Blatt 2dd0b62eff [bugfix] Added missing ) to make code compile 2019-01-16 12:03:01 +01:00
Markus Blatt 4f4f5cbca3 [bugfix] Only strip ".DATA" or "." extensions.
As there might models named MODEL.01.DATA for which a call
"flow MODEL.01" would have stripped the extension.
2019-01-16 12:03:01 +01:00
Markus Blatt 20d12f5b53 [bugfix] Use file not filename to remove files not in current directory.
Passing just the filename to remove only will remove files in the
current directory. When --output-dir the files would not have been
removed.
2019-01-16 12:01:46 +01:00
Markus Blatt 0c2edcfe47 Remove debugging output 2019-01-16 11:56:47 +01:00
Atgeirr Flø Rasmussen f9f02724b9 Merge pull request #1710 from blattms/fix-parallel-well-hasTHPConstraints
Make BlackoilWellModel::hasTHPConstraints() work correctly in parallel.
2019-01-15 09:50:55 +01:00
Atgeirr Flø Rasmussen 1b79501060 Merge pull request #1709 from bska/deferredlogger-openmpi-18
Deferred Logger: Support Older MPI Implementations
2019-01-15 09:34:06 +01:00
Markus Blatt 89ec35e0d2 Make BlackoilWellModel::hasTHPConstraints() work correctly in parallel.
Previously, this method did not take parallelism into account but just
checked the local wells for the constraints. Depending on the load balancing
of the wells this sometimes led to different return values of the function on different
processors. As the output is used to limit the time step size, different processors
were sometimes using different time steps in their local computations. This screwed
up convergence checks int the nonlinear operator such that only some processor thought
convergence was already achieved while others wanted to do more iterations.

With this commit the method now returns whether there is any well on any processor
with the constraint being true.
2019-01-14 22:14:01 +01:00
Bård Skaflestad 767df6c6fe Deferred Logger: Support Older MPI Implementations
The MPI_Pack() function does not support pointers-to-const until
MPI-3.
2019-01-14 18:10:53 +01:00
Atgeirr Flø Rasmussen 8927df3095 Merge pull request #1705 from fgfuchs/feature_gatherdeferredlogger
gather deferredLogger implemented
2019-01-14 14:56:45 +01:00
Markus Blatt 4b6144bb65 Only warn and show parallel logging fallout on demand.
This commit adds an option that allows to enable detecting parallel
logging fallout (option --enable-logging-fallout-warning). It is now
false by default (previous behavior was as if the option was true).

If option is true a warning will be printed for any process with nonzero
rank that does try to log to *.PRT or *.DBG and the logged output will be appended
to these files at the end.
2019-01-14 13:06:21 +01:00
Markus Blatt 52270e7ac7 Use uppercase basename for *DBG and *PRT files for any extension.
Previously runs of flow started with 'flow base.' Would result in base..DBG
files; note the double dot and the case sensitivity. Now the file will be
BASE.DBG in this case. Note that any extension will be stipped (not only
.DATA as before).
2019-01-14 13:03:03 +01:00
Atgeirr Flø Rasmussen 9ea723a83e Merge pull request #1704 from joakim-hove/create-all-objects
Create all objects
2019-01-14 10:50:47 +01:00