From: maier Date: Thu, 13 Dec 2012 17:59:24 +0000 (+0000) Subject: A bunch of trivial name changes X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4227f6e1f42146dc94688e3c4a09c781c9d99fe;p=dealii-svn.git A bunch of trivial name changes git-svn-id: https://svn.dealii.org/branches/branch_deprecated@27811 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/dofs/dof_tools.h b/deal.II/include/deal.II/dofs/dof_tools.h index 2c635f08bc..7ec8a8b946 100644 --- a/deal.II/include/deal.II/dofs/dof_tools.h +++ b/deal.II/include/deal.II/dofs/dof_tools.h @@ -497,7 +497,7 @@ namespace DoFTools SparsityPattern &sparsity_pattern, const ConstraintMatrix &constraints = ConstraintMatrix(), const bool keep_constrained_dofs = true, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id); + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id); /** * Locate non-zero entries for @@ -659,7 +659,7 @@ namespace DoFTools SparsityPattern &sparsity_pattern, const ConstraintMatrix &constraints = ConstraintMatrix(), const bool keep_constrained_dofs = true, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id); + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id); /** * @deprecated This is the old diff --git a/deal.II/include/deal.II/grid/tria_accessor.h b/deal.II/include/deal.II/grid/tria_accessor.h index 2c565fb292..e90be3648e 100644 --- a/deal.II/include/deal.II/grid/tria_accessor.h +++ b/deal.II/include/deal.II/grid/tria_accessor.h @@ -2702,12 +2702,12 @@ public: /** * Get the level subdomain id of this cell. This is used for parallel multigrid. */ - types::subdomain_id_t level_subdomain_id () const; + types::subdomain_id level_subdomain_id () const; /** * Set the level subdomain id of this cell. This is used for parallel multigrid. */ - void set_level_subdomain_id (const types::subdomain_id_t new_level_subdomain_id) const; + void set_level_subdomain_id (const types::subdomain_id new_level_subdomain_id) const; /** diff --git a/deal.II/include/deal.II/grid/tria_accessor.templates.h b/deal.II/include/deal.II/grid/tria_accessor.templates.h index 4bc326d50a..b34c505fcb 100644 --- a/deal.II/include/deal.II/grid/tria_accessor.templates.h +++ b/deal.II/include/deal.II/grid/tria_accessor.templates.h @@ -2887,7 +2887,7 @@ CellAccessor::is_locally_owned () const return true; #else const types::subdomain_id subdomain = this->subdomain_id(); - if (subdomain == types::artificial_subdomain_id) + if (subdomain == numbers::artificial_subdomain_id) return false; const parallel::distributed::Triangulation *pdt @@ -2910,7 +2910,7 @@ CellAccessor::is_ghost () const return false; #else const types::subdomain_id subdomain = this->subdomain_id(); - if (subdomain == types::artificial_subdomain_id) + if (subdomain == numbers::artificial_subdomain_id) return false; const parallel::distributed::Triangulation *pdt @@ -2933,7 +2933,7 @@ CellAccessor::is_artificial () const #ifndef DEAL_II_USE_P4EST return false; #else - return (this->subdomain_id() == types::artificial_subdomain_id); + return (this->subdomain_id() == numbers::artificial_subdomain_id); #endif } diff --git a/deal.II/include/deal.II/grid/tria_levels.h b/deal.II/include/deal.II/grid/tria_levels.h index 8fa3eb101a..70f35c0a4d 100644 --- a/deal.II/include/deal.II/grid/tria_levels.h +++ b/deal.II/include/deal.II/grid/tria_levels.h @@ -143,7 +143,7 @@ namespace internal /** * for parallel multigrid */ - std::vector level_subdomain_ids; + std::vector level_subdomain_ids; /** * One integer for every consecutive @@ -248,7 +248,7 @@ namespace internal std::vector coarsen_flags; std::vector > neighbors; std::vector subdomain_ids; - std::vector level_subdomain_ids; + std::vector level_subdomain_ids; std::vector parents; // The following is not used diff --git a/deal.II/include/deal.II/numerics/error_estimator.h b/deal.II/include/deal.II/numerics/error_estimator.h index 5bdce1a2d1..4e8a40b1ad 100644 --- a/deal.II/include/deal.II/numerics/error_estimator.h +++ b/deal.II/include/deal.II/numerics/error_estimator.h @@ -349,7 +349,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = numbers::invalid_unsigned_int, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); /** @@ -366,7 +366,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); /** @@ -406,7 +406,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); /** @@ -423,7 +423,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -443,7 +443,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -462,7 +462,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -482,7 +482,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -501,7 +501,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -612,7 +612,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); /** @@ -629,7 +629,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); /** @@ -669,7 +669,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); /** @@ -686,7 +686,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -706,7 +706,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -725,7 +725,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -745,7 +745,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); @@ -764,7 +764,7 @@ public: const ComponentMask &component_mask = ComponentMask(), const Function *coefficients = 0, const unsigned int n_threads = multithread_info.n_default_threads, - const types::subdomain_id subdomain_id = types::invalid_subdomain_id, + const types::subdomain_id subdomain_id = numbers::invalid_subdomain_id, const types::material_id material_id = numbers::invalid_material_id); /** diff --git a/deal.II/source/distributed/tria.cc b/deal.II/source/distributed/tria.cc index cc3d29cfb1..09f62e6f32 100644 --- a/deal.II/source/distributed/tria.cc +++ b/deal.II/source/distributed/tria.cc @@ -1035,7 +1035,7 @@ namespace // not local. delete_all_children (dealii_cell->child(c)); dealii_cell->child(c) - ->recursively_set_subdomain_id(types::artificial_subdomain_id); + ->recursively_set_subdomain_id(numbers::artificial_subdomain_id); } else { @@ -1968,7 +1968,7 @@ namespace parallel { std::string fname=std::string(filename)+".info"; std::ofstream f(fname.c_str()); - f << Utilities::System::get_n_mpi_processes (mpi_communicator) << " " + f << Utilities::MPI::n_mpi_processes (mpi_communicator) << " " << real_data_size << " " << attached_data_pack_callbacks.size() << std::endl; } @@ -2010,7 +2010,7 @@ namespace parallel std::string fname=std::string(filename)+".info"; std::ifstream f(fname.c_str()); f >> numcpus >> attached_size >> attached_count; - if (numcpus != Utilities::System::get_n_mpi_processes (mpi_communicator)) + if (numcpus != Utilities::MPI::n_mpi_processes (mpi_communicator)) throw ExcInternalError(); } @@ -2454,7 +2454,7 @@ namespace parallel cell = this->begin(0); cell != this->end(0); ++cell) - cell->recursively_set_subdomain_id(types::artificial_subdomain_id); + cell->recursively_set_subdomain_id(numbers::artificial_subdomain_id); do { @@ -2476,7 +2476,7 @@ namespace parallel == false) { delete_all_children (cell); - cell->set_subdomain_id (types::artificial_subdomain_id); + cell->set_subdomain_id (numbers::artificial_subdomain_id); } else @@ -2583,7 +2583,7 @@ namespace parallel { if (cell->subdomain_id() != my_subdomain && - cell->subdomain_id() != types::artificial_subdomain_id) + cell->subdomain_id() != numbers::artificial_subdomain_id) ++num_ghosts; } diff --git a/deal.II/source/dofs/dof_handler_policy.cc b/deal.II/source/dofs/dof_handler_policy.cc index 868b9aa43a..00358b0d10 100644 --- a/deal.II/source/dofs/dof_handler_policy.cc +++ b/deal.II/source/dofs/dof_handler_policy.cc @@ -214,7 +214,7 @@ namespace internal /** * Distribute degrees of freedom on all cells, or on cells with the * correct subdomain_id if the corresponding argument is not equal to - * types::invalid_subdomain_id. Return the total number of dofs + * numbers::invalid_subdomain_id. Return the total number of dofs * returned. */ template @@ -242,7 +242,7 @@ namespace internal endc = dof_handler.end(); for (; cell != endc; ++cell) - if ((subdomain_id == types::invalid_subdomain_id) + if ((subdomain_id == numbers::invalid_subdomain_id) || (cell->subdomain_id() == subdomain_id)) next_free_dof @@ -253,7 +253,7 @@ namespace internal // update the cache used for cell dof indices for (typename DoFHandler::cell_iterator cell = dof_handler.begin(); cell != dof_handler.end(); ++cell) - if (cell->subdomain_id() != types::artificial_subdomain_id) + if (cell->subdomain_id() != numbers::artificial_subdomain_id) cell->update_cell_dof_indices_cache (); // finally restore the user flags @@ -488,7 +488,7 @@ namespace internal { const unsigned int n_dofs = Implementation::distribute_dofs (0, - types::invalid_subdomain_id, + numbers::invalid_subdomain_id, dof_handler); // now set the elements of the @@ -1482,8 +1482,7 @@ namespace internal // * Create global_dof_indexsets by // transferring our own owned_dofs to // every other machine. - const unsigned int n_cpus = Utilities::System:: - get_n_mpi_processes (tr->get_communicator()); + const unsigned int n_cpus = Utilities::MPI::n_mpi_processes (tr->get_communicator()); // Serialize our IndexSet and // determine size. diff --git a/deal.II/source/dofs/dof_tools.cc b/deal.II/source/dofs/dof_tools.cc index 783311e152..3d34a2d1ca 100644 --- a/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/source/dofs/dof_tools.cc @@ -73,9 +73,9 @@ namespace DoFTools // subdomain. Not setting a subdomain is also okay, because we skip // ghost cells in the loop below. Assert ( - (dof.get_tria().locally_owned_subdomain() == types::invalid_subdomain_id) + (dof.get_tria().locally_owned_subdomain() == numbers::invalid_subdomain_id) || - (subdomain_id == types::invalid_subdomain_id) + (subdomain_id == numbers::invalid_subdomain_id) || (subdomain_id == dof.get_tria().locally_owned_subdomain()), ExcMessage ("For parallel::distributed::Triangulation objects and " @@ -91,7 +91,7 @@ namespace DoFTools // type, we only have to do the work if the current cell is owned by // the calling processor. Otherwise, just continue. for (; cell!=endc; ++cell) - if (((subdomain_id == types::invalid_subdomain_id) + if (((subdomain_id == numbers::invalid_subdomain_id) || (subdomain_id == cell->subdomain_id())) && @@ -136,9 +136,9 @@ namespace DoFTools // subdomain. Not setting a subdomain is also okay, because we skip // ghost cells in the loop below. Assert ( - (dof.get_tria().locally_owned_subdomain() == types::invalid_subdomain_id) + (dof.get_tria().locally_owned_subdomain() == numbers::invalid_subdomain_id) || - (subdomain_id == types::invalid_subdomain_id) + (subdomain_id == numbers::invalid_subdomain_id) || (subdomain_id == dof.get_tria().locally_owned_subdomain()), ExcMessage ("For parallel::distributed::Triangulation objects and " @@ -201,7 +201,7 @@ namespace DoFTools // type, we only have to do the work if the current cell is owned by // the calling processor. Otherwise, just continue. for (; cell!=endc; ++cell) - if (((subdomain_id == types::invalid_subdomain_id) + if (((subdomain_id == numbers::invalid_subdomain_id) || (subdomain_id == cell->subdomain_id())) && @@ -503,9 +503,9 @@ namespace DoFTools // subdomain. Not setting a subdomain is also okay, because we skip // ghost cells in the loop below. Assert ( - (dof.get_tria().locally_owned_subdomain() == types::invalid_subdomain_id) + (dof.get_tria().locally_owned_subdomain() == numbers::invalid_subdomain_id) || - (subdomain_id == types::invalid_subdomain_id) + (subdomain_id == numbers::invalid_subdomain_id) || (subdomain_id == dof.get_tria().locally_owned_subdomain()), ExcMessage ("For parallel::distributed::Triangulation objects and " @@ -528,7 +528,7 @@ namespace DoFTools // type, we only have to do the work if the current cell is owned by // the calling processor. Otherwise, just continue. for (; cell!=endc; ++cell) - if (((subdomain_id == types::invalid_subdomain_id) + if (((subdomain_id == numbers::invalid_subdomain_id) || (subdomain_id == cell->subdomain_id())) && @@ -4140,7 +4140,7 @@ namespace DoFTools // preset all values by an invalid value std::fill_n (subdomain_association.begin(), dof_handler.n_dofs(), - types::invalid_subdomain_id); + numbers::invalid_subdomain_id); std::vector local_dof_indices; local_dof_indices.reserve (max_dofs_per_cell(dof_handler)); @@ -4183,7 +4183,7 @@ namespace DoFTools Assert (std::find (subdomain_association.begin(), subdomain_association.end(), - types::invalid_subdomain_id) + numbers::invalid_subdomain_id) == subdomain_association.end(), ExcInternalError()); } @@ -4214,7 +4214,7 @@ namespace DoFTools // If we have a distributed::Triangulation only allow locally_owned // subdomain. Assert ( - (dof_handler.get_tria().locally_owned_subdomain() == types::invalid_subdomain_id) + (dof_handler.get_tria().locally_owned_subdomain() == numbers::invalid_subdomain_id) || (subdomain == dof_handler.get_tria().locally_owned_subdomain()), ExcMessage ("For parallel::distributed::Triangulation objects and " diff --git a/deal.II/source/fe/fe_tools.cc b/deal.II/source/fe/fe_tools.cc index b1d9bd0158..a6c044a8ab 100644 --- a/deal.II/source/fe/fe_tools.cc +++ b/deal.II/source/fe/fe_tools.cc @@ -1354,7 +1354,7 @@ namespace FETools for (; cell1!=endc1; ++cell1, ++cell2) if ((cell1->subdomain_id() == subdomain_id) || - (subdomain_id == types::invalid_subdomain_id)) + (subdomain_id == numbers::invalid_subdomain_id)) { Assert(cell1->get_fe().n_components() == cell2->get_fe().n_components(), ExcDimensionMismatch (cell1->get_fe().n_components(), @@ -1508,7 +1508,7 @@ namespace FETools for (; cell!=endc; ++cell) if ((cell->subdomain_id() == subdomain_id) || - (subdomain_id == types::invalid_subdomain_id)) + (subdomain_id == numbers::invalid_subdomain_id)) { if (hanging_nodes_not_allowed) for (unsigned int face=0; face::faces_per_cell; ++face) @@ -1581,7 +1581,7 @@ namespace FETools for (; cell!=endc; ++cell) if ((cell->subdomain_id() == subdomain_id) || - (subdomain_id == types::invalid_subdomain_id)) + (subdomain_id == numbers::invalid_subdomain_id)) { Assert(cell->get_fe().n_components() == fe2.n_components(), ExcDimensionMismatch(cell->get_fe().n_components(), @@ -1755,7 +1755,7 @@ namespace FETools for (; cell!=endc; ++cell) if ((cell->subdomain_id() == subdomain_id) || - (subdomain_id == types::invalid_subdomain_id)) + (subdomain_id == numbers::invalid_subdomain_id)) { if (hanging_nodes_not_allowed) for (unsigned int face=0; face::faces_per_cell; ++face) diff --git a/deal.II/source/grid/tria.cc b/deal.II/source/grid/tria.cc index 5f9f470826..ba79d4a93b 100644 --- a/deal.II/source/grid/tria.cc +++ b/deal.II/source/grid/tria.cc @@ -12046,7 +12046,7 @@ template types::subdomain_id Triangulation::locally_owned_subdomain () const { - return types::invalid_subdomain_id; + return numbers::invalid_subdomain_id; } diff --git a/deal.II/source/numerics/error_estimator.cc b/deal.II/source/numerics/error_estimator.cc index 374b010914..34644c1b41 100644 --- a/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/source/numerics/error_estimator.cc @@ -903,7 +903,7 @@ namespace internal // material_id), or if one of the // neighbors behind the face is on // the subdomain we care for - if ( ! ( ((subdomain_id == types::invalid_subdomain_id) + if ( ! ( ((subdomain_id == numbers::invalid_subdomain_id) || (cell->subdomain_id() == subdomain_id)) && @@ -923,7 +923,7 @@ namespace internal if (face->has_children() == false) care_for_cell |= ((cell->neighbor(face_no)->subdomain_id() == subdomain_id) || - (subdomain_id == types::invalid_subdomain_id)) + (subdomain_id == numbers::invalid_subdomain_id)) && ((cell->neighbor(face_no)->material_id() == material_id) || @@ -941,7 +941,7 @@ namespace internal ->material_id() == material_id) && (subdomain_id == - types::invalid_subdomain_id))) + numbers::invalid_subdomain_id))) { care_for_cell = true; break; @@ -1176,7 +1176,7 @@ estimate (const Mapping<1,spacedim> &mapping, if (dynamic_cast*> (&dof_handler.get_tria()) != 0) - Assert ((subdomain_id_ == types::invalid_subdomain_id) + Assert ((subdomain_id_ == numbers::invalid_subdomain_id) || (subdomain_id_ == dynamic_cast&> @@ -1287,7 +1287,7 @@ estimate (const Mapping<1,spacedim> &mapping, typename DH::active_cell_iterator cell = dof_handler.begin_active(); for (unsigned int cell_index=0; cell != dof_handler.end(); ++cell, ++cell_index) - if (((subdomain_id == types::invalid_subdomain_id) + if (((subdomain_id == numbers::invalid_subdomain_id) || (cell->subdomain_id() == subdomain_id)) && @@ -1527,7 +1527,7 @@ estimate (const Mapping &mapping, if (dynamic_cast*> (&dof_handler.get_tria()) != 0) - Assert ((subdomain_id_ == types::invalid_subdomain_id) + Assert ((subdomain_id_ == numbers::invalid_subdomain_id) || (subdomain_id_ == dynamic_cast&> @@ -1637,7 +1637,7 @@ estimate (const Mapping &mapping, for (typename DH::active_cell_iterator cell=dof_handler.begin_active(); cell!=dof_handler.end(); ++cell, ++present_cell) - if ( ((subdomain_id == types::invalid_subdomain_id) + if ( ((subdomain_id == numbers::invalid_subdomain_id) || (cell->subdomain_id() == subdomain_id)) &&