Skip to content

Commit

Permalink
Fixes missed conflicts with integration of dense-matrix traits in a c…
Browse files Browse the repository at this point in the history
…ouple solvers

Signed-off-by: Heidi Thornquist <[email protected]>
  • Loading branch information
hkthorn committed Feb 11, 2025
1 parent 33afa4b commit 5916f29
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions packages/belos/src/BelosBlockCGSolMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,8 @@ setParameters (const Teuchos::RCP<Teuchos::ParameterList> &params)
}

// Convergence
using StatusTestCombo_t = Belos::StatusTestCombo<ScalarType, MV, OP>;
using StatusTestResNorm_t = Belos::StatusTestGenResNorm<ScalarType, MV, OP>;
using StatusTestCombo_t = Belos::StatusTestCombo<ScalarType, MV, OP, DM>;
using StatusTestResNorm_t = Belos::StatusTestGenResNorm<ScalarType, MV, OP, DM>;

// Check for convergence tolerance
if (params->isParameter("Convergence Tolerance")) {
Expand Down
4 changes: 2 additions & 2 deletions packages/belos/src/BelosBlockGCRODRSolMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,8 @@ class BlockGCRODRSolMgr : public SolverManager<ScalarType, MV, OP, DM> {
}
// Convenience typedefs
typedef Belos::StatusTestCombo<ScalarType,MV,OP> StatusTestCombo_t;
typedef Belos::StatusTestGenResNorm<ScalarType,MV,OP> StatusTestResNorm_t;
typedef Belos::StatusTestCombo<ScalarType,MV,OP,DM> StatusTestCombo_t;
typedef Belos::StatusTestGenResNorm<ScalarType,MV,OP,DM> StatusTestResNorm_t;
if (impConvTest_.is_null()) {
impConvTest_ = rcp (new StatusTestResNorm_t (convTol_));
Expand Down

0 comments on commit 5916f29

Please sign in to comment.