From: prill Date: Fri, 4 Aug 2006 11:25:41 +0000 (+0000) Subject: Improved support for PETSc 2.3.1+later versions. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fed05ca5cc3abc10bc0630d955ec84ae38284ff;p=dealii-svn.git Improved support for PETSc 2.3.1+later versions. git-svn-id: https://svn.dealii.org/trunk@13594 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/doc/news/changes.html b/deal.II/doc/news/changes.html index bd1b167ac5..a4426aee0d 100644 --- a/deal.II/doc/news/changes.html +++ b/deal.II/doc/news/changes.html @@ -577,6 +577,12 @@ inconvenience this causes.
    +
  1. Improved: PETSc 2.3.1 (build 16) is now supported by the + linear preconditioner classes. The new PETSc functions + PCFactorSetXXX are used.
    + (F. Prill, 2006/08/04) +

    +
  2. New: The class TransposeMatrix modeled after PointerMatrix swaps the vmult functions such that its effect is diff --git a/deal.II/lac/source/petsc_precondition.cc b/deal.II/lac/source/petsc_precondition.cc index ed3705cd70..34d7c3a2b1 100644 --- a/deal.II/lac/source/petsc_precondition.cc +++ b/deal.II/lac/source/petsc_precondition.cc @@ -218,7 +218,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) PCFactorSetLevels (pc, additional_data.levels); #else PCICCSetLevels (pc, additional_data.levels); @@ -255,7 +255,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) PCFactorSetLevels (pc, additional_data.levels); #else PCILUSetLevels (pc, additional_data.levels); @@ -296,7 +296,7 @@ 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 = PCFactorSetPivoting (pc, additional_data.pivoting); #else ierr = PCLUSetPivoting (pc, additional_data.pivoting);