From 6777afe8ec6b95cf8b05251d7f86962b152c0761 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sat, 15 Jun 2019 15:46:14 +0200
Subject: [PATCH] Fix unused/redundant assignments.
CPPCheck warning type: redundantAssignment.
---
Applications/FileIO/SWMM/SWMMInterface.cpp | 1 -
MathLib/LinAlg/Lis/LisLinearSolver.cpp | 4 ++++
MathLib/LinAlg/Lis/LisMatrix.cpp | 3 +++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/Applications/FileIO/SWMM/SWMMInterface.cpp b/Applications/FileIO/SWMM/SWMMInterface.cpp
index 0b5b4cc27a8..3ffd27a0f76 100644
--- a/Applications/FileIO/SWMM/SWMMInterface.cpp
+++ b/Applications/FileIO/SWMM/SWMMInterface.cpp
@@ -617,7 +617,6 @@ bool SwmmInterface::readSubcatchments(std::ifstream &in, std::map< std::string,
return false;
}
- sc.outlet = std::numeric_limits<std::size_t>::max();
auto const it = name_id_map.find(split_str[2]);
if (it == name_id_map.end())
{
diff --git a/MathLib/LinAlg/Lis/LisLinearSolver.cpp b/MathLib/LinAlg/Lis/LisLinearSolver.cpp
index 95cde280cfe..9829c95bd61 100644
--- a/MathLib/LinAlg/Lis/LisLinearSolver.cpp
+++ b/MathLib/LinAlg/Lis/LisLinearSolver.cpp
@@ -55,11 +55,15 @@ bool LisLinearSolver::solve(LisMatrix &A, LisVector &b, LisVector &x)
{
int precon;
ierr = lis_solver_get_precon(solver, &precon);
+ if (!checkLisError(ierr))
+ return false;
INFO("-> precon: %i", precon);
}
{
int slv;
ierr = lis_solver_get_solver(solver, &slv);
+ if (!checkLisError(ierr))
+ return false;
INFO("-> solver: %i", slv);
}
diff --git a/MathLib/LinAlg/Lis/LisMatrix.cpp b/MathLib/LinAlg/Lis/LisMatrix.cpp
index 5b075ebc256..6cccbfae9f8 100644
--- a/MathLib/LinAlg/Lis/LisMatrix.cpp
+++ b/MathLib/LinAlg/Lis/LisMatrix.cpp
@@ -63,7 +63,10 @@ LisMatrix::~LisMatrix()
{
int ierr = 0;
if (_use_external_arrays)
+ {
ierr = lis_matrix_unset(_AA);
+ checkLisError(ierr);
+ }
ierr = lis_matrix_destroy(_AA);
checkLisError(ierr);
ierr = lis_vector_destroy(_diag);
--
GitLab