From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Wed, 26 Sep 2018 17:51:30 +0000 (+0200)
Subject: Restrict more std::complex instantiations
X-Git-Tag: v9.1.0-rc1~621^2~4
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f36bfd74fd3fcfc53934ed32e7029a22aa23529;p=dealii.git

Restrict more std::complex instantiations
---

diff --git a/source/lac/affine_constraints.cc b/source/lac/affine_constraints.cc
index 094b73e2c5..aa8055fe6a 100644
--- a/source/lac/affine_constraints.cc
+++ b/source/lac/affine_constraints.cc
@@ -148,8 +148,10 @@ namespace internals
 
   SCRATCH_INITIALIZER(double, d);
   SCRATCH_INITIALIZER(float, f);
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
   SCRATCH_INITIALIZER(std::complex<double>, cd);
   SCRATCH_INITIALIZER(std::complex<float>, cf);
+#endif
 #undef SCRATCH_INITIALIZER
 } // namespace internals
 
diff --git a/source/lac/block_vector.cc b/source/lac/block_vector.cc
index b59f529135..3638fcde20 100644
--- a/source/lac/block_vector.cc
+++ b/source/lac/block_vector.cc
@@ -25,9 +25,11 @@ DEAL_II_NAMESPACE_OPEN
 template BlockVector<double>::BlockVector(const BlockVector<float> &);
 template BlockVector<float>::BlockVector(const BlockVector<double> &);
 
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
 template BlockVector<std::complex<double>>::BlockVector(
   const BlockVector<std::complex<float>> &);
 template BlockVector<std::complex<float>>::BlockVector(
   const BlockVector<std::complex<double>> &);
+#endif
 
 DEAL_II_NAMESPACE_CLOSE
diff --git a/source/lac/full_matrix.cc b/source/lac/full_matrix.cc
index ab10bf13a6..57eaa76067 100644
--- a/source/lac/full_matrix.cc
+++ b/source/lac/full_matrix.cc
@@ -21,6 +21,11 @@ DEAL_II_NAMESPACE_OPEN
 
 #include "full_matrix.inst"
 
+#ifndef DEAL_II_WITH_COMPLEX_VALUES
+// instantiate for std::complex<double> because we use it internally.
+template class FullMatrix<std::complex<double>>;
+#endif
+
 // instantiate for long double manually because we use it in a few places
 // inside the library
 template class FullMatrix<long double>;
@@ -66,10 +71,12 @@ FullMatrix<long double>::add<long double>(const long double,
 TEMPL_OP_EQ(double, float);
 TEMPL_OP_EQ(float, double);
 
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
 TEMPL_OP_EQ(std::complex<double>, std::complex<float>);
 TEMPL_OP_EQ(std::complex<float>, std::complex<double>);
 TEMPL_OP_EQ(std::complex<double>, double);
 TEMPL_OP_EQ(std::complex<float>, float);
+#endif
 
 #undef TEMPL_OP_EQ
 
diff --git a/source/lac/la_parallel_vector.cc b/source/lac/la_parallel_vector.cc
index b56ed27e32..804bbd62b8 100644
--- a/source/lac/la_parallel_vector.cc
+++ b/source/lac/la_parallel_vector.cc
@@ -36,9 +36,10 @@ namespace LinearAlgebra
 
     TEMPL_COPY_CONSTRUCTOR(double, float);
     TEMPL_COPY_CONSTRUCTOR(float, double);
-
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
     TEMPL_COPY_CONSTRUCTOR(std::complex<double>, std::complex<float>);
     TEMPL_COPY_CONSTRUCTOR(std::complex<float>, std::complex<double>);
+#endif
 
 #undef TEMPL_COPY_CONSTRUCTOR
   } // namespace distributed
diff --git a/source/lac/la_vector.cc b/source/lac/la_vector.cc
index 588b6f8df5..578c491c17 100644
--- a/source/lac/la_vector.cc
+++ b/source/lac/la_vector.cc
@@ -36,8 +36,10 @@ namespace LinearAlgebra
   TEMPL_COPY_CONSTRUCTOR(double, float);
   TEMPL_COPY_CONSTRUCTOR(float, double);
 
+#  ifdef DEAL_II_WITH_COMPLEX_VALUES
   TEMPL_COPY_CONSTRUCTOR(std::complex<double>, std::complex<float>);
   TEMPL_COPY_CONSTRUCTOR(std::complex<float>, std::complex<double>);
+#  endif
 
 #  undef TEMPL_COPY_CONSTRUCTOR
 } // namespace LinearAlgebra
diff --git a/source/lac/read_write_vector.cc b/source/lac/read_write_vector.cc
index 14358d2bfa..9d17935bba 100644
--- a/source/lac/read_write_vector.cc
+++ b/source/lac/read_write_vector.cc
@@ -33,9 +33,10 @@ namespace LinearAlgebra
 
   TEMPL_COPY_CONSTRUCTOR(double, float);
   TEMPL_COPY_CONSTRUCTOR(float, double);
-
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
   TEMPL_COPY_CONSTRUCTOR(std::complex<double>, std::complex<float>);
   TEMPL_COPY_CONSTRUCTOR(std::complex<float>, std::complex<double>);
+#endif
 
 #undef TEMPL_COPY_CONSTRUCTOR
 } // namespace LinearAlgebra
diff --git a/source/lac/tridiagonal_matrix.cc b/source/lac/tridiagonal_matrix.cc
index 48aec2743a..e5b6e3187d 100644
--- a/source/lac/tridiagonal_matrix.cc
+++ b/source/lac/tridiagonal_matrix.cc
@@ -280,7 +280,9 @@ TridiagonalMatrix<number>::
 
 template class TridiagonalMatrix<float>;
 template class TridiagonalMatrix<double>;
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
 template class TridiagonalMatrix<std::complex<float>>;
 template class TridiagonalMatrix<std::complex<double>>;
+#endif
 
 DEAL_II_NAMESPACE_CLOSE
diff --git a/source/lac/vector.cc b/source/lac/vector.cc
index 085f136551..cad91f6a02 100644
--- a/source/lac/vector.cc
+++ b/source/lac/vector.cc
@@ -19,6 +19,11 @@ DEAL_II_NAMESPACE_OPEN
 
 #include "vector.inst"
 
