From: Wolfgang Bangerth Date: Tue, 31 Oct 2023 21:09:00 +0000 (-0600) Subject: Replace ACCESSOR -> AccessorType and related changes. X-Git-Tag: relicensing~331^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F16228%2Fhead;p=dealii.git Replace ACCESSOR -> AccessorType and related changes. --- diff --git a/include/deal.II/meshworker/loop.h b/include/deal.II/meshworker/loop.h index 7cd4239d32..3576becbb5 100644 --- a/include/deal.II/meshworker/loop.h +++ b/include/deal.II/meshworker/loop.h @@ -51,17 +51,17 @@ namespace internal return false; } - template + template inline bool - is_active_iterator(const TriaActiveIterator &) + is_active_iterator(const TriaActiveIterator &) { return true; } - template + template inline bool is_active_iterator( - const dealii::FilteredIterator> &) + const dealii::FilteredIterator> &) { return true; } @@ -186,10 +186,14 @@ namespace MeshWorker * * @ingroup MeshWorker */ - template + template void cell_action( - ITERATOR cell, + IteratorType cell, DoFInfoBox &dof_info, INFOBOX &info, const std::function @@ -245,7 +249,7 @@ namespace MeshWorker if (integrate_interior_face || integrate_boundary) for (const unsigned int face_no : cell->face_indices()) { - typename ITERATOR::AccessorType::Container::face_iterator face = + typename IteratorType::AccessorType::Container::face_iterator face = cell->face(face_no); if (cell->at_boundary(face_no) && !cell->has_periodic_neighbor(face_no)) @@ -262,7 +266,7 @@ namespace MeshWorker else if (integrate_interior_face) { // Interior face - TriaIterator neighbor = + TriaIterator neighbor = cell->neighbor_or_periodic_neighbor(face_no); types::subdomain_id neighbid = numbers::artificial_subdomain_id; @@ -315,7 +319,7 @@ namespace MeshWorker cell->periodic_neighbor_of_coarser_periodic_neighbor( face_no) : cell->neighbor_of_coarser_neighbor(face_no); - const typename ITERATOR::AccessorType::Container:: + const typename IteratorType::AccessorType::Container:: face_iterator nface = neighbor->face(neighbor_face_no.first); @@ -433,13 +437,13 @@ namespace MeshWorker int spacedim, class DOFINFO, class INFOBOX, - class ASSEMBLER, - class ITERATOR> + typename AssemblerType, + typename IteratorType> void - loop(ITERATOR begin, - std_cxx20::type_identity_t end, - DOFINFO &dinfo, - INFOBOX &info, + loop(IteratorType begin, + std_cxx20::type_identity_t end, + DOFINFO &dinfo, + INFOBOX &info, const std::function &cell_worker, const std::function @@ -448,7 +452,7 @@ namespace MeshWorker DOFINFO &, typename INFOBOX::CellInfo &, typename INFOBOX::CellInfo &)> &face_worker, - ASSEMBLER &assembler, + AssemblerType &assembler, const LoopControl &lctrl = LoopControl()) { DoFInfoBox dof_info(dinfo); @@ -465,17 +469,19 @@ namespace MeshWorker begin, end, [&cell_worker, &boundary_worker, &face_worker, &lctrl]( - ITERATOR cell, INFOBOX &info, DoFInfoBox &dof_info) { - cell_action(cell, - dof_info, - info, - cell_worker, - boundary_worker, - face_worker, - lctrl); + IteratorType cell, INFOBOX &info, DoFInfoBox &dof_info) { + cell_action( + cell, + dof_info, + info, + cell_worker, + boundary_worker, + face_worker, + lctrl); }, [&assembler](const MeshWorker::DoFInfoBox &dinfo) { - dealii::internal::assemble(dinfo, &assembler); + dealii::internal::assemble(dinfo, + &assembler); }, info, dof_info); @@ -488,15 +494,18 @@ namespace MeshWorker * * @ingroup MeshWorker */ - template + template void - integration_loop(ITERATOR begin, - std_cxx20::type_identity_t end, - DoFInfo &dof_info, - IntegrationInfoBox &box, - const LocalIntegrator &integrator, - ASSEMBLER &assembler, - const LoopControl &lctrl = LoopControl()) + integration_loop(IteratorType begin, + std_cxx20::type_identity_t end, + DoFInfo &dof_info, + IntegrationInfoBox &box, + const LocalIntegrator &integrator, + AssemblerType &assembler, + const LoopControl &lctrl = LoopControl()) { std::function &, IntegrationInfo &)>