]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove some RTNodal and adjust Nedelec degree
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Tue, 14 Sep 2010 14:24:19 +0000 (14:24 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Tue, 14 Sep 2010 14:24:19 +0000 (14:24 +0000)
git-svn-id: https://svn.dealii.org/trunk@21957 0785d39b-7218-0410-832d-ea1e28bc413d

tests/hp/n_dofs.cc
tests/hp/n_dofs/cmp/generic

index d0bd8303fdf101ae8334578c3a9c1f234b41b6a4..2114bfd7bcc804efa03eeb070695bf9c7d8e8d0d 100644 (file)
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$ 
 //
-//    Copyright (C) 2005, 2006 by the deal.II authors
+//    Copyright (C) 2005, 2006, 2010 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -110,20 +110,16 @@ int main ()
   CHECK_ALL(DGP,1);
   CHECK_ALL(DGP,3);
 
-  CHECK(Nedelec, 1, 2);
-  CHECK(Nedelec, 1, 3);
+  CHECK(Nedelec, 0, 2);
+  CHECK(Nedelec, 0, 3);
 
   CHECK(RaviartThomas, 0, 2);
   CHECK(RaviartThomas, 1, 2);
   CHECK(RaviartThomas, 2, 2);
+  CHECK(RaviartThomas, 0, 3);
+  CHECK(RaviartThomas, 1, 3);
+  CHECK(RaviartThomas, 2, 3);
 
-  CHECK(RaviartThomasNodal, 0, 2);
-  CHECK(RaviartThomasNodal, 1, 2);
-  CHECK(RaviartThomasNodal, 2, 2);
-  CHECK(RaviartThomasNodal, 0, 3);
-  CHECK(RaviartThomasNodal, 1, 3);
-  CHECK(RaviartThomasNodal, 2, 3);
-      
   CHECK_SYS1(FE_Q<1>(1),  3,1);
   CHECK_SYS1(FE_DGQ<1>(2),2,1);
   CHECK_SYS1(FE_DGP<1>(3),1,1);
@@ -168,12 +164,12 @@ int main ()
 
                                   // systems with Nedelec elements
   CHECK_SYS2 (FE_DGQ<2>(3), 1,
-             FE_Nedelec<2>(1), 2,
+             FE_Nedelec<2>(0), 2,
              2);
-  CHECK_SYS3(FE_Nedelec<2>(1), 1,
+  CHECK_SYS3(FE_Nedelec<2>(0), 1,
             FESystem<2>(FE_DGQ<2>(1),2), 1,
             FESystem<2>(FE_Q<2>(2),1,
-                        FE_Nedelec<2>(1),2),2,
+                        FE_Nedelec<2>(0),2),2,
             2);
   
   deallog << "OK" << std::endl;
index d8cff951537951374b7b3eaeb7c999bbc9f28b52..3145e97873a5aa3e8cacf70ee8c893bd5427ff02 100644 (file)
@@ -26,17 +26,14 @@ DEAL::FE_DGP<3>(1) 2272 2272
 DEAL::FE_DGP<1>(3) 40 40
 DEAL::FE_DGP<2>(3) 760 760
 DEAL::FE_DGP<3>(3) 11360 11360
-DEAL::FE_Nedelec<2>(1) 176 176
-DEAL::FE_Nedelec<3>(1) 2220 2220
+DEAL::FE_Nedelec<2>(0) 176 176
+DEAL::FE_Nedelec<3>(0) 2220 2220
 DEAL::FE_RaviartThomas<2>(0) 176 176
 DEAL::FE_RaviartThomas<2>(1) 656 656
 DEAL::FE_RaviartThomas<2>(2) 1440 1440
-DEAL::FE_RaviartThomasNodal<2>(0) 176 176
-DEAL::FE_RaviartThomasNodal<2>(1) 656 656
-DEAL::FE_RaviartThomasNodal<2>(2) 1440 1440
-DEAL::FE_RaviartThomasNodal<3>(0) 1944 1944
-DEAL::FE_RaviartThomasNodal<3>(1) 14592 14592
-DEAL::FE_RaviartThomasNodal<3>(2) 48168 48168
+DEAL::FE_RaviartThomas<3>(0) 1944 1944
+DEAL::FE_RaviartThomas<3>(1) 14592 14592
+DEAL::FE_RaviartThomas<3>(2) 48168 48168
 DEAL::FESystem<1>[FE_Q<1>(1)^3] 33 33
 DEAL::FESystem<1>[FE_DGQ<1>(2)^2] 60 60
 DEAL::FESystem<1>[FE_DGP<1>(3)] 40 40
@@ -61,6 +58,6 @@ DEAL::FESystem<2>[FE_DGP<2>(3)-FE_DGP<2>(3)-FE_Q<2>(2)^3] 2567 2567
 DEAL::FESystem<3>[FE_DGQ<3>(1)^3-FE_DGP<3>(3)-FE_Q<3>(1)^3] 27473 27473
 DEAL::FESystem<2>[FESystem<2>[FE_Q<2>(1)^3]^3-FE_DGQ<2>(0)-FE_Q<2>(1)^3] 1240 1240
 DEAL::FESystem<2>[FE_DGQ<2>(3)-FESystem<2>[FE_DGQ<2>(0)^3]-FESystem<2>[FE_Q<2>(2)-FE_DGQ<2>(0)]^2] 2294 2294
-DEAL::FESystem<2>[FE_DGQ<2>(3)-FE_Nedelec<2>(1)^2] 1568 1568
-DEAL::FESystem<2>[FE_Nedelec<2>(1)-FESystem<2>[FE_DGQ<2>(1)^2]-FESystem<2>[FE_Q<2>(2)-FE_Nedelec<2>(1)^2]^2] 2186 2186
+DEAL::FESystem<2>[FE_DGQ<2>(3)-FE_Nedelec<2>(0)^2] 1568 1568
+DEAL::FESystem<2>[FE_Nedelec<2>(0)-FESystem<2>[FE_DGQ<2>(1)^2]-FESystem<2>[FE_Q<2>(2)-FE_Nedelec<2>(0)^2]^2] 2186 2186
 DEAL::OK

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.