From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Thu, 27 Oct 2016 21:21:24 +0000 (-0500)
Subject: Treat types::subdomain_id consistently throughout the testsuite.
X-Git-Tag: v8.5.0-rc1~533^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a249072eed49639a7e939d4eb2d2a2e07129c53;p=dealii.git

Treat types::subdomain_id consistently throughout the testsuite.
---

diff --git a/tests/bits/subdomain_ids_01.cc b/tests/bits/subdomain_ids_01.cc
index 697f3b2d09..6752dbe3c7 100644
--- a/tests/bits/subdomain_ids_01.cc
+++ b/tests/bits/subdomain_ids_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2015 by the deal.II authors
+// Copyright (C) 2001 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -73,7 +73,7 @@ void test ()
   deallog << dof_handler.n_dofs() << std::endl;
 
   std::vector<bool> selected_dofs (dof_handler.n_dofs());
-  for (unsigned int subdomain=0; subdomain<(1<<dim); ++subdomain)
+  for (types::subdomain_id subdomain=0; subdomain<(1<<dim); ++subdomain)
     {
       // count number on dofs on
       // subdomain. note that they add up to
diff --git a/tests/bits/subdomain_ids_02.cc b/tests/bits/subdomain_ids_02.cc
index 090e348597..74b5456697 100644
--- a/tests/bits/subdomain_ids_02.cc
+++ b/tests/bits/subdomain_ids_02.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2015 by the deal.II authors
+// Copyright (C) 2001 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -72,7 +72,7 @@ void test ()
   dof_handler.distribute_dofs (fe);
   deallog << dof_handler.n_dofs() << std::endl;
 
-  std::vector<unsigned int> subdomain_association (dof_handler.n_dofs());
+  std::vector<types::subdomain_id> subdomain_association (dof_handler.n_dofs());
   DoFTools::get_subdomain_association (dof_handler,
                                        subdomain_association);
   for (unsigned int subdomain=0; subdomain<(1<<dim); ++subdomain)
diff --git a/tests/bits/subdomain_ids_04.cc b/tests/bits/subdomain_ids_04.cc
index 2ab9f81caa..8de740f29c 100644
--- a/tests/bits/subdomain_ids_04.cc
+++ b/tests/bits/subdomain_ids_04.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2015 by the deal.II authors
+// Copyright (C) 2001 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -82,7 +82,7 @@ void test ()
   // subdomain numbers. first output these
   // numbers, then also check that this is
   // indeed so
-  std::vector<unsigned int> subdomain_association (dof_handler.n_dofs());
+  std::vector<types::subdomain_id> subdomain_association (dof_handler.n_dofs());
   DoFTools::get_subdomain_association (dof_handler, subdomain_association);
 
   for (unsigned int i=0; i<dof_handler.n_dofs(); ++i)
diff --git a/tests/bits/subdomain_ids_05.cc b/tests/bits/subdomain_ids_05.cc
index 0f45eab259..0978077f3e 100644
--- a/tests/bits/subdomain_ids_05.cc
+++ b/tests/bits/subdomain_ids_05.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2015 by the deal.II authors
+// Copyright (C) 2001 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -72,7 +72,7 @@ void test ()
   dof_handler.distribute_dofs (fe);
   deallog << dof_handler.n_dofs() << std::endl;
 
-  std::vector<unsigned int> subdomain_association (dof_handler.n_dofs());
+  std::vector<types::subdomain_id> subdomain_association (dof_handler.n_dofs());
   DoFTools::get_subdomain_association (dof_handler,
                                        subdomain_association);
   for (unsigned int subdomain=0; subdomain<(1<<dim); ++subdomain)
diff --git a/tests/bits/subdomain_ids_06.cc b/tests/bits/subdomain_ids_06.cc
index 32318f2fe7..e973e3a447 100644
--- a/tests/bits/subdomain_ids_06.cc
+++ b/tests/bits/subdomain_ids_06.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2015 by the deal.II authors
+// Copyright (C) 2001 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -65,7 +65,7 @@ void test ()
       cell->set_subdomain_id (subdomain);
     }
 
-  std::vector<unsigned int> subdomain_association (tria.n_active_cells());
+  std::vector<types::subdomain_id> subdomain_association (tria.n_active_cells());
   GridTools::get_subdomain_association (tria,
                                         subdomain_association);
   for (unsigned int subdomain=0; subdomain<(1<<dim); ++subdomain)
diff --git a/tests/bits/subdomain_ids_07.cc b/tests/bits/subdomain_ids_07.cc
index e2b6bcab57..1e07f17eca 100644
--- a/tests/bits/subdomain_ids_07.cc
+++ b/tests/bits/subdomain_ids_07.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2015 by the deal.II authors
+// Copyright (C) 2001 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -72,7 +72,7 @@ void test ()
   dof_handler.distribute_dofs (fe);
   deallog << dof_handler.n_dofs() << std::endl;
 
