Fixed a couple of tests. Still in trouble with serialization.

git-svn-id: https://svn.dealii.org/branches/branch_manifold_id_intermediate@33093 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/bits/data_out_08.cc b/tests/bits/data_out_08.cc
index f3d6444dc7d7536646d228dc09e2073610f91c61..fd3f20f78980e9dd1648be5e8880b84935865f59 100644 (file)
--- a/tests/bits/data_out_08.cc
+++ b/tests/bits/data_out_08.cc
@@ -124,7 +124,6 @@ check ()
 int
 main(int argc, char **argv)
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
   std::ofstream logfile(output_file_name.c_str());
   deallog << std::setprecision (2);
   logfile << std::setprecision (2);

diff --git a/tests/deal.II/memory_consumption_01.compiler=Intel=no.with_64bit_indices=off.release.output b/tests/deal.II/memory_consumption_01.compiler=Intel=no.with_64bit_indices=off.release.output
index ce676a64a003df31f151a616388c2e8f11cdca9d..5969e6f20d4608dc363a463f73cd2feb984b6cd8 100644 (file)
--- a/tests/deal.II/memory_consumption_01.compiler=Intel=no.with_64bit_indices=off.release.output
+++ b/tests/deal.II/memory_consumption_01.compiler=Intel=no.with_64bit_indices=off.release.output
@@ -5,7 +5,7 @@ DEAL::   Number of active cells:       8
 DEAL::   Number of degrees of freedom: 17
 DEAL:cg::Starting value 0.261041
 DEAL:cg::Convergence step 13 value 0
-DEAL::Memory consumption -- Triangulation: 2778
+DEAL::Memory consumption -- Triangulation: 2889
 DEAL::Memory consumption -- DoFHandler:    976
 DEAL::Memory consumption -- FE:            1488
 DEAL::Memory consumption -- Constraints:   78
@@ -18,7 +18,7 @@ DEAL::   Number of active cells:       11
 DEAL::   Number of degrees of freedom: 23
 DEAL:cg::Starting value 0.235472
 DEAL:cg::Convergence step 16 value 0
-DEAL::Memory consumption -- Triangulation: 3618
+DEAL::Memory consumption -- Triangulation: 3759
 DEAL::Memory consumption -- DoFHandler:    1164
 DEAL::Memory consumption -- FE:            1488
 DEAL::Memory consumption -- Constraints:   78
@@ -31,7 +31,7 @@ DEAL::   Number of active cells:       15
 DEAL::   Number of degrees of freedom: 31
 DEAL:cg::Starting value 0.226008
 DEAL:cg::Convergence step 21 value 0
-DEAL::Memory consumption -- Triangulation: 4426
+DEAL::Memory consumption -- Triangulation: 4599
 DEAL::Memory consumption -- DoFHandler:    1356
 DEAL::Memory consumption -- FE:            1488
 DEAL::Memory consumption -- Constraints:   78
@@ -44,7 +44,7 @@ DEAL::   Number of active cells:       20
 DEAL::   Number of degrees of freedom: 41
 DEAL:cg::Starting value 0.204506
 DEAL:cg::Convergence step 27 value 0
-DEAL::Memory consumption -- Triangulation: 5442
+DEAL::Memory consumption -- Triangulation: 5649
 DEAL::Memory consumption -- DoFHandler:    1584
 DEAL::Memory consumption -- FE:            1488
 DEAL::Memory consumption -- Constraints:   78
@@ -59,7 +59,7 @@ DEAL::   Number of active cells:       20
 DEAL::   Number of degrees of freedom: 89
 DEAL:cg::Starting value 0.351647
 DEAL:cg::Convergence step 22 value 0
-DEAL::Memory consumption -- Triangulation: 4887
+DEAL::Memory consumption -- Triangulation: 5040
 DEAL::Memory consumption -- DoFHandler:    1936
 DEAL::Memory consumption -- FE:            3904
 DEAL::Memory consumption -- Constraints:   78
@@ -72,7 +72,7 @@ DEAL::   Number of active cells:       44
 DEAL::   Number of degrees of freedom: 209
 DEAL:cg::Starting value 0.271387
 DEAL:cg::Convergence step 30 value 0
-DEAL::Memory consumption -- Triangulation: 10047
+DEAL::Memory consumption -- Triangulation: 10336
 DEAL::Memory consumption -- DoFHandler:    3728
 DEAL::Memory consumption -- FE:            3904
 DEAL::Memory consumption -- Constraints:   3102
