From de2a27d7dae67ea44d2c0dd17ad4e0efe8a1cef8 Mon Sep 17 00:00:00 2001
From: kanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 18 Mar 2013 14:56:33 +0000
Subject: [PATCH] support long double

git-svn-id: https://svn.dealii.org/trunk@28931 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/include/deal.II/integrators/divergence.h   | 12 ++++++------
 deal.II/include/deal.II/integrators/elasticity.h   | 14 +++++++-------
 deal.II/include/deal.II/integrators/l2.h           |  8 ++++----
 deal.II/include/deal.II/integrators/laplace.h      |  6 +++---
 deal.II/include/deal.II/meshworker/dof_info.h      |  6 ++----
 .../include/deal.II/meshworker/integration_info.h  | 14 +++++++++-----
 6 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/deal.II/include/deal.II/integrators/divergence.h b/deal.II/include/deal.II/integrators/divergence.h
index 56b6baff08..8982d4a7ed 100644
--- a/deal.II/include/deal.II/integrators/divergence.h
+++ b/deal.II/include/deal.II/integrators/divergence.h
@@ -121,9 +121,9 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2011
      */
-    template <int dim>
+    template <int dim, typename number=double>
     void cell_residual(
-      Vector<double> &result,
+      Vector<number> &result,
       const FEValuesBase<dim> &fetest,
       const VectorSlice<const std::vector<std::vector<Tensor<1,dim> > > > &input,
       const double factor = 1.)
@@ -201,9 +201,9 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2011
      */
-    template <int dim>
+    template <int dim, typename number=double>
     void gradient_residual(
-      Vector<double> &result,
+      Vector<number> &result,
       const FEValuesBase<dim> &fetest,
       const std::vector<Tensor<1,dim> > &input,
       const double factor = 1.)
@@ -273,10 +273,10 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2011
      */
-    template<int dim>
+    template<int dim, typename number=double>
     void
     u_dot_n_residual (
-      Vector<double> &result,
+      Vector<number> &result,
       const FEValuesBase<dim> &fe,
       const FEValuesBase<dim> &fetest,
       const VectorSlice<const std::vector<std::vector<double> > > &data,
diff --git a/deal.II/include/deal.II/integrators/elasticity.h b/deal.II/include/deal.II/integrators/elasticity.h
index 8fe0766f8b..39c6220744 100644
--- a/deal.II/include/deal.II/integrators/elasticity.h
+++ b/deal.II/include/deal.II/integrators/elasticity.h
@@ -75,10 +75,10 @@ namespace LocalIntegrators
      * - \int_Z \varepsilon(u): \varepsilon(v) \,dx
      * \f]
      */
-    template <int dim>
+    template <int dim, typename number=double>
     inline void
     cell_residual  (
-      Vector<double> &result,
+      Vector<number> &result,
       const FEValuesBase<dim> &fe,
       const VectorSlice<const std::vector<std::vector<Tensor<1,dim> > > > &input,
       double factor = 1.)
@@ -167,9 +167,9 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2013
      */