+#ifndef DEAL_II_WITH_COMPLEX_VALUES
+// instantiate for std::complex<double> since we are using it internally.
+template class Vector<std::complex<double>>;
+#endif
+
 // instantiate for integers:
 template class Vector<int>;
 template Vector<double> &Vector<double>::
@@ -45,8 +50,10 @@ template long double Vector<long double>::
 TEMPL_COPY_CONSTRUCTOR(double, float);
 TEMPL_COPY_CONSTRUCTOR(float, double);
 
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
 TEMPL_COPY_CONSTRUCTOR(std::complex<double>, std::complex<float>);
 TEMPL_COPY_CONSTRUCTOR(std::complex<float>, std::complex<double>);
+#endif
 
 #undef TEMPL_COPY_CONSTRUCTOR
 
@@ -59,8 +66,10 @@ TEMPL_OP_EQ(double, float);
 TEMPL_OP_EQ(float, double);
 
 
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
 TEMPL_OP_EQ(std::complex<double>, std::complex<float>);
 TEMPL_OP_EQ(std::complex<float>, std::complex<double>);
+#endif
 
 #undef TEMPL_OP_EQ
 
diff --git a/tests/base/functions_13.output b/tests/base/functions_13.with_complex_values=on.output
similarity index 100%
rename from tests/base/functions_13.output
rename to tests/base/functions_13.with_complex_values=on.output
diff --git a/tests/data_out/data_out_complex_01.output b/tests/data_out/data_out_complex_01.with_complex_values=on.output
similarity index 100%
rename from tests/data_out/data_out_complex_01.output
rename to tests/data_out/data_out_complex_01.with_complex_values=on.output
diff --git a/tests/data_out/data_out_complex_01_mixed.output b/tests/data_out/data_out_complex_01_mixed.with_complex_values=on.output
similarity index 100%
rename from tests/data_out/data_out_complex_01_mixed.output
rename to tests/data_out/data_out_complex_01_mixed.with_complex_values=on.output
diff --git a/tests/data_out/data_out_complex_02.output b/tests/data_out/data_out_complex_02.with_complex_values=on.output
similarity index 100%
rename from tests/data_out/data_out_complex_02.output
rename to tests/data_out/data_out_complex_02.with_complex_values=on.output
diff --git a/tests/data_out/data_out_complex_02_mixed.output b/tests/data_out/data_out_complex_02_mixed.with_complex_values=on.output
similarity index 100%
rename from tests/data_out/data_out_complex_02_mixed.output
rename to tests/data_out/data_out_complex_02_mixed.with_complex_values=on.output
diff --git a/tests/data_out/data_out_complex_03.output b/tests/data_out/data_out_complex_03.with_complex_values=on.output
similarity index 100%
rename from tests/data_out/data_out_complex_03.output
rename to tests/data_out/data_out_complex_03.with_complex_values=on.output
diff --git a/tests/data_out/data_out_complex_03_mixed.output b/tests/data_out/data_out_complex_03_mixed.with_complex_values=on.output
similarity index 100%
rename from tests/data_out/data_out_complex_03_mixed.output
rename to tests/data_out/data_out_complex_03_mixed.with_complex_values=on.output
diff --git a/tests/data_out/data_out_complex_04.output b/tests/data_out/data_out_complex_04.with_complex_values=on.output
similarity index 100%
rename from tests/data_out/data_out_complex_04.output
rename to tests/data_out/data_out_complex_04.with_complex_values=on.output
diff --git a/tests/data_out/data_out_complex_04_mixed.output b/tests/data_out/data_out_complex_04_mixed.with_complex_values=on.output
similarity index 100%
rename from tests/data_out/data_out_complex_04_mixed.output
rename to tests/data_out/data_out_complex_04_mixed.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_01.output b/tests/full_matrix/complex_complex_full_matrix_01.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_01.output
rename to tests/full_matrix/complex_complex_full_matrix_01.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_02.output b/tests/full_matrix/complex_complex_full_matrix_02.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_02.output
rename to tests/full_matrix/complex_complex_full_matrix_02.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_03.output b/tests/full_matrix/complex_complex_full_matrix_03.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_03.output
rename to tests/full_matrix/complex_complex_full_matrix_03.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_04.output b/tests/full_matrix/complex_complex_full_matrix_04.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_04.output
rename to tests/full_matrix/complex_complex_full_matrix_04.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_06.output b/tests/full_matrix/complex_complex_full_matrix_06.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_06.output
rename to tests/full_matrix/complex_complex_full_matrix_06.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_07.output b/tests/full_matrix/complex_complex_full_matrix_07.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_07.output
rename to tests/full_matrix/complex_complex_full_matrix_07.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_08.output b/tests/full_matrix/complex_complex_full_matrix_08.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_08.output
rename to tests/full_matrix/complex_complex_full_matrix_08.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_10.output b/tests/full_matrix/complex_complex_full_matrix_10.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_10.output
rename to tests/full_matrix/complex_complex_full_matrix_10.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_11.output b/tests/full_matrix/complex_complex_full_matrix_11.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_11.output
rename to tests/full_matrix/complex_complex_full_matrix_11.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_12.output b/tests/full_matrix/complex_complex_full_matrix_12.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_12.output
rename to tests/full_matrix/complex_complex_full_matrix_12.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_13.output b/tests/full_matrix/complex_complex_full_matrix_13.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_13.output
rename to tests/full_matrix/complex_complex_full_matrix_13.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_14.output b/tests/full_matrix/complex_complex_full_matrix_14.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_14.output
rename to tests/full_matrix/complex_complex_full_matrix_14.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_15.output b/tests/full_matrix/complex_complex_full_matrix_15.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_15.output
rename to tests/full_matrix/complex_complex_full_matrix_15.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_16.output b/tests/full_matrix/complex_complex_full_matrix_16.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_16.output
rename to tests/full_matrix/complex_complex_full_matrix_16.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_17.output b/tests/full_matrix/complex_complex_full_matrix_17.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_17.output
rename to tests/full_matrix/complex_complex_full_matrix_17.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_18.output b/tests/full_matrix/complex_complex_full_matrix_18.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_18.output
rename to tests/full_matrix/complex_complex_full_matrix_18.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_19.output b/tests/full_matrix/complex_complex_full_matrix_19.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_19.output
rename to tests/full_matrix/complex_complex_full_matrix_19.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_20.output b/tests/full_matrix/complex_complex_full_matrix_20.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_20.output
rename to tests/full_matrix/complex_complex_full_matrix_20.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_21.output b/tests/full_matrix/complex_complex_full_matrix_21.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_21.output
rename to tests/full_matrix/complex_complex_full_matrix_21.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_22.output b/tests/full_matrix/complex_complex_full_matrix_22.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_22.output
rename to tests/full_matrix/complex_complex_full_matrix_22.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_23.output b/tests/full_matrix/complex_complex_full_matrix_23.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_23.output
rename to tests/full_matrix/complex_complex_full_matrix_23.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_24.output b/tests/full_matrix/complex_complex_full_matrix_24.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_24.output
rename to tests/full_matrix/complex_complex_full_matrix_24.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_25.output b/tests/full_matrix/complex_complex_full_matrix_25.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_25.output
rename to tests/full_matrix/complex_complex_full_matrix_25.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_26.output b/tests/full_matrix/complex_complex_full_matrix_26.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_26.output
rename to tests/full_matrix/complex_complex_full_matrix_26.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_27.output b/tests/full_matrix/complex_complex_full_matrix_27.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_27.output
rename to tests/full_matrix/complex_complex_full_matrix_27.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_28.output b/tests/full_matrix/complex_complex_full_matrix_28.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_28.output
rename to tests/full_matrix/complex_complex_full_matrix_28.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_29.output b/tests/full_matrix/complex_complex_full_matrix_29.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_29.output
rename to tests/full_matrix/complex_complex_full_matrix_29.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_30.output b/tests/full_matrix/complex_complex_full_matrix_30.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_30.output
rename to tests/full_matrix/complex_complex_full_matrix_30.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_31.output b/tests/full_matrix/complex_complex_full_matrix_31.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_31.output
rename to tests/full_matrix/complex_complex_full_matrix_31.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_32.output b/tests/full_matrix/complex_complex_full_matrix_32.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_32.output
rename to tests/full_matrix/complex_complex_full_matrix_32.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_33.output b/tests/full_matrix/complex_complex_full_matrix_33.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_33.output
rename to tests/full_matrix/complex_complex_full_matrix_33.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_34.output b/tests/full_matrix/complex_complex_full_matrix_34.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_34.output
rename to tests/full_matrix/complex_complex_full_matrix_34.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_36.output b/tests/full_matrix/complex_complex_full_matrix_36.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_36.output
rename to tests/full_matrix/complex_complex_full_matrix_36.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_37.output b/tests/full_matrix/complex_complex_full_matrix_37.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_37.output
rename to tests/full_matrix/complex_complex_full_matrix_37.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_38.output b/tests/full_matrix/complex_complex_full_matrix_38.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_38.output
rename to tests/full_matrix/complex_complex_full_matrix_38.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_39.output b/tests/full_matrix/complex_complex_full_matrix_39.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_39.output
rename to tests/full_matrix/complex_complex_full_matrix_39.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_40.output b/tests/full_matrix/complex_complex_full_matrix_40.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_40.output
rename to tests/full_matrix/complex_complex_full_matrix_40.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_41.output b/tests/full_matrix/complex_complex_full_matrix_41.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_41.output
rename to tests/full_matrix/complex_complex_full_matrix_41.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_42.output b/tests/full_matrix/complex_complex_full_matrix_42.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_42.output
rename to tests/full_matrix/complex_complex_full_matrix_42.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_43.output b/tests/full_matrix/complex_complex_full_matrix_43.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_43.output
rename to tests/full_matrix/complex_complex_full_matrix_43.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_44.output b/tests/full_matrix/complex_complex_full_matrix_44.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_44.output
rename to tests/full_matrix/complex_complex_full_matrix_44.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_45.output b/tests/full_matrix/complex_complex_full_matrix_45.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_45.output
rename to tests/full_matrix/complex_complex_full_matrix_45.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_46.output b/tests/full_matrix/complex_complex_full_matrix_46.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_46.output
rename to tests/full_matrix/complex_complex_full_matrix_46.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_47.output b/tests/full_matrix/complex_complex_full_matrix_47.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_47.output
rename to tests/full_matrix/complex_complex_full_matrix_47.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_48.output b/tests/full_matrix/complex_complex_full_matrix_48.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_48.output
rename to tests/full_matrix/complex_complex_full_matrix_48.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_49.output b/tests/full_matrix/complex_complex_full_matrix_49.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_49.output
rename to tests/full_matrix/complex_complex_full_matrix_49.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_50.output b/tests/full_matrix/complex_complex_full_matrix_50.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_50.output
rename to tests/full_matrix/complex_complex_full_matrix_50.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_51.output b/tests/full_matrix/complex_complex_full_matrix_51.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_51.output
rename to tests/full_matrix/complex_complex_full_matrix_51.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_complex_full_matrix_52.output b/tests/full_matrix/complex_complex_full_matrix_52.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_complex_full_matrix_52.output
rename to tests/full_matrix/complex_complex_full_matrix_52.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_01.output b/tests/full_matrix/complex_real_full_matrix_01.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_01.output
rename to tests/full_matrix/complex_real_full_matrix_01.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_02.output b/tests/full_matrix/complex_real_full_matrix_02.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_02.output
rename to tests/full_matrix/complex_real_full_matrix_02.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_03.output b/tests/full_matrix/complex_real_full_matrix_03.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_03.output
rename to tests/full_matrix/complex_real_full_matrix_03.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_04.output b/tests/full_matrix/complex_real_full_matrix_04.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_04.output
rename to tests/full_matrix/complex_real_full_matrix_04.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_05.output b/tests/full_matrix/complex_real_full_matrix_05.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_05.output
rename to tests/full_matrix/complex_real_full_matrix_05.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_06.output b/tests/full_matrix/complex_real_full_matrix_06.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_06.output
rename to tests/full_matrix/complex_real_full_matrix_06.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_07.output b/tests/full_matrix/complex_real_full_matrix_07.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_07.output
rename to tests/full_matrix/complex_real_full_matrix_07.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_08.output b/tests/full_matrix/complex_real_full_matrix_08.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_08.output
rename to tests/full_matrix/complex_real_full_matrix_08.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_09.output b/tests/full_matrix/complex_real_full_matrix_09.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_09.output
rename to tests/full_matrix/complex_real_full_matrix_09.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_10.output b/tests/full_matrix/complex_real_full_matrix_10.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_10.output
rename to tests/full_matrix/complex_real_full_matrix_10.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_11.output b/tests/full_matrix/complex_real_full_matrix_11.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_11.output
rename to tests/full_matrix/complex_real_full_matrix_11.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_12.output b/tests/full_matrix/complex_real_full_matrix_12.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_12.output
rename to tests/full_matrix/complex_real_full_matrix_12.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_13.output b/tests/full_matrix/complex_real_full_matrix_13.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_13.output
rename to tests/full_matrix/complex_real_full_matrix_13.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_14.output b/tests/full_matrix/complex_real_full_matrix_14.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_14.output
rename to tests/full_matrix/complex_real_full_matrix_14.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_15.output b/tests/full_matrix/complex_real_full_matrix_15.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_15.output
rename to tests/full_matrix/complex_real_full_matrix_15.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_16.output b/tests/full_matrix/complex_real_full_matrix_16.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_16.output
rename to tests/full_matrix/complex_real_full_matrix_16.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_17.output b/tests/full_matrix/complex_real_full_matrix_17.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_17.output
rename to tests/full_matrix/complex_real_full_matrix_17.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_18.output b/tests/full_matrix/complex_real_full_matrix_18.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_18.output
rename to tests/full_matrix/complex_real_full_matrix_18.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_19.output b/tests/full_matrix/complex_real_full_matrix_19.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_19.output
rename to tests/full_matrix/complex_real_full_matrix_19.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_20.output b/tests/full_matrix/complex_real_full_matrix_20.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_20.output
rename to tests/full_matrix/complex_real_full_matrix_20.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_21.output b/tests/full_matrix/complex_real_full_matrix_21.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_21.output
rename to tests/full_matrix/complex_real_full_matrix_21.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_22.output b/tests/full_matrix/complex_real_full_matrix_22.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_22.output
rename to tests/full_matrix/complex_real_full_matrix_22.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_23.output b/tests/full_matrix/complex_real_full_matrix_23.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_23.output
rename to tests/full_matrix/complex_real_full_matrix_23.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_24.output b/tests/full_matrix/complex_real_full_matrix_24.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_24.output
rename to tests/full_matrix/complex_real_full_matrix_24.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_25.output b/tests/full_matrix/complex_real_full_matrix_25.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_25.output
rename to tests/full_matrix/complex_real_full_matrix_25.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_26.output b/tests/full_matrix/complex_real_full_matrix_26.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_26.output
rename to tests/full_matrix/complex_real_full_matrix_26.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_27.output b/tests/full_matrix/complex_real_full_matrix_27.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_27.output
rename to tests/full_matrix/complex_real_full_matrix_27.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_28.output b/tests/full_matrix/complex_real_full_matrix_28.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_28.output
rename to tests/full_matrix/complex_real_full_matrix_28.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_29.output b/tests/full_matrix/complex_real_full_matrix_29.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_29.output
rename to tests/full_matrix/complex_real_full_matrix_29.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_30.output b/tests/full_matrix/complex_real_full_matrix_30.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_30.output
rename to tests/full_matrix/complex_real_full_matrix_30.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_31.output b/tests/full_matrix/complex_real_full_matrix_31.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_31.output
rename to tests/full_matrix/complex_real_full_matrix_31.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_32.output b/tests/full_matrix/complex_real_full_matrix_32.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_32.output
rename to tests/full_matrix/complex_real_full_matrix_32.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_33.output b/tests/full_matrix/complex_real_full_matrix_33.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_33.output
rename to tests/full_matrix/complex_real_full_matrix_33.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_34.output b/tests/full_matrix/complex_real_full_matrix_34.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_34.output
rename to tests/full_matrix/complex_real_full_matrix_34.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_36.output b/tests/full_matrix/complex_real_full_matrix_36.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_36.output
rename to tests/full_matrix/complex_real_full_matrix_36.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_37.output b/tests/full_matrix/complex_real_full_matrix_37.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_37.output
rename to tests/full_matrix/complex_real_full_matrix_37.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_38.output b/tests/full_matrix/complex_real_full_matrix_38.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_38.output
rename to tests/full_matrix/complex_real_full_matrix_38.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_39.output b/tests/full_matrix/complex_real_full_matrix_39.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_39.output
rename to tests/full_matrix/complex_real_full_matrix_39.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_40.output b/tests/full_matrix/complex_real_full_matrix_40.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_40.output
rename to tests/full_matrix/complex_real_full_matrix_40.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_41.output b/tests/full_matrix/complex_real_full_matrix_41.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_41.output
rename to tests/full_matrix/complex_real_full_matrix_41.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_42.output b/tests/full_matrix/complex_real_full_matrix_42.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_42.output
rename to tests/full_matrix/complex_real_full_matrix_42.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_43.output b/tests/full_matrix/complex_real_full_matrix_43.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_43.output
rename to tests/full_matrix/complex_real_full_matrix_43.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_44.output b/tests/full_matrix/complex_real_full_matrix_44.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_44.output
rename to tests/full_matrix/complex_real_full_matrix_44.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_45.output b/tests/full_matrix/complex_real_full_matrix_45.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_45.output
rename to tests/full_matrix/complex_real_full_matrix_45.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_46.output b/tests/full_matrix/complex_real_full_matrix_46.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_46.output
rename to tests/full_matrix/complex_real_full_matrix_46.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_47.output b/tests/full_matrix/complex_real_full_matrix_47.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_47.output
rename to tests/full_matrix/complex_real_full_matrix_47.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_48.output b/tests/full_matrix/complex_real_full_matrix_48.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_48.output
rename to tests/full_matrix/complex_real_full_matrix_48.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_49.output b/tests/full_matrix/complex_real_full_matrix_49.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_49.output
rename to tests/full_matrix/complex_real_full_matrix_49.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_50.output b/tests/full_matrix/complex_real_full_matrix_50.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_50.output
rename to tests/full_matrix/complex_real_full_matrix_50.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_51.output b/tests/full_matrix/complex_real_full_matrix_51.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_51.output
rename to tests/full_matrix/complex_real_full_matrix_51.with_complex_values=on.output
diff --git a/tests/full_matrix/complex_real_full_matrix_52.output b/tests/full_matrix/complex_real_full_matrix_52.with_complex_values=on.output
similarity index 100%
rename from tests/full_matrix/complex_real_full_matrix_52.output
rename to tests/full_matrix/complex_real_full_matrix_52.with_complex_values=on.output
diff --git a/tests/lac/complex_block_vector.output b/tests/lac/complex_block_vector.with_complex_values=on.output
similarity index 100%
rename from tests/lac/complex_block_vector.output
rename to tests/lac/complex_block_vector.with_complex_values=on.output
diff --git a/tests/lac/complex_block_vector_iterator.output b/tests/lac/complex_block_vector_iterator.with_complex_values=on.output
similarity index 100%
rename from tests/lac/complex_block_vector_iterator.output
rename to tests/lac/complex_block_vector_iterator.with_complex_values=on.output
diff --git a/tests/lac/complex_block_vector_vector_assign.output b/tests/lac/complex_block_vector_vector_assign.with_complex_values=on.output
similarity index 100%
rename from tests/lac/complex_block_vector_vector_assign.output
rename to tests/lac/complex_block_vector_vector_assign.with_complex_values=on.output
diff --git a/tests/lac/constraint_matrix_distribute_complex.output b/tests/lac/constraint_matrix_distribute_complex.with_complex_values=on.output
similarity index 100%
rename from tests/lac/constraint_matrix_distribute_complex.output
rename to tests/lac/constraint_matrix_distribute_complex.with_complex_values=on.output
diff --git a/tests/lac/la_parallel_vector_add_and_dot_complex.output b/tests/lac/la_parallel_vector_add_and_dot_complex.with_complex_values=on.output
similarity index 100%
rename from tests/lac/la_parallel_vector_add_and_dot_complex.output
rename to tests/lac/la_parallel_vector_add_and_dot_complex.with_complex_values=on.output
diff --git a/tests/lac/la_parallel_vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 b/tests/lac/la_parallel_vector_add_and_dot_complex.with_complex_values=on.output.DEAL_II_MAX_THREADS2
similarity index 100%
rename from tests/lac/la_parallel_vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2
rename to tests/lac/la_parallel_vector_add_and_dot_complex.with_complex_values=on.output.DEAL_II_MAX_THREADS2
diff --git a/tests/lac/la_parallel_vector_add_and_dot_complex.output.no_threads b/tests/lac/la_parallel_vector_add_and_dot_complex.with_complex_values=on.output.no_threads
similarity index 100%
rename from tests/lac/la_parallel_vector_add_and_dot_complex.output.no_threads
rename to tests/lac/la_parallel_vector_add_and_dot_complex.with_complex_values=on.output.no_threads
diff --git a/tests/lac/la_vector_accumulation_01.cc b/tests/lac/la_vector_accumulation_01.cc
index 1b94add4d6..cccf0d68fd 100644
--- a/tests/lac/la_vector_accumulation_01.cc
+++ b/tests/lac/la_vector_accumulation_01.cc
@@ -56,6 +56,8 @@ main()
 
   check_norms<float>();
   check_norms<double>();
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
   check_norms<std::complex<double>>();
