New test.

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

diff --git a/tests/bits/Makefile b/tests/bits/Makefile
index a117de34526fc811037a74594b78b0215af44889..d51a1eaf7b564b73e704c3d4748a09a5970c269d 100644 (file)
--- a/tests/bits/Makefile
+++ b/tests/bits/Makefile
@@ -1,6 +1,6 @@
 ############################################################
 # Makefile,v 1.15 2002/06/13 12:51:13 hartmann Exp
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors
 ############################################################
 
 ############################################################
@@ -56,8 +56,7 @@ tests_x = grid_generator_?? \
          normals_* \
          q_point_sum_* \
          volume_* \
-         mapping_cartesian_1 \
-         mapping_q4_3d \
+         mapping_* \
          q_points \
          find_closest_vertex_* \
          find_cells_adjacent_to_vertex_* \

diff --git a/tests/bits/mapping_q_eulerian_01.cc b/tests/bits/mapping_q_eulerian_01.cc
new file mode 100644 (file)
index 0000000..c7c8663
--- /dev/null
+++ b/tests/bits/mapping_q_eulerian_01.cc
@@ -0,0 +1,127 @@
+//----------------------------------------------------------------------
+//    $Id$
+//    Version: $Name$
+//
+//    Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010 by the deal.II authors
+//
+//    This file is subject to QPL and may not be  distributed
+//    without copyright and license information. Please refer
+//    to the file deal.II/doc/license.html for the  text  and
+//    further information on this license.
+//
+//----------------------------------------------------------------------
+
+// test that DataOut and MappingQEulerian agree on how to output a
+// displaced mesh. This was broken between r20158 and r21072
+
+#include "../tests.h"
+
+#include <grid/tria.h>
+#include <grid/tria_accessor.h>
+#include <grid/tria_iterator.h>
+#include <lac/full_matrix.h>
+#include <lac/identity_matrix.h>
+#include <base/quadrature_lib.h>
+#include <base/thread_management.h>
+#include <base/function.h>
+#include <lac/vector.h>
+#include <lac/vector_memory.h>
+#include <lac/filtered_matrix.h>
+#include <lac/precondition.h>
+#include <lac/solver_cg.h>
+#include <lac/sparse_matrix.h>
+#include <grid/grid_generator.h>
+#include <grid/grid_reordering.h>
+#include <grid/grid_tools.h>
+#include <grid/tria.h>
+#include <grid/tria_accessor.h>
+#include <grid/tria_iterator.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_accessor.h>
+#include <dofs/dof_tools.h>
+#include <lac/constraint_matrix.h>
+#include <fe/mapping_q1.h>
+#include <fe/mapping_q_eulerian.h>
+#include <fe/fe_q.h>
+#include <fe/fe_system.h>
+#include <numerics/vectors.h>
+#include <numerics/data_out.h>
+#include <base/multithread_info.h>
+#include <fstream>
+#include <cmath>
+#include <iostream>
+#include <vector>
+
+using namespace dealii;
+
+
+template <int dim>
+class Displacement : public Function<dim>
+{
+  public:
+    Displacement() :
+                   Function<dim>(dim)
+      {}
+
+    double value (const Point<dim> &p,
+                 const unsigned int component) const
+      {
+       return p[component];
+      }
+
+    void vector_value (const Point<dim> &p,
+                      Vector<double> &v) const
+      {
+       for (unsigned int i=0; i<dim; ++i)
+         v(i) = p[i];
+      }
+};
+
+
+template <int dim>
+void test ()
+{
+  deallog << "dim=" << dim << std::endl;
+
+  Triangulation<dim> triangulation;
+  GridGenerator::hyper_cube (triangulation, -1, 1);
+
+  FESystem<dim> fe(FE_Q<dim>(1),dim);
+  DoFHandler<dim> dof_handler(triangulation);
+  dof_handler.distribute_dofs(fe);
+
+  Vector<double> displacements (dof_handler.n_dofs());
+
+  VectorTools::interpolate (dof_handler,
+                           Displacement<dim>(),
+                           displacements);
+
+  MappingQEulerian<dim> euler(2, displacements, dof_handler);
+                                  // now the actual test
+  DataOut<dim> data_out;
+  data_out.attach_dof_handler(dof_handler);
+  std::vector<std::string> names (dim, "displacement");
+  data_out.add_data_vector(displacements,names);
+
+                                  // output with all cells curved
+  data_out.build_patches(euler,1,DataOut<dim>::curved_inner_cells);
+  data_out.write_gnuplot(deallog.get_file_stream());
+}
+
+
+
+int main ()
+{
+  std::ofstream logfile("mapping_q_eulerian_01/output");
+  deallog.attach(logfile);
+  deallog << std::setprecision (4);
+  logfile << std::setprecision (4);
+  deallog.depth_console(0);
+  deallog.threshold_double(1.e-10);
+
+  test<1> ();
+  test<2> ();
+  test<3> ();
+}
+
+

