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

Updated comments, fixed shadowed declaration warnings

Browse Source
This commit is contained in:
T.D. (Tongdong) Qiu 2020-06-23 11:30:15 +02:00
parent f974a5f6db
commit 39df7c9381
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/simulators/linalg/bda/BILU0.cpp
View File

@ -340,11 +340,11 @@ namespace bda
this->lmem_per_work_group = lmem_per_work_group;
}
void BILU0::setKernels(
cl::make_kernel<cl::Buffer&, cl::Buffer&, cl::Buffer&, const unsigned int, cl::Buffer&, cl::Buffer&, cl::Buffer&, const unsigned int, const unsigned int, cl::LocalSpaceArg> *ILU_apply1,
cl::make_kernel<cl::Buffer&, cl::Buffer&, cl::Buffer&, const unsigned int, cl::Buffer&, cl::Buffer&, cl::Buffer&, const unsigned int, const unsigned int, cl::LocalSpaceArg> *ILU_apply2
cl::make_kernel<cl::Buffer&, cl::Buffer&, cl::Buffer&, const unsigned int, cl::Buffer&, cl::Buffer&, cl::Buffer&, const unsigned int, const unsigned int, cl::LocalSpaceArg> *ILU_apply1_,
cl::make_kernel<cl::Buffer&, cl::Buffer&, cl::Buffer&, const unsigned int, cl::Buffer&, cl::Buffer&, cl::Buffer&, const unsigned int, const unsigned int, cl::LocalSpaceArg> *ILU_apply2_
){
this->ILU_apply1 = ILU_apply1;
this->ILU_apply2 = ILU_apply2;
this->ILU_apply1 = ILU_apply1_;
this->ILU_apply2 = ILU_apply2_;
}
} // end namespace bda

2
opm/simulators/linalg/bda/BdaBridge.cpp
View File

@ -177,7 +177,7 @@ void BdaBridge::solve_system(BridgeMatrix *mat OPM_UNUSED, BridgeVector &b OPM_U
BdaSolverStatus status = backend->solve_system(N, nnz, dim, static_cast<double*>(&(((*mat)[0][0][0][0]))), h_rows.data(), h_cols.data(), static_cast<double*>(&(b[0][0])), wellContribs, result);
switch(status) {
case BdaSolverStatus::BDA_SOLVER_SUCCESS:
//OpmLog::info("cusparseSolver converged");
//OpmLog::info("BdaSolver converged");
break;
case BdaSolverStatus::BDA_SOLVER_ANALYSIS_FAILED:
OpmLog::warning("BdaSolver could not analyse level information of matrix, perhaps there is still a 0.0 on the diagonal of a block on the diagonal");

6
opm/simulators/linalg/bda/MultisegmentWellContribution.cpp
View File

@ -127,10 +127,10 @@ unsigned int MultisegmentWellContribution::getColIdx(unsigned int idx)
}
}
void MultisegmentWellContribution::setReordering(int *toOrder, bool reorder)
void MultisegmentWellContribution::setReordering(int *toOrder_, bool reorder_)
{
this->toOrder = toOrder;
this->reorder = reorder;
this->toOrder = toOrder_;
this->reorder = reorder_;
}
} //namespace Opm

12
opm/simulators/linalg/bda/WellContributions.cu
View File

@ -315,19 +315,19 @@ void WellContributions::addMultisegmentWellContribution(unsigned int dim, unsign
}
void WellContributions::setReordering(int *toOrder, bool reorder)
void WellContributions::setReordering(int *toOrder_, bool reorder_)
{
this->toOrder = toOrder;
this->reorder = reorder;
this->toOrder = toOrder_;
this->reorder = reorder_;
for (auto& ms : multisegments) {
ms->setReordering(toOrder, reorder);
ms->setReordering(toOrder_, reorder_);
}
}
#if HAVE_OPENCL
void WellContributions::setOpenCLQueue(cl::CommandQueue *queue)
void WellContributions::setOpenCLQueue(cl::CommandQueue *queue_)
{
this->queue = queue;
this->queue = queue_;
}
#endif

6
opm/simulators/linalg/bda/cusparseSolverBackend.cu
View File

@ -51,7 +51,7 @@ const cusparseSolvePolicy_t policy = CUSPARSE_SOLVE_POLICY_USE_LEVEL;
const cusparseOperation_t operation = CUSPARSE_OPERATION_NON_TRANSPOSE;
const cusparseDirection_t order = CUSPARSE_DIRECTION_ROW;
cusparseSolverBackend::cusparseSolverBackend(int verbosity_, int maxit_, double tolerance_) : BdaSolver(verbosity_, maxit_, tolerance) {}
cusparseSolverBackend::cusparseSolverBackend(int verbosity_, int maxit_, double tolerance_) : BdaSolver(verbosity_, maxit_, tolerance_) {}
cusparseSolverBackend::~cusparseSolverBackend() {
finalize();
@ -491,10 +491,10 @@ void cusparseSolverBackend::get_result(double *x) {
if (verbosity > 2) {
t2 = second();
std::ostringstream out;
out << "cusparseSolver::post_process(): " << t2 - t1 << " s";
out << "cusparseSolver::get_result(): " << t2 - t1 << " s";
OpmLog::info(out.str());
}
} // end post_process()
} // end get_result()
typedef BdaSolver::BdaSolverStatus BdaSolverStatus;