From ae8e2fb8c2f6a9ba4df0b842b478ac1cd7b58805 Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Tue, 18 Aug 2020 17:53:37 +0200 Subject: [PATCH] Removed commented out code from MSWell. --- opm/simulators/wells/MultisegmentWell_impl.hpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/opm/simulators/wells/MultisegmentWell_impl.hpp b/opm/simulators/wells/MultisegmentWell_impl.hpp index 0189b2797..7b9622cb5 100644 --- a/opm/simulators/wells/MultisegmentWell_impl.hpp +++ b/opm/simulators/wells/MultisegmentWell_impl.hpp @@ -624,7 +624,6 @@ namespace Opm duneB_.mv(x, Bx); // invDBx = duneD^-1 * Bx_ - // const BVectorWell invDBx = mswellhelpers::invDXDirect(duneD_, Bx); const BVectorWell invDBx = mswellhelpers::applyUMFPack(duneD_, duneDSolver_, Bx); // Ax = Ax - duneC_^T * invDBx @@ -1016,7 +1015,6 @@ namespace Opm { // We assemble the well equations, then we check the convergence, // which is why we do not put the assembleWellEq here. - //const BVectorWell dx_well = mswellhelpers::invDXDirect(duneD_, resWell_); const BVectorWell dx_well = mswellhelpers::applyUMFPack(duneD_, duneDSolver_, resWell_); updateWellState(dx_well, well_state, deferred_logger); @@ -1114,14 +1112,12 @@ namespace Opm for (int seg = 0; seg < numberOfSegments(); ++seg) { if (FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx)) { const int sign = dwells[seg][WFrac] > 0. ? 1 : -1; - // const double dx_limited = sign * std::min(std::abs(dwells[seg][WFrac]), relaxation_factor * dFLimit); const double dx_limited = sign * std::min(std::abs(dwells[seg][WFrac]) * relaxation_factor, dFLimit); primary_variables_[seg][WFrac] = old_primary_variables[seg][WFrac] - dx_limited; } if (FluidSystem::phaseIsActive(FluidSystem::gasPhaseIdx)) { const int sign = dwells[seg][GFrac] > 0. ? 1 : -1; - // const double dx_limited = sign * std::min(std::abs(dwells[seg][GFrac]), relaxation_factor * dFLimit); const double dx_limited = sign * std::min(std::abs(dwells[seg][GFrac]) * relaxation_factor, dFLimit); primary_variables_[seg][GFrac] = old_primary_variables[seg][GFrac] - dx_limited; } @@ -1132,7 +1128,6 @@ namespace Opm // update the segment pressure { const int sign = dwells[seg][SPres] > 0.? 1 : -1; - //const double dx_limited = sign * std::min(std::abs(dwells[seg][SPres]), relaxation_factor * max_pressure_change); const double dx_limited = sign * std::min(std::abs(dwells[seg][SPres]) * relaxation_factor, max_pressure_change); primary_variables_[seg][SPres] = std::max( old_primary_variables[seg][SPres] - dx_limited, 1e5); }