diff --git a/tests/bits/mapping_q_eulerian_01/cmp/generic b/tests/bits/mapping_q_eulerian_01/cmp/generic
new file mode 100644 (file)
index 0000000..3c5900d
--- /dev/null
+++ b/tests/bits/mapping_q_eulerian_01/cmp/generic
@@ -0,0 +1,84 @@
+
+DEAL::dim=1
+# This file was generated by the deal.II library.
+
+
+#
+# For a description of the GNUPLOT format see the GNUPLOT manual.
+#
+# <x> <displacement> 
+-2.000 -1.000 
+2.000 1.000 
+
+
+DEAL::dim=2
+# This file was generated by the deal.II library.
+
+
+#
+# For a description of the GNUPLOT format see the GNUPLOT manual.
+#
+# <x> <y> <displacement> <displacement> 
+-2.000 -2.000 -1.000 -1.000 
+2.000 -2.000 1.000 -1.000 
+
+-2.000 2.000 -1.000 1.000 
+2.000 2.000 1.000 1.000 
+
+
+DEAL::dim=3
+# This file was generated by the deal.II library.
+
+
+#
+# For a description of the GNUPLOT format see the GNUPLOT manual.
+#
+# <x> <y> <z> <displacement> <displacement> <displacement> 
+-2.000 -2.000 -2.000 -1.000 -1.000 -1.000
+2.000 -2.000 -2.000 1.000 -1.000 -1.000
+
+
+-2.000 -2.000 -2.000 -1.000 -1.000 -1.000
+-2.000 2.000 -2.000 -1.000 1.000 -1.000
+
+
+-2.000 -2.000 -2.000 -1.000 -1.000 -1.000
+-2.000 -2.000 2.000 -1.000 -1.000 1.000
+
+
+2.000 -2.000 -2.000 1.000 -1.000 -1.000
+2.000 2.000 -2.000 1.000 1.000 -1.000
+
+
+2.000 -2.000 -2.000 1.000 -1.000 -1.000
+2.000 -2.000 2.000 1.000 -1.000 1.000
+
+
+-2.000 2.000 -2.000 -1.000 1.000 -1.000
+2.000 2.000 -2.000 1.000 1.000 -1.000
+
+
+-2.000 2.000 -2.000 -1.000 1.000 -1.000
+-2.000 2.000 2.000 -1.000 1.000 1.000
+
+
+2.000 2.000 -2.000 1.000 1.000 -1.000
+2.000 2.000 2.000 1.000 1.000 1.000
+
+
+-2.000 -2.000 2.000 -1.000 -1.000 1.000
+2.000 -2.000 2.000 1.000 -1.000 1.000
+
+
+-2.000 -2.000 2.000 -1.000 -1.000 1.000
+-2.000 2.000 2.000 -1.000 1.000 1.000
+
+
+2.000 -2.000 2.000 1.000 -1.000 1.000
+2.000 2.000 2.000 1.000 1.000 1.000
+
+
+-2.000 2.000 2.000 -1.000 1.000 1.000
+2.000 2.000 2.000 1.000 1.000 1.000
+
+