MueLu: fix compiler warnings

trilinos · Oct 12, 2021 · 222aeb7 · 222aeb7
1 parent ffaeb3f
commit 222aeb7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/muelu/src/MueCentral/MueLu_Hierarchy_decl.hpp b/packages/muelu/src/MueCentral/MueLu_Hierarchy_decl.hpp
@@ -366,7 +366,7 @@ namespace MueLu {
     appropriate \c ConvergenceStatus
     */
     ConvergenceStatus IsConverged(const Teuchos::Array<MagnitudeType>& residualNorm,
-        const Scalar convergenceTolerance) const;
+        const MagnitudeType convergenceTolerance) const;
 
     //! Print \c residualNorm for this \c iteration to the screen
     void PrintResidualHistory(const LO iteration,

diff --git a/packages/muelu/src/MueCentral/MueLu_Hierarchy_def.hpp b/packages/muelu/src/MueCentral/MueLu_Hierarchy_def.hpp
@@ -918,7 +918,7 @@ namespace MueLu {
 
     // Print residual information before iterating
     typedef Teuchos::ScalarTraits<typename STS::magnitudeType> STM;
-    MagnitudeType prevNorm = STM::one(), curNorm = STM::one();
+    MagnitudeType prevNorm = STM::one();
     rate_ = 1.0;
     if (IsCalculationOfResidualRequired(startLevel, conv))
       ComputeResidualAndPrintHistory(*A, X, B, Teuchos::ScalarTraits<LO>::zero(), startLevel, conv, prevNorm);
@@ -1570,11 +1570,11 @@ bool Hierarchy<Scalar, LocalOrdinal, GlobalOrdinal, Node>::IsCalculationOfResidu
 
 template <class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>
 ConvergenceStatus Hierarchy<Scalar, LocalOrdinal, GlobalOrdinal, Node>::IsConverged(
-    const Teuchos::Array<MagnitudeType>& residualNorm, const Scalar convergenceTolerance) const
+    const Teuchos::Array<MagnitudeType>& residualNorm, const MagnitudeType convergenceTolerance) const
 {
   ConvergenceStatus convergenceStatus = ConvergenceStatus::Undefined;
 
-  if (convergenceTolerance > 0)
+  if (convergenceTolerance > Teuchos::ScalarTraits<MagnitudeType>::zero())
   {
     bool passed = true;
     for (LO k = 0; k < residualNorm.size(); k++)