@@ -85,7 +85,7 @@ DEAL::   Number of active cells:       92
 DEAL::   Number of degrees of freedom: 449
 DEAL:cg::Starting value 0.203851
 DEAL:cg::Convergence step 51 value 0
-DEAL::Memory consumption -- Triangulation: 19591
+DEAL::Memory consumption -- Triangulation: 20120
 DEAL::Memory consumption -- DoFHandler:    7184
 DEAL::Memory consumption -- FE:            3904
 DEAL::Memory consumption -- Constraints:   10734
@@ -98,7 +98,7 @@ DEAL::   Number of active cells:       200
 DEAL::   Number of degrees of freedom: 921
 DEAL:cg::Starting value 0.151971
 DEAL:cg::Convergence step 71 value 0
-DEAL::Memory consumption -- Triangulation: 39319
+DEAL::Memory consumption -- Triangulation: 40304
 DEAL::Memory consumption -- DoFHandler:    14672
 DEAL::Memory consumption -- FE:            3904
 DEAL::Memory consumption -- Constraints:   19966
@@ -113,7 +113,7 @@ DEAL::   Number of active cells:       56
 DEAL::   Number of degrees of freedom: 517
 DEAL:cg::Starting value 0.206362
 DEAL:cg::Convergence step 29 value 0
-DEAL::Memory consumption -- Triangulation: 22643
+DEAL::Memory consumption -- Triangulation: 23240
 DEAL::Memory consumption -- DoFHandler:    9760
 DEAL::Memory consumption -- FE:            12280
 DEAL::Memory consumption -- Constraints:   78
@@ -126,7 +126,7 @@ DEAL::   Number of active cells:       217
 DEAL::   Number of degrees of freedom: 2217
 DEAL:cg::Starting value 0.116541
 DEAL:cg::Convergence step 31 value 0
-DEAL::Memory consumption -- Triangulation: 88881
+DEAL::Memory consumption -- Triangulation: 91120
 DEAL::Memory consumption -- DoFHandler:    37996
 DEAL::Memory consumption -- FE:            12280
 DEAL::Memory consumption -- Constraints:   55262
@@ -139,7 +139,7 @@ DEAL::   Number of active cells:       896
 DEAL::   Number of degrees of freedom: 9373
 DEAL:cg::Starting value 0.0978429
 DEAL:cg::Convergence step 55 value 0
-DEAL::Memory consumption -- Triangulation: 355923
+DEAL::Memory consumption -- Triangulation: 364776
 DEAL::Memory consumption -- DoFHandler:    151280
 DEAL::Memory consumption -- FE:            12280
 DEAL::Memory consumption -- Constraints:   367086
@@ -152,7 +152,7 @@ DEAL::   Number of active cells:       3248
 DEAL::   Number of degrees of freedom: 32433
 DEAL:cg::Starting value 0.0425276
 DEAL:cg::Convergence step 82 value 0
-DEAL::Memory consumption -- Triangulation: 1252759
+DEAL::Memory consumption -- Triangulation: 1283544
 DEAL::Memory consumption -- DoFHandler:    542008
 DEAL::Memory consumption -- FE:            12280
 DEAL::Memory consumption -- Constraints:   1307806

diff --git a/tests/deal.II/memory_consumption_01.compiler=Intel=yes.with_64bit_indices=off.release.output b/tests/deal.II/memory_consumption_01.compiler=Intel=yes.with_64bit_indices=off.release.output
index c33c4acdaadd2c57047c4fecdb7869dab74cbc42..5969e6f20d4608dc363a463f73cd2feb984b6cd8 100644 (file)
--- a/tests/deal.II/memory_consumption_01.compiler=Intel=yes.with_64bit_indices=off.release.output
+++ b/tests/deal.II/memory_consumption_01.compiler=Intel=yes.with_64bit_indices=off.release.output
@@ -5,7 +5,7 @@ DEAL::   Number of active cells:       8
 DEAL::   Number of degrees of freedom: 17
 DEAL:cg::Starting value 0.261041
 DEAL:cg::Convergence step 13 value 0
