]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make things compile in 1D again.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 2 Feb 1999 13:53:17 +0000 (13:53 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 2 Feb 1999 13:53:17 +0000 (13:53 +0000)
git-svn-id: https://svn.dealii.org/trunk@750 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/dofs/dof_accessor.cc
deal.II/deal.II/source/fe/fe_lib.cubic.cc
deal.II/deal.II/source/fe/fe_linear_mapping.cc
deal.II/deal.II/source/fe/fe_system.cc
deal.II/deal.II/source/numerics/vectors.cc

index 66f266706a8fb0a63b3dc1fd334ad6ac84c6cd31..c55ffbac34a259892f1a83c497401a5ff5a52cac 100644 (file)
@@ -455,7 +455,7 @@ DoFCellAccessor<1>::get_dof_values (const dVector &values,
   vector<double>::iterator next_local_value=local_values.begin();
   for (unsigned int vertex=0; vertex<2; ++vertex)
     for (unsigned int d=0; d<dofs_per_vertex; ++d)
-      *next_lcoal_value++ = values(vertex_dof_index(vertex,d));
+      *next_local_value++ = values(vertex_dof_index(vertex,d));
   for (unsigned int d=0; d<dofs_per_line; ++d)
     *next_local_value++ = values(dof_index(d));
 };
index ad15a4653d1c82e6f453da6d09039bacba0d8de0..5b1fef0987765f5730723eac5f5b7fa7708e7555 100644 (file)
@@ -29,7 +29,7 @@ FECubicSub<1>::FECubicSub () :
 
 template <>
 FECubicSub<1>::FECubicSub (const int) :
-               FELinearMapping<2> (0, 0, 4)
+               FELinearMapping<1> (0, 4)
 {
   initialize_matrices ();
 };
index 19eb9d4314f51408fb6c9965b421e79207765438..bbbaad3aa8db26328c1a225da702775b7324292d 100644 (file)
@@ -109,19 +109,22 @@ void FELinearMapping<1>::get_normal_vectors (const DoFHandler<1>::cell_iterator
 
 template <>
 void FELinearMapping<1>::fill_fe_values (const DoFHandler<1>::cell_iterator &cell,
-                                        const vector<Point<1> >            &unit_points,
-                                        vector<dFMatrix>  &jacobians,
-                                        const bool         compute_jacobians,
-                                        vector<Point<1> > &support_points,
-                                        const bool         compute_support_points,
-                                        vector<Point<1> > &q_points,
-                                        const bool         compute_q_points,
-                                        const dFMatrix      &shape_values_transform,
+                                        const vector<Point<1> > &unit_points,
+                                        vector<Tensor<2,1> >    &jacobians,
+                                        const bool            compute_jacobians,
+                                        vector<Tensor<3,1> > &jacobians_grad,
+                                        const bool            compute_jacobians_grad,
+                                        vector<Point<1> >    &support_points,
+                                        const bool            compute_support_points,
+                                        vector<Point<1> >    &q_points,
+                                        const bool            compute_q_points,
+                                        const dFMatrix       &shape_values_transform,
                                         const vector<vector<Tensor<1,1> > > &shape_gradients_transform,
                                         const Boundary<1> &boundary) const {
                                   // simply pass down
   FiniteElement<1>::fill_fe_values (cell, unit_points,
                                    jacobians, compute_jacobians,
+                                   jacobians_grad, compute_jacobians_grad,
                                    support_points, compute_support_points,
                                    q_points, compute_q_points,
                                    shape_values_transform, shape_gradients_transform,
index bdb00ef020fc1d3bce43f9ee7fda2e39f265ad82..f8ba397cb99990c544cb4b54824050e45a4081fc 100644 (file)
@@ -50,7 +50,7 @@ void FESystem<dim>::initialize_matrices () {
 template <>
 FiniteElementData<1>
 FESystem<1>::multiply_dof_numbers (const FiniteElementData<1> &fe_data,
-                                  const unsigned int         &N) {
+                                  const unsigned int          N) {
   return FiniteElementData<1> (fe_data.dofs_per_vertex * N,
                               fe_data.dofs_per_line * N,
                               fe_data.n_transform_functions);
@@ -64,7 +64,7 @@ FESystem<1>::multiply_dof_numbers (const FiniteElementData<1> &fe_data,
 template <>
 FiniteElementData<2>
 FESystem<2>::multiply_dof_numbers (const FiniteElementData<2> &fe_data,
-                                  const unsigned int         N) {
+                                  const unsigned int          N) {
   return FiniteElementData<2> (fe_data.dofs_per_vertex * N,
                               fe_data.dofs_per_line * N,
                               fe_data.dofs_per_quad * N,
index 3e7ce4b779186861aaf954d92b6cc9f0992a6f4e..d21341c5ec38bd501640529998f8f9a8f820fdc3 100644 (file)
@@ -94,6 +94,7 @@ VectorTools<dim>::interpolate(const DoFHandler<dim>    &high_dof,
 #if deal_II_dimension == 1
 
 
+template <>
 void VectorTools<1>::project (const DoFHandler<1>    &,
                              const ConstraintMatrix &,
                              const FiniteElement<1> &,

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.