Fixed bug in constructor of MKL solver if MKL was not used. Now not r…

…egistering mkl solvers if mkl is not used.
febiosoftware · Dec 12, 2024 · aed29b9 · aed29b9
1 parent 8425656
commit aed29b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/NumCore/MKLDSSolver.cpp b/NumCore/MKLDSSolver.cpp
@@ -188,7 +188,7 @@ BEGIN_FECORE_CLASS(MKLDSSolver, LinearSolver)
 ADD_PARAMETER(m->msglvl, "msglvl");
 END_FECORE_CLASS();
 
-MKLDSSolver::MKLDSSolver(FEModel* fem) : LinearSolver(fem), m(nullptr) {}
+MKLDSSolver::MKLDSSolver(FEModel* fem) : LinearSolver(fem), m(new MKLDSSolver::Imp) {}
 MKLDSSolver::~MKLDSSolver() {}
 SparseMatrix* MKLDSSolver::CreateSparseMatrix(Matrix_Type ntype) {	return nullptr; }
 bool MKLDSSolver::SetSparseMatrix(SparseMatrix* pA) { return false; }

diff --git a/NumCore/NumCore.cpp b/NumCore/NumCore.cpp
@@ -56,8 +56,12 @@ SOFTWARE.*/
 NUMCORE_API void NumCore::InitModule()
 {
 	// register linear solvers
+#ifdef PARDISO
 	REGISTER_FECORE_CLASS(PardisoSolver  , "pardiso");
 	REGISTER_FECORE_CLASS(PardisoSolver64, "pardiso_64");
+	REGISTER_FECORE_CLASS(MKLDSSolver, "mkl_dss");
+#endif
+
     REGISTER_FECORE_CLASS(PardisoProjectSolver, "pardiso-project");
 	REGISTER_FECORE_CLASS(FGMRESSolver        , "fgmres"   );
 	REGISTER_FECORE_CLASS(BoomerAMGSolver     , "boomeramg");
@@ -72,7 +76,6 @@ NUMCORE_API void NumCore::InitModule()
 	REGISTER_FECORE_CLASS(TestSolver          , "test");
     REGISTER_FECORE_CLASS(AccelerateSparseSolver, "accelerate");
     REGISTER_FECORE_CLASS(SuperLU_MT_Solver     , "superlu_mt");
-    REGISTER_FECORE_CLASS(MKLDSSolver           , "mkl_dss");
 
 	// register preconditioners
 	REGISTER_FECORE_CLASS(ILU0_Preconditioner, "ilu0");