-DEAL::Memory consumption -- Triangulation: 2778
+DEAL::Memory consumption -- Triangulation: 2889
 DEAL::Memory consumption -- DoFHandler:    976
 DEAL::Memory consumption -- FE:            1488
 DEAL::Memory consumption -- Constraints:   78
@@ -18,7 +18,7 @@ DEAL::   Number of active cells:       11
 DEAL::   Number of degrees of freedom: 23
 DEAL:cg::Starting value 0.235472
 DEAL:cg::Convergence step 16 value 0
-DEAL::Memory consumption -- Triangulation: 3618
+DEAL::Memory consumption -- Triangulation: 3759
 DEAL::Memory consumption -- DoFHandler:    1164
 DEAL::Memory consumption -- FE:            1488
 DEAL::Memory consumption -- Constraints:   78
@@ -31,7 +31,7 @@ DEAL::   Number of active cells:       15
 DEAL::   Number of degrees of freedom: 31
 DEAL:cg::Starting value 0.226008
 DEAL:cg::Convergence step 21 value 0
-DEAL::Memory consumption -- Triangulation: 4426
+DEAL::Memory consumption -- Triangulation: 4599
 DEAL::Memory consumption -- DoFHandler:    1356
 DEAL::Memory consumption -- FE:            1488
 DEAL::Memory consumption -- Constraints:   78
@@ -42,9 +42,9 @@ DEAL::Memory consumption -- Rhs:           336
 DEAL::Cycle 3:
 DEAL::   Number of active cells:       20
 DEAL::   Number of degrees of freedom: 41
-DEAL:cg::Starting value 0.203975
+DEAL:cg::Starting value 0.204506
 DEAL:cg::Convergence step 27 value 0
-DEAL::Memory consumption -- Triangulation: 5442
+DEAL::Memory consumption -- Triangulation: 5649
 DEAL::Memory consumption -- DoFHandler:    1584
 DEAL::Memory consumption -- FE:            1488
 DEAL::Memory consumption -- Constraints:   78
@@ -59,7 +59,7 @@ DEAL::   Number of active cells:       20
 DEAL::   Number of degrees of freedom: 89
 DEAL:cg::Starting value 0.351647
 DEAL:cg::Convergence step 22 value 0
-DEAL::Memory consumption -- Triangulation: 4887
+DEAL::Memory consumption -- Triangulation: 5040
 DEAL::Memory consumption -- DoFHandler:    1936
 DEAL::Memory consumption -- FE:            3904
 DEAL::Memory consumption -- Constraints:   78
@@ -72,7 +72,7 @@ DEAL::   Number of active cells:       44
 DEAL::   Number of degrees of freedom: 209
 DEAL:cg::Starting value 0.271387
 DEAL:cg::Convergence step 30 value 0
-DEAL::Memory consumption -- Triangulation: 10047
+DEAL::Memory consumption -- Triangulation: 10336
 DEAL::Memory consumption -- DoFHandler:    3728
 DEAL::Memory consumption -- FE:            3904
 DEAL::Memory consumption -- Constraints:   3102
@@ -85,7 +85,7 @@ DEAL::   Number of active cells:       92
 DEAL::   Number of degrees of freedom: 449
 DEAL:cg::Starting value 0.203851
 DEAL:cg::Convergence step 51 value 0
-DEAL::Memory consumption -- Triangulation: 19591
+DEAL::Memory consumption -- Triangulation: 20120
 DEAL::Memory consumption -- DoFHandler:    7184
 DEAL::Memory consumption -- FE:            3904
 DEAL::Memory consumption -- Constraints:   10734
@@ -98,7 +98,7 @@ DEAL::   Number of active cells:       200
 DEAL::   Number of degrees of freedom: 921
 DEAL:cg::Starting value 0.151971
 DEAL:cg::Convergence step 71 value 0
-DEAL::Memory consumption -- Triangulation: 39319
+DEAL::Memory consumption -- Triangulation: 40304
 DEAL::Memory consumption -- DoFHandler:    14672
 DEAL::Memory consumption -- FE:            3904
 DEAL::Memory consumption -- Constraints:   19966
@@ -113,7 +113,7 @@ DEAL::   Number of active cells:       56
 DEAL::   Number of degrees of freedom: 517
 DEAL:cg::Starting value 0.206362
 DEAL:cg::Convergence step 29 value 0
