Make sure that FE_Nothing can be identified by its name

diff --git a/source/fe/fe_nothing.cc b/source/fe/fe_nothing.cc
index b7e97f0d0133d443bdb49a9623878099265aa0df..db131e195cf4c98617acc25870154aed7c900cb7 100644 (file)
--- a/source/fe/fe_nothing.cc
+++ b/source/fe/fe_nothing.cc
@@ -70,7 +70,13 @@ FE_Nothing<dim,spacedim>::get_name () const
   std::ostringstream namebuf;
   namebuf << "FE_Nothing<" << dim << ">(";
   if (this->n_components() > 1)
-    namebuf << this->n_components();
+    {
+      namebuf << this->n_components();
+      if (dominate)
+        namebuf << ", dominating";
+    }
+  else if (dominate)
+    namebuf << "dominating";
   namebuf << ")";
   return namebuf.str();
 }

diff --git a/tests/hp/hp_constraints_neither_dominate_01.output b/tests/hp/hp_constraints_neither_dominate_01.output
index 10f1da2b1b074a4a57688e55a04e8564d45101e8..9b065fb6fedb154a22f71a664dcaf7389ab74a75 100644 (file)
--- a/tests/hp/hp_constraints_neither_dominate_01.output
+++ b/tests/hp/hp_constraints_neither_dominate_01.output
@@ -1,31 +1,31 @@
 
-DEAL::2cells: FESystem<2>[FE_Q<2>(1)-FE_Nothing<2>()] vs FESystem<2>[FE_Q<2>(2)-FE_Q<2>(1)]
+DEAL::2cells: FESystem<2>[FE_Q<2>(1)-FE_Nothing<2>(dominating)] vs FESystem<2>[FE_Q<2>(2)-FE_Q<2>(1)]
     2 = 0
     5 = 0
     7 11:  0.500000
     7 13:  0.500000
 DEAL::cell=0.0 face=1
-DEAL::u[0.0000 -1.0000]={23.5000,0}
-DEAL::u[0.0000 -0.5000]={23.0000,0}
-DEAL::u[0.0000 0.0000]={22.5000,0}
+DEAL::u[0.0000 -1.0000]={23.5000,0.0000}
+DEAL::u[0.0000 -0.5000]={23.0000,0.0000}
+DEAL::u[0.0000 0.0000]={22.5000,0.0000}
 DEAL::cell=0.1 face=0
-DEAL::u[0.0000 -1.0000]={23.5000,0}
-DEAL::u[0.0000 -0.5000]={23.0000,0}
-DEAL::u[0.0000 0.0000]={22.5000,0}
-DEAL::2cells: FESystem<2>[FE_Q<2>(2)-FE_Nothing<2>()] vs FESystem<2>[FE_Q<2>(1)-FE_Q<2>(1)]
+DEAL::u[0.0000 -1.0000]={23.5000,0.0000}
+DEAL::u[0.0000 -0.5000]={23.0000,0.0000}
+DEAL::u[0.0000 0.0000]={22.5000,0.0000}
+DEAL::2cells: FESystem<2>[FE_Q<2>(2)-FE_Nothing<2>(dominating)] vs FESystem<2>[FE_Q<2>(1)-FE_Q<2>(1)]
     2 = 0
     5 = 0
     10 6:  0.500000
     10 8:  0.500000
 DEAL::cell=0.0 face=1
-DEAL::u[0.0000 -1.0000]={0.5000,0}
-DEAL::u[0.0000 -0.5000]={1.5000,0}
-DEAL::u[0.0000 0.0000]={2.5000,0}
+DEAL::u[0.0000 -1.0000]={0.5000,0.0000}
+DEAL::u[0.0000 -0.5000]={1.5000,0.0000}
+DEAL::u[0.0000 0.0000]={2.5000,0.0000}
 DEAL::cell=0.1 face=0
