From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Tue, 29 May 2018 09:29:12 +0000 (+0200)
Subject: Fix the gla tests for complex PETSc scalar type
X-Git-Tag: v9.1.0-rc1~1067^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4c6bdf060b423659eac959ba4911e95df6120df;p=dealii.git

Fix the gla tests for complex PETSc scalar type
---

diff --git a/tests/gla/block_mat_03.cc b/tests/gla/block_mat_03.cc
index 2e2b1f6615..40ba2719c1 100644
--- a/tests/gla/block_mat_03.cc
+++ b/tests/gla/block_mat_03.cc
@@ -99,8 +99,9 @@ test()
   deallog << "relevant: ";
   locally_relevant_dofs.print(deallog);
 
+  typedef typename LA::MPI::BlockSparseMatrix::value_type number;
 
-  ConstraintMatrix constraints(locally_relevant_dofs);
+  AffineConstraints<number> constraints(locally_relevant_dofs);
   constraints.close();
 
   BlockDynamicSparsityPattern bcsp(locally_relevant_partitioning);
@@ -111,8 +112,7 @@ test()
     MPI_COMM_WORLD,
     locally_relevant_dofs);
 
-  typedef typename LA::MPI::BlockSparseMatrix::value_type number;
-  typename LA::MPI::BlockSparseMatrix                     A;
+  typename LA::MPI::BlockSparseMatrix A;
   A.reinit(locally_owned_partitioning, bcsp, MPI_COMM_WORLD);
 
   QGauss<3>   quadrature(3);
diff --git a/tests/gla/block_vec_02.cc b/tests/gla/block_vec_02.cc
index a768a80ae0..92d489dfc4 100644
--- a/tests/gla/block_vec_02.cc
+++ b/tests/gla/block_vec_02.cc
@@ -75,7 +75,8 @@ test()
             << std::endl;
 
 
-  ConstraintMatrix cm;
+  using scalar_type = typename LA::MPI::BlockVector::value_type;
+  AffineConstraints<scalar_type> cm;
   cm.add_line(0);
   cm.add_entry(0, 1, 3.0);
   cm.close();
diff --git a/tests/gla/vec_03.cc b/tests/gla/vec_03.cc
index b59105f7d7..6f9e8731c2 100644
--- a/tests/gla/vec_03.cc
+++ b/tests/gla/vec_03.cc
@@ -78,7 +78,8 @@ test()
   Assert(get_real_assert_zero_imag(v(myid * 2 + 1)) == myid * 4.0 + 2.0,
          ExcInternalError());
 
-  ConstraintMatrix cm;
+  using scalar_type = typename LA::MPI::BlockVector::value_type;
+  AffineConstraints<scalar_type> cm;
   cm.add_line(1);
   cm.add_entry(1, 2, 3.0);
   cm.close();