]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix some remaining problem with the templatization.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 16 May 2000 11:06:49 +0000 (11:06 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 16 May 2000 11:06:49 +0000 (11:06 +0000)
git-svn-id: https://svn.dealii.org/trunk@2868 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/dofs/dof_accessor.cc
deal.II/deal.II/source/fe/fe_values.cc

index 6dad3f3def4046c6515e5aade8c10b6f0f1b0f60..717425fda90d1b1995f50f0088afc4de37fecf4c 100644 (file)
@@ -680,7 +680,7 @@ DoFObjectAccessor<1,deal_II_dimension>::set_dof_values (const Vector<float> &,
 template
 void
 DoFObjectAccessor<1,deal_II_dimension>::get_dof_values (const BlockVector<2,double> &,
-                                                       Vector<float>       &) const;
+                                                       Vector<double>       &) const;
 
 template
 void
@@ -692,7 +692,7 @@ DoFObjectAccessor<1,deal_II_dimension>::set_dof_values (const Vector<double>  &,
 template
 void
 DoFObjectAccessor<1,deal_II_dimension>::get_dof_values (const BlockVector<3,double> &,
-                                                       Vector<float>       &) const;
+                                                       Vector<double>       &) const;
 
 template
 void
@@ -731,7 +731,7 @@ DoFObjectAccessor<2,deal_II_dimension>::set_dof_values (const Vector<float> &,
 template
 void
 DoFObjectAccessor<2,deal_II_dimension>::get_dof_values (const BlockVector<2,double> &,
-                                                       Vector<float>       &) const;
+                                                       Vector<double>       &) const;
 
 template
 void
@@ -743,7 +743,7 @@ DoFObjectAccessor<2,deal_II_dimension>::set_dof_values (const Vector<double>  &,
 template
 void
 DoFObjectAccessor<2,deal_II_dimension>::get_dof_values (const BlockVector<3,double> &,
-                                                       Vector<float>       &) const;
+                                                       Vector<double>       &) const;
 
 template
 void
@@ -783,7 +783,7 @@ DoFObjectAccessor<3,deal_II_dimension>::set_dof_values (const Vector<float> &,
 template
 void
 DoFObjectAccessor<3,deal_II_dimension>::get_dof_values (const BlockVector<2,double> &,
-                                                       Vector<float>       &) const;
+                                                       Vector<double>       &) const;
 template
 void
 DoFObjectAccessor<3,deal_II_dimension>::set_dof_values (const Vector<double>  &,
@@ -794,7 +794,7 @@ DoFObjectAccessor<3,deal_II_dimension>::set_dof_values (const Vector<double>  &,
 template
 void
 DoFObjectAccessor<3,deal_II_dimension>::get_dof_values (const BlockVector<3,double> &,
-                                                       Vector<float>       &) const;
+                                                       Vector<double>       &) const;
 template
 void
 DoFObjectAccessor<3,deal_II_dimension>::set_dof_values (const Vector<double>  &,
index ee631100d3a636426382ba068272260db6790646..8b8c79a55809cf5e8d66045d53b2cdaca64fb99d 100644 (file)
@@ -75,9 +75,9 @@ double FEValuesBase<dim>::shape_value (const unsigned int i,
 
 
 template <int dim>
-template <class InputVector>
+template <class InputVector, typename number>
 void FEValuesBase<dim>::get_function_values (const InputVector &fe_function,
-                                            vector<double>    &values) const
+                                            vector<number>    &values) const
 {
   Assert (fe->n_components() == 1,
          ExcWrongNoOfComponents());
@@ -88,7 +88,7 @@ void FEValuesBase<dim>::get_function_values (const InputVector &fe_function,
 
                                   // get function values of dofs
                                   // on this cell
-  Vector<double> dof_values (dofs_per_cell);
+  Vector<typename InputVector::value_type> dof_values (dofs_per_cell);
   if (present_cell->active())
     present_cell->get_dof_values (fe_function, dof_values);
   else
@@ -108,9 +108,9 @@ void FEValuesBase<dim>::get_function_values (const InputVector &fe_function,
 
 
 template <int dim>
-template <class InputVector>
-void FEValuesBase<dim>::get_function_values (const InputVector        &fe_function,
-                                            vector< Vector<double> > &values) const
+template <class InputVector, typename number>
+void FEValuesBase<dim>::get_function_values (const InputVector       &fe_function,
+                                            vector<Vector<number> > &values) const
 {
   Assert (n_quadrature_points == values.size(),
          ExcWrongVectorSize(values.size(), n_quadrature_points));
@@ -122,7 +122,7 @@ void FEValuesBase<dim>::get_function_values (const InputVector        &fe_functi
 
                                   // get function values of dofs
                                   // on this cell
-  Vector<double> dof_values (dofs_per_cell);
+  Vector<typename InputVector::value_type> dof_values (dofs_per_cell);
   if (present_cell->active())
     present_cell->get_dof_values (fe_function, dof_values);
   else
@@ -170,7 +170,7 @@ void FEValuesBase<dim>::get_function_grads (const InputVector      &fe_function,
 
                                   // get function values of dofs
                                   // on this cell
-  Vector<double> dof_values (dofs_per_cell);
+  Vector<typename InputVector::value_type> dof_values (dofs_per_cell);
   if (present_cell->active())
     present_cell->get_dof_values (fe_function, dof_values);
   else
@@ -207,7 +207,7 @@ void FEValuesBase<dim>::get_function_grads (const InputVector               &fe_
 
                                   // get function values of dofs
                                   // on this cell
-  Vector<double> dof_values (dofs_per_cell);
+  Vector<typename InputVector::value_type> dof_values (dofs_per_cell);
   if (present_cell->active())
     present_cell->get_dof_values (fe_function, dof_values);
   else
@@ -259,7 +259,7 @@ void FEValuesBase<dim>::get_function_2nd_derivatives (const InputVector      &fe
 
                                   // get function values of dofs
                                   // on this cell
-  Vector<double> dof_values (dofs_per_cell);
+  Vector<typename InputVector::value_type> dof_values (dofs_per_cell);
   if (present_cell->active())
     present_cell->get_dof_values (fe_function, dof_values);
   else
@@ -829,7 +829,7 @@ void FEValuesBase<deal_II_dimension>::get_function_values (const Vector<double>
                                             vector<double>       &) const;
 template
 void FEValuesBase<deal_II_dimension>::get_function_values (const Vector<float> &,
-                                            vector<double>      &) const;
+                                            vector<float>      &) const;
 template
 void FEValuesBase<deal_II_dimension>::get_function_values (const BlockVector<2,double> &,
                                             vector<double>      &) const;
@@ -844,7 +844,7 @@ void FEValuesBase<deal_II_dimension>::get_function_values (const Vector<double>
                                             vector<Vector<double> > &) const;
 template
 void FEValuesBase<deal_II_dimension>::get_function_values (const Vector<float> &,
-                                            vector<Vector<double> > &) const;
+                                            vector<Vector<float> > &) const;
 template
 void FEValuesBase<deal_II_dimension>::get_function_values (const BlockVector<2,double> &,
                                             vector<Vector<double> >     &) const;

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.