OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1168 from dr-robertk/PR/remove-warnings

Browse Source 
[cleanup] remove two uninitialized warnings in SaturationProposFromDeck.
This commit is contained in:
Atgeirr Flø Rasmussen 2017-06-07 14:08:57 +02:00 committed by GitHub
commit 4bab353e90
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/core/props/satfunc/SaturationPropsFromDeck.cpp
View File

@ -103,7 +103,7 @@ namespace Opm
ExplicitArraysFluidState fluidState(phaseUsage_); ExplicitArraysFluidState fluidState(phaseUsage_);
fluidState.setSaturationArray(s); fluidState.setSaturationArray(s);
double relativePerms[BlackoilPhases::MaxNumPhases]; double relativePerms[BlackoilPhases::MaxNumPhases] = { 0 };
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
fluidState.setIndex(i); fluidState.setIndex(i);
const auto& params = materialLawManager_->materialLawParams(cells[i]); const auto& params = materialLawManager_->materialLawParams(cells[i]);
@ -136,7 +136,7 @@ namespace Opm
double* pc, double* pc,
double* dpcds) const double* dpcds) const
{ {
assert(cells != 0); assert(cells != 0);
assert(phaseUsage_.phase_used[BlackoilPhases::Liquid]); assert(phaseUsage_.phase_used[BlackoilPhases::Liquid]);
const int np = numPhases(); const int np = numPhases();
@ -179,8 +179,8 @@ namespace Opm
ExplicitArraysFluidState fluidState(phaseUsage_); ExplicitArraysFluidState fluidState(phaseUsage_);
fluidState.setSaturationArray(s); fluidState.setSaturationArray(s);
double capillaryPressures[BlackoilPhases::MaxNumPhases]; double capillaryPressures[BlackoilPhases::MaxNumPhases] = { 0 };
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
fluidState.setIndex(i); fluidState.setIndex(i);
const auto& params = materialLawManager_->materialLawParams(cells[i]); const auto& params = materialLawManager_->materialLawParams(cells[i]);
MaterialLaw::capillaryPressures(capillaryPressures, params, fluidState); MaterialLaw::capillaryPressures(capillaryPressures, params, fluidState);
@ -249,13 +249,13 @@ namespace Opm
} }
} }
/// Update saturation state for the hysteresis tracking /// Update saturation state for the hysteresis tracking
/// \param[in] n Number of data points. /// \param[in] n Number of data points.
/// \param[in] s Array of nP saturation values. /// \param[in] s Array of nP saturation values.
void SaturationPropsFromDeck::updateSatHyst(const int n, void SaturationPropsFromDeck::updateSatHyst(const int n,
const int* cells, const int* cells,
const double* s) const double* s)
{ {
assert(cells != 0); assert(cells != 0);
if (materialLawManager_->enableHysteresis()) { if (materialLawManager_->enableHysteresis()) {