From 2145d6fb1aac427c4a1ca57e88211c1d1f1b02df Mon Sep 17 00:00:00 2001 From: guido Date: Tue, 11 May 1999 15:31:10 +0000 Subject: [PATCH] changed FE names git-svn-id: https://svn.dealii.org/trunk@1311 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/deal.II/constraints.cc | 4 ++-- tests/deal.II/dof_test.cc | 2 +- tests/deal.II/fe_tables.cc | 31 ++++++++++++----------------- tests/deal.II/gradients.cc | 2 +- tests/deal.II/second_derivatives.cc | 2 +- 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/tests/deal.II/constraints.cc b/tests/deal.II/constraints.cc index fa1c70b078..fe1d428e7d 100644 --- a/tests/deal.II/constraints.cc +++ b/tests/deal.II/constraints.cc @@ -242,10 +242,10 @@ int main () { switch (element) { case 0: - fe = new FELinear<3>(); + fe = new FEQ1<3>(); break; case 1: - fe = new FEQuadraticSub<3>(); + fe = new FEQ2<3>(); break; }; diff --git a/tests/deal.II/dof_test.cc b/tests/deal.II/dof_test.cc index bec350bc8a..0fffc3cb8e 100644 --- a/tests/deal.II/dof_test.cc +++ b/tests/deal.II/dof_test.cc @@ -284,7 +284,7 @@ void TestCases::run (const unsigned int test_case) { cout << " Distributing degrees of freedom..." << endl; - FELinear fe; + FEQ1 fe; dof->distribute_dofs (fe); cout << " Renumbering degrees of freedom..." << endl; diff --git a/tests/deal.II/fe_tables.cc b/tests/deal.II/fe_tables.cc index ab5ca42e51..9afd62f862 100644 --- a/tests/deal.II/fe_tables.cc +++ b/tests/deal.II/fe_tables.cc @@ -115,24 +115,19 @@ main() deallog.pop(); - TEST_ELEMENT(FEDGConstant<2>); - TEST_ELEMENT(FEDGLinear<2>); + TEST_ELEMENT(FEDG_Q0<2>); + TEST_ELEMENT(FEDG_Q1<2>); - TEST_ELEMENT(FELinear<2>); - TEST_ELEMENT(FEQuadraticSub<2>); - TEST_ELEMENT(FECubicSub<2>); - TEST_ELEMENT(FEQuarticSub<2>); -/* - TEST_ELEMENT(FELinear<1>); - TEST_ELEMENT(FEQuadraticSub<1>); - TEST_ELEMENT(FECubicSub<1>); - TEST_ELEMENT(FEQuarticSub<1>); -*/ - TEST_MULTIPLE(FELinear<2>,3,2); - TEST_MULTIPLE(FEQuadraticSub<2>,3,2); - TEST_MULTIPLE(FECubicSub<2>,3,2); + TEST_ELEMENT(FEQ1<2>); + TEST_ELEMENT(FEQ2<2>); + TEST_ELEMENT(FEQ3<2>); + TEST_ELEMENT(FEQ4<2>); + + TEST_MULTIPLE(FEQ1<2>,3,2); + TEST_MULTIPLE(FEQ2<2>,3,2); + TEST_MULTIPLE(FEQ3<2>,3,2); - TEST_MIXED2(FELinear<2>,1,FEDGConstant<2>,1,2); - TEST_MIXED2(FEQuadraticSub<2>,3,FELinear<2>,1,2); - TEST_MIXED2(FECubicSub<2>,3,FEQuadraticSub<2>,2,2); + TEST_MIXED2(FEQ1<2>,1,FEDG_Q0<2>,1,2); + TEST_MIXED2(FEQ2<2>,3,FEQ1<2>,1,2); + TEST_MIXED2(FEQ3<2>,3,FEQ2<2>,2,2); } diff --git a/tests/deal.II/gradients.cc b/tests/deal.II/gradients.cc index 1b000fc53e..d28cb69688 100644 --- a/tests/deal.II/gradients.cc +++ b/tests/deal.II/gradients.cc @@ -31,7 +31,7 @@ int main () { GridGenerator::hyper_cube (tria,0,1); tria.begin_active()->vertex(2)(0) = 2; - FELinear<2> fe; + FEQ1<2> fe; DoFHandler<2> dof(&tria); dof.distribute_dofs(fe); diff --git a/tests/deal.II/second_derivatives.cc b/tests/deal.II/second_derivatives.cc index 0c4d5064cb..412a5b0409 100644 --- a/tests/deal.II/second_derivatives.cc +++ b/tests/deal.II/second_derivatives.cc @@ -22,7 +22,7 @@ int main () { Triangulation<2> tria; GridGenerator::hyper_cube (tria,0,1); - FELinear<2> fe; + FEQ1<2> fe; DoFHandler<2> dof(&tria); dof.distribute_dofs(fe); -- 2.39.5