From 104da563836a7bf02bdfe4739bf4fffd07c076f6 Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Tue, 14 Sep 2021 09:02:39 +0200 Subject: [PATCH] Rename VECTOR to VectorType --- .../deal.II/non_matching/mesh_classifier.h | 5 +-- source/non_matching/mesh_classifier.cc | 38 +++++++++---------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/include/deal.II/non_matching/mesh_classifier.h b/include/deal.II/non_matching/mesh_classifier.h index e6bae28b96..1a019dffb0 100644 --- a/include/deal.II/non_matching/mesh_classifier.h +++ b/include/deal.II/non_matching/mesh_classifier.h @@ -114,10 +114,9 @@ namespace NonMatching * Vector. The triangulation attached to DoFHandler is the one that will be * classified. */ - template + template MeshClassifier(const DoFHandler &level_set_dof_handler, - const VECTOR & level_set); - + const VectorType & level_set); /** * Constructor. Takes the triangulation that should be classified, a diff --git a/source/non_matching/mesh_classifier.cc b/source/non_matching/mesh_classifier.cc index 9af37da25c..3d919a69d5 100644 --- a/source/non_matching/mesh_classifier.cc +++ b/source/non_matching/mesh_classifier.cc @@ -51,9 +51,9 @@ namespace NonMatching * vector are negative/positive, otherwise return * LocationToLevelSet::intersected. */ - template + template LocationToLevelSet - location_from_dof_signs(const VECTOR &local_levelset_values) + location_from_dof_signs(const VectorType &local_levelset_values) { const auto min_max_element = std::minmax_element(local_levelset_values.begin(), @@ -73,7 +73,7 @@ namespace NonMatching * The concrete LevelSetDescription used when the level set function is * described as a (DoFHandler, Vector)-pair. */ - template + template class DiscreteLevelSetDescription : public LevelSetDescription { public: @@ -81,7 +81,7 @@ namespace NonMatching * Constructor. */ DiscreteLevelSetDescription(const DoFHandler &dof_handler, - const VECTOR & level_set); + const VectorType & level_set); /** * Return the FECollection of the DoFHandler passed to the constructor. @@ -117,33 +117,33 @@ namespace NonMatching * Pointer to the vector containing the level set function's global dof * values. */ - const SmartPointer level_set; + const SmartPointer level_set; }; - template - DiscreteLevelSetDescription::DiscreteLevelSetDescription( + template + DiscreteLevelSetDescription::DiscreteLevelSetDescription( const DoFHandler &dof_handler, - const VECTOR & level_set) + const VectorType & level_set) : dof_handler(&dof_handler) , level_set(&level_set) {} - template + template const hp::FECollection & - DiscreteLevelSetDescription::get_fe_collection() const + DiscreteLevelSetDescription::get_fe_collection() const { return dof_handler->get_fe_collection(); } - template + template void - DiscreteLevelSetDescription::get_local_level_set_values( + DiscreteLevelSetDescription::get_local_level_set_values( const typename Triangulation::active_cell_iterator &cell, const unsigned int face_index, Vector &local_levelset_values) @@ -163,15 +163,15 @@ namespace NonMatching for (unsigned int i = 0; i < dof_indices.size(); i++) local_levelset_values[i] = - dealii::internal::ElementAccess::get(*level_set, - dof_indices[i]); + dealii::internal::ElementAccess::get(*level_set, + dof_indices[i]); } - template + template unsigned int - DiscreteLevelSetDescription::active_fe_index( + DiscreteLevelSetDescription::active_fe_index( const typename Triangulation::active_cell_iterator &cell) const { typename DoFHandler::active_cell_iterator cell_with_dofs( @@ -301,13 +301,13 @@ namespace NonMatching template - template + template MeshClassifier::MeshClassifier(const DoFHandler &dof_handler, - const VECTOR & level_set) + const VectorType & level_set) : triangulation(&dof_handler.get_triangulation()) , level_set_description( std::make_unique>( + DiscreteLevelSetDescription>( dof_handler, level_set)) { -- 2.39.5