-    template <int dim>
+    template <int dim, typename number=double>
     void nitsche_residual (
-      Vector<double> &result,
+      Vector<number> &result,
       const FEValuesBase<dim> &fe,
       const VectorSlice<const std::vector<std::vector<double> > > &input,
       const VectorSlice<const std::vector<std::vector<Tensor<1,dim> > > > &Dinput,
@@ -292,11 +292,11 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2013
      */
-    template<int dim>
+    template<int dim, typename number=double>
     void
     ip_residual(
-      Vector<double> &result1,
-      Vector<double> &result2,
+      Vector<number> &result1,
+      Vector<number> &result2,
       const FEValuesBase<dim> &fe1,
       const FEValuesBase<dim> &fe2,
       const VectorSlice<const std::vector<std::vector<double> > > &input1,
diff --git a/deal.II/include/deal.II/integrators/l2.h b/deal.II/include/deal.II/integrators/l2.h
index 9f5a304f8b..a6b6536639 100644
--- a/deal.II/include/deal.II/integrators/l2.h
+++ b/deal.II/include/deal.II/integrators/l2.h
@@ -80,9 +80,9 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2008, 2009, 2010
      */
-    template <int dim>
+    template <int dim, typename number=double>
     void L2 (
-      Vector<double> &result,
+      Vector<number> &result,
       const FEValuesBase<dim> &fe,
       const std::vector<double> &input,
       const double factor = 1.)
@@ -109,9 +109,9 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2008, 2009, 2010
      */
-    template <int dim>
+    template <int dim, typename number=double>
     void L2 (
-      Vector<double> &result,
+      Vector<number> &result,
       const FEValuesBase<dim> &fe,
       const VectorSlice<const std::vector<std::vector<double> > > &input,
       const double factor = 1.)
diff --git a/deal.II/include/deal.II/integrators/laplace.h b/deal.II/include/deal.II/integrators/laplace.h
index 7a0c003eba..272e8d2c9d 100644
--- a/deal.II/include/deal.II/integrators/laplace.h
+++ b/deal.II/include/deal.II/integrators/laplace.h
@@ -486,10 +486,10 @@ namespace LocalIntegrators
      * @author Guido Kanschat
      * @date 2010
      */
-    template <int dim>
+    template <int dim, int spacedim=dim, typename number>
     double compute_penalty(
-      const MeshWorker::DoFInfo<dim> &dinfo1,
-      const MeshWorker::DoFInfo<dim> &dinfo2,
+      const MeshWorker::DoFInfo<dim,spacedim,number> &dinfo1,
+      const MeshWorker::DoFInfo<dim,spacedim,number> &dinfo2,
       unsigned int deg1,
       unsigned int deg2)
     {
diff --git a/deal.II/include/deal.II/meshworker/dof_info.h b/deal.II/include/deal.II/meshworker/dof_info.h
index 46116bd4e2..cc12fedd04 100644
--- a/deal.II/include/deal.II/meshworker/dof_info.h
+++ b/deal.II/include/deal.II/meshworker/dof_info.h
@@ -117,8 +117,7 @@ namespace MeshWorker
      * pointer empty, but setting
      * the #aux_local_indices.
      */
-    template <class DH>
-    DoFInfo (const DH &dof_handler);
+    DoFInfo (const DoFHandler<dim, spacedim>& dof_handler);
 
     /**
      * Set the current cell and
@@ -281,8 +280,7 @@ namespace MeshWorker
 //----------------------------------------------------------------------//
 
   template <int dim, int spacedim, typename number>
-  template <class DH>
-  DoFInfo<dim,spacedim,number>::DoFInfo(const DH &dof_handler)
+  DoFInfo<dim,spacedim,number>::DoFInfo(const DoFHandler<dim,spacedim> &dof_handler)
   {
     std::vector<unsigned int> aux(1);
     aux[0] = dof_handler.get_fe().dofs_per_cell;
diff --git a/deal.II/include/deal.II/meshworker/integration_info.h b/deal.II/include/deal.II/meshworker/integration_info.h
index a57459f2db..dbea00f0e1 100644
--- a/deal.II/include/deal.II/meshworker/integration_info.h
+++ b/deal.II/include/deal.II/meshworker/integration_info.h
@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 //    $Id$
 //
-//    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 by the deal.II authors
+//    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -220,7 +220,8 @@ namespace MeshWorker
      * Reinitialize internal data
      * structures for use on a cell.
      */
-    void reinit(const DoFInfo<dim, spacedim> &i);
+    template <typename number=double>
+    void reinit(const DoFInfo<dim, spacedim, number> &i);
 
     /**
      * Use the finite element
@@ -887,8 +888,9 @@ namespace MeshWorker
 
 
   template <int dim, int spacedim>
+  template <typename number>
   inline void
-  IntegrationInfo<dim,spacedim>::reinit(const DoFInfo<dim, spacedim> &info)
+  IntegrationInfo<dim,spacedim>::reinit(const DoFInfo<dim, spacedim, number> &info)
   {
     for (unsigned int i=0; i<fevalv.size(); ++i)
       {
@@ -920,8 +922,9 @@ namespace MeshWorker
 
 
   template <>
+  template <typename number>
   inline void
-  IntegrationInfo<1,1>::reinit(const DoFInfo<1,1> &info)
+  IntegrationInfo<1,1>::reinit(const DoFInfo<1,1,number> &info)
   {
     const int dim = 1;
     const int spacedim = 1;
@@ -954,8 +957,9 @@ namespace MeshWorker
 
 
   template <>
+  template <typename number>
   inline void
-  IntegrationInfo<1,2>::reinit(const DoFInfo<1,2> &info)
+  IntegrationInfo<1,2>::reinit(const DoFInfo<1,2,number> &info)
   {
     const int dim = 1;
     const int spacedim = 2;
-- 
2.39.5