From 6d5eb8c474f549cd306b36c80fee5a099de759ab Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 2 Feb 1999 13:37:59 +0000 Subject: [PATCH] Make things compile for the 1d case. git-svn-id: https://svn.dealii.org/trunk@747 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/fe/fe.cc | 37 ++++++++++++------- .../deal.II/source/fe/fe_lib.criss_cross.cc | 22 ++++++----- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index 91a527b74d..283e08b23d 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -213,22 +213,24 @@ FiniteElement::FiniteElement (const FiniteElementData &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 > &support_points) const; +template <> +void FiniteElement<1>::get_support_points (const DoFHandler<1>::cell_iterator &cell, + const Boundary<1> &, + vector > &support_points) const; template <> void FiniteElement<1>::fill_fe_values (const DoFHandler<1>::cell_iterator &cell, const vector > &unit_points, vector > &jacobians, - const bool compute_jacobians, - vector > &support_points, - const bool compute_support_points, - vector > &q_points, - const bool compute_q_points, - const dFMatrix &, + const bool compute_jacobians, + vector > &jacobians_grad, + const bool compute_jacobians_grad, + vector > &support_points, + const bool compute_support_points, + vector > &q_points, + const bool compute_q_points, + const dFMatrix &, const vector > > &, 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(); + 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 > &, vector > &, const bool , + vector > &, + const bool , vector > &, const bool , vector > &, @@ -293,6 +302,8 @@ void FiniteElement<1>::fill_fe_subface_values (const DoFHandler<1>::cell_iterato const vector > &, vector > &, const bool , + vector > &, + const bool , vector > &, const bool , vector &, @@ -318,9 +329,9 @@ void FiniteElement<1>::get_unit_support_points (vector > &support_point unsigned int next = 0; // first the dofs in the vertices for (unsigned int i=0; i(0); + support_points[next++] = Point<1>(0.0); for (unsigned int i=0; i(1); + support_points[next++] = Point<1>(1.0); // now dofs on line for (unsigned int i=0; i::get_normal_vectors (const DoFHandler<1>::cell_iterator &, template <> void FECrissCross<1>::fill_fe_values (const DoFHandler<1>::cell_iterator &, - const vector > &, - vector &, - const bool, - vector > &, - const bool, - vector > &, - const bool, - const dFMatrix &, - const vector > > &, - const Boundary<1> &) const { + const vector > &, + vector > &, + const bool , + vector > &, + const bool , + vector > &, + const bool , + vector > &, + const bool , + const dFMatrix &, + const vector > > &, + const Boundary<1> &) const { Assert (false, ExcNotUseful()); }; -- 2.39.5