diff --git a/opm/autodiff/BlackoilModelEbos.hpp b/opm/autodiff/BlackoilModelEbos.hpp index c5c7e0c31..24bfec244 100644 --- a/opm/autodiff/BlackoilModelEbos.hpp +++ b/opm/autodiff/BlackoilModelEbos.hpp @@ -475,27 +475,27 @@ namespace Opm { /// Zero out off-diagonal blocks on rows corresponding to overlap cells /// Diagonal blocks on ovelap rows are set to diag(1e100). void makeOverlapRowsInvalid(Mat& ebosJacIgnoreOverlap) const - { + { //value to set on diagonal MatrixBlockType diag_block(0.0); - for (int eq = 0; eq < numEq; ++eq) + for (int eq = 0; eq < numEq; ++eq) diag_block[eq][eq] = 1.0e100; - + //loop over precalculated overlap rows and columns for (auto row = overlapRowAndColumns_.begin(); row != overlapRowAndColumns_.end(); row++ ) { - int lcell = row->first; + int lcell = row->first; //diagonal block set to large value diagonal ebosJacIgnoreOverlap[lcell][lcell] = diag_block; - //loop over off diagonal blocks in overlap row + //loop over off diagonal blocks in overlap row for (auto col = row->second.begin(); col != row->second.end(); ++col) { int ncell = *col; //zero out block ebosJacIgnoreOverlap[lcell][ncell] = 0.0; } - } + } } /// Solve the Jacobian system Jx = r where J is the Jacobian and @@ -522,7 +522,7 @@ namespace Opm { const Mat& actual_mat_for_prec = matrix_for_preconditioner_ ? *matrix_for_preconditioner_.get() : ebosJac.istlMatrix(); // Solve system. if( isParallel() ) - { + { typedef WellModelMatrixAdapter< Mat, BVector, BVector, BlackoilWellModel, true > Operator; auto ebosJacIgnoreOverlap = Mat(ebosJac.istlMatrix()); @@ -966,7 +966,7 @@ namespace Opm { /// Should not be called std::vector > computeFluidInPlace(const std::vector& /*fipnum*/) const - { + { //assert(true) //return an empty vector std::vector > regionValues(0, std::vector(0,0.0)); @@ -1030,7 +1030,7 @@ namespace Opm { double current_relaxation_; BVector dx_old_; - std::unique_ptr matrix_for_preconditioner_; + std::unique_ptr matrix_for_preconditioner_; std::vector>> overlapRowAndColumns_; std::vector convergence_reports_; diff --git a/opm/autodiff/WellInterface_impl.hpp b/opm/autodiff/WellInterface_impl.hpp index 890ba192c..e99dba664 100644 --- a/opm/autodiff/WellInterface_impl.hpp +++ b/opm/autodiff/WellInterface_impl.hpp @@ -1204,7 +1204,7 @@ namespace Opm for (int p = 0; p < np; ++p) { well_state.wellReservoirRates()[well_rate_index + p] = voidage_rates[p]; - } + } } template