From 288d4b5ea683dbfb057b4cd22ad217df59889426 Mon Sep 17 00:00:00 2001 From: guido Date: Wed, 28 Apr 1999 08:43:23 +0000 Subject: [PATCH] Replaced ambiguous names by common abbrevs git-svn-id: https://svn.dealii.org/trunk@1215 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/fe/fe_lib.lagrange.h | 28 ++++---- deal.II/deal.II/source/fe/fe_lib.cubic.cc | 64 +++++++++---------- deal.II/deal.II/source/fe/fe_lib.linear.cc | 60 ++++++++--------- deal.II/deal.II/source/fe/fe_lib.quadratic.cc | 64 +++++++++---------- deal.II/deal.II/source/fe/fe_lib.quartic.cc | 44 ++++++------- 5 files changed, 132 insertions(+), 128 deletions(-) diff --git a/deal.II/deal.II/include/fe/fe_lib.lagrange.h b/deal.II/deal.II/include/fe/fe_lib.lagrange.h index 5114f9b90d..ee58dfedc2 100644 --- a/deal.II/deal.II/include/fe/fe_lib.lagrange.h +++ b/deal.II/deal.II/include/fe/fe_lib.lagrange.h @@ -8,6 +8,10 @@ #include +#define FELinear FEQ1 +#define FEQuadraticSub FEQ2 +#define FECubicSub FEQ3 +#define FEQuarticSub FEQ4 /** * Define a (bi-, tri-, etc)linear finite element in #dim# space dimensions, @@ -29,12 +33,12 @@ */ template -class FELinear : public FELinearMapping { +class FEQ1 : public FELinearMapping { public: /** * Constructor */ - FELinear (); + FEQ1 (); protected: /** * Constructor that is called by the @@ -45,7 +49,7 @@ class FELinear : public FELinearMapping { * matrices are build. * For more detail see class #FEDGLinear#. */ - FELinear (const int); + FEQ1 (const int); public: /** @@ -208,12 +212,12 @@ class FELinear : public FELinearMapping { * @author Wolfgang Bangerth, 1998, 1999 */ template -class FEQuadraticSub : public FELinearMapping { +class FEQ2 : public FELinearMapping { public: /** * Constructor */ - FEQuadraticSub (); + FEQ2 (); protected: /** * Constructor that is called by the @@ -226,7 +230,7 @@ class FEQuadraticSub : public FELinearMapping { * For more detail see class * #FEDGQuadraticSub#. */ - FEQuadraticSub (const int); + FEQ2 (const int); public: /** @@ -330,12 +334,12 @@ class FEQuadraticSub : public FELinearMapping { * @author Wolfgang Bangerth, 1998 */ template -class FECubicSub : public FELinearMapping { +class FEQ3 : public FELinearMapping { public: /** * Constructor */ - FECubicSub (); + FEQ3 (); protected: /** @@ -348,7 +352,7 @@ class FECubicSub : public FELinearMapping { * For more detail see class * #FEDGCubicSub#. */ - FECubicSub (const int); + FEQ3 (const int); public: /** @@ -453,12 +457,12 @@ class FECubicSub : public FELinearMapping { * @author Wolfgang Bangerth, 1998 */ template -class FEQuarticSub : public FELinearMapping { +class FEQ4 : public FELinearMapping { public: /** * Constructor */ - FEQuarticSub (); + FEQ4 (); protected: /** @@ -471,7 +475,7 @@ class FEQuarticSub : public FELinearMapping { * For more detail see class * #FEDGQuarticSub#. */ - FEQuarticSub (const int); + FEQ4 (const int); public: /** diff --git a/deal.II/deal.II/source/fe/fe_lib.cubic.cc b/deal.II/deal.II/source/fe/fe_lib.cubic.cc index a11e2c5178..9fd04e15ac 100644 --- a/deal.II/deal.II/source/fe/fe_lib.cubic.cc +++ b/deal.II/deal.II/source/fe/fe_lib.cubic.cc @@ -12,7 +12,7 @@ // declare explicit specializations before use: -template <> void FECubicSub::initialize_matrices (); +template <> void FEQ3::initialize_matrices (); @@ -20,7 +20,7 @@ template <> void FECubicSub::initialize_matrices (); #if deal_II_dimension == 1 template <> -FECubicSub<1>::FECubicSub () : +FEQ3<1>::FEQ3 () : FELinearMapping<1> (1, 2) { initialize_matrices (); }; @@ -28,7 +28,7 @@ FECubicSub<1>::FECubicSub () : template <> -FECubicSub<1>::FECubicSub (const int) : +FEQ3<1>::FEQ3 (const int) : FELinearMapping<1> (0, 4) { initialize_matrices (); @@ -37,7 +37,7 @@ FECubicSub<1>::FECubicSub (const int) : template <> -void FECubicSub<1>::initialize_matrices () { +void FEQ3<1>::initialize_matrices () { prolongation[0](0,0) = 1.0; prolongation[0](0,1) = 0.0; @@ -110,7 +110,7 @@ void FECubicSub<1>::initialize_matrices () { template <> double -FECubicSub<1>::shape_value (const unsigned int i, +FEQ3<1>::shape_value (const unsigned int i, const Point<1> &p) const { Assert((i::shape_value (const unsigned int i, template <> Tensor<1,1> -FECubicSub<1>::shape_grad (const unsigned int i, +FEQ3<1>::shape_grad (const unsigned int i, const Point<1> &p) const { Assert((i::shape_grad (const unsigned int i, template <> Tensor<2,1> -FECubicSub<1>::shape_grad_grad (const unsigned int i, +FEQ3<1>::shape_grad_grad (const unsigned int i, const Point<1> &p) const { Assert (i::shape_grad_grad (const unsigned int i, template <> -void FECubicSub<1>::get_unit_support_points (vector > &unit_points) const { +void FEQ3<1>::get_unit_support_points (vector > &unit_points) const { FiniteElement<1>::get_unit_support_points (unit_points); }; template <> -void FECubicSub<1>::get_support_points (const typename DoFHandler<1>::cell_iterator &cell, +void FEQ3<1>::get_support_points (const typename DoFHandler<1>::cell_iterator &cell, vector > &support_points) const { FiniteElement<1>::get_support_points (cell, support_points); }; @@ -189,7 +189,7 @@ void FECubicSub<1>::get_support_points (const typename DoFHandler<1>::cell_itera template <> -void FECubicSub<1>::get_face_support_points (const typename DoFHandler<1>::face_iterator &, +void FEQ3<1>::get_face_support_points (const typename DoFHandler<1>::face_iterator &, vector > &) const { Assert (false, ExcInternalError()); }; @@ -197,7 +197,7 @@ void FECubicSub<1>::get_face_support_points (const typename DoFHandler<1>::face_ template <> -void FECubicSub<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, +void FEQ3<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { Assert (local_mass_matrix.n() == total_dofs, ExcWrongFieldDimension(local_mass_matrix.n(),total_dofs)); @@ -239,7 +239,7 @@ void FECubicSub<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &c #if deal_II_dimension == 2 template <> -FECubicSub<2>::FECubicSub () : +FEQ3<2>::FEQ3 () : FELinearMapping<2> (1, 2, 4) { interface_constraints(0,0) = -1.0/16.0; @@ -263,7 +263,7 @@ FECubicSub<2>::FECubicSub () : template <> -FECubicSub<2>::FECubicSub (const int) : +FEQ3<2>::FEQ3 (const int) : FELinearMapping<2> (0, 0, 16) { initialize_matrices (); @@ -272,7 +272,7 @@ FECubicSub<2>::FECubicSub (const int) : template <> -void FECubicSub<2>::initialize_matrices () { +void FEQ3<2>::initialize_matrices () { prolongation[0](0,0) = 1.0; prolongation[0](1,0) = -1.0/16.0; prolongation[0](1,1) = -1.0/16.0; @@ -696,7 +696,7 @@ void FECubicSub<2>::initialize_matrices () { template <> double -FECubicSub<2>::shape_value (const unsigned int i, +FEQ3<2>::shape_value (const unsigned int i, const Point<2> &p) const { Assert (i Tensor<1,2> -FECubicSub<2>::shape_grad (const unsigned int i, +FEQ3<2>::shape_grad (const unsigned int i, const Point<2> &p) const { Assert (i::shape_grad (const unsigned int i, template <> Tensor<2,2> -FECubicSub<2>::shape_grad_grad (const unsigned int i, +FEQ3<2>::shape_grad_grad (const unsigned int i, const Point<2> &p) const { Assert (i::shape_grad_grad (const unsigned int i, template <> -void FECubicSub<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, +void FEQ3<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { Assert (local_mass_matrix.n() == total_dofs, ExcWrongFieldDimension(local_mass_matrix.n(),total_dofs)); @@ -1480,7 +1480,7 @@ void FECubicSub<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &c template <> -void FECubicSub<2>::get_unit_support_points (vector > &unit_points) const { +void FEQ3<2>::get_unit_support_points (vector > &unit_points) const { Assert (unit_points.size() == total_dofs, ExcWrongFieldDimension (unit_points.size(), total_dofs)); @@ -1505,7 +1505,7 @@ void FECubicSub<2>::get_unit_support_points (vector > &unit_points) con template <> -void FECubicSub<2>::get_support_points (const typename DoFHandler<2>::cell_iterator &cell, +void FEQ3<2>::get_support_points (const typename DoFHandler<2>::cell_iterator &cell, vector > &support_points) const { Assert (support_points.size() == total_dofs, ExcWrongFieldDimension (support_points.size(), total_dofs)); @@ -1579,7 +1579,7 @@ void FECubicSub<2>::get_support_points (const typename DoFHandler<2>::cell_itera template <> -void FECubicSub<2>::get_face_support_points (const typename DoFHandler<2>::face_iterator &face, +void FEQ3<2>::get_face_support_points (const typename DoFHandler<2>::face_iterator &face, vector > &support_points) const { Assert (support_points.size() == dofs_per_face, ExcWrongFieldDimension (support_points.size(), dofs_per_face)); @@ -1602,7 +1602,7 @@ void FECubicSub<2>::get_face_support_points (const typename DoFHandler<2>::face_ #if deal_II_dimension == 3 template <> -FECubicSub<3>::FECubicSub () : +FEQ3<3>::FEQ3 () : FELinearMapping<3> (1, 2, 4, 8) { interface_constraints(0,0) = 1.0/256.0; @@ -1864,7 +1864,7 @@ FECubicSub<3>::FECubicSub () : template <> -FECubicSub<3>::FECubicSub (const int) : +FEQ3<3>::FEQ3 (const int) : FELinearMapping<3> (0, 0, 0, 64) { initialize_matrices (); @@ -1873,7 +1873,7 @@ FECubicSub<3>::FECubicSub (const int) : template <> -void FECubicSub<3>::initialize_matrices () { +void FEQ3<3>::initialize_matrices () { prolongation[0](0,0) = 1.0; prolongation[0](1,0) = -1.0/16.0; prolongation[0](1,1) = -1.0/16.0; @@ -9946,7 +9946,7 @@ void FECubicSub<3>::initialize_matrices () { template <> double -FECubicSub<3>::shape_value (const unsigned int i, +FEQ3<3>::shape_value (const unsigned int i, const Point<3> &p) const { Assert (i Tensor<1,3> -FECubicSub<3>::shape_grad (const unsigned int i, +FEQ3<3>::shape_grad (const unsigned int i, const Point<3> &p) const { Assert (i::shape_grad (const unsigned int i, template <> Tensor<2,3> -FECubicSub<3>::shape_grad_grad (const unsigned int i, +FEQ3<3>::shape_grad_grad (const unsigned int i, const Point<3> &p) const { Assert (i void -FECubicSub<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, +FEQ3<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, FullMatrix &local_mass_matrix) const { Assert (local_mass_matrix.n() == total_dofs, @@ -11404,7 +11404,7 @@ FECubicSub<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, template <> -void FECubicSub<3>::get_unit_support_points (vector > &unit_points) const { +void FEQ3<3>::get_unit_support_points (vector > &unit_points) const { Assert (unit_points.size() == total_dofs, ExcWrongFieldDimension (unit_points.size(), total_dofs)); unit_points[0] = Point<3>(0, 0, 0); @@ -11476,7 +11476,7 @@ void FECubicSub<3>::get_unit_support_points (vector > &unit_points) con template <> -void FECubicSub<3>::get_support_points (const typename DoFHandler<3>::cell_iterator &cell, +void FEQ3<3>::get_support_points (const typename DoFHandler<3>::cell_iterator &cell, vector > &support_points) const { Assert (support_points.size() == total_dofs, ExcWrongFieldDimension (support_points.size(), total_dofs)); @@ -11854,7 +11854,7 @@ void FECubicSub<3>::get_support_points (const typename DoFHandler<3>::cell_itera template <> -void FECubicSub<3>::get_face_support_points (const typename DoFHandler<3>::face_iterator &face, +void FEQ3<3>::get_face_support_points (const typename DoFHandler<3>::face_iterator &face, vector > &support_points) const { Assert (support_points.size() == dofs_per_face, ExcWrongFieldDimension (support_points.size(), dofs_per_face)); @@ -11897,5 +11897,5 @@ void FECubicSub<3>::get_face_support_points (const typename DoFHandler<3>::face_ // explicit instantiations -template class FECubicSub; +template class FEQ3; diff --git a/deal.II/deal.II/source/fe/fe_lib.linear.cc b/deal.II/deal.II/source/fe/fe_lib.linear.cc index bf351038ff..8a99e24f3c 100644 --- a/deal.II/deal.II/source/fe/fe_lib.linear.cc +++ b/deal.II/deal.II/source/fe/fe_lib.linear.cc @@ -13,7 +13,7 @@ // declare explicit specializations before use: -template <> void FELinear::initialize_matrices (); +template <> void FEQ1::initialize_matrices (); @@ -21,7 +21,7 @@ template <> void FELinear::initialize_matrices (); #if deal_II_dimension == 1 template <> -FELinear<1>::FELinear () : +FEQ1<1>::FEQ1 () : FELinearMapping<1> (1, 0) { initialize_matrices (); @@ -29,7 +29,7 @@ FELinear<1>::FELinear () : template <> -FELinear<1>::FELinear (const int) : +FEQ1<1>::FEQ1 (const int) : FELinearMapping<1> (0, 2) { initialize_matrices (); @@ -39,7 +39,7 @@ FELinear<1>::FELinear (const int) : template <> -void FELinear<1>::initialize_matrices () { +void FEQ1<1>::initialize_matrices () { // for restriction and prolongation matrices: // note that we do not add up all the // contributions since then we would get @@ -68,7 +68,7 @@ void FELinear<1>::initialize_matrices () { template <> double -FELinear<1>::shape_value(const unsigned int i, +FEQ1<1>::shape_value(const unsigned int i, const Point<1> &p) const { Assert((i::shape_value(const unsigned int i, template <> inline Tensor<1,1> -FELinear<1>::shape_grad(const unsigned int i, +FEQ1<1>::shape_grad(const unsigned int i, const Point<1>&) const { Assert((i::shape_grad(const unsigned int i, template <> inline Tensor<2,1> -FELinear<1>::shape_grad_grad (const unsigned int i, +FEQ1<1>::shape_grad_grad (const unsigned int i, const Point<1> &) const { Assert((i::shape_grad_grad (const unsigned int i, template <> -void FELinear<1>::get_unit_support_points (vector > &support_points) const { +void FEQ1<1>::get_unit_support_points (vector > &support_points) const { FiniteElement<1>::get_unit_support_points (support_points); }; template <> -void FELinear<1>::get_support_points (const typename DoFHandler<1>::cell_iterator &cell, +void FEQ1<1>::get_support_points (const typename DoFHandler<1>::cell_iterator &cell, vector > &support_points) const { FiniteElement<1>::get_support_points (cell, support_points); }; @@ -134,7 +134,7 @@ void FELinear<1>::get_support_points (const typename DoFHandler<1>::cell_iterato template <> -void FELinear<1>::get_face_support_points (const typename DoFHandler<1>::face_iterator &, +void FEQ1<1>::get_face_support_points (const typename DoFHandler<1>::face_iterator &, vector > &) const { Assert (false, ExcInternalError()); }; @@ -142,7 +142,7 @@ void FELinear<1>::get_face_support_points (const typename DoFHandler<1>::face_it template <> -void FELinear<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, +void FEQ1<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { Assert (local_mass_matrix.n() == total_dofs, ExcWrongFieldDimension(local_mass_matrix.n(),total_dofs)); @@ -164,7 +164,7 @@ void FELinear<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cel #if deal_II_dimension == 2 template <> -FELinear<2>::FELinear () : +FEQ1<2>::FEQ1 () : FELinearMapping<2> (1, 0, 0) { interface_constraints(0,0) = 1./2.; @@ -176,7 +176,7 @@ FELinear<2>::FELinear () : template <> -FELinear<2>::FELinear (const int) : +FEQ1<2>::FEQ1 (const int) : FELinearMapping<2> (0, 0, 4) { initialize_matrices (); @@ -185,7 +185,7 @@ FELinear<2>::FELinear (const int) : template <> -void FELinear<2>::initialize_matrices () { +void FEQ1<2>::initialize_matrices () { restriction[0](0,0) = 1.0; restriction[1](1,1) = 1.0; restriction[2](2,2) = 1.0; @@ -238,7 +238,7 @@ void FELinear<2>::initialize_matrices () { template <> inline double -FELinear<2>::shape_value (const unsigned int i, +FEQ1<2>::shape_value (const unsigned int i, const Point<2>& p) const { Assert((i::shape_value (const unsigned int i, template <> inline Tensor<1,2> -FELinear<2>::shape_grad (const unsigned int i, +FEQ1<2>::shape_grad (const unsigned int i, const Point<2>& p) const { Assert((i::shape_grad (const unsigned int i, template <> inline Tensor<2,2> -FELinear<2>::shape_grad_grad (const unsigned int i, +FEQ1<2>::shape_grad_grad (const unsigned int i, const Point<2> &) const { Assert((i::shape_grad_grad (const unsigned int i, template <> -void FELinear<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, +void FEQ1<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { Assert (local_mass_matrix.n() == total_dofs, ExcWrongFieldDimension(local_mass_matrix.n(),total_dofs)); @@ -415,7 +415,7 @@ void FELinear<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cel template <> -void FELinear<2>::get_unit_support_points (vector > &unit_points) const { +void FEQ1<2>::get_unit_support_points (vector > &unit_points) const { Assert (unit_points.size() == total_dofs, ExcWrongFieldDimension (unit_points.size(), total_dofs)); @@ -432,7 +432,7 @@ void FELinear<2>::get_unit_support_points (vector > &unit_points) const #if deal_II_dimension == 3 template <> -FELinear<3>::FELinear () : +FEQ1<3>::FEQ1 () : FELinearMapping<3> (1, 0, 0, 0) { interface_constraints(0,0) = 1.0/4.0; @@ -454,7 +454,7 @@ FELinear<3>::FELinear () : template <> -FELinear<3>::FELinear (const int) : +FEQ1<3>::FEQ1 (const int) : FELinearMapping<3> (0, 0, 0, 8) { initialize_matrices (); @@ -463,7 +463,7 @@ FELinear<3>::FELinear (const int) : template <> -void FELinear<3>::initialize_matrices () { +void FEQ1<3>::initialize_matrices () { restriction[0](0,0) = 1.0; restriction[1](1,1) = 1.0; restriction[2](2,2) = 1.0; @@ -697,7 +697,7 @@ void FELinear<3>::initialize_matrices () { template <> inline double -FELinear<3>::shape_value (const unsigned int i, +FEQ1<3>::shape_value (const unsigned int i, const Point<3>& p) const { Assert((i::shape_value (const unsigned int i, template <> inline Tensor<1,3> -FELinear<3>::shape_grad (const unsigned int i, +FEQ1<3>::shape_grad (const unsigned int i, const Point<3>& p) const { Assert((i::shape_grad (const unsigned int i, template <> inline Tensor<2,3> -FELinear<3>::shape_grad_grad (const unsigned int i, +FEQ1<3>::shape_grad_grad (const unsigned int i, const Point<3> &p) const { Assert((i::shape_grad_grad (const unsigned int i, template <> -void FELinear<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, +void FEQ1<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, FullMatrix &local_mass_matrix) const { Assert (local_mass_matrix.n() == total_dofs, ExcWrongFieldDimension(local_mass_matrix.n(),total_dofs)); @@ -857,7 +857,7 @@ void FELinear<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, template <> -void FELinear<3>::get_unit_support_points (vector > &unit_points) const { +void FEQ1<3>::get_unit_support_points (vector > &unit_points) const { Assert (unit_points.size() == total_dofs, ExcWrongFieldDimension (unit_points.size(), total_dofs)); @@ -878,7 +878,7 @@ void FELinear<3>::get_unit_support_points (vector > &unit_points) const template void -FELinear::get_support_points (const typename DoFHandler::cell_iterator &cell, +FEQ1::get_support_points (const typename DoFHandler::cell_iterator &cell, vector > &support_points) const { Assert (support_points.size() == total_dofs, ExcWrongFieldDimension (support_points.size(), total_dofs)); @@ -891,7 +891,7 @@ FELinear::get_support_points (const typename DoFHandler::cell_iterator template void -FELinear::get_face_support_points (const typename DoFHandler::face_iterator &face, +FEQ1::get_face_support_points (const typename DoFHandler::face_iterator &face, vector > &support_points) const { Assert ((support_points.size() == dofs_per_face) && (support_points.size() == GeometryInfo::vertices_per_face), @@ -907,4 +907,4 @@ FELinear::get_face_support_points (const typename DoFHandler::face_ite // explicit instantiations -template class FELinear; +template class FEQ1; diff --git a/deal.II/deal.II/source/fe/fe_lib.quadratic.cc b/deal.II/deal.II/source/fe/fe_lib.quadratic.cc index f7795e06a4..88ee2e7132 100644 --- a/deal.II/deal.II/source/fe/fe_lib.quadratic.cc +++ b/deal.II/deal.II/source/fe/fe_lib.quadratic.cc @@ -11,14 +11,14 @@ // declare explicit specializations before use: -template <> void FEQuadraticSub::initialize_matrices (); +template <> void FEQ2::initialize_matrices (); #if deal_II_dimension == 1 template <> -FEQuadraticSub<1>::FEQuadraticSub () : +FEQ2<1>::FEQ2 () : FELinearMapping<1> (1, 1) { initialize_matrices (); }; @@ -26,7 +26,7 @@ FEQuadraticSub<1>::FEQuadraticSub () : template <> -FEQuadraticSub<1>::FEQuadraticSub (const int) : +FEQ2<1>::FEQ2 (const int) : FELinearMapping<1> (0, 3) { initialize_matrices (); }; @@ -34,7 +34,7 @@ FEQuadraticSub<1>::FEQuadraticSub (const int) : template <> -void FEQuadraticSub<1>::initialize_matrices () { +void FEQ2<1>::initialize_matrices () { /* Get the prolongation matrices by the following little maple script: @@ -120,7 +120,7 @@ void FEQuadraticSub<1>::initialize_matrices () { template <> double -FEQuadraticSub<1>::shape_value(const unsigned int i, +FEQ2<1>::shape_value(const unsigned int i, const Point<1> &p) const { Assert((i::shape_value(const unsigned int i, template <> Tensor<1,1> -FEQuadraticSub<1>::shape_grad(const unsigned int i, +FEQ2<1>::shape_grad(const unsigned int i, const Point<1> &p) const { Assert((i::shape_grad(const unsigned int i, template <> Tensor<2,1> -FEQuadraticSub<1>::shape_grad_grad (const unsigned int i, +FEQ2<1>::shape_grad_grad (const unsigned int i, const Point<1> &) const { Assert((i::shape_grad_grad (const unsigned int i, template <> -void FEQuadraticSub<1>::get_unit_support_points (vector > &unit_points) const { +void FEQ2<1>::get_unit_support_points (vector > &unit_points) const { FiniteElement<1>::get_unit_support_points (unit_points); }; template <> -void FEQuadraticSub<1>::get_support_points (const typename DoFHandler<1>::cell_iterator &cell, +void FEQ2<1>::get_support_points (const typename DoFHandler<1>::cell_iterator &cell, vector > &support_points) const { FiniteElement<1>::get_support_points (cell, support_points); }; @@ -200,7 +200,7 @@ void FEQuadraticSub<1>::get_support_points (const typename DoFHandler<1>::cell_i template <> -void FEQuadraticSub<1>::get_face_support_points (const typename DoFHandler<1>::face_iterator &, +void FEQ2<1>::get_face_support_points (const typename DoFHandler<1>::face_iterator &, vector > &) const { Assert (false, ExcInternalError()); }; @@ -208,7 +208,7 @@ void FEQuadraticSub<1>::get_face_support_points (const typename DoFHandler<1>::f template <> -void FEQuadraticSub<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, +void FEQ2<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { Assert (local_mass_matrix.n() == total_dofs, ExcWrongFieldDimension(local_mass_matrix.n(),total_dofs)); @@ -231,7 +231,7 @@ void FEQuadraticSub<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterato #if deal_II_dimension == 2 template <> -FEQuadraticSub<2>::FEQuadraticSub () : +FEQ2<2>::FEQ2 () : FELinearMapping<2> (1, 1, 1) { interface_constraints(0,2) = 1.0; @@ -248,7 +248,7 @@ FEQuadraticSub<2>::FEQuadraticSub () : template <> -FEQuadraticSub<2>::FEQuadraticSub (const int) : +FEQ2<2>::FEQ2 (const int) : FELinearMapping<2> (0, 0, 9) { initialize_matrices (); @@ -257,7 +257,7 @@ FEQuadraticSub<2>::FEQuadraticSub (const int) : template <> -void FEQuadraticSub<2>::initialize_matrices () { +void FEQ2<2>::initialize_matrices () { /* Get the prolongation and restriction matrices by the following little maple script: @@ -644,7 +644,7 @@ void FEQuadraticSub<2>::initialize_matrices () { template <> double -FEQuadraticSub<2>::shape_value (const unsigned int i, +FEQ2<2>::shape_value (const unsigned int i, const Point<2> &p) const { Assert (i::shape_value (const unsigned int i, template <> Tensor<1,2> -FEQuadraticSub<2>::shape_grad (const unsigned int i, +FEQ2<2>::shape_grad (const unsigned int i, const Point<2> &p) const { Assert (i::shape_grad (const unsigned int i, template <> Tensor<2,2> -FEQuadraticSub<2>::shape_grad_grad (const unsigned int i, +FEQ2<2>::shape_grad_grad (const unsigned int i, const Point<2> &p) const { Assert (i::shape_grad_grad (const unsigned int i, template <> -void FEQuadraticSub<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, +void FEQ2<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { Assert (local_mass_matrix.n() == total_dofs, ExcWrongFieldDimension(local_mass_matrix.n(),total_dofs)); @@ -1057,7 +1057,7 @@ void FEQuadraticSub<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterato template <> -void FEQuadraticSub<2>::get_unit_support_points (vector > &unit_points) const { +void FEQ2<2>::get_unit_support_points (vector > &unit_points) const { Assert (unit_points.size() == total_dofs, ExcWrongFieldDimension (unit_points.size(), total_dofs)); @@ -1075,7 +1075,7 @@ void FEQuadraticSub<2>::get_unit_support_points (vector > &unit_points) template <> -void FEQuadraticSub<2>::get_support_points (const typename DoFHandler<2>::cell_iterator &cell, +void FEQ2<2>::get_support_points (const typename DoFHandler<2>::cell_iterator &cell, vector > &support_points) const { Assert (support_points.size() == total_dofs, ExcWrongFieldDimension (support_points.size(), total_dofs)); @@ -1103,7 +1103,7 @@ void FEQuadraticSub<2>::get_support_points (const typename DoFHandler<2>::cell_i template <> -void FEQuadraticSub<2>::get_face_support_points (const typename DoFHandler<2>::face_iterator &face, +void FEQ2<2>::get_face_support_points (const typename DoFHandler<2>::face_iterator &face, vector > &support_points) const { Assert (support_points.size() == dofs_per_face, ExcWrongFieldDimension (support_points.size(), dofs_per_face)); @@ -1120,7 +1120,7 @@ void FEQuadraticSub<2>::get_face_support_points (const typename DoFHandler<2>::f #if deal_II_dimension == 3 template <> -FEQuadraticSub<3>::FEQuadraticSub () : +FEQ2<3>::FEQ2 () : FELinearMapping<3> (1, 1, 1, 1) { interface_constraints(0,8) = 1.0; @@ -1207,7 +1207,7 @@ FEQuadraticSub<3>::FEQuadraticSub () : template <> -FEQuadraticSub<3>::FEQuadraticSub (const int) : +FEQ2<3>::FEQ2 (const int) : FELinearMapping<3> (0, 0, 0, 27) { initialize_matrices (); @@ -1216,7 +1216,7 @@ FEQuadraticSub<3>::FEQuadraticSub (const int) : template <> -void FEQuadraticSub<3>::initialize_matrices () { +void FEQ2<3>::initialize_matrices () { prolongation[0](0,0) = 1.0; prolongation[0](1,8) = 1.0; prolongation[0](2,20) = 1.0; @@ -2288,7 +2288,7 @@ void FEQuadraticSub<3>::initialize_matrices () { template <> double -FEQuadraticSub<3>::shape_value (const unsigned int i, +FEQ2<3>::shape_value (const unsigned int i, const Point<3> &p) const { Assert (i Tensor<1,3> -FEQuadraticSub<3>::shape_grad (const unsigned int i, +FEQ2<3>::shape_grad (const unsigned int i, const Point<3> &p) const { Assert (i::shape_grad (const unsigned int i, template <> Tensor<2,3> -FEQuadraticSub<3>::shape_grad_grad (const unsigned int i, +FEQ2<3>::shape_grad_grad (const unsigned int i, const Point<3> &p) const { Assert (i -void FEQuadraticSub<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, +void FEQ2<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterator &, FullMatrix &local_mass_matrix) const { Assert (local_mass_matrix.n() == total_dofs, ExcWrongFieldDimension(local_mass_matrix.n(),total_dofs)); @@ -2782,7 +2782,7 @@ void FEQuadraticSub<3>::get_local_mass_matrix (const DoFHandler<3>::cell_iterato template <> -void FEQuadraticSub<3>::get_unit_support_points (vector > &unit_points) const { +void FEQ2<3>::get_unit_support_points (vector > &unit_points) const { Assert (unit_points.size() == total_dofs, ExcWrongFieldDimension (unit_points.size(), total_dofs)); @@ -2818,7 +2818,7 @@ void FEQuadraticSub<3>::get_unit_support_points (vector > &unit_points) template <> -void FEQuadraticSub<3>::get_support_points (const typename DoFHandler<3>::cell_iterator &cell, +void FEQ2<3>::get_support_points (const typename DoFHandler<3>::cell_iterator &cell, vector > &support_points) const { Assert (support_points.size() == total_dofs, ExcWrongFieldDimension (support_points.size(), total_dofs)); @@ -2918,7 +2918,7 @@ void FEQuadraticSub<3>::get_support_points (const typename DoFHandler<3>::cell_i template <> -void FEQuadraticSub<3>::get_face_support_points (const typename DoFHandler<3>::face_iterator &face, +void FEQ2<3>::get_face_support_points (const typename DoFHandler<3>::face_iterator &face, vector > &support_points) const { Assert (support_points.size() == dofs_per_face, ExcWrongFieldDimension (support_points.size(), dofs_per_face)); @@ -2941,5 +2941,5 @@ void FEQuadraticSub<3>::get_face_support_points (const typename DoFHandler<3>::f // explicit instantiations -template class FEQuadraticSub; +template class FEQ2; diff --git a/deal.II/deal.II/source/fe/fe_lib.quartic.cc b/deal.II/deal.II/source/fe/fe_lib.quartic.cc index 6aa559b062..e23f3fc1f9 100644 --- a/deal.II/deal.II/source/fe/fe_lib.quartic.cc +++ b/deal.II/deal.II/source/fe/fe_lib.quartic.cc @@ -11,21 +11,21 @@ // declare explicit specializations before use: -template <> void FEQuarticSub::initialize_matrices (); +template <> void FEQ4::initialize_matrices (); #if deal_II_dimension == 1 template <> -FEQuarticSub<1>::FEQuarticSub () : +FEQ4<1>::FEQ4 () : FELinearMapping<1> (1, 3) { initialize_matrices (); }; template <> -FEQuarticSub<1>::FEQuarticSub (const int) : +FEQ4<1>::FEQ4 (const int) : FELinearMapping<1> (0, 5) { initialize_matrices (); }; @@ -34,7 +34,7 @@ FEQuarticSub<1>::FEQuarticSub (const int) : template <> -void FEQuarticSub<1>::initialize_matrices () { +void FEQ4<1>::initialize_matrices () { prolongation[0](0,0) = 1.0; prolongation[0](1,3) = 1.0; prolongation[0](2,0) = 35.0/128.0; @@ -74,7 +74,7 @@ void FEQuarticSub<1>::initialize_matrices () { template <> double -FEQuarticSub<1>::shape_value(const unsigned int i, +FEQ4<1>::shape_value(const unsigned int i, const Point<1> &p) const { Assert((i::shape_value(const unsigned int i, template <> Tensor<1,1> -FEQuarticSub<1>::shape_grad(const unsigned int i, +FEQ4<1>::shape_grad(const unsigned int i, const Point<1> &p) const { Assert((i::shape_grad(const unsigned int i, template <> Tensor<2,1> -FEQuarticSub<1>::shape_grad_grad (const unsigned int i, +FEQ4<1>::shape_grad_grad (const unsigned int i, const Point<1> &p) const { Assert (i::shape_grad_grad (const unsigned int i, template <> -void FEQuarticSub<1>::get_unit_support_points (vector > &unit_points) const { +void FEQ4<1>::get_unit_support_points (vector > &unit_points) const { FiniteElement<1>::get_unit_support_points (unit_points); }; template <> -void FEQuarticSub<1>::get_support_points (const typename DoFHandler<1>::cell_iterator &cell, +void FEQ4<1>::get_support_points (const typename DoFHandler<1>::cell_iterator &cell, vector > &support_points) const { FiniteElement<1>::get_support_points (cell, support_points); }; @@ -156,7 +156,7 @@ void FEQuarticSub<1>::get_support_points (const typename DoFHandler<1>::cell_ite template <> -void FEQuarticSub<1>::get_face_support_points (const typename DoFHandler<1>::face_iterator &, +void FEQ4<1>::get_face_support_points (const typename DoFHandler<1>::face_iterator &, vector > &) const { Assert (false, ExcInternalError()); }; @@ -164,7 +164,7 @@ void FEQuarticSub<1>::get_face_support_points (const typename DoFHandler<1>::fac template <> -void FEQuarticSub<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, +void FEQ4<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { Assert (local_mass_matrix.n() == total_dofs, ExcWrongFieldDimension(local_mass_matrix.n(),total_dofs)); @@ -217,7 +217,7 @@ void FEQuarticSub<1>::get_local_mass_matrix (const DoFHandler<1>::cell_iterator #if deal_II_dimension == 2 template <> -FEQuarticSub<2>::FEQuarticSub () : +FEQ4<2>::FEQ4 () : FELinearMapping<2> (1, 3, 9) { interface_constraints(0,3) = 1.0; @@ -250,7 +250,7 @@ FEQuarticSub<2>::FEQuarticSub () : template <> -FEQuarticSub<2>::FEQuarticSub (const int) : +FEQ4<2>::FEQ4 (const int) : FELinearMapping<2> (0, 0, 25) { initialize_matrices (); @@ -259,7 +259,7 @@ FEQuarticSub<2>::FEQuarticSub (const int) : template <> -void FEQuarticSub<2>::initialize_matrices () { +void FEQ4<2>::initialize_matrices () { prolongation[0](0,0) = 1.0; prolongation[0](1,5) = 1.0; prolongation[0](2,24) = 1.0; @@ -978,7 +978,7 @@ void FEQuarticSub<2>::initialize_matrices () { template <> double -FEQuarticSub<2>::shape_value (const unsigned int i, +FEQ4<2>::shape_value (const unsigned int i, const Point<2> &p) const { Assert (i::shape_value (const unsigned int i, template <> Tensor<1,2> -FEQuarticSub<2>::shape_grad (const unsigned int i, +FEQ4<2>::shape_grad (const unsigned int i, const Point<2> &p) const { Assert (i::shape_grad (const unsigned int i, template <> Tensor<2,2> -FEQuarticSub<2>::shape_grad_grad (const unsigned int i, +FEQ4<2>::shape_grad_grad (const unsigned int i, const Point<2> &p) const { Assert (i::shape_grad_grad (const unsigned int i, template <> -void FEQuarticSub<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, +void FEQ4<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator &cell, FullMatrix &local_mass_matrix) const { Assert (local_mass_matrix.n() == total_dofs, ExcWrongFieldDimension(local_mass_matrix.n(),total_dofs)); @@ -2602,7 +2602,7 @@ void FEQuarticSub<2>::get_local_mass_matrix (const DoFHandler<2>::cell_iterator template <> -void FEQuarticSub<2>::get_unit_support_points (vector > &unit_points) const { +void FEQ4<2>::get_unit_support_points (vector > &unit_points) const { Assert (unit_points.size() == total_dofs, ExcWrongFieldDimension (unit_points.size(), total_dofs)); @@ -2636,7 +2636,7 @@ void FEQuarticSub<2>::get_unit_support_points (vector > &unit_points) c template <> -void FEQuarticSub<2>::get_support_points (const typename DoFHandler<2>::cell_iterator &cell, +void FEQ4<2>::get_support_points (const typename DoFHandler<2>::cell_iterator &cell, vector > &support_points) const { Assert (support_points.size() == total_dofs, ExcWrongFieldDimension (support_points.size(), total_dofs)); @@ -2745,7 +2745,7 @@ void FEQuarticSub<2>::get_support_points (const typename DoFHandler<2>::cell_ite template <> -void FEQuarticSub<2>::get_face_support_points (const typename DoFHandler<2>::face_iterator &face, +void FEQ4<2>::get_face_support_points (const typename DoFHandler<2>::face_iterator &face, vector > &support_points) const { Assert (support_points.size() == dofs_per_face, ExcWrongFieldDimension (support_points.size(), dofs_per_face)); @@ -2769,5 +2769,5 @@ void FEQuarticSub<2>::get_face_support_points (const typename DoFHandler<2>::fac // explicit instantiations -template class FEQuarticSub; +template class FEQ4; -- 2.39.5