+#endif
   deallog << "OK" << std::endl;
 }
diff --git a/tests/lac/la_vector_add_and_dot.cc b/tests/lac/la_vector_add_and_dot.cc
index c15fa6d3a7..c5a0fd3e2e 100644
--- a/tests/lac/la_vector_add_and_dot.cc
+++ b/tests/lac/la_vector_add_and_dot.cc
@@ -79,6 +79,8 @@ main()
 
   check<float>();
   check<double>();
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
   check<std::complex<double>>();
+#endif
   deallog << "OK" << std::endl;
 }
diff --git a/tests/lac/la_vector_add_and_dot.with_complex_values=false.output b/tests/lac/la_vector_add_and_dot.with_complex_values=false.output
new file mode 100644
index 0000000000..d70ce10ee8
--- /dev/null
+++ b/tests/lac/la_vector_add_and_dot.with_complex_values=false.output
@@ -0,0 +1,15 @@
+
+DEAL::Add and dot should be 0.30, is 0.30
+DEAL::Add and dot should be 13.40, is 13.40
+DEAL::Add and dot should be 26.50, is 26.50
+DEAL::Add and dot should be 39.61, is 39.61
+DEAL::Add and dot should be 52.71, is 52.71
+DEAL::Vector add reference:   0.03 0.03 0.04 0.05 0.06 0.06 0.07 0.08 0.09 0.09 0.10 0.11 0.12 0.12 0.13 0.14 0.15 
+DEAL::Vector check reference: 0.03 0.03 0.04 0.05 0.06 0.06 0.07 0.08 0.09 0.09 0.10 0.11 0.12 0.12 0.13 0.14 0.15 
+DEAL::Vector add constant:    1.03 1.03 1.04 1.05 1.06 1.06 1.07 1.08 1.09 1.09 1.10 1.11 1.12 1.12 1.13 1.14 1.15 
+DEAL::Add and dot should be 0.30, is 0.30
+DEAL::Add and dot should be 13.40, is 13.40
+DEAL::Add and dot should be 26.50, is 26.50
+DEAL::Add and dot should be 39.61, is 39.61
+DEAL::Add and dot should be 52.71, is 52.71
+DEAL::OK
diff --git a/tests/lac/la_vector_add_and_dot.output b/tests/lac/la_vector_add_and_dot.with_complex_values=true.output
similarity index 100%
rename from tests/lac/la_vector_add_and_dot.output
rename to tests/lac/la_vector_add_and_dot.with_complex_values=true.output
diff --git a/tests/lac/la_vector_add_and_dot_complex.output b/tests/lac/la_vector_add_and_dot_complex.with_complex_values=on.output
similarity index 100%
rename from tests/lac/la_vector_add_and_dot_complex.output
rename to tests/lac/la_vector_add_and_dot_complex.with_complex_values=on.output
diff --git a/tests/lac/la_vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 b/tests/lac/la_vector_add_and_dot_complex.with_complex_values=on.output.DEAL_II_MAX_THREADS2
similarity index 100%
rename from tests/lac/la_vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2
rename to tests/lac/la_vector_add_and_dot_complex.with_complex_values=on.output.DEAL_II_MAX_THREADS2
diff --git a/tests/lac/la_vector_add_and_dot_complex.output.no_threads b/tests/lac/la_vector_add_and_dot_complex.with_complex_values=on.output.no_threads
similarity index 100%
rename from tests/lac/la_vector_add_and_dot_complex.output.no_threads
rename to tests/lac/la_vector_add_and_dot_complex.with_complex_values=on.output.no_threads
diff --git a/tests/lac/la_vector_norms.cc b/tests/lac/la_vector_norms.cc
index e76bc38ecc..52f87e5322 100644
--- a/tests/lac/la_vector_norms.cc
+++ b/tests/lac/la_vector_norms.cc
@@ -109,7 +109,9 @@ main()
 
   check_norms<float>();
   check_norms<double>();
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
   check_complex_norms<double>();
   check_complex_norms<float>();
