Having PETSC_WITH_COMPLEX would stop step-55 from being able to

configure/build. Now we fall back to trilinos as described in the error

diff --git a/examples/step-55/CMakeLists.txt b/examples/step-55/CMakeLists.txt
index 62d705e0533593b17f085c1007f96ccbfcc88e06..3a6874a4086bfe6079f5a979599fecd3d1e382f5 100644 (file)
--- a/examples/step-55/CMakeLists.txt
+++ b/examples/step-55/CMakeLists.txt
@@ -37,7 +37,7 @@ ENDIF()
 #
 # Are all dependencies fulfilled?
 #
-IF(NOT (DEAL_II_WITH_PETSC OR DEAL_II_WITH_TRILINOS) OR NOT DEAL_II_WITH_P4EST OR DEAL_II_PETSC_WITH_COMPLEX) # keep in one line
+IF(NOT ((DEAL_II_WITH_PETSC AND NOT DEAL_II_PETSC_WITH_COMPLEX) OR DEAL_II_WITH_TRILINOS) OR NOT DEAL_II_WITH_P4EST) # keep in one line
   MESSAGE(FATAL_ERROR "
 Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_PETSC = ON

diff --git a/examples/step-55/step-55.cc b/examples/step-55/step-55.cc
index 10b6ac513f102b1db93fd6b76a37fddfabd10910..d2d3e03890aee0562b4e2aa18c2e27c665813055 100644 (file)
--- a/examples/step-55/step-55.cc
+++ b/examples/step-55/step-55.cc
@@ -30,7 +30,7 @@
 
 namespace LA
 {
-#if defined(DEAL_II_WITH_PETSC) && \
+#if defined(DEAL_II_WITH_PETSC) && !defined(DEAL_II_PETSC_WITH_COMPLEX) && \
   !(defined(DEAL_II_WITH_TRILINOS) && defined(FORCE_USE_OF_TRILINOS))
   using namespace dealii::LinearAlgebraPETSc;
 #  define USE_PETSC_LA