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

removing some white spaces.

Browse Source
This commit is contained in:
Kai Bao 2018-12-21 13:51:13 +01:00
parent 7771725e4c
commit dcf036e757
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -475,27 +475,27 @@ namespace Opm {
/// Zero out off-diagonal blocks on rows corresponding to overlap cells /// Zero out off-diagonal blocks on rows corresponding to overlap cells
/// Diagonal blocks on ovelap rows are set to diag(1e100). /// Diagonal blocks on ovelap rows are set to diag(1e100).
void makeOverlapRowsInvalid(Mat& ebosJacIgnoreOverlap) const void makeOverlapRowsInvalid(Mat& ebosJacIgnoreOverlap) const
{ {
//value to set on diagonal //value to set on diagonal
MatrixBlockType diag_block(0.0); 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; diag_block[eq][eq] = 1.0e100;
//loop over precalculated overlap rows and columns //loop over precalculated overlap rows and columns
for (auto row = overlapRowAndColumns_.begin(); row != overlapRowAndColumns_.end(); row++ ) for (auto row = overlapRowAndColumns_.begin(); row != overlapRowAndColumns_.end(); row++ )
{ {
int lcell = row->first; int lcell = row->first;
//diagonal block set to large value diagonal //diagonal block set to large value diagonal
ebosJacIgnoreOverlap[lcell][lcell] = diag_block; 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) for (auto col = row->second.begin(); col != row->second.end(); ++col)
{ {
int ncell = *col; int ncell = *col;
//zero out block //zero out block
ebosJacIgnoreOverlap[lcell][ncell] = 0.0; ebosJacIgnoreOverlap[lcell][ncell] = 0.0;
} }
} }
} }
/// Solve the Jacobian system Jx = r where J is the Jacobian and /// 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(); const Mat& actual_mat_for_prec = matrix_for_preconditioner_ ? *matrix_for_preconditioner_.get() : ebosJac.istlMatrix();
// Solve system. // Solve system.
if( isParallel() ) if( isParallel() )
{ {
typedef WellModelMatrixAdapter< Mat, BVector, BVector, BlackoilWellModel<TypeTag>, true > Operator; typedef WellModelMatrixAdapter< Mat, BVector, BVector, BlackoilWellModel<TypeTag>, true > Operator;
auto ebosJacIgnoreOverlap = Mat(ebosJac.istlMatrix()); auto ebosJacIgnoreOverlap = Mat(ebosJac.istlMatrix());
@ -966,7 +966,7 @@ namespace Opm {
/// Should not be called /// Should not be called
std::vector<std::vector<double> > std::vector<std::vector<double> >
computeFluidInPlace(const std::vector<int>& /*fipnum*/) const computeFluidInPlace(const std::vector<int>& /*fipnum*/) const
{ {
//assert(true) //assert(true)
//return an empty vector //return an empty vector
std::vector<std::vector<double> > regionValues(0, std::vector<double>(0,0.0)); std::vector<std::vector<double> > regionValues(0, std::vector<double>(0,0.0));
@ -1030,7 +1030,7 @@ namespace Opm {
double current_relaxation_; double current_relaxation_;
BVector dx_old_; BVector dx_old_;
std::unique_ptr<Mat> matrix_for_preconditioner_; std::unique_ptr<Mat> matrix_for_preconditioner_;
std::vector<std::pair<int,std::vector<int>>> overlapRowAndColumns_; std::vector<std::pair<int,std::vector<int>>> overlapRowAndColumns_;
std::vector<StepReport> convergence_reports_; std::vector<StepReport> convergence_reports_;

2
opm/autodiff/WellInterface_impl.hpp
View File

@ -1204,7 +1204,7 @@ namespace Opm
for (int p = 0; p < np; ++p) { for (int p = 0; p < np; ++p) {
well_state.wellReservoirRates()[well_rate_index + p] = voidage_rates[p]; well_state.wellReservoirRates()[well_rate_index + p] = voidage_rates[p];
} }
} }
template<typename TypeTag> template<typename TypeTag>