From 5916f290732053e7bdd62e3b84a36511e81c6640 Mon Sep 17 00:00:00 2001 From: Heidi Thornquist Date: Tue, 11 Feb 2025 11:44:30 -0700 Subject: [PATCH] Fixes missed conflicts with integration of dense-matrix traits in a couple solvers Signed-off-by: Heidi Thornquist --- packages/belos/src/BelosBlockCGSolMgr.hpp | 4 ++-- packages/belos/src/BelosBlockGCRODRSolMgr.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/belos/src/BelosBlockCGSolMgr.hpp b/packages/belos/src/BelosBlockCGSolMgr.hpp index db3ea377c5a8..3533f1ea9d1f 100644 --- a/packages/belos/src/BelosBlockCGSolMgr.hpp +++ b/packages/belos/src/BelosBlockCGSolMgr.hpp @@ -581,8 +581,8 @@ setParameters (const Teuchos::RCP ¶ms) } // Convergence - using StatusTestCombo_t = Belos::StatusTestCombo; - using StatusTestResNorm_t = Belos::StatusTestGenResNorm; + using StatusTestCombo_t = Belos::StatusTestCombo; + using StatusTestResNorm_t = Belos::StatusTestGenResNorm; // Check for convergence tolerance if (params->isParameter("Convergence Tolerance")) { diff --git a/packages/belos/src/BelosBlockGCRODRSolMgr.hpp b/packages/belos/src/BelosBlockGCRODRSolMgr.hpp index ae7bafeef2c8..c42bbd44da2e 100644 --- a/packages/belos/src/BelosBlockGCRODRSolMgr.hpp +++ b/packages/belos/src/BelosBlockGCRODRSolMgr.hpp @@ -476,8 +476,8 @@ class BlockGCRODRSolMgr : public SolverManager { } // Convenience typedefs - typedef Belos::StatusTestCombo StatusTestCombo_t; - typedef Belos::StatusTestGenResNorm StatusTestResNorm_t; + typedef Belos::StatusTestCombo StatusTestCombo_t; + typedef Belos::StatusTestGenResNorm StatusTestResNorm_t; if (impConvTest_.is_null()) { impConvTest_ = rcp (new StatusTestResNorm_t (convTol_));