From a1fe421de922b73a0e3856bce71a3c2ea21e035b Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 13 Aug 2024 11:21:47 +0200 Subject: [PATCH] remove unused variables --- opm/simulators/linalg/bda/rocm/rocsparseBILU0.cpp | 1 - opm/simulators/linalg/bda/rocm/rocsparseCPR.cpp | 2 -- .../linalg/bda/rocm/rocsparsePreconditioner.cpp | 6 +++--- opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.cpp | 8 +++----- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/opm/simulators/linalg/bda/rocm/rocsparseBILU0.cpp b/opm/simulators/linalg/bda/rocm/rocsparseBILU0.cpp index f1e6f6da6..677194f57 100644 --- a/opm/simulators/linalg/bda/rocm/rocsparseBILU0.cpp +++ b/opm/simulators/linalg/bda/rocm/rocsparseBILU0.cpp @@ -253,7 +253,6 @@ update_system_on_gpu(Scalar *d_Avals) { template void rocsparseBILU0:: apply(Scalar& y, Scalar& x) { - Scalar zero = 0.0; Scalar one = 1.0; Timer t_apply; diff --git a/opm/simulators/linalg/bda/rocm/rocsparseCPR.cpp b/opm/simulators/linalg/bda/rocm/rocsparseCPR.cpp index 5a95dd475..1e36588f8 100644 --- a/opm/simulators/linalg/bda/rocm/rocsparseCPR.cpp +++ b/opm/simulators/linalg/bda/rocm/rocsparseCPR.cpp @@ -223,8 +223,6 @@ amg_cycle_gpu(const int level, RocmMatrix *A = &d_Amatrices[level]; RocmMatrix *R = &d_Rmatrices[level]; int Ncur = A->Nb; - Scalar zero = 0.0; - Scalar one = 1.0; rocsparse_mat_info spmv_info; rocsparse_mat_descr descr_R; diff --git a/opm/simulators/linalg/bda/rocm/rocsparsePreconditioner.cpp b/opm/simulators/linalg/bda/rocm/rocsparsePreconditioner.cpp index f5449b903..93e0d5a58 100644 --- a/opm/simulators/linalg/bda/rocm/rocsparsePreconditioner.cpp +++ b/opm/simulators/linalg/bda/rocm/rocsparsePreconditioner.cpp @@ -38,10 +38,10 @@ create(PreconditionerType type, return std::make_unique >(verbosity); case PreconditionerType::CPR: return std::make_unique >(verbosity); + default: + OPM_THROW(std::logic_error, + "Invalid preconditioner type " + std::to_string(static_cast(type))); } - - OPM_THROW(std::logic_error, - "Invalid preconditioner type " + std::to_string(static_cast(type))); } template diff --git a/opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.cpp b/opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.cpp index 3a1781076..4cd126a6c 100644 --- a/opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.cpp +++ b/opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.cpp @@ -63,18 +63,16 @@ rocsparseSolverBackend(int verbosity_, int maxit_, Scalar tolerance_, : Base(verbosity_, maxit_, tolerance_, platformID_, deviceID_) { int numDevices = 0; - bool use_cpr, use_isai; + bool use_cpr; if (linsolver.compare("ilu0") == 0) { use_cpr = false; - use_isai = false; } else if (linsolver.compare("cpr_quasiimpes") == 0) { use_cpr = true; - use_isai = false; } else if (linsolver.compare("isai") == 0) { - OPM_THROW(std::logic_error, "Error rocsparseSolver does not support --linerar-solver=isai"); + OPM_THROW(std::logic_error, "Error rocsparseSolver does not support --linear-solver=isai"); } else if (linsolver.compare("cpr_trueimpes") == 0) { - OPM_THROW(std::logic_error, "Error rocsparseSolver does not support --linerar-solver=cpr_trueimpes"); + OPM_THROW(std::logic_error, "Error rocsparseSolver does not support --linear-solver=cpr_trueimpes"); } else { OPM_THROW(std::logic_error, "Error unknown value for argument --linear-solver, " + linsolver); }