]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make things compile for the 1d case.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 2 Feb 1999 13:37:59 +0000 (13:37 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 2 Feb 1999 13:37:59 +0000 (13:37 +0000)
git-svn-id: https://svn.dealii.org/trunk@747 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/fe/fe.cc
deal.II/deal.II/source/fe/fe_lib.criss_cross.cc

index 91a527b74ddec40c5671a5f3c1c29f19295f6f5b..283e08b23db4444bd24782954f09bdd64353d3f9 100644 (file)
@@ -213,22 +213,24 @@ FiniteElement<dim>::FiniteElement (const FiniteElementData<dim> &fe_data) :
 // we drop this declaration again for the time being
 
 
-//template <>
-//void FiniteElement<1>::get_support_points (const DoFHandler<1>::cell_iterator &cell,
-//                                       const Boundary<1> &,
-//                                       vector<Point<1> > &support_points) const;
+template <>
+void FiniteElement<1>::get_support_points (const DoFHandler<1>::cell_iterator &cell,
+                                          const Boundary<1> &,
+                                          vector<Point<1> > &support_points) const;
 
 
 template <>
 void FiniteElement<1>::fill_fe_values (const DoFHandler<1>::cell_iterator &cell,
                                       const vector<Point<1> > &unit_points,
                                       vector<Tensor<2,1> >    &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      &,
+                                      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       &,
                                       const vector<vector<Tensor<1,1> > > &,
                                       const Boundary<1> &boundary) const {
   Assert (jacobians.size() == unit_points.size(),
@@ -245,7 +247,12 @@ void FiniteElement<1>::fill_fe_values (const DoFHandler<1>::cell_iterator &cell,
   for (unsigned int i=0; i<q_points.size(); ++i) 
     {
       if (compute_jacobians)
-       jacobians[i](0,0) = 1./h;
+       jacobians[i][0][0] = 1./h;
+
+                                      // gradient of jacobian is zero
+      if (compute_jacobians_grad)
+       jacobians_grad[i] = Tensor<3,1>();
+      
       if (compute_q_points)
                                         // assume a linear mapping from unit
                                         // to real space. overload this
@@ -270,6 +277,8 @@ void FiniteElement<1>::fill_fe_face_values (const DoFHandler<1>::cell_iterator &
                                            const vector<Point<1> > &,
                                            vector<Tensor<2,1> >    &,
                                            const bool               ,
+                                           vector<Tensor<3,1> >    &,
+                                           const bool               ,
                                            vector<Point<1> >       &,
                                            const bool               ,
                                            vector<Point<1> >       &,
@@ -293,6 +302,8 @@ void FiniteElement<1>::fill_fe_subface_values (const DoFHandler<1>::cell_iterato
                                               const vector<Point<1> > &,
                                               vector<Tensor<2,1> >    &,
                                               const bool               ,
+                                              vector<Tensor<3,1> >    &,
+                                              const bool               ,
                                               vector<Point<1> >       &,
                                               const bool               ,
                                               vector<double>          &,
@@ -318,9 +329,9 @@ void FiniteElement<1>::get_unit_support_points (vector<Point<1> > &support_point
   unsigned int next = 0;
                                   // first the dofs in the vertices
   for (unsigned int i=0; i<dofs_per_vertex; ++i)
-    support_points[next++] = Point<1>(0);
+    support_points[next++] = Point<1>(0.0);
   for (unsigned int i=0; i<dofs_per_vertex; ++i)
-    support_points[next++] = Point<1>(1);
+    support_points[next++] = Point<1>(1.0);
   
                                   // now dofs on line
   for (unsigned int i=0; i<dofs_per_line; ++i) 
index 7262f3bf3ecc2b6f5d36b5845d206780ad1814f7..dcfc8443dd70377c4577a0147e4cf9af7f29751d 100644 (file)
@@ -436,16 +436,18 @@ void FECrissCross<1>::get_normal_vectors (const DoFHandler<1>::cell_iterator &,
 
 template <>
 void FECrissCross<1>::fill_fe_values (const DoFHandler<1>::cell_iterator &,
-                                     const vector<Point<1> >            &,
-                                     vector<dFMatrix>    &,
-                                     const bool,
-                                     vector<Point<1> > &,
-                                     const bool,
-                                     vector<Point<1> > &,
-                                     const bool,
-                                     const dFMatrix      &,
-                                     const vector<vector<Tensor<1,1> > > &,
-                                     const Boundary<1> &) const {
+                                      const vector<Point<1> > &,
+                                      vector<Tensor<2,1> >    &,
+                                      const bool            ,
+                                      vector<Tensor<3,1> > &,
+                                      const bool            ,
+                                      vector<Point<1> >    &,
+                                      const bool            ,
+                                      vector<Point<1> >    &,
+                                      const bool            ,
+                                      const dFMatrix       &,
+                                      const vector<vector<Tensor<1,1> > > &,
+                                      const Boundary<1> &) const {
   Assert (false, ExcNotUseful());
 };
 

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.