Bård Skaflestad
2418df701f
WellState FIBO: Return Segment Vectors from report()
...
This commit extends class WellStateFullyImplictBlackoil to report
segment-related quantities as Opm::data::Segment objects (included
in Opm::data::WellRates objects). All wells have at least a top
segment in the context of WellState FIBO, so there is a meaningful
value to report for each well.
We put the extraction of segment-related quantities into a new
helper function
WellStateFullyImplicitBlackoil::reportSegmentResults()
to avoid cluttering up the body of report() more than absolutely
needed.
The primary use-case for this is assigning appropriate values to
items 8 through 11 of restart vector RSEG. In turn, this will
enable restoring these quantities from a restart file.
2019-04-04 16:22:19 +02:00
Bård Skaflestad
519e6ad174
Make WellStateFIBO Header Self Contained
...
In particular, include Schedule.hpp since commit 222241b made the
init() member function depend on Schedule but failed to add the
requisite header.
2019-04-04 16:22:19 +02:00
hnil
3a0db3adff
fixed indentation
2019-04-03 09:09:57 +02:00
hnil
30368ca7c5
Merge branch 'master' of https://github.com/OPM/opm-simulators into fix_cpr_oil_gas
2019-04-01 12:57:18 +02:00
hnil
88beff7a9d
Fixed pressure equation for case where water is not pressent, often used for co2 simulations
2019-04-01 12:55:06 +02:00
Joakim Hove
66b7d1596a
Remove ECHO and NOECHO from list of unsupported keywords
2019-03-29 12:27:11 +01:00
Joakim Hove
798c20a886
Remove EDITNNC from list of unsupported keywords
2019-03-29 12:26:54 +01:00
Joakim Hove
a9f680119a
Remove WTEST from list of unsupported keywords
2019-03-29 12:26:35 +01:00
Joakim Hove
415694f206
Remove RPTSCHED from list of unsupported keywords
2019-03-29 12:26:15 +01:00
Tor Harald Sandve
17c249fa46
Merge pull request #1765 from andlaus/minor_cleanups
...
Minor cleanups
2019-03-26 12:38:50 +01:00
Joakim Hove
e16b19adc7
Merge pull request #1764 from joakim-hove/move-events
...
Move events
2019-03-21 14:51:52 +01:00
Joakim Hove
27c78eb3dc
Extract NEW_WELL event from Schedule
2019-03-21 14:49:49 +01:00
Andreas Lauser
f1d3be27a7
ISTLSolverEbos: fix valgrind complaint that isIORank_ is not initialized
...
like most of the rest of the code, we now simply assume that rank 0
does all printing.
2019-03-21 12:35:26 +01:00
Joakim Hove
222241b3b3
Extract production update events from Schedule
2019-03-21 11:45:29 +01:00
Atgeirr Flø Rasmussen
f18477ce71
Merge pull request #1757 from atgeirr/improve_cpr_mod
...
Improve CPR solver
2019-03-21 11:19:10 +01:00
Atgeirr Flø Rasmussen
19b78b78c0
Updated after review comments.
2019-03-20 10:24:44 +01:00
Andreas Lauser
685a193558
make the branch self contained
...
Concretely this avoids having to patch eWoms by adding a generic
`Opm::transposeDenseMatrix()` template function instead of relying on
the dense matrix class to provide a `transpose()` method.
2019-03-19 15:09:19 +01:00
hnil
41acbcf861
change verbosity level setting for cpr to be more finegrained
2019-03-19 14:38:40 +01:00
hnil
b27e56e386
fixed bug in scaling of rhs for cpr
2019-03-19 14:32:32 +01:00
hnil
31f4c01938
Changes to make CPR able to use general indexing.
2019-03-15 11:27:38 +01:00
Arne Morten Kvarving
bedd88bc77
remove unused variables
2019-03-14 15:21:59 +01:00
Arne Morten Kvarving
d8d8050de9
convert to unix eol
...
unmark sources as executable
2019-03-14 13:37:05 +01:00
Arne Morten Kvarving
e1db2d2344
simplify: use dotproduct in DRS for vector
2019-03-14 11:52:21 +01:00
Arne Morten Kvarving
f98be9d43b
simplify: use matrix-vector product in DRS for matrix
2019-03-14 11:52:21 +01:00
Arne Morten Kvarving
41ff0da2b4
fixed: drs without matrix-add-well-contributions
2019-03-14 11:52:21 +01:00
Arne Morten Kvarving
e05e5e4f0e
Fix indenting
2019-03-14 11:52:21 +01:00
Atgeirr Flø Rasmussen
111feead14
Formatting fixes and removing unused code.
2019-03-14 11:22:07 +01:00
Atgeirr Flø Rasmussen
6ee5406a9f
Formatting and indentation fixes.
2019-03-14 10:37:46 +01:00
Atgeirr Flø Rasmussen
4eb44b4808
Remove unused code and fix indentation changes.
2019-03-14 10:05:20 +01:00
Franz G. Fuchs
25299b7a0a
correct exception handling in wells for parallel runs
2019-03-13 15:19:31 +01:00
hnil
40537f1999
Changes to make cpr work
2019-03-12 13:55:11 +01:00
Joakim Hove
485db348f0
Move well includes to subdirectory Well/
2019-03-07 15:30:33 +01:00
Kai Bao
3c88cb2f9d
correcting the sign of the accumulation term of StandardWell
...
Following the sign of the production rates.
And also keep the primary variables updated when calculating the
explicit quantities.
2019-03-06 09:48:30 +01:00
Andreas Lauser
c37bc1cf38
flow: hide a few unused eWoms parameters
...
these parameters where introduced with support for the TUNIING keyword
in `ebos`. since `flow` implements its own time stepping these
parameters are unused and should thus be hidden from view in it.
2019-03-04 13:58:38 +01:00
Andreas Lauser
21f5c1fbd3
ISTLSolverEbos: throw NumericalIssue instead of LinearSolverProblem
...
the former is caught by `ebos`, while the latter isn't. Alternatively,
this can be fixed by deriving `LinearSolverProblem` from
`NumericalIssue`, if preferred.
2019-03-04 13:58:38 +01:00
Andreas Lauser
0a9d6a0760
include missing header files
...
this makes the well model and the equil initializer header more autonomous.
2019-03-04 13:58:38 +01:00
Andreas Lauser
f36680bf3a
EclProblem: Rename NewtonRawTolerance to NewtonTolerance
...
this property is not used by `flow` because `flow` implements its own
Newton method, but it not renaming the property prevents `flow` from
building.
2019-03-01 10:48:06 +01:00
Andreas Lauser
6753e9ca31
aquifers: add missing serialize() and deserialize() methods
...
the original purpose of those is to provide a checkpoint/restart
mechanism using an ad-hoc file format. They might also be useful for
implementing the adjoint functionality, though.
2019-02-25 15:04:16 +01:00
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
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
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
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
Franz G. Fuchs
42f6f4d784
Correct Logging for Black Oil Well Model for parallel runs using DeferredLogger
2019-02-05 15:24:10 +01:00