+#endif
   deallog << "OK" << std::endl;
 }
diff --git a/tests/lac/linear_operator_02a.output b/tests/lac/linear_operator_02a.with_complex_values=on.output
similarity index 100%
rename from tests/lac/linear_operator_02a.output
rename to tests/lac/linear_operator_02a.with_complex_values=on.output
diff --git a/tests/lac/vector_accumulation_02.cc b/tests/lac/vector_accumulation_02.cc
index fcd59a6d83..a9895d36ab 100644
--- a/tests/lac/vector_accumulation_02.cc
+++ b/tests/lac/vector_accumulation_02.cc
@@ -73,5 +73,7 @@ main()
   check_norms<float>();
   check_norms<double>();
   check_norms<long double>();
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
   check_norms<std::complex<double>>();
+#endif
 }
diff --git a/tests/lac/vector_accumulation_02.with_complex_values=false.output b/tests/lac/vector_accumulation_02.with_complex_values=false.output
new file mode 100644
index 0000000000..90394638c6
--- /dev/null
+++ b/tests/lac/vector_accumulation_02.with_complex_values=false.output
@@ -0,0 +1,16 @@
+
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
+DEAL::Vector difference: 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 
diff --git a/tests/lac/vector_accumulation_02.output b/tests/lac/vector_accumulation_02.with_complex_values=true.output
similarity index 100%
rename from tests/lac/vector_accumulation_02.output
rename to tests/lac/vector_accumulation_02.with_complex_values=true.output
diff --git a/tests/lac/vector_add_and_dot.cc b/tests/lac/vector_add_and_dot.cc
index 7e3b82fc22..814940b222 100644
--- a/tests/lac/vector_add_and_dot.cc
+++ b/tests/lac/vector_add_and_dot.cc
@@ -70,6 +70,8 @@ main()
   check<float>();
   check<double>();
   check<long double>();
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
   check<std::complex<double>>();
