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

Silence multiple warnings.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2015-05-29 16:31:32 +02:00
parent bd51ce8dbe
commit 79b861db10
11 changed files with 26 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp
View File

@@ -354,7 +354,7 @@ namespace Opm {
const ADB mu = fluidViscosity(canonicalPhaseIdx, phasePressure, state.temperature, state.rs, state.rv, cond, cells_);
const ADB cmax = ADB::constant(cmax_, state.concentration.blockPattern());
const ADB mc = computeMc(state);
const ADB krw_eff = polymer_props_ad_.effectiveRelPerm(state.concentration, cmax, kr, state.saturation[actph]);
const ADB krw_eff = polymer_props_ad_.effectiveRelPerm(state.concentration, cmax, kr);
const ADB inv_wat_eff_visc = polymer_props_ad_.effectiveInvWaterVisc(state.concentration, mu.value().data());
// Reduce mobility of water phase by relperm reduction and effective viscosity increase.
rq_[actph].mob = tr_mult * krw_eff * inv_wat_eff_visc;
@@ -404,7 +404,7 @@ namespace Opm {
for ( int idx=0; idx<MaxNumPhases+1; ++idx )
{
if (idx == MaxNumPhases || active_[idx]) { // Dealing with polymer *or* an active phase.
if ((idx == MaxNumPhases && has_polymer_) || active_[idx]) { // Dealing with polymer *or* an active phase.
auto values = std::tuple<double,double,double>(0.0 ,0.0 ,0.0);
auto containers = std::make_tuple(B.col(idx),
tempV.col(idx),
@@ -430,7 +430,6 @@ namespace Opm {
}
info.communicator().max(&maxNormWell[0], MaxNumPhases+1);
// Compute pore volume
#warning Missing polymer code for MPI version
return std::get<1>(nc_and_pv);
}
else
@@ -438,9 +437,9 @@ namespace Opm {
{
for ( int idx=0; idx<MaxNumPhases+1; ++idx )
{
if (idx == MaxNumPhases || active_[idx]) { // Dealing with polymer *or* an active phase.
if ((idx == MaxNumPhases && has_polymer_) || active_[idx]) { // Dealing with polymer *or* an active phase.
B_avg[idx] = B.col(idx).sum()/nc;
maxCoeff[idx]=tempV.col(idx).maxCoeff();
maxCoeff[idx] = tempV.col(idx).maxCoeff();
R_sum[idx] = R.col(idx).sum();
}
else
@@ -454,11 +453,6 @@ namespace Opm {
}
}
}
if (has_polymer_) {
B_avg[MaxNumPhases] = B.col(MaxNumPhases).sum()/nc;
maxCoeff[MaxNumPhases]=tempV.col(MaxNumPhases).maxCoeff();
R_sum[MaxNumPhases] = R.col(MaxNumPhases).sum();
}
// Compute total pore volume
return geo_.poreVolume().sum();
}