Fix a nasty bug in DerivativeApproximation which simply did not work at all in parallel.

git-svn-id: https://svn.dealii.org/trunk@32049 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/mpi/derivative_approximation_01.cc b/tests/mpi/derivative_approximation_01.cc
index 11d0f1d958ae2077c932290cf7b82b1d07cc2846..955655f3acbf0eaacd7b37a7ed7338167d5ebcd0 100644 (file)
--- a/tests/mpi/derivative_approximation_01.cc
+++ b/tests/mpi/derivative_approximation_01.cc
@@ -21,14 +21,14 @@
  --------------------------------------------------------
  An error occurred in line <3349> of file </ssd/deal-trunk/deal.II/include/deal.II/dofs/dof_accessor.templates.h> in function
      void dealii::DoFCellAccessor<DH, lda>::get_dof_values(const InputVector&, ForwardIterator, ForwardIterator) const [with InputVector = dealii::TrilinosWrappers::MPI::Vector, ForwardIterator = double*, DH = dealii::DoFHandler<2>, bool level_dof_access = false]
- The violated condition was: 
+ The violated condition was:
      this->is_artificial() == false
  The name and call sequence of the exception was:
      ExcMessage ("Can't ask for DoF indices on artificial cells.")
- Additional Information: 
+ Additional Information:
  Can't ask for DoF indices on artificial cells.
  --------------------------------------------------------
-  
+
  */
 
 #include "../tests.h"
@@ -85,8 +85,7 @@ void test()
                                                  vec_rel,
                                                  indicators);
 
-  deallog <<"output:" << indicators.l2_norm() << std::endl;
-
+  // we got here, so no exception.
   if (myid == 0)
     deallog << "OK" << std::endl;
 }

diff --git a/tests/mpi/derivative_approximation_01.with_trilinos=true.mpirun=3.debug.output b/tests/mpi/derivative_approximation_01.with_trilinos=true.mpirun=3.debug.output
index 0deadca86b779f0f237c2bf93e174a7f4008b87b..03cc72804adeff2dc50a896a8504e5744256cd8d 100644 (file)
--- a/tests/mpi/derivative_approximation_01.with_trilinos=true.mpirun=3.debug.output
+++ b/tests/mpi/derivative_approximation_01.with_trilinos=true.mpirun=3.debug.output
@@ -1,9 +1,6 @@
 
-DEAL:0::output:34.4565
 DEAL:0::OK
 
-DEAL:1::output:61.6543
 
 
-DEAL:2::output:47.0585
 

diff --git a/tests/mpi/derivative_approximation_02.cc b/tests/mpi/derivative_approximation_02.cc
new file mode 100644 (file)
index 0000000..af7e1b1
--- /dev/null
+++ b/tests/mpi/derivative_approximation_02.cc
@@ -0,0 +1,110 @@
+// ---------------------------------------------------------------------
+// $Id$
+//
+// Copyright (C) 2009 - 2013 by the deal.II authors
+//
+// This file is part of the deal.II library.
+//
+// The deal.II library is free software; you can use it, redistribute
+// it, and/or modify it under the terms of the GNU Lesser General
+// Public License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// The full text of the license can be found in the file LICENSE at
+// the top level of the deal.II distribution.
+//
+// ---------------------------------------------------------------------
+
+
+
+
+// DerivativeApproximation didn't work in parallel at all. This test verifies
+// that it now does.
+
+
+#include "../tests.h"
+#include <deal.II/base/logstream.h>
+#include <deal.II/lac/trilinos_vector.h>
+#include <deal.II/lac/constraint_matrix.h>
+#include <deal.II/grid/tria.h>
+#include <deal.II/distributed/tria.h>
+#include <deal.II/grid/grid_generator.h>
+#include <deal.II/grid/tria_accessor.h>
+#include <deal.II/fe/fe_q.h>
+#include <deal.II/dofs/dof_handler.h>
+#include <deal.II/dofs/dof_tools.h>
+#include <deal.II/base/function.h>
+#include <deal.II/numerics/vector_tools.h>
+#include <deal.II/numerics/derivative_approximation.h>
+
+#include <fstream>
+#include <sstream>
+
+
+template <int dim>
+class Quadratic :
+  public Function<dim>
+{
+public:
+  double value (const Point<dim> &p, const unsigned int) const
+    {
+      return p*p;
+    }
+};
+
+
+template <int dim>
+void test()
+{
+  const unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD);
+  const unsigned int n_processes = Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD);
+
+  parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
+
+  GridGenerator::hyper_cube(tr);
+  tr.refine_global(2);
+
+  const FE_Q<dim> fe(1);
+  DoFHandler<dim> dofh(tr);
+  dofh.distribute_dofs (fe);
+
+  IndexSet locally_relevant_set;
+  DoFTools::extract_locally_relevant_dofs (dofh,
+                                          locally_relevant_set);
+
+  // create a vector representing a function that is independent of the number
+  // of processors involved
+  TrilinosWrappers::MPI::Vector vec (dofh.locally_owned_dofs(), MPI_COMM_WORLD);
+  VectorTools::interpolate (dofh, Quadratic<dim>(), vec);
+  vec.compress(VectorOperation::insert);
+
+  // create such a vector with ghost elements and use it to compute
+  // derivative information
+  TrilinosWrappers::MPI::Vector vec_rel ( locally_relevant_set);
+  vec_rel = vec;
+
+  Vector<float> indicators(tr.n_active_cells());
+  DerivativeApproximation::approximate_gradient  (dofh,
+                                                 vec_rel,
+                                                 indicators);
+
+  // what we get must be a set of derivative indicators, one for each
+  // cell of the distributed mesh. they need to be the same, no matter
+  // how many processors we use. So, the sum of absolute values must
+  // be the same for any processor number
+  const double sum = Utilities::MPI::sum (indicators.l1_norm(), MPI_COMM_WORLD);
+  if (myid == 0)
+    deallog << sum << std::endl;
+}
+
+
+
+int main(int argc, char *argv[])
+{
+  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
+
+  MPILogInitAll log;
+
+  test<2> ();
+  test<3> ();
+}
+

diff --git a/tests/mpi/derivative_approximation_02.with_trilinos=true.mpirun=1.output b/tests/mpi/derivative_approximation_02.with_trilinos=true.mpirun=1.output
new file mode 100644 (file)
index 0000000..380b2ea
--- /dev/null
+++ b/tests/mpi/derivative_approximation_02.with_trilinos=true.mpirun=1.output
@@ -0,0 +1,3 @@
+
+DEAL:0::23.4892
+DEAL:0::116.543

diff --git a/tests/mpi/derivative_approximation_02.with_trilinos=true.mpirun=3.output b/tests/mpi/derivative_approximation_02.with_trilinos=true.mpirun=3.output
new file mode 100644 (file)
index 0000000..ece4add
--- /dev/null
+++ b/tests/mpi/derivative_approximation_02.with_trilinos=true.mpirun=3.output
@@ -0,0 +1,7 @@
+
+DEAL:0::23.4892
+DEAL:0::116.543
+
+
+
+

diff --git a/tests/mpi/derivative_approximation_02.with_trilinos=true.mpirun=7.output b/tests/mpi/derivative_approximation_02.with_trilinos=true.mpirun=7.output
new file mode 100644 (file)
index 0000000..ce82c71
--- /dev/null
+++ b/tests/mpi/derivative_approximation_02.with_trilinos=true.mpirun=7.output
@@ -0,0 +1,15 @@
+
+DEAL:0::23.4892
+DEAL:0::116.543
+
+
+
+
+
+
+
+
+
+
+
+