From e79b2ae2acd9fa68a9e6e1a1d0d0e64ba43a4924 Mon Sep 17 00:00:00 2001 From: Roland Date: Mon, 6 May 2019 10:10:26 +0200 Subject: [PATCH] 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 --- examples/step-55/CMakeLists.txt | 2 +- examples/step-55/step-55.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/step-55/CMakeLists.txt b/examples/step-55/CMakeLists.txt index 62d705e053..3a6874a408 100644 --- 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 10b6ac513f..d2d3e03890 100644 --- 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 -- 2.39.5