+#endif
   deallog << "OK" << std::endl;
 }
diff --git a/tests/lac/vector_add_and_dot.with_complex_values=false.output b/tests/lac/vector_add_and_dot.with_complex_values=false.output
new file mode 100644
index 0000000000..dc764c0dd4
--- /dev/null
+++ b/tests/lac/vector_add_and_dot.with_complex_values=false.output
@@ -0,0 +1,19 @@
+
+DEAL::Add and dot should be 0.30, is 0.30
+DEAL::Add and dot should be 13.40, is 13.40
+DEAL::Add and dot should be 26.50, is 26.50
+DEAL::Add and dot should be 39.61, is 39.61
+DEAL::Add and dot should be 52.71, is 52.71
+DEAL::Vector add reference:   0.03   0.03   0.04   0.05   0.06   0.06   0.07   0.08   0.09   0.09   0.10   0.11   0.12   0.12   0.13   0.14   0.15   
+DEAL::Vector check reference: 0.03   0.03   0.04   0.05   0.06   0.06   0.07   0.08   0.09   0.09   0.10   0.11   0.12   0.12   0.13   0.14   0.15   
+DEAL::Add and dot should be 0.30, is 0.30
+DEAL::Add and dot should be 13.40, is 13.40
+DEAL::Add and dot should be 26.50, is 26.50
+DEAL::Add and dot should be 39.61, is 39.61
+DEAL::Add and dot should be 52.71, is 52.71
+DEAL::Add and dot should be 0.30, is 0.30
+DEAL::Add and dot should be 13.40, is 13.40
+DEAL::Add and dot should be 26.50, is 26.50
+DEAL::Add and dot should be 39.61, is 39.61
+DEAL::Add and dot should be 52.71, is 52.71
+DEAL::OK
diff --git a/tests/lac/vector_add_and_dot.output b/tests/lac/vector_add_and_dot.with_complex_values=true.output
similarity index 100%
rename from tests/lac/vector_add_and_dot.output
rename to tests/lac/vector_add_and_dot.with_complex_values=true.output
diff --git a/tests/lac/vector_add_and_dot_complex.output b/tests/lac/vector_add_and_dot_complex.with_complex_values=on.output
similarity index 100%
rename from tests/lac/vector_add_and_dot_complex.output
rename to tests/lac/vector_add_and_dot_complex.with_complex_values=on.output
diff --git a/tests/lac/vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2 b/tests/lac/vector_add_and_dot_complex.with_complex_values=on.output.DEAL_II_MAX_THREADS2
similarity index 100%
rename from tests/lac/vector_add_and_dot_complex.output.DEAL_II_MAX_THREADS2
rename to tests/lac/vector_add_and_dot_complex.with_complex_values=on.output.DEAL_II_MAX_THREADS2
diff --git a/tests/lac/vector_add_and_dot_complex.output.no_threads b/tests/lac/vector_add_and_dot_complex.with_complex_values=on.output.no_threads
similarity index 100%
rename from tests/lac/vector_add_and_dot_complex.output.no_threads
rename to tests/lac/vector_add_and_dot_complex.with_complex_values=on.output.no_threads
diff --git a/tests/lac/vector_norms.cc b/tests/lac/vector_norms.cc
index ad383c5d3d..55e01d7cd4 100644
--- a/tests/lac/vector_norms.cc
+++ b/tests/lac/vector_norms.cc
@@ -125,7 +125,9 @@ main()
   check_norms<float>();
   check_norms<double>();
   check_norms<long double>();
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
   check_complex_norms<double>();
   check_complex_norms<float>();
