Fixed a compile bug caused by bad boolean logic error

git-svn-id: https://svn.dealii.org/trunk@18538 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/lac/include/lac/petsc_vector.h b/deal.II/lac/include/lac/petsc_vector.h
index e56bdccb835d9cd930d7d9f1ea8f6b3f031f8f9a..2698d68cc4198667b52754e7d0f5748e2b9e65d9 100644 (file)
--- a/deal.II/lac/include/lac/petsc_vector.h
+++ b/deal.II/lac/include/lac/petsc_vector.h
@@ -285,7 +285,7 @@ namespace PETScWrappers
     ierr = VecScatterCreateToAll (static_cast<const Vec &>(v), &ctx, &vector);
     AssertThrow (ierr == 0, ExcPETScError(ierr));
     
-#if ((PETSC_VERSION_MAJOR >= 2) && \
+#if ((PETSC_VERSION_MAJOR == 2) && \
     (PETSC_VERSION_MINOR < 3) &&  \
     (PETSC_VERSION_SUBMINOR < 3))
 

diff --git a/deal.II/lac/source/petsc_precondition.cc b/deal.II/lac/source/petsc_precondition.cc
index e07324115559a0f727f7833e6b003c5440e15606..88213a8a8c83f81279ae4dd51db3772ab5d52a8a 100644 (file)
--- a/deal.II/lac/source/petsc_precondition.cc
+++ b/deal.II/lac/source/petsc_precondition.cc
@@ -234,7 +234,7 @@ namespace PETScWrappers
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 
                                      // then set flags
-#if (PETSC_VERSION_MAJOR >= 2) && (PETSC_VERSION_MINOR < 3) && (PETSC_VERSION_SUBMINOR < 1)
+#if (PETSC_VERSION_MAJOR == 2) && (PETSC_VERSION_MINOR < 3) && (PETSC_VERSION_SUBMINOR < 1)
     PCICCSetLevels (pc, additional_data.levels);
 #else
     PCFactorSetLevels (pc, additional_data.levels);
@@ -274,7 +274,7 @@ namespace PETScWrappers
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 
                                      // then set flags
-#if (PETSC_VERSION_MAJOR >= 2) && (PETSC_VERSION_MINOR < 3) && (PETSC_VERSION_SUBMINOR < 1)
+#if (PETSC_VERSION_MAJOR == 2) && (PETSC_VERSION_MINOR < 3) && (PETSC_VERSION_SUBMINOR < 1)
     PCILUSetLevels (pc, additional_data.levels);  
 #else
     PCFactorSetLevels (pc, additional_data.levels);
@@ -318,14 +318,14 @@ namespace PETScWrappers
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 
                                      // set flags as given
-#if (PETSC_VERSION_MAJOR >= 2) && (PETSC_VERSION_MINOR >= 3) && (PETSC_VERSION_SUBMINOR >= 1)
+#if (PETSC_VERSION_MAJOR == 2) && (PETSC_VERSION_MINOR >= 3) && (PETSC_VERSION_SUBMINOR >= 1)
     ierr = PCLUSetPivoting (pc, additional_data.pivoting);
 #else
     ierr = PCFactorSetPivoting (pc, additional_data.pivoting);
 #endif
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 
-#if (PETSC_VERSION_MAJOR >= 2) && (PETSC_VERSION_MINOR < 3)
+#if (PETSC_VERSION_MAJOR == 2) && (PETSC_VERSION_MINOR < 3)
     ierr = PCLUSetZeroPivot (pc, additional_data.zero_pivot);
 #else
     ierr = PCFactorSetZeroPivot (pc, additional_data.zero_pivot);
@@ -333,7 +333,7 @@ namespace PETScWrappers
     
     AssertThrow (ierr == 0, ExcPETScError(ierr));
 
-#if (PETSC_VERSION_MAJOR >= 2) && (PETSC_VERSION_MINOR < 3)
+#if (PETSC_VERSION_MAJOR == 2) && (PETSC_VERSION_MINOR < 3)
     ierr = PCLUSetDamping (pc, additional_data.damping);
 #else
     ierr = PCFactorSetShiftNonzero (pc, additional_data.damping);