-DEAL::Memory consumption -- Triangulation: 22643
+DEAL::Memory consumption -- Triangulation: 23240
 DEAL::Memory consumption -- DoFHandler:    9760
 DEAL::Memory consumption -- FE:            12280
 DEAL::Memory consumption -- Constraints:   78
@@ -126,7 +126,7 @@ DEAL::   Number of active cells:       217
 DEAL::   Number of degrees of freedom: 2217
 DEAL:cg::Starting value 0.116541
 DEAL:cg::Convergence step 31 value 0
-DEAL::Memory consumption -- Triangulation: 88881
+DEAL::Memory consumption -- Triangulation: 91120
 DEAL::Memory consumption -- DoFHandler:    37996
 DEAL::Memory consumption -- FE:            12280
 DEAL::Memory consumption -- Constraints:   55262
@@ -139,7 +139,7 @@ DEAL::   Number of active cells:       896
 DEAL::   Number of degrees of freedom: 9373
 DEAL:cg::Starting value 0.0978429
 DEAL:cg::Convergence step 55 value 0
-DEAL::Memory consumption -- Triangulation: 355923
+DEAL::Memory consumption -- Triangulation: 364776
 DEAL::Memory consumption -- DoFHandler:    151280
 DEAL::Memory consumption -- FE:            12280
 DEAL::Memory consumption -- Constraints:   367086
@@ -152,7 +152,7 @@ DEAL::   Number of active cells:       3248
 DEAL::   Number of degrees of freedom: 32433
 DEAL:cg::Starting value 0.0425276
 DEAL:cg::Convergence step 82 value 0
-DEAL::Memory consumption -- Triangulation: 1252759
+DEAL::Memory consumption -- Triangulation: 1283544
 DEAL::Memory consumption -- DoFHandler:    542008
 DEAL::Memory consumption -- FE:            12280
 DEAL::Memory consumption -- Constraints:   1307806

diff --git a/tests/deal.II/memory_consumption_01.with_64bit_indices=off.debug.output b/tests/deal.II/memory_consumption_01.with_64bit_indices=off.debug.output
index ce676a64a003df31f151a616388c2e8f11cdca9d..5969e6f20d4608dc363a463f73cd2feb984b6cd8 100644 (file)
--- a/tests/deal.II/memory_consumption_01.with_64bit_indices=off.debug.output
+++ b/tests/deal.II/memory_consumption_01.with_64bit_indices=off.debug.output
@@ -5,7 +5,7 @@ DEAL::   Number of active cells:       8
 DEAL::   Number of degrees of freedom: 17
 DEAL:cg::Starting value 0.261041
 DEAL:cg::Convergence step 13 value 0
-DEAL::Memory consumption -- Triangulation: 2778
+DEAL::Memory consumption -- Triangulation: 2889
 DEAL::Memory consumption -- DoFHandler:    976
 DEAL::Memory consumption -- FE:            1488
 DEAL::Memory consumption -- Constraints:   78
@@ -18,7 +18,7 @@ DEAL::   Number of active cells:       11
 DEAL::   Number of degrees of freedom: 23
 DEAL:cg::Starting value 0.235472
 DEAL:cg::Convergence step 16 value 0
-DEAL::Memory consumption -- Triangulation: 3618
+DEAL::Memory consumption -- Triangulation: 3759
 DEAL::Memory consumption -- DoFHandler:    1164
 DEAL::Memory consumption -- FE:            1488
 DEAL::Memory consumption -- Constraints:   78
@@ -31,7 +31,7 @@ DEAL::   Number of active cells:       15
 DEAL::   Number of degrees of freedom: 31
 DEAL:cg::Starting value 0.226008
 DEAL:cg::Convergence step 21 value 0
-DEAL::Memory consumption -- Triangulation: 4426
+DEAL::Memory consumption -- Triangulation: 4599
 DEAL::Memory consumption -- DoFHandler:    1356
 DEAL::Memory consumption -- FE:            1488
 DEAL::Memory consumption -- Constraints:   78
@@ -44,7 +44,7 @@ DEAL::   Number of active cells:       20
 DEAL::   Number of degrees of freedom: 41
 DEAL:cg::Starting value 0.204506
 DEAL:cg::Convergence step 27 value 0
-DEAL::Memory consumption -- Triangulation: 5442
+DEAL::Memory consumption -- Triangulation: 5649
 DEAL::Memory consumption -- DoFHandler:    1584
 DEAL::Memory consumption -- FE:            1488
 DEAL::Memory consumption -- Constraints:   78