-  std::vector<unsigned int> subdomain_association (dof_handler.n_dofs());
+  std::vector<types::subdomain_id> subdomain_association (dof_handler.n_dofs());
   DoFTools::get_subdomain_association (dof_handler,
                                        subdomain_association);
   for (unsigned int subdomain=0; subdomain<(1<<dim); ++subdomain)
diff --git a/tests/mpi/p4est_2d_coarse_01.cc b/tests/mpi/p4est_2d_coarse_01.cc
index 5a4a89045e..2815b5510e 100644
--- a/tests/mpi/p4est_2d_coarse_01.cc
+++ b/tests/mpi/p4est_2d_coarse_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2009 - 2015 by the deal.II authors
+// Copyright (C) 2009 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -61,8 +61,7 @@ void test()
                 << tr.begin_active()->subdomain_id()
                 << std::endl;
 
-//      std::vector< unsigned int > cell_subd;
-//      cell_subd.resize(tr.n_active_cells());
+//      std::vector<types::subdomain_id> cell_subd(tr.n_active_cells());
 
 //      GridTools::get_subdomain_association(tr, cell_subd);
 //       for (unsigned int i=0;i<tr.n_active_cells();++i)
diff --git a/tests/mpi/p4est_2d_ghost_01.cc b/tests/mpi/p4est_2d_ghost_01.cc
index 022582b091..a0efb9294a 100644
--- a/tests/mpi/p4est_2d_ghost_01.cc
+++ b/tests/mpi/p4est_2d_ghost_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2009 - 2015 by the deal.II authors
+// Copyright (C) 2009 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -50,8 +50,7 @@ void test()
       if (myid==0)
         {
 
-          std::vector< unsigned int > cell_subd;
-          cell_subd.resize(tr.n_active_cells());
+          std::vector<types::subdomain_id> cell_subd(tr.n_active_cells());
 
           GridTools::get_subdomain_association(tr, cell_subd);
           for (unsigned int i=0; i<tr.n_active_cells(); ++i)
diff --git a/tests/mpi/p4est_2d_ghost_02.cc b/tests/mpi/p4est_2d_ghost_02.cc
index 7d91d97ee2..b3bc511126 100644
--- a/tests/mpi/p4est_2d_ghost_02.cc
+++ b/tests/mpi/p4est_2d_ghost_02.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2009 - 2015 by the deal.II authors
+// Copyright (C) 2009 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -56,8 +56,7 @@ void test()
           if (myid==0)
             {
 
-              std::vector< unsigned int > cell_subd;
-              cell_subd.resize(tr.n_active_cells());
+              std::vector<types::subdomain_id> cell_subd(tr.n_active_cells());
 
               GridTools::get_subdomain_association(tr, cell_subd);
               for (unsigned int i=0; i<tr.n_active_cells(); ++i)
diff --git a/tests/mpi/p4est_2d_refine_01.cc b/tests/mpi/p4est_2d_refine_01.cc
index 83af42e359..677bbb7302 100644
--- a/tests/mpi/p4est_2d_refine_01.cc
+++ b/tests/mpi/p4est_2d_refine_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2009 - 2015 by the deal.II authors
+// Copyright (C) 2009 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -47,8 +47,7 @@ void test()
       GridGenerator::hyper_cube(tr);
       tr.refine_global(1);
 
-      std::vector< unsigned int > cell_subd;
-      cell_subd.resize(tr.n_active_cells());
+      std::vector<types::subdomain_id> cell_subd(tr.n_active_cells());
 
       GridTools::get_subdomain_association(tr, cell_subd);
       if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
diff --git a/tests/mpi/p4est_3d_ghost_01.cc b/tests/mpi/p4est_3d_ghost_01.cc
index 37cd1b7fc8..acecad8001 100644
--- a/tests/mpi/p4est_3d_ghost_01.cc
+++ b/tests/mpi/p4est_3d_ghost_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2009 - 2015 by the deal.II authors
+// Copyright (C) 2009 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -61,8 +61,7 @@ void test()
       if (myid==0)
         {
 
-          std::vector< unsigned int > cell_subd;
-          cell_subd.resize(tr.n_active_cells());
+          std::vector<types::subdomain_id> cell_subd(tr.n_active_cells());
 
           GridTools::get_subdomain_association(tr, cell_subd);
           for (unsigned int i=0; i<tr.n_active_cells(); ++i)
diff --git a/tests/mpi/tria_ghost_owners_01.cc b/tests/mpi/tria_ghost_owners_01.cc
index 73464c24fe..2ebb9c7fc0 100644
--- a/tests/mpi/tria_ghost_owners_01.cc
+++ b/tests/mpi/tria_ghost_owners_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2009 - 2015 by the deal.II authors
+// Copyright (C) 2009 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -37,11 +37,11 @@
 
 
 // make sure if i is in s on proc j, j is in s on proc i
-void mpi_check(const std::set<unsigned int> &s)
+void mpi_check(const std::set<types::subdomain_id> &s)
 {
   MPI_Barrier(MPI_COMM_WORLD);
   unsigned int tag = 1234;
-  for (std::set<unsigned int>::iterator it = s.begin();
+  for (std::set<types::subdomain_id>::iterator it = s.begin();
        it != s.end(); ++it)
     MPI_Send(NULL, 0, MPI_INT, *it, tag, MPI_COMM_WORLD);
 
@@ -84,16 +84,16 @@ void test()
       deallog << "* cycle " << ref << std::endl;
 
       deallog << "ghost owners: ";
-      std::set<unsigned int> ghost_owners = tr.ghost_owners();
-      for (std::set<unsigned int>::iterator it = ghost_owners.begin(); it!=ghost_owners.end(); ++it)
+      std::set<types::subdomain_id> ghost_owners = tr.ghost_owners();
+      for (std::set<types::subdomain_id>::iterator it = ghost_owners.begin(); it!=ghost_owners.end(); ++it)
         deallog << *it << " ";
       deallog << std::endl;
 
       mpi_check(ghost_owners);
 
       deallog << "level ghost owners: ";
-      std::set<unsigned int> level_ghost_owners = tr.level_ghost_owners();
-      for (std::set<unsigned int>::iterator it = level_ghost_owners.begin(); it!=level_ghost_owners.end(); ++it)
+      std::set<types::subdomain_id> level_ghost_owners = tr.level_ghost_owners();
+      for (std::set<types::subdomain_id>::iterator it = level_ghost_owners.begin(); it!=level_ghost_owners.end(); ++it)
         deallog << *it << " ";
       deallog << std::endl;
 
@@ -104,7 +104,7 @@ void test()
       Assert(is_subset, ExcInternalError());
 
       Vector<float> indicators (tr.n_active_cells());
-      std::set<unsigned int> neighbors;
+      std::set<types::subdomain_id> neighbors;
       {
         for (typename Triangulation<dim>::active_cell_iterator
              cell = tr.begin_active(); cell != tr.end(); ++cell)
diff --git a/tests/mpi/tria_ghost_owners_02.cc b/tests/mpi/tria_ghost_owners_02.cc
index 23d0fa438c..0afc062003 100644
--- a/tests/mpi/tria_ghost_owners_02.cc
+++ b/tests/mpi/tria_ghost_owners_02.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2009 - 2015 by the deal.II authors
+// Copyright (C) 2009 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -40,11 +40,11 @@
 
 
 // make sure if i is in s on proc j, j is in s on proc i
-void mpi_check(const std::set<unsigned int> &s)
+void mpi_check(const std::set<types::subdomain_id> &s)
 {
   MPI_Barrier(MPI_COMM_WORLD);
   unsigned int tag = 1234;
-  for (std::set<unsigned int>::iterator it = s.begin();
+  for (std::set<types::subdomain_id>::iterator it = s.begin();
        it != s.end(); ++it)
     MPI_Send(NULL, 0, MPI_INT, *it, tag, MPI_COMM_WORLD);
 
@@ -77,16 +77,16 @@ void test()
       deallog << "* cycle " << ref << std::endl;
 
       deallog << "ghost owners: ";
-      std::set<unsigned int> ghost_owners = tr.ghost_owners();
-      for (std::set<unsigned int>::iterator it = ghost_owners.begin(); it!=ghost_owners.end(); ++it)
+      std::set<types::subdomain_id> ghost_owners = tr.ghost_owners();
+      for (std::set<types::subdomain_id>::iterator it = ghost_owners.begin(); it!=ghost_owners.end(); ++it)
         deallog << *it << " ";
       deallog << std::endl;
 
       mpi_check(ghost_owners);
 
       deallog << "level ghost owners: ";
-      std::set<unsigned int> level_ghost_owners = tr.level_ghost_owners();
-      for (std::set<unsigned int>::iterator it = level_ghost_owners.begin(); it!=level_ghost_owners.end(); ++it)
+      std::set<types::subdomain_id> level_ghost_owners = tr.level_ghost_owners();
+      for (std::set<types::subdomain_id>::iterator it = level_ghost_owners.begin(); it!=level_ghost_owners.end(); ++it)
         deallog << *it << " ";
       deallog << std::endl;
 
@@ -97,7 +97,7 @@ void test()
       Assert(is_subset, ExcInternalError());
 
       Vector<float> indicators (tr.n_active_cells());
-      std::set<unsigned int> neighbors;
+      std::set<types::subdomain_id> neighbors;
       {
         for (typename Triangulation<dim>::active_cell_iterator
              cell = tr.begin_active(); cell != tr.end(); ++cell)