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

remove unused variables

Browse Source
This commit is contained in:
Arne Morten Kvarving 2019-03-14 15:21:34 +01:00
parent 81ba405f26
commit bedd88bc77
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/autodiff/BlackoilAmg.hpp
View File

@ -116,7 +116,6 @@ scaleMatrixDRS(const Operator& op, const Communication& comm,
const BlockVector& bw = weights[i.index()]; const BlockVector& bw = weights[i.index()];
const auto endj = (*i).end(); const auto endj = (*i).end();
for (auto j = (*i).begin(); j != endj; ++j) { for (auto j = (*i).begin(); j != endj; ++j) {
BlockVector bvec(0.0);
Block& block = *j; Block& block = *j;
BlockVector& bvec = block[pressureIndex]; BlockVector& bvec = block[pressureIndex];
// should introduce limits which also change the weights // should introduce limits which also change the weights

7
opm/autodiff/ISTLSolverEbos.hpp
View File

@ -653,7 +653,6 @@ protected:
Scalar scvVolume = elemCtx.stencil(/*timeIdx=*/0).subControlVolume(0).volume() * extrusionFactor; Scalar scvVolume = elemCtx.stencil(/*timeIdx=*/0).subControlVolume(0).volume() * extrusionFactor;
Scalar storage_scale = scvVolume / elemCtx.simulator().timeStepSize(); Scalar storage_scale = scvVolume / elemCtx.simulator().timeStepSize();
MatrixBlockType block; MatrixBlockType block;
int offset = 0;
double pressure_scale = 50e5; double pressure_scale = 50e5;
for (int ii = 0; ii < numEq; ++ii) { for (int ii = 0; ii < numEq; ++ii) {
for (int jj = 0; jj < numEq; ++jj) { for (int jj = 0; jj < numEq; ++jj) {
@ -676,15 +675,12 @@ protected:
void scaleEquationsAndVariables(Vector& weights) void scaleEquationsAndVariables(Vector& weights)
{ {
// loop over primary variables // loop over primary variables
const auto& sol = simulator_.model().solution(0);
const auto endi = matrix_->end(); const auto endi = matrix_->end();
int index = 0;
for (auto i = matrix_->begin(); i != endi; ++i) { for (auto i = matrix_->begin(); i != endi; ++i) {
const auto endj = (*i).end(); const auto endj = (*i).end();
BlockVector& brhs = (*rhs_)[i.index()]; BlockVector& brhs = (*rhs_)[i.index()];
for (auto j = (*i).begin(); j != endj; ++j) { for (auto j = (*i).begin(); j != endj; ++j) {
MatrixBlockType& block = *j; MatrixBlockType& block = *j;
const auto& priVars = sol[i.index()];
for (std::size_t ii = 0; ii < block.rows; ii++ ) { for (std::size_t ii = 0; ii < block.rows; ii++ ) {
for (std::size_t jj = 0; jj < block.cols; jj++) { for (std::size_t jj = 0; jj < block.cols; jj++) {
double var_scale = simulator_.model().primaryVarWeight(i.index(),jj); double var_scale = simulator_.model().primaryVarWeight(i.index(),jj);
@ -710,9 +706,7 @@ protected:
void scaleSolution(Vector& x) void scaleSolution(Vector& x)
{ {
const auto& sol = simulator_.model().solution(0);
for (std::size_t i = 0; i < x.size(); ++i) { for (std::size_t i = 0; i < x.size(); ++i) {
const auto& primVar = sol[i];
auto& bx = x[i]; auto& bx = x[i];
for (std::size_t jj = 0; jj < bx.size(); jj++) { for (std::size_t jj = 0; jj < bx.size(); jj++) {
double var_scale = simulator_.model().primaryVarWeight(i,jj); double var_scale = simulator_.model().primaryVarWeight(i,jj);
@ -728,7 +722,6 @@ protected:
BlockVector rhs(0.0); BlockVector rhs(0.0);
rhs[pressureIndex] = 1; rhs[pressureIndex] = 1;
const auto endi = A.end(); const auto endi = A.end();
int index = 0;
for (auto i = A.begin(); i!=endi; ++i) { for (auto i = A.begin(); i!=endi; ++i) {
const auto endj = (*i).end(); const auto endj = (*i).end();
MatrixBlockType diag_block(0.0); MatrixBlockType diag_block(0.0);