@@ -59,7 +59,7 @@ DEAL::   Number of active cells:       20
 DEAL::   Number of degrees of freedom: 89
 DEAL:cg::Starting value 0.351647
 DEAL:cg::Convergence step 22 value 0
-DEAL::Memory consumption -- Triangulation: 4887
+DEAL::Memory consumption -- Triangulation: 5040
 DEAL::Memory consumption -- DoFHandler:    1936
 DEAL::Memory consumption -- FE:            3904
 DEAL::Memory consumption -- Constraints:   78
@@ -72,7 +72,7 @@ DEAL::   Number of active cells:       44
 DEAL::   Number of degrees of freedom: 209
 DEAL:cg::Starting value 0.271387
 DEAL:cg::Convergence step 30 value 0
-DEAL::Memory consumption -- Triangulation: 10047
+DEAL::Memory consumption -- Triangulation: 10336
 DEAL::Memory consumption -- DoFHandler:    3728
 DEAL::Memory consumption -- FE:            3904
 DEAL::Memory consumption -- Constraints:   3102
@@ -85,7 +85,7 @@ DEAL::   Number of active cells:       92
 DEAL::   Number of degrees of freedom: 449
 DEAL:cg::Starting value 0.203851
 DEAL:cg::Convergence step 51 value 0
-DEAL::Memory consumption -- Triangulation: 19591
+DEAL::Memory consumption -- Triangulation: 20120
 DEAL::Memory consumption -- DoFHandler:    7184
 DEAL::Memory consumption -- FE:            3904
 DEAL::Memory consumption -- Constraints:   10734
@@ -98,7 +98,7 @@ DEAL::   Number of active cells:       200
 DEAL::   Number of degrees of freedom: 921
 DEAL:cg::Starting value 0.151971
 DEAL:cg::Convergence step 71 value 0
-DEAL::Memory consumption -- Triangulation: 39319
+DEAL::Memory consumption -- Triangulation: 40304
 DEAL::Memory consumption -- DoFHandler:    14672
 DEAL::Memory consumption -- FE:            3904
 DEAL::Memory consumption -- Constraints:   19966
@@ -113,7 +113,7 @@ DEAL::   Number of active cells:       56
 DEAL::   Number of degrees of freedom: 517
 DEAL:cg::Starting value 0.206362
 DEAL:cg::Convergence step 29 value 0
-DEAL::Memory consumption -- Triangulation: 22643
+DEAL::Memory consumption -- Triangulation: 23240
 DEAL::Memory consumption -- DoFHandler:    9760
 DEAL::Memory consumption -- FE:            12280
 DEAL::Memory consumption -- Constraints:   78
@@ -126,7 +126,7 @@ DEAL::   Number of active cells:       217
 DEAL::   Number of degrees of freedom: 2217
 DEAL:cg::Starting value 0.116541
 DEAL:cg::Convergence step 31 value 0
-DEAL::Memory consumption -- Triangulation: 88881
+DEAL::Memory consumption -- Triangulation: 91120
 DEAL::Memory consumption -- DoFHandler:    37996
 DEAL::Memory consumption -- FE:            12280
 DEAL::Memory consumption -- Constraints:   55262
@@ -139,7 +139,7 @@ DEAL::   Number of active cells:       896
 DEAL::   Number of degrees of freedom: 9373
 DEAL:cg::Starting value 0.0978429
 DEAL:cg::Convergence step 55 value 0
-DEAL::Memory consumption -- Triangulation: 355923
+DEAL::Memory consumption -- Triangulation: 364776
 DEAL::Memory consumption -- DoFHandler:    151280
 DEAL::Memory consumption -- FE:            12280
 DEAL::Memory consumption -- Constraints:   367086
@@ -152,7 +152,7 @@ DEAL::   Number of active cells:       3248
 DEAL::   Number of degrees of freedom: 32433
 DEAL:cg::Starting value 0.0425276
 DEAL:cg::Convergence step 82 value 0
-DEAL::Memory consumption -- Triangulation: 1252759
+DEAL::Memory consumption -- Triangulation: 1283544
 DEAL::Memory consumption -- DoFHandler:    542008
 DEAL::Memory consumption -- FE:            12280
 DEAL::Memory consumption -- Constraints:   1307806

