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

Fixes rotated function parameters during function call.

Browse Source 
There was a mixup in the order of the function parameters, both in
the declaration and in the actual function call. This commit resolves this.
This commit is contained in:
Markus Blatt 2015-01-28 19:08:48 +01:00
parent 0b18e6a15f
commit f5ed31d128
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/autodiff/FullyImplicitBlackoilSolver.hpp
View File

@ -364,21 +364,21 @@ namespace Opm {
/// \param[in] R A matrix with MaxNumPhases columns and the same number rows
/// as the number of cells of the grid. B.col(i) contains the values
/// for phase i.
/// \param[out] B_avg An array of size MaxNumPhases where entry i contains the average
/// of B for the phase i.
/// \param[out] maxCoeff An array of size MaxNumPhases where entry i contains the
/// maximum of (???) for the phase i.
/// \param[out] R_sum An array of size MaxNumPhases where entry i contains the sum
/// of R for the phase i.
/// \param[out] maxCoeff An array of size MaxNumPhases where entry i contains the
/// maximum of (???) for the phase i.
/// \param[out] B_avg An array of size MaxNumPhases where entry i contains the average
/// of B for the phase i.
/// \param[in] nc The number of cells of the local grid.
/// \return The total pore volume over all cells.
double
convergenceReduction(const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases>& B,
const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases>& tempV,
const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases>& R,
std::array<double,MaxNumPhases>& B_avg,
std::array<double,MaxNumPhases>& maxCoeff,
std::array<double,MaxNumPhases>& R_sum,
std::array<double,MaxNumPhases>& maxCoeff,
std::array<double,MaxNumPhases>& B_avg,
int nc) const;
void detectNewtonOscillations(const std::vector<std::vector<double>>& residual_history,

2
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@ -1947,7 +1947,7 @@ namespace {
}
}
const double pvSum = convergenceReduction(B, tempV, R, B_avg, maxCoeff, R_sum, nc);
const double pvSum = convergenceReduction(B, tempV, R, R_sum, maxCoeff, B_avg, nc);
bool converged_MB = true;
bool converged_CNV = true;