From: hartmann Date: Thu, 23 Jun 2005 07:55:43 +0000 (+0000) Subject: The FE_Q_Helper::generate_face_unit_point<2> and FE_Q_Helper::constraint_function_is_... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44f7e5381653a36bf59aae8b3d32429edda5fad1;p=dealii-svn.git The FE_Q_Helper::generate_face_unit_point<2> and FE_Q_Helper::constraint_function_is_active_on_child<3> functions are not needed any more. They are now removed. git-svn-id: https://svn.dealii.org/trunk@10931 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/fe/fe_q.cc b/deal.II/deal.II/source/fe/fe_q.cc index 1e0a806663..054f9114cf 100644 --- a/deal.II/deal.II/source/fe/fe_q.cc +++ b/deal.II/deal.II/source/fe/fe_q.cc @@ -188,57 +188,7 @@ namespace FE_Q_Helper Assert (i((1+i)*h); - } - - - // given N, generate i=0...N-1 - // equidistant points in the domain - // [0,1]^2, but excluding the four - // vertices (since we don't have to - // consider shape functions on - // child cells that are located on - // existing vertices) -#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) - static -#endif - inline - Point<2> - generate_face_unit_point (const unsigned int i, - const unsigned int N, - const int2type<2> ) - { - Assert (i= N1d-2 ? 1 : 0) - + - (i >= N1d*(N1d-1)-2 ? 1 : 0)); - return Point<2> ((true_i%N1d)*h, - (true_i/N1d)*h); - } - + } // return whether shape function j, @@ -268,73 +218,6 @@ namespace FE_Q_Helper ((j>=1+fe_data.dofs_per_line) && (subface == 0))); } - - -#if defined(DEAL_II_ANON_NAMESPACE_BUG) && defined(DEAL_II_ANON_NAMESPACE_LINKAGE_BUG) - static -#endif - inline - bool - constraint_function_is_active_on_child (const unsigned int j, - const unsigned int subface, - const FiniteElementData<3> &fe_data) - { - // in 3d: in our weird numbering, - // the zeroth function is the one - // associated with the center - // node, then come the four edge - // midpoints, then the ones on - // the 12 edges then those on - // subfaces. some are active on - // more than one child - - if (j < 5) - // one one of the five vertices - { - switch (j) - { - case 0: return true; - case 1: return (subface == 0) || (subface == 1); - case 2: return (subface == 1) || (subface == 2); - case 3: return (subface == 2) || (subface == 3); - case 4: return (subface == 3) || (subface == 0); - } - } - else if (j < 5 + 12*fe_data.dofs_per_line) - // one one of the 12 lines - { - const unsigned int line = (j-5)/fe_data.dofs_per_line; - Assert (line<12, ExcInternalError()); - - switch (line) - { - case 0: return (subface == 0) || (subface == 1); - case 1: return (subface == 1) || (subface == 2); - case 2: return (subface == 2) || (subface == 3); - case 3: return (subface == 3) || (subface == 0); - case 4: return (subface == 0); - case 5: return (subface == 1); - case 6: return (subface == 1); - case 7: return (subface == 2); - case 8: return (subface == 3); - case 9: return (subface == 2); - case 10: return (subface == 0); - case 11: return (subface == 2); - } - } - else - // interior - { - const unsigned int quad = (j-5-12*fe_data.dofs_per_line)/fe_data.dofs_per_quad; - Assert (quad<4, ExcInternalError()); - return quad == subface; - } - - Assert (false, ExcInternalError()); - return deal_II_numbers::invalid_unsigned_int; - } - - // given index j in the weird // constraint numbering, compute // its index in the polynomials