diff --git a/tests/fe/component_mask_02.debug.output b/tests/fe/component_mask_02.debug.output
index 801cb748fae6f1ff8476b3427ac6805ff766851d..12b4c19b61eb0617fafe229a2cda6970fb409fae 100644 (file)
--- a/tests/fe/component_mask_02.debug.output
+++ b/tests/fe/component_mask_02.debug.output
@@ -1,3 +1,3 @@
 
-DEAL::ExcIndexRange (component_index, 0, component_mask.size())
+DEAL::dealii::ExcIndexRange((component_index),0,(component_mask.size()))
 DEAL::OK

diff --git a/tests/grid/cell_id_01.cc b/tests/grid/cell_id_01.cc
index 0f8cdc4f421a0231580dd1c9cbc29afbfbb47c21..eca5d9893e93adcfbcf2c771da9fd66483d349b0 100644 (file)
--- a/tests/grid/cell_id_01.cc
+++ b/tests/grid/cell_id_01.cc
@@ -52,7 +52,7 @@ void check (TRIA &tr)
 
 int main (int argc, char *argv[])
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  // Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
 
   initlog();
   deal_II_exceptions::disable_abort_on_exception();

diff --git a/tests/grid/cell_id_02.cc b/tests/grid/cell_id_02.cc
index c5c32a4e9e83b4f7826b5c8f714e615cbb06bd68..3ad8305db9286241759bf598e0e5aa8e94e590ac 100644 (file)
--- a/tests/grid/cell_id_02.cc
+++ b/tests/grid/cell_id_02.cc
@@ -64,7 +64,7 @@ void check (TRIA &tr)
 
 int main (int argc, char *argv[])
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
+  // Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv);
 
   initlog();
   deal_II_exceptions::disable_abort_on_exception();

diff --git a/tests/lac/precondition_chebyshev_01.with_lapack=true.output b/tests/lac/precondition_chebyshev_01.with_lapack=true.output
index 981a24f709936088f27aa22d2a73bac376124775..eede3a88806a33c14f52a686a6b60a08d565c917 100644 (file)
--- a/tests/lac/precondition_chebyshev_01.with_lapack=true.output
+++ b/tests/lac/precondition_chebyshev_01.with_lapack=true.output
@@ -1,6 +1,8 @@
 
+
 DEAL::Exact inverse:     0.84 0.20 0.26 0.20 0.18 0.03 0.05 0.10 0.03 0.06 
 DEAL::Check  vmult orig: 1.09 0.26 0.34 0.26 0.24 0.04 0.06 0.12 0.04 0.07 
 DEAL::Check Tvmult orig: 1.09 0.26 0.34 0.26 0.24 0.04 0.06 0.12 0.04 0.07 
+
 DEAL::Check  vmult diag: 0.82 0.26 0.33 0.21 0.15 0.02 0.03 0.09 0.03 0.07 
 DEAL::Check Tvmult diag: 0.82 0.26 0.33 0.21 0.15 0.02 0.03 0.09 0.03 0.07 

diff --git a/tests/serialization/triangulation_01.cc b/tests/serialization/triangulation_01.cc
index c12557e369cb126c6e52991cf68d7c10f3c29a02..d06643532c6c7151873d6215c790dbb78ad0644f 100644 (file)
--- a/tests/serialization/triangulation_01.cc
+++ b/tests/serialization/triangulation_01.cc
@@ -52,12 +52,20 @@ namespace dealii
             if (c1->vertex_index(v) != c2->vertex_index(v))
               return false;
           }
+       
+       // if (c1->manifold_id() !=
+       //     c2->manifold_id())
+       //   return false;
 
         for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
           {
             if (c1->face(f)->at_boundary() != c2->face(f)->at_boundary())
               return false;
 
+           // if (c1->face(f)->manifold_id() !=
+           //  c2->face(f)->manifold_id())
+           //   return false;
+
             if (c1->face(f)->at_boundary())
               {
                 if (c1->face(f)->boundary_indicator() !=
@@ -115,8 +123,10 @@ void do_boundary (Triangulation<dim,spacedim> &t1)
   c1 = t1.begin();
   for (; c1 != t1.end(); ++c1)
     for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
-      if (c1->at_boundary(f))
+      if (c1->at_boundary(f)) {
         c1->face(f)->set_boundary_indicator (42);
+       //        c1->face(f)->set_manifold_id (43);
+      }
 }