From 0062e1247ad216467418b8b7927b90973762faef Mon Sep 17 00:00:00 2001 From: young Date: Tue, 31 Mar 2009 13:32:02 +0000 Subject: [PATCH] Fixed a compile bug caused by bad boolean logic error git-svn-id: https://svn.dealii.org/trunk@18538 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/petsc_vector.h | 2 +- deal.II/lac/source/petsc_precondition.cc | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deal.II/lac/include/lac/petsc_vector.h b/deal.II/lac/include/lac/petsc_vector.h index e56bdccb83..2698d68cc4 100644 --- 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(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 e073241155..88213a8a8c 100644 --- 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); -- 2.39.5