-DEAL::u[0.0000 -1.0000]={0.5000,0}
-DEAL::u[0.0000 -0.5000]={1.5000,0}
-DEAL::u[0.0000 0.0000]={2.5000,0}
-DEAL::2cells: FESystem<3>[FE_Q<3>(1)-FE_Nothing<3>()] vs FESystem<3>[FE_Q<3>(2)-FE_Q<3>(1)]
+DEAL::u[0.0000 -1.0000]={0.5000,0.0000}
+DEAL::u[0.0000 -0.5000]={1.5000,0.0000}
+DEAL::u[0.0000 0.0000]={2.5000,0.0000}
+DEAL::2cells: FESystem<3>[FE_Q<3>(1)-FE_Nothing<3>(dominating)] vs FESystem<3>[FE_Q<3>(2)-FE_Q<3>(1)]
     2 = 0
     5 = 0
     8 = 0
@@ -43,26 +43,26 @@ DEAL::2cells: FESystem<3>[FE_Q<3>(1)-FE_Nothing<3>()] vs FESystem<3>[FE_Q<3>(2)-
     25 35:  0.250000
     25 37:  0.250000
 DEAL::cell=0.0 face=1
-DEAL::u[0.0000 -1.0000 -1.0000]={22.5000,0}
-DEAL::u[0.0000 -0.5000 -1.0000]={22.0000,0}
-DEAL::u[0.0000 0.0000 -1.0000]={21.5000,0}
-DEAL::u[0.0000 -1.0000 -0.5000]={23.0000,0}
-DEAL::u[0.0000 -0.5000 -0.5000]={22.5000,0}
-DEAL::u[0.0000 0.0000 -0.5000]={22.0000,0}
-DEAL::u[0.0000 -1.0000 0.0000]={23.5000,0}
-DEAL::u[0.0000 -0.5000 0.0000]={23.0000,0}
-DEAL::u[0.0000 0.0000 0.0000]={22.5000,0}
+DEAL::u[0.0000 -1.0000 -1.0000]={22.5000,0.0000}
+DEAL::u[0.0000 -0.5000 -1.0000]={22.0000,0.0000}
+DEAL::u[0.0000 0.0000 -1.0000]={21.5000,0.0000}
+DEAL::u[0.0000 -1.0000 -0.5000]={23.0000,0.0000}
+DEAL::u[0.0000 -0.5000 -0.5000]={22.5000,0.0000}
+DEAL::u[0.0000 0.0000 -0.5000]={22.0000,0.0000}
+DEAL::u[0.0000 -1.0000 0.0000]={23.5000,0.0000}
+DEAL::u[0.0000 -0.5000 0.0000]={23.0000,0.0000}
+DEAL::u[0.0000 0.0000 0.0000]={22.5000,0.0000}
 DEAL::cell=0.1 face=0
-DEAL::u[0.0000 -1.0000 -1.0000]={22.5000,0}
-DEAL::u[0.0000 -0.5000 -1.0000]={22.0000,0}
-DEAL::u[0.0000 0.0000 -1.0000]={21.5000,0}
-DEAL::u[0.0000 -1.0000 -0.5000]={23.0000,0}
-DEAL::u[0.0000 -0.5000 -0.5000]={22.5000,0}
-DEAL::u[0.0000 0.0000 -0.5000]={22.0000,0}
-DEAL::u[0.0000 -1.0000 0.0000]={23.5000,0}
-DEAL::u[0.0000 -0.5000 0.0000]={23.0000,0}
-DEAL::u[0.0000 0.0000 0.0000]={22.5000,0}
-DEAL::2cells: FESystem<3>[FE_Q<3>(2)-FE_Nothing<3>()] vs FESystem<3>[FE_Q<3>(1)-FE_Q<3>(1)]
+DEAL::u[0.0000 -1.0000 -1.0000]={22.5000,0.0000}
+DEAL::u[0.0000 -0.5000 -1.0000]={22.0000,0.0000}
+DEAL::u[0.0000 0.0000 -1.0000]={21.5000,0.0000}
+DEAL::u[0.0000 -1.0000 -0.5000]={23.0000,0.0000}
+DEAL::u[0.0000 -0.5000 -0.5000]={22.5000,0.0000}
+DEAL::u[0.0000 0.0000 -0.5000]={22.0000,0.0000}
+DEAL::u[0.0000 -1.0000 0.0000]={23.5000,0.0000}
+DEAL::u[0.0000 -0.5000 0.0000]={23.0000,0.0000}
+DEAL::u[0.0000 0.0000 0.0000]={22.5000,0.0000}
+DEAL::2cells: FESystem<3>[FE_Q<3>(2)-FE_Nothing<3>(dominating)] vs FESystem<3>[FE_Q<3>(1)-FE_Q<3>(1)]
     2 = 0
     5 = 0
     8 = 0
@@ -80,22 +80,22 @@ DEAL::2cells: FESystem<3>[FE_Q<3>(2)-FE_Nothing<3>()] vs FESystem<3>[FE_Q<3>(1)-
     32 16:  0.250000
     32 18:  0.250000
 DEAL::cell=0.0 face=1
-DEAL::u[0.0000 -1.0000 -1.0000]={0.5000,0}
-DEAL::u[0.0000 -0.5000 -1.0000]={1.5000,0}
-DEAL::u[0.0000 0.0000 -1.0000]={2.5000,0}
-DEAL::u[0.0000 -1.0000 -0.5000]={1.0000,0}
-DEAL::u[0.0000 -0.5000 -0.5000]={1.2500,0}
-DEAL::u[0.0000 0.0000 -0.5000]={1.5000,0}
-DEAL::u[0.0000 -1.0000 0.0000]={1.5000,0}
-DEAL::u[0.0000 -0.5000 0.0000]={1.0000,0}
-DEAL::u[0.0000 0.0000 0.0000]={0.5000,0}
+DEAL::u[0.0000 -1.0000 -1.0000]={0.5000,0.0000}
+DEAL::u[0.0000 -0.5000 -1.0000]={1.5000,0.0000}
+DEAL::u[0.0000 0.0000 -1.0000]={2.5000,0.0000}
+DEAL::u[0.0000 -1.0000 -0.5000]={1.0000,0.0000}
+DEAL::u[0.0000 -0.5000 -0.5000]={1.2500,0.0000}
+DEAL::u[0.0000 0.0000 -0.5000]={1.5000,0.0000}
+DEAL::u[0.0000 -1.0000 0.0000]={1.5000,0.0000}
+DEAL::u[0.0000 -0.5000 0.0000]={1.0000,0.0000}
+DEAL::u[0.0000 0.0000 0.0000]={0.5000,0.0000}
 DEAL::cell=0.1 face=0
-DEAL::u[0.0000 -1.0000 -1.0000]={0.5000,0}
-DEAL::u[0.0000 -0.5000 -1.0000]={1.5000,0}
-DEAL::u[0.0000 0.0000 -1.0000]={2.5000,0}
-DEAL::u[0.0000 -1.0000 -0.5000]={1.0000,0}
-DEAL::u[0.0000 -0.5000 -0.5000]={1.2500,0}
-DEAL::u[0.0000 0.0000 -0.5000]={1.5000,0}
-DEAL::u[0.0000 -1.0000 0.0000]={1.5000,0}
-DEAL::u[0.0000 -0.5000 0.0000]={1.0000,0}
-DEAL::u[0.0000 0.0000 0.0000]={0.5000,0}
+DEAL::u[0.0000 -1.0000 -1.0000]={0.5000,0.0000}
+DEAL::u[0.0000 -0.5000 -1.0000]={1.5000,0.0000}
+DEAL::u[0.0000 0.0000 -1.0000]={2.5000,0.0000}
+DEAL::u[0.0000 -1.0000 -0.5000]={1.0000,0.0000}
+DEAL::u[0.0000 -0.5000 -0.5000]={1.2500,0.0000}
+DEAL::u[0.0000 0.0000 -0.5000]={1.5000,0.0000}
+DEAL::u[0.0000 -1.0000 0.0000]={1.5000,0.0000}
+DEAL::u[0.0000 -0.5000 0.0000]={1.0000,0.0000}
+DEAL::u[0.0000 0.0000 0.0000]={0.5000,0.0000}