From c98b8044e3efe18cd4c8278edf4d26a007a9773e Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Thu, 4 Sep 2014 10:38:00 +0200
Subject: [PATCH] Changed if-condition for PETSc version according to the
suggestion by Nori
---
CMakeLists.txt | 4 ----
MathLib/LinAlg/PETSc/PETScLinearSolver.cpp | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f700fbebc14..28763f81e40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,11 +117,7 @@ IF(OGS_USE_LIS)
ENDIF()
IF(OGS_USE_PETSC)
- MESSAGE(STATUS "PETSc version is ${PETSC_VERSION}")
ADD_DEFINITIONS(-DUSE_PETSC)
- IF(PETSC_VERSION VERSION_GREATER 3.4)
- ADD_DEFINITIONS(-DPETSC_V35)
- ENDIF(PETSC_VERSION VERSION_GREATER 3.4)
ENDIF()
IF(OGS_USE_EIGEN)
diff --git a/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp b/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp
index ed7dda97792..2a3d6d2fefb 100644
--- a/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp
+++ b/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp
@@ -41,9 +41,9 @@ bool PETScLinearSolver::solve(const PETScVector &b, PETScVector &x)
PetscMemoryGetCurrentUsage(&mem1);
#endif
-#ifdef PETSC_V35
+#if (PETSC_VERSION_MAJOR == 3) && (PETSC_VERSION_MINOR > 4)
KSPSetOperators(_solver, _A.getRawMatrix(), _A.getRawMatrix());
-#else
+#else
KSPSetOperators(_solver, _A.getRawMatrix(), _A.getRawMatrix(), DIFFERENT_NONZERO_PATTERN);
#endif
--
GitLab