]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix the gla tests for complex PETSc scalar type
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Tue, 29 May 2018 09:29:12 +0000 (11:29 +0200)
committerMatthias Maier <tamiko@43-1.org>
Wed, 6 Jun 2018 15:19:39 +0000 (10:19 -0500)
tests/gla/block_mat_03.cc
tests/gla/block_vec_02.cc
tests/gla/vec_03.cc

index 2e2b1f6615e72be9a9b7d06041242b92c350c363..40ba2719c1a9ca46747b5708e9e7c8b1de1f3171 100644 (file)
@@ -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);
index a768a80ae0b591fc91b44dc8d53e741ecab4ed07..92d489dfc40d605d92a34c8d8943c256b53a0661 100644 (file)
@@ -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();
index b59105f7d7e827e973781184a291cb8fb3419024..6f9e8731c202f4ee68ae15a92202b0939a39678c 100644 (file)
@@ -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();

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.