OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into opm-parser-integrate

Browse Source
This commit is contained in:
Joakim Hove 2014-02-26 23:31:13 +01:00
commit 745c62a551
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/FullyImplicitBlackoilSolver.cpp
View File

@ -210,7 +210,6 @@ namespace {
, rq_ (fluid.numPhases())
, phaseCondition_(grid.number_of_cells)
, residual_ ( { std::vector<ADB>(fluid.numPhases(), ADB::null()),
ADB::null(),
ADB::null(),
ADB::null() } )
{
@ -1275,9 +1274,6 @@ namespace {
{
r = std::max(r, (*b).value().matrix().norm());
}
if (active_[Oil] && active_[Gas]) {
r = std::max(r, residual_.rs_or_sg_eq.value().matrix().norm());
}
r = std::max(r, residual_.well_flux_eq.value().matrix().norm());
r = std::max(r, residual_.well_eq.value().matrix().norm());

1
opm/autodiff/FullyImplicitBlackoilSolver.hpp
View File

@ -141,7 +141,6 @@ namespace Opm {
// The well_eq has size equal to the number of wells.
struct {
std::vector<ADB> mass_balance;
ADB rs_or_sg_eq; // Only used if both gas and oil present
ADB well_flux_eq;
ADB well_eq;
} residual_;

2
opm/autodiff/WellDensitySegmented.hpp
View File

@ -28,7 +28,7 @@ namespace Opm
{
class WellState;
class PhaseUsage;
struct PhaseUsage;
/// A class giving a well model, by which we mean a way to compute