+#endif
   deallog << "OK" << std::endl;
 }
diff --git a/tests/mpi/collective_full_matrix.cc b/tests/mpi/collective_full_matrix.cc
index 9b7c92b2de..7cbcb43396 100644
--- a/tests/mpi/collective_full_matrix.cc
+++ b/tests/mpi/collective_full_matrix.cc
@@ -68,14 +68,18 @@ main(int argc, char *argv[])
       deallog.push("double");
       test<double>();
       deallog.pop();
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
       deallog.push("complex<double>");
       test<std::complex<double>>();
+#endif
       deallog.pop();
     }
   else
     {
       test<float>();
       test<double>();
+#ifdef DEAL_II_WITH_COMPLEX_VALUES
       test<std::complex<double>>();
+#endif
     }
 }
diff --git a/tests/mpi/collective_full_matrix.with_complex_values=false.mpirun=1.output b/tests/mpi/collective_full_matrix.with_complex_values=false.mpirun=1.output
new file mode 100644
index 0000000000..1d1ebcece8
--- /dev/null
+++ b/tests/mpi/collective_full_matrix.with_complex_values=false.mpirun=1.output
@@ -0,0 +1,3 @@
+
+DEAL:float::Ok
+DEAL:double::Ok
diff --git a/tests/mpi/collective_full_matrix.with_complex_values=false.mpirun=10.output b/tests/mpi/collective_full_matrix.with_complex_values=false.mpirun=10.output
new file mode 100644
index 0000000000..1d1ebcece8
--- /dev/null
+++ b/tests/mpi/collective_full_matrix.with_complex_values=false.mpirun=10.output
@@ -0,0 +1,3 @@
+
+DEAL:float::Ok
+DEAL:double::Ok
diff --git a/tests/mpi/collective_full_matrix.with_complex_values=false.mpirun=3.output b/tests/mpi/collective_full_matrix.with_complex_values=false.mpirun=3.output
new file mode 100644
index 0000000000..1d1ebcece8
--- /dev/null
+++ b/tests/mpi/collective_full_matrix.with_complex_values=false.mpirun=3.output
@@ -0,0 +1,3 @@
+
+DEAL:float::Ok
+DEAL:double::Ok
diff --git a/tests/mpi/collective_full_matrix.mpirun=1.output b/tests/mpi/collective_full_matrix.with_complex_values=true.mpirun=1.output
similarity index 100%
rename from tests/mpi/collective_full_matrix.mpirun=1.output
rename to tests/mpi/collective_full_matrix.with_complex_values=true.mpirun=1.output
diff --git a/tests/mpi/collective_full_matrix.mpirun=10.output b/tests/mpi/collective_full_matrix.with_complex_values=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/collective_full_matrix.mpirun=10.output
rename to tests/mpi/collective_full_matrix.with_complex_values=true.mpirun=10.output
diff --git a/tests/mpi/collective_full_matrix.mpirun=3.output b/tests/mpi/collective_full_matrix.with_complex_values=true.mpirun=3.output
similarity index 100%
rename from tests/mpi/collective_full_matrix.mpirun=3.output
rename to tests/mpi/collective_full_matrix.with_complex_values=true.mpirun=3.output
diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=1.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.with_petsc_with_hypre=true.mpirun=1.output
similarity index 100%
rename from tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=1.output
rename to tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.with_petsc_with_hypre=true.mpirun=1.output
diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=10.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.with_petsc_with_hypre=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=10.output
rename to tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.with_petsc_with_hypre=true.mpirun=10.output
diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=3.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.with_petsc_with_hypre=true.mpirun=3.output
similarity index 100%
rename from tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=3.output
rename to tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.with_petsc_with_hypre=true.mpirun=3.output
diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=4.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.with_petsc_with_hypre=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.mpirun=4.output
rename to tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=false.with_petsc_with_hypre=true.mpirun=4.output
diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=1.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.with_petsc_with_hypre=true.mpirun=1.output
similarity index 100%
rename from tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=1.output
rename to tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.with_petsc_with_hypre=true.mpirun=1.output
diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=10.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.with_petsc_with_hypre=true.mpirun=10.output
similarity index 100%
rename from tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=10.output
rename to tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.with_petsc_with_hypre=true.mpirun=10.output
diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=3.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.with_petsc_with_hypre=true.mpirun=3.output
similarity index 100%
rename from tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=3.output
rename to tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.with_petsc_with_hypre=true.mpirun=3.output
diff --git a/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=4.output b/tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.with_petsc_with_hypre=true.mpirun=4.output
similarity index 100%
rename from tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.mpirun=4.output
rename to tests/mpi/hp_step-40_variable_01.with_petsc=true.with_petsc_with_complex=true.with_petsc_with_hypre=true.mpirun=4.output
diff --git a/tests/numerics/error_estimator_02_complex.output b/tests/numerics/error_estimator_02_complex.with_complex_values=on.output
similarity index 100%
rename from tests/numerics/error_estimator_02_complex.output
rename to tests/numerics/error_estimator_02_complex.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_11.output b/tests/vector/complex_vector_11.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_11.output
rename to tests/vector/complex_vector_11.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_12.output b/tests/vector/complex_vector_12.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_12.output
rename to tests/vector/complex_vector_12.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_13.output b/tests/vector/complex_vector_13.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_13.output
rename to tests/vector/complex_vector_13.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_14.output b/tests/vector/complex_vector_14.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_14.output
rename to tests/vector/complex_vector_14.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_15.output b/tests/vector/complex_vector_15.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_15.output
rename to tests/vector/complex_vector_15.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_16.output b/tests/vector/complex_vector_16.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_16.output
rename to tests/vector/complex_vector_16.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_17.output b/tests/vector/complex_vector_17.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_17.output
rename to tests/vector/complex_vector_17.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_18.output b/tests/vector/complex_vector_18.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_18.output
rename to tests/vector/complex_vector_18.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_19.output b/tests/vector/complex_vector_19.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_19.output
rename to tests/vector/complex_vector_19.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_20.output b/tests/vector/complex_vector_20.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_20.output
rename to tests/vector/complex_vector_20.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_21.output b/tests/vector/complex_vector_21.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_21.output
rename to tests/vector/complex_vector_21.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_21_negative.output b/tests/vector/complex_vector_21_negative.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_21_negative.output
rename to tests/vector/complex_vector_21_negative.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_22.output b/tests/vector/complex_vector_22.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_22.output
rename to tests/vector/complex_vector_22.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_23.output b/tests/vector/complex_vector_23.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_23.output
rename to tests/vector/complex_vector_23.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_24.output b/tests/vector/complex_vector_24.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_24.output
rename to tests/vector/complex_vector_24.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_25.output b/tests/vector/complex_vector_25.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_25.output
rename to tests/vector/complex_vector_25.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_26.output b/tests/vector/complex_vector_26.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_26.output
rename to tests/vector/complex_vector_26.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_27.output b/tests/vector/complex_vector_27.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_27.output
rename to tests/vector/complex_vector_27.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_28.output b/tests/vector/complex_vector_28.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_28.output
rename to tests/vector/complex_vector_28.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_29.output b/tests/vector/complex_vector_29.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_29.output
rename to tests/vector/complex_vector_29.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_30.output b/tests/vector/complex_vector_30.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_30.output
rename to tests/vector/complex_vector_30.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_31.output b/tests/vector/complex_vector_31.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_31.output
rename to tests/vector/complex_vector_31.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_32.output b/tests/vector/complex_vector_32.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_32.output
rename to tests/vector/complex_vector_32.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_33.output b/tests/vector/complex_vector_33.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_33.output
rename to tests/vector/complex_vector_33.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_34.output b/tests/vector/complex_vector_34.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_34.output
rename to tests/vector/complex_vector_34.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_35.output b/tests/vector/complex_vector_35.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_35.output
rename to tests/vector/complex_vector_35.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_36.output b/tests/vector/complex_vector_36.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_36.output
rename to tests/vector/complex_vector_36.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_37.output b/tests/vector/complex_vector_37.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_37.output
rename to tests/vector/complex_vector_37.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_39.output b/tests/vector/complex_vector_39.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_39.output
rename to tests/vector/complex_vector_39.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_40.output b/tests/vector/complex_vector_40.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_40.output
rename to tests/vector/complex_vector_40.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_41.output b/tests/vector/complex_vector_41.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_41.output
rename to tests/vector/complex_vector_41.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_42.output b/tests/vector/complex_vector_42.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_42.output
rename to tests/vector/complex_vector_42.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_45.output b/tests/vector/complex_vector_45.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_45.output
rename to tests/vector/complex_vector_45.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_46.output b/tests/vector/complex_vector_46.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_46.output
rename to tests/vector/complex_vector_46.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_48.output b/tests/vector/complex_vector_48.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_48.output
rename to tests/vector/complex_vector_48.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_49.output b/tests/vector/complex_vector_49.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_49.output
rename to tests/vector/complex_vector_49.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_equality_1.output b/tests/vector/complex_vector_equality_1.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_equality_1.output
rename to tests/vector/complex_vector_equality_1.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_equality_2.output b/tests/vector/complex_vector_equality_2.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_equality_2.output
rename to tests/vector/complex_vector_equality_2.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_equality_3.output b/tests/vector/complex_vector_equality_3.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_equality_3.output
rename to tests/vector/complex_vector_equality_3.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_equality_4.output b/tests/vector/complex_vector_equality_4.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_equality_4.output
rename to tests/vector/complex_vector_equality_4.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_equality_5.output b/tests/vector/complex_vector_equality_5.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_equality_5.output
rename to tests/vector/complex_vector_equality_5.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_equality_6.output b/tests/vector/complex_vector_equality_6.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_equality_6.output
rename to tests/vector/complex_vector_equality_6.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_equality_7.output b/tests/vector/complex_vector_equality_7.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_equality_7.output
rename to tests/vector/complex_vector_equality_7.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_equality_8.output b/tests/vector/complex_vector_equality_8.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_equality_8.output
rename to tests/vector/complex_vector_equality_8.with_complex_values=on.output
diff --git a/tests/vector/complex_vector_vector_01.output b/tests/vector/complex_vector_vector_01.with_complex_values=on.output
similarity index 100%
rename from tests/vector/complex_vector_vector_01.output
rename to tests/vector/complex_vector_vector_01.with_complex_values=on.output
diff --git a/tests/vector_tools/boundaries_complex.output b/tests/vector_tools/boundaries_complex.with_complex_values=on.output
similarity index 100%
rename from tests/vector_tools/boundaries_complex.output
rename to tests/vector_tools/boundaries_complex.with_complex_values=on.output
diff --git a/tests/vector_tools/boundaries_complex_hp.output b/tests/vector_tools/boundaries_complex_hp.with_complex_values=on.output
similarity index 100%
rename from tests/vector_tools/boundaries_complex_hp.output
rename to tests/vector_tools/boundaries_complex_hp.with_complex_values=on.output
diff --git a/tests/vector_tools/integrate_difference_01_complex_01.output b/tests/vector_tools/integrate_difference_01_complex_01.with_complex_values=on.output
similarity index 100%
rename from tests/vector_tools/integrate_difference_01_complex_01.output
rename to tests/vector_tools/integrate_difference_01_complex_01.with_complex_values=on.output
diff --git a/tests/vector_tools/integrate_difference_01_complex_02.output b/tests/vector_tools/integrate_difference_01_complex_02.with_complex_values=on.output
similarity index 100%
rename from tests/vector_tools/integrate_difference_01_complex_02.output
rename to tests/vector_tools/integrate_difference_01_complex_02.with_complex_values=on.output
diff --git a/tests/vector_tools/integrate_difference_01_complex_03.output b/tests/vector_tools/integrate_difference_01_complex_03.with_complex_values=on.output
similarity index 100%
rename from tests/vector_tools/integrate_difference_01_complex_03.output
rename to tests/vector_tools/integrate_difference_01_complex_03.with_complex_values=on.output