From: wolf Date: Tue, 11 Jun 2002 16:09:03 +0000 (+0000) Subject: Take over Anna's changes from the branch. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5945487c5052cbc5b692132e012034ebeb3d09c;p=dealii-svn.git Take over Anna's changes from the branch. git-svn-id: https://svn.dealii.org/trunk@6066 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/fe/fe_nedelec.cc b/deal.II/deal.II/source/fe/fe_nedelec.cc index 638f60ab26..0645bf2104 100644 --- a/deal.II/deal.II/source/fe/fe_nedelec.cc +++ b/deal.II/deal.II/source/fe/fe_nedelec.cc @@ -1,3 +1,4 @@ + //---------------------------------------------------------------- // $Id$ // Version: $Name$ @@ -287,7 +288,7 @@ FE_Nedelec::shape_value_component (const unsigned int i, // only non-zero // component is // requested: -//TODO[Anna]: check +//[Anna]:checked: OK const double x = p(0), y = p(1), z = p(2); @@ -365,7 +366,7 @@ FE_Nedelec::shape_grad_component (const unsigned int i, // component, thrid // index=component // within gradient -//TODO[Anna]: check +//[Anna]: checked:OK static const double unit_gradients[4][2][2] = { { {0.,-1.}, {0.,0.} }, { {0.,0.}, {1.,0.} }, diff --git a/deal.II/deal.II/source/fe/fe_nedelec_2d.cc b/deal.II/deal.II/source/fe/fe_nedelec_2d.cc index 80e5d88254..1b32e5b5f1 100644 --- a/deal.II/deal.II/source/fe/fe_nedelec_2d.cc +++ b/deal.II/deal.II/source/fe/fe_nedelec_2d.cc @@ -34,30 +34,27 @@ namespace FE_Nedelec_2d static const double q1_into_q1_refined_1[] = { - 0 -//TODO[Anna] -// 13.5/27., 13.5/27., 0., 0., -// 0., 1., 0., 0., -// 0., 13.5/27., 13.5/27., 0., -// 6.75/27., 6.75/27., 6.75/27., 6.75/27., +//[Anna]:done + 1., 0., 0., 0., + 0., 1., 0., 0., + 0.5, 0., 0.5, 0., + 0., 0.5, 0., 0.5, }; static const double q1_into_q1_refined_2[] = { - 0 -// 6.75/27., 6.75/27., 6.75/27., 6.75/27., -// 0., 13.5/27., 13.5/27., 0., -// 0., 0., 1., 0., -// 0., 0., 13.5/27., 13.5/27., + 0.5, 0., 0.5, 0., + 0., 1., 0., 0., + 0., 0., 1., 0., + 0., 0.5, 0., 0.5, }; static const double q1_into_q1_refined_3[] = { - 0 -// 13.5/27., 0., 0., 13.5/27., -// 6.75/27., 6.75/27., 6.75/27., 6.75/27., -// 0., 0., 13.5/27., 13.5/27., -// 0., 0., 0., 1., + 0.5, 0., 0.5, 0., + 0., 0.5, 0., 0.5, + 0., 0., 1., 0., + 0., 0., 0., 1., }; }; // namespace FE_Nedelec_2d