From: Jaeryun Yim Date: Thu, 14 Jul 2016 07:38:09 +0000 (+0900) Subject: Rename the class for P1NC element: FE_P1NCNonparametric -> FE_P1NC X-Git-Tag: v8.5.0-rc1~624^2~15 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a631a0eb55c454d7c9fb9a6b75172dec4a4bcb99;p=dealii.git Rename the class for P1NC element: FE_P1NCNonparametric -> FE_P1NC + Delete the class FE_P1NCParametric (header, source, tests)] --- diff --git a/tests/fe/p1nc_01.cc b/tests/fe/p1nc_01.cc index 357b1fd2e1..e1da4e4dad 100644 --- a/tests/fe/p1nc_01.cc +++ b/tests/fe/p1nc_01.cc @@ -41,7 +41,7 @@ check() Triangulation triangulation; GridGenerator::hyper_cube (triangulation, 0, 5); - FE_P1NCNonparametric fe; + FE_P1NC fe; DoFHandler dof_handler (triangulation); dof_handler.distribute_dofs(fe); diff --git a/tests/fe/p1nc_02.cc b/tests/fe/p1nc_02.cc index ad615aa6b5..a3d49c3d56 100644 --- a/tests/fe/p1nc_02.cc +++ b/tests/fe/p1nc_02.cc @@ -53,7 +53,7 @@ check() GridGenerator::hyper_cube (triangulation, 0., 5.); GridTools::transform (&stretch, triangulation) ; - FE_P1NCNonparametric fe; + FE_P1NC fe; DoFHandler dof_handler (triangulation); dof_handler.distribute_dofs(fe); diff --git a/tests/fe/p1nc_03.cc b/tests/fe/p1nc_03.cc index 3856fc2fcf..f249a92a95 100644 --- a/tests/fe/p1nc_03.cc +++ b/tests/fe/p1nc_03.cc @@ -57,7 +57,7 @@ check() GridGenerator::hyper_cube (triangulation, 0., 1.); GridTools::transform (&affine, triangulation) ; - FE_P1NCNonparametric fe; + FE_P1NC fe; DoFHandler dof_handler (triangulation); dof_handler.distribute_dofs(fe); diff --git a/tests/fe/p1nc_04.cc b/tests/fe/p1nc_04.cc index f6bcdc68e7..217e994624 100644 --- a/tests/fe/p1nc_04.cc +++ b/tests/fe/p1nc_04.cc @@ -57,7 +57,7 @@ check() GridGenerator::hyper_cube (triangulation, 0., 1.); GridTools::transform (&bilinear, triangulation) ; - FE_P1NCNonparametric fe; + FE_P1NC fe; DoFHandler dof_handler (triangulation); dof_handler.distribute_dofs(fe); diff --git a/tests/fe/p1nc_05.cc b/tests/fe/p1nc_05.cc index b1efa9058b..93a041620f 100644 --- a/tests/fe/p1nc_05.cc +++ b/tests/fe/p1nc_05.cc @@ -41,7 +41,7 @@ check() Triangulation triangulation; GridGenerator::hyper_cube (triangulation, 0, 5); - FE_P1NCNonparametric fe; + FE_P1NC fe; DoFHandler dof_handler (triangulation); dof_handler.distribute_dofs(fe); diff --git a/tests/fe/p1nc_06.cc b/tests/fe/p1nc_06.cc index da4d46b715..46e9ba345d 100644 --- a/tests/fe/p1nc_06.cc +++ b/tests/fe/p1nc_06.cc @@ -53,7 +53,7 @@ check() GridGenerator::hyper_cube (triangulation, 0., 5.); GridTools::transform (&stretch, triangulation) ; - FE_P1NCNonparametric fe; + FE_P1NC fe; DoFHandler dof_handler (triangulation); dof_handler.distribute_dofs(fe); diff --git a/tests/fe/p1nc_07.cc b/tests/fe/p1nc_07.cc index bdcdadfe8d..ad8f0c8efb 100644 --- a/tests/fe/p1nc_07.cc +++ b/tests/fe/p1nc_07.cc @@ -57,7 +57,7 @@ check() GridGenerator::hyper_cube (triangulation, 0., 1.); GridTools::transform (&affine, triangulation) ; - FE_P1NCNonparametric fe; + FE_P1NC fe; DoFHandler dof_handler (triangulation); dof_handler.distribute_dofs(fe); diff --git a/tests/fe/p1nc_08.cc b/tests/fe/p1nc_08.cc index 4a433771cb..22c6ddfafc 100644 --- a/tests/fe/p1nc_08.cc +++ b/tests/fe/p1nc_08.cc @@ -57,7 +57,7 @@ check() GridGenerator::hyper_cube (triangulation, 0., 1.); GridTools::transform (&bilinear, triangulation) ; - FE_P1NCNonparametric fe; + FE_P1NC fe; DoFHandler dof_handler (triangulation); dof_handler.distribute_dofs(fe); diff --git a/tests/fe/p1nc_parametric_01.cc b/tests/fe/p1nc_parametric_01.cc deleted file mode 100644 index 436d30f4ff..0000000000 --- a/tests/fe/p1nc_parametric_01.cc +++ /dev/null @@ -1,77 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2015 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - - - -// check the P1NC parametric element on a square - -#include "../tests.h" -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -#define PRECISION 5 - - - -template -void -check() -{ - Triangulation triangulation; - GridGenerator::hyper_cube (triangulation, 0, 5); - - FE_P1NCParametric fe; - DoFHandler dof_handler (triangulation); - dof_handler.distribute_dofs(fe); - - QGauss quadrature(3); - FEValues fe_values (fe, quadrature, update_values | update_q_points); - fe_values.reinit (dof_handler.begin_active()); - - for (unsigned int q=0; q(); -} - - - diff --git a/tests/fe/p1nc_parametric_01.output b/tests/fe/p1nc_parametric_01.output deleted file mode 100644 index 5436e9b991..0000000000 --- a/tests/fe/p1nc_parametric_01.output +++ /dev/null @@ -1,10 +0,0 @@ - -DEAL::index=0 position=0.56351 0.56351 values=0.63730 0.25000 0.25000 -0.13730 -DEAL::index=1 position=2.50000 0.56351 values=0.44365 0.44365 0.05635 0.05635 -DEAL::index=2 position=4.43649 0.56351 values=0.25000 0.63730 -0.13730 0.25000 -DEAL::index=3 position=0.56351 2.50000 values=0.44365 0.05635 0.44365 0.05635 -DEAL::index=4 position=2.50000 2.50000 values=0.25000 0.25000 0.25000 0.25000 -DEAL::index=5 position=4.43649 2.50000 values=0.05635 0.44365 0.05635 0.44365 -DEAL::index=6 position=0.56351 4.43649 values=0.25000 -0.13730 0.63730 0.25000 -DEAL::index=7 position=2.50000 4.43649 values=0.05635 0.05635 0.44365 0.44365 -DEAL::index=8 position=4.43649 4.43649 values=-0.13730 0.25000 0.25000 0.63730 diff --git a/tests/fe/p1nc_parametric_02.cc b/tests/fe/p1nc_parametric_02.cc deleted file mode 100644 index 32f16185c4..0000000000 --- a/tests/fe/p1nc_parametric_02.cc +++ /dev/null @@ -1,89 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2015 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - - - -// check the P1NC parametric element on a rectangle - -#include "../tests.h" -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -#define PRECISION 5 - - -template -Point stretch (const Point &p) -{ - Point q = p ; - q(dim-1) *= 2. ; - - return q ; -} - - - -template -void -check() -{ - Triangulation triangulation; - GridGenerator::hyper_cube (triangulation, 0., 5.); - GridTools::transform (&stretch, triangulation) ; - - FE_P1NCParametric fe; - DoFHandler dof_handler (triangulation); - dof_handler.distribute_dofs(fe); - - QGauss quadrature(3); - FEValues fe_values (fe, quadrature, update_values | update_q_points); - fe_values.reinit (dof_handler.begin_active()); - - for (unsigned int q=0; q(); -} - - - diff --git a/tests/fe/p1nc_parametric_02.output b/tests/fe/p1nc_parametric_02.output deleted file mode 100644 index 4d62e4cb59..0000000000 --- a/tests/fe/p1nc_parametric_02.output +++ /dev/null @@ -1,10 +0,0 @@ - -DEAL::index=0 position=0.56351 1.12702 values=0.63730 0.25000 0.25000 -0.13730 -DEAL::index=1 position=2.50000 1.12702 values=0.44365 0.44365 0.05635 0.05635 -DEAL::index=2 position=4.43649 1.12702 values=0.25000 0.63730 -0.13730 0.25000 -DEAL::index=3 position=0.56351 5.00000 values=0.44365 0.05635 0.44365 0.05635 -DEAL::index=4 position=2.50000 5.00000 values=0.25000 0.25000 0.25000 0.25000 -DEAL::index=5 position=4.43649 5.00000 values=0.05635 0.44365 0.05635 0.44365 -DEAL::index=6 position=0.56351 8.87298 values=0.25000 -0.13730 0.63730 0.25000 -DEAL::index=7 position=2.50000 8.87298 values=0.05635 0.05635 0.44365 0.44365 -DEAL::index=8 position=4.43649 8.87298 values=-0.13730 0.25000 0.25000 0.63730 diff --git a/tests/fe/p1nc_parametric_03.cc b/tests/fe/p1nc_parametric_03.cc deleted file mode 100644 index f7ae39b3be..0000000000 --- a/tests/fe/p1nc_parametric_03.cc +++ /dev/null @@ -1,93 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2015 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - - - -// check the P1NC parametric element on a parallelogram - -#include "../tests.h" -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -#define PRECISION 5 - - -template -Point affine (const Point &p) -{ - Point q = p ; - if (dim>=2) - { - q(0) = 2.*p(0) + p(1) ; - q(1) = p(0) + 3.*p(1) ; - } - - return q ; -} - - - -template -void -check() -{ - Triangulation triangulation; - GridGenerator::hyper_cube (triangulation, 0., 1.); - GridTools::transform (&affine, triangulation) ; - - FE_P1NCParametric fe; - DoFHandler dof_handler (triangulation); - dof_handler.distribute_dofs(fe); - - QGauss quadrature(3); - FEValues fe_values (fe, quadrature, update_values | update_q_points); - fe_values.reinit (dof_handler.begin_active()); - - for (unsigned int q=0; q(); -} - - - diff --git a/tests/fe/p1nc_parametric_03.output b/tests/fe/p1nc_parametric_03.output deleted file mode 100644 index 4f8444a193..0000000000 --- a/tests/fe/p1nc_parametric_03.output +++ /dev/null @@ -1,10 +0,0 @@ - -DEAL::index=0 position=0.33810 0.45081 values=0.63730 0.25000 0.25000 -0.13730 -DEAL::index=1 position=1.11270 0.83810 values=0.44365 0.44365 0.05635 0.05635 -DEAL::index=2 position=1.88730 1.22540 values=0.25000 0.63730 -0.13730 0.25000 -DEAL::index=3 position=0.72540 1.61270 values=0.44365 0.05635 0.44365 0.05635 -DEAL::index=4 position=1.50000 2.00000 values=0.25000 0.25000 0.25000 0.25000 -DEAL::index=5 position=2.27460 2.38730 values=0.05635 0.44365 0.05635 0.44365 -DEAL::index=6 position=1.11270 2.77460 values=0.25000 -0.13730 0.63730 0.25000 -DEAL::index=7 position=1.88730 3.16190 values=0.05635 0.05635 0.44365 0.44365 -DEAL::index=8 position=2.66190 3.54919 values=-0.13730 0.25000 0.25000 0.63730 diff --git a/tests/fe/p1nc_parametric_04.cc b/tests/fe/p1nc_parametric_04.cc deleted file mode 100644 index 0773503ca6..0000000000 --- a/tests/fe/p1nc_parametric_04.cc +++ /dev/null @@ -1,77 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2015 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - - - -// check the P1NC parametric element's gradient on a square - -#include "../tests.h" -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -#define PRECISION 5 - - - -template -void -check() -{ - Triangulation triangulation; - GridGenerator::hyper_cube (triangulation, 0, 5); - - FE_P1NCParametric fe; - DoFHandler dof_handler (triangulation); - dof_handler.distribute_dofs(fe); - - QGauss quadrature(3); - FEValues fe_values (fe, quadrature, update_gradients | update_q_points); - fe_values.reinit (dof_handler.begin_active()); - - for (unsigned int q=0; q(); -} - - - diff --git a/tests/fe/p1nc_parametric_04.output b/tests/fe/p1nc_parametric_04.output deleted file mode 100644 index 51ce573974..0000000000 --- a/tests/fe/p1nc_parametric_04.output +++ /dev/null @@ -1,10 +0,0 @@ - -DEAL::index=0 position=0.56351 0.56351 values=[-0.10000 -0.10000] [0.10000 -0.10000] [-0.10000 0.10000] [0.10000 0.10000] -DEAL::index=1 position=2.50000 0.56351 values=[-0.10000 -0.10000] [0.10000 -0.10000] [-0.10000 0.10000] [0.10000 0.10000] -DEAL::index=2 position=4.43649 0.56351 values=[-0.10000 -0.10000] [0.10000 -0.10000] [-0.10000 0.10000] [0.10000 0.10000] -DEAL::index=3 position=0.56351 2.50000 values=[-0.10000 -0.10000] [0.10000 -0.10000] [-0.10000 0.10000] [0.10000 0.10000] -DEAL::index=4 position=2.50000 2.50000 values=[-0.10000 -0.10000] [0.10000 -0.10000] [-0.10000 0.10000] [0.10000 0.10000] -DEAL::index=5 position=4.43649 2.50000 values=[-0.10000 -0.10000] [0.10000 -0.10000] [-0.10000 0.10000] [0.10000 0.10000] -DEAL::index=6 position=0.56351 4.43649 values=[-0.10000 -0.10000] [0.10000 -0.10000] [-0.10000 0.10000] [0.10000 0.10000] -DEAL::index=7 position=2.50000 4.43649 values=[-0.10000 -0.10000] [0.10000 -0.10000] [-0.10000 0.10000] [0.10000 0.10000] -DEAL::index=8 position=4.43649 4.43649 values=[-0.10000 -0.10000] [0.10000 -0.10000] [-0.10000 0.10000] [0.10000 0.10000] diff --git a/tests/fe/p1nc_parametric_05.cc b/tests/fe/p1nc_parametric_05.cc deleted file mode 100644 index 991ac01d1f..0000000000 --- a/tests/fe/p1nc_parametric_05.cc +++ /dev/null @@ -1,89 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2015 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - - - -// check the P1NC parametric element's gradient on a rectangle - -#include "../tests.h" -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -#define PRECISION 5 - - -template -Point stretch (const Point &p) -{ - Point q = p ; - q(dim-1) *= 2. ; - - return q ; -} - - - -template -void -check() -{ - Triangulation triangulation; - GridGenerator::hyper_cube (triangulation, 0., 5.); - GridTools::transform (&stretch, triangulation) ; - - FE_P1NCParametric fe; - DoFHandler dof_handler (triangulation); - dof_handler.distribute_dofs(fe); - - QGauss quadrature(3); - FEValues fe_values (fe, quadrature, update_gradients | update_q_points); - fe_values.reinit (dof_handler.begin_active()); - - for (unsigned int q=0; q(); -} - - - diff --git a/tests/fe/p1nc_parametric_05.output b/tests/fe/p1nc_parametric_05.output deleted file mode 100644 index 2d11da0b3d..0000000000 --- a/tests/fe/p1nc_parametric_05.output +++ /dev/null @@ -1,10 +0,0 @@ - -DEAL::index=0 position=0.56351 1.12702 values=[-0.10000 -0.05000] [0.10000 -0.05000] [-0.10000 0.05000] [0.10000 0.05000] -DEAL::index=1 position=2.50000 1.12702 values=[-0.10000 -0.05000] [0.10000 -0.05000] [-0.10000 0.05000] [0.10000 0.05000] -DEAL::index=2 position=4.43649 1.12702 values=[-0.10000 -0.05000] [0.10000 -0.05000] [-0.10000 0.05000] [0.10000 0.05000] -DEAL::index=3 position=0.56351 5.00000 values=[-0.10000 -0.05000] [0.10000 -0.05000] [-0.10000 0.05000] [0.10000 0.05000] -DEAL::index=4 position=2.50000 5.00000 values=[-0.10000 -0.05000] [0.10000 -0.05000] [-0.10000 0.05000] [0.10000 0.05000] -DEAL::index=5 position=4.43649 5.00000 values=[-0.10000 -0.05000] [0.10000 -0.05000] [-0.10000 0.05000] [0.10000 0.05000] -DEAL::index=6 position=0.56351 8.87298 values=[-0.10000 -0.05000] [0.10000 -0.05000] [-0.10000 0.05000] [0.10000 0.05000] -DEAL::index=7 position=2.50000 8.87298 values=[-0.10000 -0.05000] [0.10000 -0.05000] [-0.10000 0.05000] [0.10000 0.05000] -DEAL::index=8 position=4.43649 8.87298 values=[-0.10000 -0.05000] [0.10000 -0.05000] [-0.10000 0.05000] [0.10000 0.05000] diff --git a/tests/fe/p1nc_parametric_06.cc b/tests/fe/p1nc_parametric_06.cc deleted file mode 100644 index 0d70de6579..0000000000 --- a/tests/fe/p1nc_parametric_06.cc +++ /dev/null @@ -1,93 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2015 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - - - -// check the P1NC parametric element's gradient on a parallelogram - -#include "../tests.h" -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -#define PRECISION 5 - - -template -Point affine (const Point &p) -{ - Point q = p ; - if (dim>=2) - { - q(0) = 2.*p(0) + p(1) ; - q(1) = p(0) + 3.*p(1) ; - } - - return q ; -} - - - -template -void -check() -{ - Triangulation triangulation; - GridGenerator::hyper_cube (triangulation, 0., 1.); - GridTools::transform (&affine, triangulation) ; - - FE_P1NCParametric fe; - DoFHandler dof_handler (triangulation); - dof_handler.distribute_dofs(fe); - - QGauss quadrature(3); - FEValues fe_values (fe, quadrature, update_gradients | update_q_points); - fe_values.reinit (dof_handler.begin_active()); - - for (unsigned int q=0; q(); -} - - - diff --git a/tests/fe/p1nc_parametric_06.output b/tests/fe/p1nc_parametric_06.output deleted file mode 100644 index d9f5209314..0000000000 --- a/tests/fe/p1nc_parametric_06.output +++ /dev/null @@ -1,10 +0,0 @@ - -DEAL::index=0 position=0.33810 0.45081 values=[-0.20000 -0.10000] [0.40000 -0.30000] [-0.40000 0.30000] [0.20000 0.10000] -DEAL::index=1 position=1.11270 0.83810 values=[-0.20000 -0.10000] [0.40000 -0.30000] [-0.40000 0.30000] [0.20000 0.10000] -DEAL::index=2 position=1.88730 1.22540 values=[-0.20000 -0.10000] [0.40000 -0.30000] [-0.40000 0.30000] [0.20000 0.10000] -DEAL::index=3 position=0.72540 1.61270 values=[-0.20000 -0.10000] [0.40000 -0.30000] [-0.40000 0.30000] [0.20000 0.10000] -DEAL::index=4 position=1.50000 2.00000 values=[-0.20000 -0.10000] [0.40000 -0.30000] [-0.40000 0.30000] [0.20000 0.10000] -DEAL::index=5 position=2.27460 2.38730 values=[-0.20000 -0.10000] [0.40000 -0.30000] [-0.40000 0.30000] [0.20000 0.10000] -DEAL::index=6 position=1.11270 2.77460 values=[-0.20000 -0.10000] [0.40000 -0.30000] [-0.40000 0.30000] [0.20000 0.10000] -DEAL::index=7 position=1.88730 3.16190 values=[-0.20000 -0.10000] [0.40000 -0.30000] [-0.40000 0.30000] [0.20000 0.10000] -DEAL::index=8 position=2.66190 3.54919 values=[-0.20000 -0.10000] [0.40000 -0.30000] [-0.40000 0.30000] [0.20000 0.10000]