From 4c37068f1be09340889e251c6edd8f9f5711ed91 Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 2 Feb 1999 13:53:17 +0000 Subject: [PATCH] Make things compile in 1D again. git-svn-id: https://svn.dealii.org/trunk@750 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/dofs/dof_accessor.cc | 2 +- deal.II/deal.II/source/fe/fe_lib.cubic.cc | 2 +- .../deal.II/source/fe/fe_linear_mapping.cc | 19 +++++++++++-------- deal.II/deal.II/source/fe/fe_system.cc | 4 ++-- deal.II/deal.II/source/numerics/vectors.cc | 1 + 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/deal.II/deal.II/source/dofs/dof_accessor.cc b/deal.II/deal.II/source/dofs/dof_accessor.cc index 66f266706a..c55ffbac34 100644 --- a/deal.II/deal.II/source/dofs/dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/dof_accessor.cc @@ -455,7 +455,7 @@ DoFCellAccessor<1>::get_dof_values (const dVector &values, vector::iterator next_local_value=local_values.begin(); for (unsigned int vertex=0; vertex<2; ++vertex) for (unsigned int d=0; d::FECubicSub () : template <> FECubicSub<1>::FECubicSub (const int) : - FELinearMapping<2> (0, 0, 4) + FELinearMapping<1> (0, 4) { initialize_matrices (); }; diff --git a/deal.II/deal.II/source/fe/fe_linear_mapping.cc b/deal.II/deal.II/source/fe/fe_linear_mapping.cc index 19eb9d4314..bbbaad3aa8 100644 --- a/deal.II/deal.II/source/fe/fe_linear_mapping.cc +++ b/deal.II/deal.II/source/fe/fe_linear_mapping.cc @@ -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 > &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 &shape_values_transform, + const vector > &unit_points, + vector > &jacobians, + 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 &shape_values_transform, const vector > > &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, diff --git a/deal.II/deal.II/source/fe/fe_system.cc b/deal.II/deal.II/source/fe/fe_system.cc index bdb00ef020..f8ba397cb9 100644 --- a/deal.II/deal.II/source/fe/fe_system.cc +++ b/deal.II/deal.II/source/fe/fe_system.cc @@ -50,7 +50,7 @@ void FESystem::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, diff --git a/deal.II/deal.II/source/numerics/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index 3e7ce4b779..d21341c5ec 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -94,6 +94,7 @@ VectorTools::interpolate(const DoFHandler &high_dof, #if deal_II_dimension == 1 +template <> void VectorTools<1>::project (const DoFHandler<1> &, const ConstraintMatrix &, const FiniteElement<1> &, -- 2.39.5