From 1c1d3ff5f1a1fde59a5ebf2a7f1bb1c048126560 Mon Sep 17 00:00:00 2001 From: Charlie Vanaret Date: Mon, 18 Nov 2024 15:16:26 +0100 Subject: [PATCH] Minor changes --- uno/linear_algebra/SymmetricIndefiniteLinearSystem.hpp | 5 +++-- uno/solvers/MUMPS/MUMPSSolver.cpp | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/uno/linear_algebra/SymmetricIndefiniteLinearSystem.hpp b/uno/linear_algebra/SymmetricIndefiniteLinearSystem.hpp index 808b1ae7..4cb5711a 100644 --- a/uno/linear_algebra/SymmetricIndefiniteLinearSystem.hpp +++ b/uno/linear_algebra/SymmetricIndefiniteLinearSystem.hpp @@ -110,12 +110,13 @@ namespace uno { size_t number_attempts = 1; DEBUG << "Testing factorization with regularization factors (" << this->primal_regularization << ", " << this->dual_regularization << ")\n"; + auto [number_pos_eigenvalues, number_neg_eigenvalues, number_zero_eigenvalues] = linear_solver.get_inertia(); + DEBUG << "Inertia (" << number_pos_eigenvalues << ", " << number_neg_eigenvalues << ", " << number_zero_eigenvalues << ")\n"; if (not linear_solver.matrix_is_singular() && linear_solver.number_negative_eigenvalues() == size_dual_block) { - DEBUG << "Inertia is good\n"; + DEBUG << "Inertia is correct\n"; statistics.set("regulariz", this->primal_regularization); return; } - auto [number_pos_eigenvalues, number_neg_eigenvalues, number_zero_eigenvalues] = linear_solver.get_inertia(); DEBUG << "Expected inertia (" << size_primal_block << ", " << size_dual_block << ", 0), "; DEBUG << "got (" << number_pos_eigenvalues << ", " << number_neg_eigenvalues << ", " << number_zero_eigenvalues << ")\n"; DEBUG << "Number of attempts: " << number_attempts << "\n\n"; diff --git a/uno/solvers/MUMPS/MUMPSSolver.cpp b/uno/solvers/MUMPS/MUMPSSolver.cpp index 8a754c3d..2ba7d39d 100644 --- a/uno/solvers/MUMPS/MUMPSSolver.cpp +++ b/uno/solvers/MUMPS/MUMPSSolver.cpp @@ -16,8 +16,7 @@ namespace uno { #if defined(HAS_MPI) && defined(MUMPS_PARALLEL) // TODO load number of processes from option file this->mumps_structure.par = 1; -#endif -#ifdef MUMPS_SEQUENTIAL +#else this->mumps_structure.par = 1; #endif this->mumps_structure.job = MUMPSSolver::JOB_INIT;