From: Guido Kanschat Date: Mon, 17 Oct 2005 05:28:43 +0000 (+0000) Subject: unit removed from support point function X-Git-Tag: v8.0.0~12998 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8f6fb8da2dd4dde955bf67923eef92645374033;p=dealii.git unit removed from support point function git-svn-id: https://svn.dealii.org/trunk@11605 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe_raviart_thomas.h b/deal.II/deal.II/include/fe/fe_raviart_thomas.h index 9adc531bd2..6b50cae56b 100644 --- a/deal.II/deal.II/include/fe/fe_raviart_thomas.h +++ b/deal.II/deal.II/include/fe/fe_raviart_thomas.h @@ -443,7 +443,7 @@ class FE_RaviartThomas : public FiniteElement * class. Called from the * constructor. */ - void initialize_unit_support_points (); + void initialize_support_points (const unsigned int rt_degree); /** * Initialize the @@ -452,8 +452,7 @@ class FE_RaviartThomas : public FiniteElement * class. Called from the * constructor. */ - void initialize_unit_face_support_points (); - + void initialize_face_support_points (); /** * Given a set of flags indicating * what quantities are requested @@ -663,20 +662,12 @@ class FE_RaviartThomasNodal get_ria_vector (const unsigned int degree); /** * Initialize the - * FiniteElement::unit_support_points - * and FiniteElement::unit_face_support_points + * FiniteElement::generalized_support_points + * and FiniteElement::generalized_face_support_points * fields. Called from the * constructor. */ - void initialize_unit_support_points (const unsigned int degree); - - /** - * Initialize the - * #inverse_node_matrix - * field. Called from the - * constructor. - */ - void initialize_node_matrix (); + void initialize_support_points (const unsigned int rt_degree); }; @@ -687,7 +678,7 @@ class FE_RaviartThomasNodal #ifndef DOXYGEN template <> -void FE_RaviartThomas<1>::initialize_unit_face_support_points (); +void FE_RaviartThomas<1>::initialize_face_support_points (); template <> std::vector FE_RaviartThomas<1>::get_dpo_vector (const unsigned int); diff --git a/deal.II/deal.II/source/fe/fe_raviart_thomas.cc b/deal.II/deal.II/source/fe/fe_raviart_thomas.cc index 6becd13f1a..28aeebe84c 100644 --- a/deal.II/deal.II/source/fe/fe_raviart_thomas.cc +++ b/deal.II/deal.II/source/fe/fe_raviart_thomas.cc @@ -167,8 +167,8 @@ FE_RaviartThomas::FE_RaviartThomas (const unsigned int rt_order) // finally fill in support points // on cell and face - initialize_unit_support_points (); - initialize_unit_face_support_points (); + initialize_support_points (rt_order); + initialize_face_support_points (); // then make // system_to_component_table @@ -809,10 +809,21 @@ FE_RaviartThomas<3>::initialize_restriction () #endif +//TODO: Unit support points should go away according to new definition. + template void -FE_RaviartThomas::initialize_unit_support_points () +FE_RaviartThomas::initialize_support_points (const unsigned int) { +// unsigned int n_face_points = (dim>1) ? 1 : 0; +// // compute (deg+1)^(dim-1) +// for (unsigned int d=1;dunit_generalized_support_points.resize (this->dofs_per_cell); +// this->generalized_face_support_points.resize (this->dofs_per_face); + + this->unit_support_points.resize (this->dofs_per_cell); switch (dim) { @@ -893,7 +904,7 @@ FE_RaviartThomas::initialize_unit_support_points () #if deal_II_dimension == 1 template <> -void FE_RaviartThomas<1>::initialize_unit_face_support_points () +void FE_RaviartThomas<1>::initialize_face_support_points () { // no faces in 1d, so nothing to do } @@ -902,7 +913,7 @@ void FE_RaviartThomas<1>::initialize_unit_face_support_points () template -void FE_RaviartThomas::initialize_unit_face_support_points () +void FE_RaviartThomas::initialize_face_support_points () { this->unit_face_support_points.resize (this->dofs_per_face); diff --git a/deal.II/deal.II/source/fe/fe_raviart_thomas_nodal.cc b/deal.II/deal.II/source/fe/fe_raviart_thomas_nodal.cc index dcefd4fb67..54b3059ad5 100644 --- a/deal.II/deal.II/source/fe/fe_raviart_thomas_nodal.cc +++ b/deal.II/deal.II/source/fe/fe_raviart_thomas_nodal.cc @@ -54,7 +54,7 @@ FE_RaviartThomasNodal::FE_RaviartThomasNodal (const unsigned int deg) // Set up the generalized support // points - initialize_unit_support_points (deg); + initialize_support_points (deg); //Now compute the inverse node //matrix, generating the correct @@ -338,7 +338,7 @@ FE_RaviartThomasNodal::get_ria_vector (const unsigned int deg) template void -FE_RaviartThomasNodal::initialize_unit_support_points (const unsigned int deg) +FE_RaviartThomasNodal::initialize_support_points (const unsigned int deg) { this->generalized_support_points.resize (this->dofs_per_cell); this->generalized_face_support_points.resize (this->dofs_per_face); @@ -390,12 +390,4 @@ FE_RaviartThomasNodal::initialize_unit_support_points (const unsigned int d } -template -void -FE_RaviartThomasNodal::initialize_node_matrix () -{ -} - - - template class FE_RaviartThomasNodal;