From: Daniel Arndt Date: Tue, 28 Apr 2020 03:05:16 +0000 (-0400) Subject: Fix more funny spacings X-Git-Tag: v9.2.0-rc1~168^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9976%2Fhead;p=dealii.git Fix more funny spacings --- diff --git a/include/deal.II/lac/tensor_product_matrix.h b/include/deal.II/lac/tensor_product_matrix.h index 061ff661ee..653901aec5 100644 --- a/include/deal.II/lac/tensor_product_matrix.h +++ b/include/deal.II/lac/tensor_product_matrix.h @@ -691,7 +691,7 @@ TensorProductMatrixSymmetricSum::reinit_impl( this->eigenvectors[dir].reinit(mass_matrices[dir].n_cols(), mass_matrices[dir].n_rows()); this->eigenvalues[dir].resize(mass_matrices[dir].n_cols()); - internal::TensorProductMatrix ::spectral_assembly( + internal::TensorProductMatrix::spectral_assembly( &(mass_matrices[dir](0, 0)), &(derivative_matrices[dir](0, 0)), mass_matrices[dir].n_rows(), @@ -851,7 +851,7 @@ TensorProductMatrixSymmetricSum, n_rows_1d>:: Number * eigenvec_begin = eigenvectors_flat.data(); Number * eigenval_begin = eigenvalues_flat.data(); for (unsigned int lane = 0; lane < macro_size; ++lane) - internal::TensorProductMatrix ::spectral_assembly( + internal::TensorProductMatrix::spectral_assembly( mass_cbegin + nm * lane, deriv_cbegin + nm * lane, n_rows, diff --git a/include/deal.II/matrix_free/dof_info.templates.h b/include/deal.II/matrix_free/dof_info.templates.h index b717de9bfc..724197e3c6 100644 --- a/include/deal.II/matrix_free/dof_info.templates.h +++ b/include/deal.II/matrix_free/dof_info.templates.h @@ -254,7 +254,7 @@ namespace internal template void - DoFInfo ::read_dof_indices( + DoFInfo::read_dof_indices( const std::vector &local_indices, const std::vector & lexicographic_inv, const AffineConstraints & constraints, @@ -425,7 +425,7 @@ namespace internal void - DoFInfo ::assign_ghosts(const std::vector &boundary_cells) + DoFInfo::assign_ghosts(const std::vector &boundary_cells) { Assert(boundary_cells.size() < row_starts.size(), ExcInternalError()); @@ -544,7 +544,7 @@ namespace internal void - DoFInfo ::reorder_cells( + DoFInfo::reorder_cells( const TaskInfo & task_info, const std::vector & renumbering, const std::vector & constraint_pool_row_index, @@ -1631,7 +1631,7 @@ namespace internal void - DoFInfo ::compute_dof_renumbering( + DoFInfo::compute_dof_renumbering( std::vector &renumbering) { const unsigned int local_size = vector_partitioner->local_size(); diff --git a/include/deal.II/matrix_free/mapping_info.templates.h b/include/deal.II/matrix_free/mapping_info.templates.h index dcfab025c7..9a41f9e666 100644 --- a/include/deal.II/matrix_free/mapping_info.templates.h +++ b/include/deal.II/matrix_free/mapping_info.templates.h @@ -46,7 +46,7 @@ namespace internal typename Number, typename VectorizedArrayType> MappingInfoStorage:: - QuadratureDescriptor ::QuadratureDescriptor() + QuadratureDescriptor::QuadratureDescriptor() : n_q_points(numbers::invalid_unsigned_int) {} @@ -58,7 +58,7 @@ namespace internal typename VectorizedArrayType> void MappingInfoStorage:: - QuadratureDescriptor ::initialize( + QuadratureDescriptor::initialize( const Quadrature<1> &quadrature_1d, const UpdateFlags update_flags_inner_faces) { @@ -116,7 +116,7 @@ namespace internal typename VectorizedArrayType> std::size_t MappingInfoStorage:: - QuadratureDescriptor ::memory_consumption() const + QuadratureDescriptor::memory_consumption() const { std::size_t memory = sizeof(this) + quadrature.memory_consumption() + quadrature_weights.memory_consumption() + diff --git a/include/deal.II/numerics/data_out_dof_data.templates.h b/include/deal.II/numerics/data_out_dof_data.templates.h index ea183e4895..8f29d90ce0 100644 --- a/include/deal.II/numerics/data_out_dof_data.templates.h +++ b/include/deal.II/numerics/data_out_dof_data.templates.h @@ -1019,7 +1019,7 @@ namespace internal // get here reinterpret_cast< std::vector> &>( patch_hessians)); } diff --git a/include/deal.II/numerics/matrix_creator.templates.h b/include/deal.II/numerics/matrix_creator.templates.h index aeb070944b..207ae1c679 100644 --- a/include/deal.II/numerics/matrix_creator.templates.h +++ b/include/deal.II/numerics/matrix_creator.templates.h @@ -1429,7 +1429,7 @@ namespace MatrixCreator create_hp_boundary_mass_matrix_1( typename hp::DoFHandler::active_cell_iterator const &cell, MatrixCreator::internal::AssemblerBoundary::Scratch const &, - MatrixCreator::internal::AssemblerBoundary :: + MatrixCreator::internal::AssemblerBoundary:: CopyData, number> ©_data, hp::MappingCollection const & mapping, hp::FECollection const & fe_collection, @@ -1684,7 +1684,7 @@ namespace MatrixCreator template void copy_hp_boundary_mass_matrix_1( - MatrixCreator::internal::AssemblerBoundary :: + MatrixCreator::internal::AssemblerBoundary:: CopyData, number> const ©_data, std::map *> const & boundary_functions, @@ -1872,7 +1872,7 @@ namespace MatrixCreator typename hp::DoFHandler::active_cell_iterator const & cell, MatrixCreator::internal::AssemblerBoundary::Scratch const &scratch_data, - MatrixCreator::internal::AssemblerBoundary :: + MatrixCreator::internal::AssemblerBoundary:: CopyData, number> ©_data) { internal::create_hp_boundary_mass_matrix_1(cell, scratch_data, @@ -1885,7 +1885,7 @@ namespace MatrixCreator component_mapping); }, [&boundary_functions, &dof_to_boundary_mapping, &matrix, &rhs_vector]( - MatrixCreator::internal::AssemblerBoundary :: + MatrixCreator::internal::AssemblerBoundary:: CopyData, number> const ©_data) { internal::copy_hp_boundary_mass_matrix_1(copy_data, boundary_functions, diff --git a/include/deal.II/numerics/vector_tools_integrate_difference.templates.h b/include/deal.II/numerics/vector_tools_integrate_difference.templates.h index b17bcfee5d..bc3f7c63e3 100644 --- a/include/deal.II/numerics/vector_tools_integrate_difference.templates.h +++ b/include/deal.II/numerics/vector_tools_integrate_difference.templates.h @@ -1052,16 +1052,16 @@ namespace VectorTools const Function * weight, const double exponent) { - internal ::do_integrate_difference(hp::MappingCollection( - mapping), - dof, - fe_function, - exact_solution, - difference, - hp::QCollection(q), - norm, - weight, - exponent); + internal::do_integrate_difference(hp::MappingCollection( + mapping), + dof, + fe_function, + exact_solution, + difference, + hp::QCollection(q), + norm, + weight, + exponent); } template @@ -1077,16 +1077,16 @@ namespace VectorTools const Function * weight, const double exponent) { - internal ::do_integrate_difference(hp::MappingCollection( - mapping), - dof, - fe_function, - exact_solution, - difference, - hp::QCollection(q), - norm, - weight, - exponent); + internal::do_integrate_difference(hp::MappingCollection( + mapping), + dof, + fe_function, + exact_solution, + difference, + hp::QCollection(q), + norm, + weight, + exponent); } @@ -1102,7 +1102,7 @@ namespace VectorTools const Function * weight, const double exponent) { - internal ::do_integrate_difference( + internal::do_integrate_difference( hp::StaticMappingQ1::mapping_collection, dof, fe_function, @@ -1127,7 +1127,7 @@ namespace VectorTools const Function * weight, const double exponent) { - internal ::do_integrate_difference( + internal::do_integrate_difference( hp::StaticMappingQ1::mapping_collection, dof, fe_function, @@ -1154,16 +1154,16 @@ namespace VectorTools const Function * weight, const double exponent) { - internal ::do_integrate_difference(hp::MappingCollection( - mapping), - dof, - fe_function, - exact_solution, - difference, - q, - norm, - weight, - exponent); + internal::do_integrate_difference(hp::MappingCollection( + mapping), + dof, + fe_function, + exact_solution, + difference, + q, + norm, + weight, + exponent); } template @@ -1180,16 +1180,16 @@ namespace VectorTools const Function * weight, const double exponent) { - internal ::do_integrate_difference(hp::MappingCollection( - mapping), - dof, - fe_function, - exact_solution, - difference, - q, - norm, - weight, - exponent); + internal::do_integrate_difference(hp::MappingCollection( + mapping), + dof, + fe_function, + exact_solution, + difference, + q, + norm, + weight, + exponent); } @@ -1205,7 +1205,7 @@ namespace VectorTools const Function * weight, const double exponent) { - internal ::do_integrate_difference( + internal::do_integrate_difference( hp::StaticMappingQ1::mapping_collection, dof, fe_function, @@ -1229,7 +1229,7 @@ namespace VectorTools const Function * weight, const double exponent) { - internal ::do_integrate_difference( + internal::do_integrate_difference( hp::StaticMappingQ1::mapping_collection, dof, fe_function, diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc index 8aa5670873..ccc65310c0 100644 --- a/source/distributed/tria.cc +++ b/source/distributed/tria.cc @@ -2257,8 +2257,8 @@ namespace parallel return sizeof(unsigned int) + tree_index.size() * sizeof(unsigned int) + quadrants.size() * - sizeof(typename dealii::internal::p4est ::types< - dim>::quadrant) + + sizeof( + typename dealii::internal::p4est::types::quadrant) + vertex_indices.size() * sizeof(unsigned int) + vertices.size() * sizeof(dealii::Point); } diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc index 4ab9b295e6..d30886f4ee 100644 --- a/source/grid/grid_tools.cc +++ b/source/grid/grid_tools.cc @@ -3547,7 +3547,7 @@ namespace GridTools "This function is only valid for a list of cells that " "have children (i.e., no cell in the list may be active).")); - internal::FixUpDistortedChildCells ::fix_up_faces( + internal::FixUpDistortedChildCells::fix_up_faces( cell, std::integral_constant(), std::integral_constant()); diff --git a/source/grid/tria.cc b/source/grid/tria.cc index 3bc8fa488a..200926dc3e 100644 --- a/source/grid/tria.cc +++ b/source/grid/tria.cc @@ -1827,7 +1827,7 @@ namespace internal ++next_free_line; next_free_line->set( - internal::TriangulationImplementation ::TriaObject<1>( + internal::TriangulationImplementation::TriaObject<1>( cells[cell].vertices[0], cells[cell].vertices[1])); next_free_line->set_used_flag(); next_free_line->set_material_id(cells[cell].material_id); @@ -2939,7 +2939,7 @@ namespace internal // make the cell out of // these iterators - cell->set(internal::TriangulationImplementation ::TriaObject<3>( + cell->set(internal::TriangulationImplementation::TriaObject<3>( face_iterator[0]->index(), face_iterator[1]->index(), face_iterator[2]->index(), @@ -4824,7 +4824,7 @@ namespace internal cell->set_children(0, first_child->index()); first_child->clear_children(); first_child->set( - internal::TriangulationImplementation ::TriaObject<1>( + internal::TriangulationImplementation::TriaObject<1>( cell->vertex_index(0), next_unused_vertex)); first_child->set_material_id(cell->material_id()); first_child->set_manifold_id(cell->manifold_id()); @@ -4875,7 +4875,7 @@ namespace internal // insert second child second_child->clear_children(); second_child->set( - internal::TriangulationImplementation ::TriaObject<1>( + internal::TriangulationImplementation::TriaObject<1>( next_unused_vertex, cell->vertex_index(1))); second_child->set_neighbor(0, first_child); second_child->set_material_id(cell->material_id()); @@ -5152,10 +5152,10 @@ namespace internal "Internal error: We want to use a cell during refinement that should be unused, but turns out not to be.")); children[0]->set( - internal::TriangulationImplementation ::TriaObject<1>( + internal::TriangulationImplementation::TriaObject<1>( line->vertex_index(0), next_unused_vertex)); children[1]->set( - internal::TriangulationImplementation ::TriaObject<1>( + internal::TriangulationImplementation::TriaObject<1>( next_unused_vertex, line->vertex_index(1))); children[0]->set_used_flag(); @@ -5621,10 +5621,10 @@ namespace internal "Internal error: We want to use a cell during refinement that should be unused, but turns out not to be.")); children[0]->set( - internal::TriangulationImplementation ::TriaObject<1>( + internal::TriangulationImplementation::TriaObject<1>( line->vertex_index(0), next_unused_vertex)); children[1]->set( - internal::TriangulationImplementation ::TriaObject<1>( + internal::TriangulationImplementation::TriaObject<1>( next_unused_vertex, line->vertex_index(1))); children[0]->set_used_flag(); @@ -5804,7 +5804,7 @@ namespace internal if (aniso_quad_ref_case == RefinementCase::cut_x) { new_quads[0]->set( - internal::TriangulationImplementation ::TriaObject<2>( + internal::TriangulationImplementation::TriaObject<2>( quad->line_index(0), new_line->index(), quad->line(2) @@ -5814,7 +5814,7 @@ namespace internal ->child(index[0][quad->line_orientation(3)]) ->index())); new_quads[1]->set( - internal::TriangulationImplementation ::TriaObject<2>( + internal::TriangulationImplementation::TriaObject<2>( new_line->index(), quad->line_index(1), quad->line(2) @@ -5827,7 +5827,7 @@ namespace internal else { new_quads[0]->set( - internal::TriangulationImplementation ::TriaObject<2>( + internal::TriangulationImplementation::TriaObject<2>( quad->line(0) ->child(index[0][quad->line_orientation(0)]) ->index(), @@ -5837,7 +5837,7 @@ namespace internal quad->line_index(2), new_line->index())); new_quads[1]->set( - internal::TriangulationImplementation ::TriaObject<2>( + internal::TriangulationImplementation::TriaObject<2>( quad->line(0) ->child(index[1][quad->line_orientation(0)]) ->index(), @@ -6526,7 +6526,7 @@ namespace internal quad->set_children(0, new_quads[0]->index()); quad->set_children(2, new_quads[2]->index()); new_quads[0]->set( - internal::TriangulationImplementation ::TriaObject<2>( + internal::TriangulationImplementation::TriaObject<2>( line_indices[0], line_indices[8], line_indices[4], @@ -6535,25 +6535,25 @@ namespace internal quad->set_refinement_case(RefinementCase<2>::cut_xy); new_quads[0]->set( - internal::TriangulationImplementation ::TriaObject<2>( + internal::TriangulationImplementation::TriaObject<2>( line_indices[0], line_indices[8], line_indices[4], line_indices[10])); new_quads[1]->set( - internal::TriangulationImplementation ::TriaObject<2>( + internal::TriangulationImplementation::TriaObject<2>( line_indices[8], line_indices[2], line_indices[5], line_indices[11])); new_quads[2]->set( - internal::TriangulationImplementation ::TriaObject<2>( + internal::TriangulationImplementation::TriaObject<2>( line_indices[1], line_indices[9], line_indices[10], line_indices[6])); new_quads[3]->set( - internal::TriangulationImplementation ::TriaObject<2>( + internal::TriangulationImplementation::TriaObject<2>( line_indices[9], line_indices[3], line_indices[11], @@ -6971,7 +6971,7 @@ namespace internal // set up the new quad, line numbering is as // indicated above new_quads[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[0], line_indices[1], line_indices[2], @@ -7059,7 +7059,7 @@ namespace internal }; new_hexes[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[1], quad_indices[0], quad_indices[3], @@ -7067,7 +7067,7 @@ namespace internal quad_indices[7], quad_indices[9])); new_hexes[1]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[0], quad_indices[2], quad_indices[4], @@ -7200,7 +7200,7 @@ namespace internal // set up the new quad, line numbering is as // indicated above new_quads[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[2], line_indices[3], line_indices[0], @@ -7288,7 +7288,7 @@ namespace internal }; new_hexes[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[1], quad_indices[3], quad_indices[5], @@ -7296,7 +7296,7 @@ namespace internal quad_indices[7], quad_indices[9])); new_hexes[1]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[2], quad_indices[4], quad_indices[0], @@ -7431,7 +7431,7 @@ namespace internal // set up the new quad, line numbering is as // indicated above new_quads[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[0], line_indices[1], line_indices[2], @@ -7519,7 +7519,7 @@ namespace internal }; new_hexes[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[1], quad_indices[3], quad_indices[5], @@ -7527,7 +7527,7 @@ namespace internal quad_indices[9], quad_indices[0])); new_hexes[1]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[2], quad_indices[4], quad_indices[6], @@ -7800,25 +7800,25 @@ namespace internal // *---*---*y *-6-*-7-* new_quads[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[2], line_indices[12], line_indices[4], line_indices[8])); new_quads[1]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[12], line_indices[3], line_indices[5], line_indices[9])); new_quads[2]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[6], line_indices[10], line_indices[0], line_indices[12])); new_quads[3]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[7], line_indices[11], line_indices[12], @@ -7948,7 +7948,7 @@ namespace internal 3, f_or[5], f_fl[5], f_ro[5]))}; new_hexes[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[4], quad_indices[0], quad_indices[8], @@ -7956,7 +7956,7 @@ namespace internal quad_indices[12], quad_indices[16])); new_hexes[1]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[0], quad_indices[6], quad_indices[9], @@ -7964,7 +7964,7 @@ namespace internal quad_indices[13], quad_indices[17])); new_hexes[2]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[5], quad_indices[1], quad_indices[2], @@ -7972,7 +7972,7 @@ namespace internal quad_indices[14], quad_indices[18])); new_hexes[3]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[1], quad_indices[7], quad_indices[3], @@ -8245,25 +8245,25 @@ namespace internal // *----*----*x *--6-*--7-* new_quads[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[0], line_indices[12], line_indices[6], line_indices[10])); new_quads[1]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[12], line_indices[1], line_indices[7], line_indices[11])); new_quads[2]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[4], line_indices[8], line_indices[2], line_indices[12])); new_quads[3]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[5], line_indices[9], line_indices[12], @@ -8403,7 +8403,7 @@ namespace internal // | 0 | 2 | // *---*---* new_hexes[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[4], quad_indices[2], quad_indices[8], @@ -8411,7 +8411,7 @@ namespace internal quad_indices[16], quad_indices[0])); new_hexes[1]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[5], quad_indices[3], quad_indices[9], @@ -8419,7 +8419,7 @@ namespace internal quad_indices[0], quad_indices[18])); new_hexes[2]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[2], quad_indices[6], quad_indices[10], @@ -8427,7 +8427,7 @@ namespace internal quad_indices[17], quad_indices[1])); new_hexes[3]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[3], quad_indices[7], quad_indices[11], @@ -8697,25 +8697,25 @@ namespace internal // *---------*x *----0----* new_quads[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[6], line_indices[10], line_indices[0], line_indices[12])); new_quads[1]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[7], line_indices[11], line_indices[12], line_indices[1])); new_quads[2]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[2], line_indices[12], line_indices[4], line_indices[8])); new_quads[3]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[12], line_indices[3], line_indices[5], @@ -8846,7 +8846,7 @@ namespace internal 1][f_fl[5]][f_ro[5]])}; new_hexes[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[4], quad_indices[8], quad_indices[12], @@ -8854,7 +8854,7 @@ namespace internal quad_indices[16], quad_indices[0])); new_hexes[1]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[5], quad_indices[9], quad_indices[2], @@ -8862,7 +8862,7 @@ namespace internal quad_indices[17], quad_indices[1])); new_hexes[2]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[6], quad_indices[10], quad_indices[13], @@ -8870,7 +8870,7 @@ namespace internal quad_indices[0], quad_indices[18])); new_hexes[3]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[7], quad_indices[11], quad_indices[3], @@ -9289,73 +9289,73 @@ namespace internal // *----*----*x *--8-*--9-* new_quads[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[10], line_indices[28], line_indices[16], line_indices[24])); new_quads[1]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[28], line_indices[14], line_indices[17], line_indices[25])); new_quads[2]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[11], line_indices[29], line_indices[24], line_indices[20])); new_quads[3]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[29], line_indices[15], line_indices[25], line_indices[21])); new_quads[4]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[18], line_indices[26], line_indices[0], line_indices[28])); new_quads[5]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[26], line_indices[22], line_indices[1], line_indices[29])); new_quads[6]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[19], line_indices[27], line_indices[28], line_indices[4])); new_quads[7]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[27], line_indices[23], line_indices[29], line_indices[5])); new_quads[8]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[2], line_indices[24], line_indices[8], line_indices[26])); new_quads[9]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[24], line_indices[6], line_indices[9], line_indices[27])); new_quads[10]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[3], line_indices[25], line_indices[26], line_indices[12])); new_quads[11]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 2>(line_indices[25], line_indices[7], line_indices[27], @@ -9557,7 +9557,7 @@ namespace internal // bottom children new_hexes[0]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[12], quad_indices[0], quad_indices[20], @@ -9565,7 +9565,7 @@ namespace internal quad_indices[28], quad_indices[8])); new_hexes[1]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[0], quad_indices[16], quad_indices[22], @@ -9573,7 +9573,7 @@ namespace internal quad_indices[29], quad_indices[9])); new_hexes[2]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[13], quad_indices[1], quad_indices[4], @@ -9581,7 +9581,7 @@ namespace internal quad_indices[30], quad_indices[10])); new_hexes[3]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[1], quad_indices[17], quad_indices[6], @@ -9591,7 +9591,7 @@ namespace internal // top children new_hexes[4]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[14], quad_indices[2], quad_indices[21], @@ -9599,7 +9599,7 @@ namespace internal quad_indices[8], quad_indices[32])); new_hexes[5]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[2], quad_indices[18], quad_indices[23], @@ -9607,7 +9607,7 @@ namespace internal quad_indices[9], quad_indices[33])); new_hexes[6]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[15], quad_indices[3], quad_indices[5], @@ -9615,7 +9615,7 @@ namespace internal quad_indices[10], quad_indices[34])); new_hexes[7]->set( - internal::TriangulationImplementation ::TriaObject< + internal::TriangulationImplementation::TriaObject< 3>(quad_indices[3], quad_indices[19], quad_indices[7], @@ -10543,7 +10543,7 @@ Triangulation::create_triangulation( // update our counts of the various elements of a triangulation, and set // active_cell_indices of all cells - internal::TriangulationImplementation::Implementation ::compute_number_cache( + internal::TriangulationImplementation::Implementation::compute_number_cache( *this, levels.size(), number_cache); reset_active_cell_indices(); @@ -13527,7 +13527,7 @@ Triangulation::execute_refinement() // re-compute number of lines - internal::TriangulationImplementation::Implementation ::compute_number_cache( + internal::TriangulationImplementation::Implementation::compute_number_cache( *this, levels.size(), number_cache); #ifdef DEBUG @@ -13606,12 +13606,12 @@ Triangulation::execute_coarsening() // inform all listeners that cell coarsening is going to happen signals.pre_coarsening_on_cell(cell); // use a separate function, since this is dimension specific - internal::TriangulationImplementation::Implementation :: + internal::TriangulationImplementation::Implementation:: delete_children(*this, cell, line_cell_count, quad_cell_count); } // re-compute number of lines and quads - internal::TriangulationImplementation::Implementation ::compute_number_cache( + internal::TriangulationImplementation::Implementation::compute_number_cache( *this, levels.size(), number_cache); // in principle no user flags should be set any more at this point diff --git a/source/matrix_free/task_info.cc b/source/matrix_free/task_info.cc index 0e8b5c729e..eee6463e9a 100644 --- a/source/matrix_free/task_info.cc +++ b/source/matrix_free/task_info.cc @@ -772,7 +772,7 @@ namespace internal void - TaskInfo ::create_blocks_serial( + TaskInfo::create_blocks_serial( const std::vector &boundary_cells, const unsigned int dofs_per_cell, const std::vector &cell_vectorization_categories, @@ -956,7 +956,7 @@ namespace internal void - TaskInfo ::initial_setup_blocks_tasks( + TaskInfo::initial_setup_blocks_tasks( const std::vector &boundary_cells, std::vector & renumbering, std::vector & incompletely_filled_vectorization) diff --git a/source/numerics/data_out_rotation.cc b/source/numerics/data_out_rotation.cc index 8930c8af76..25842ab1af 100644 --- a/source/numerics/data_out_rotation.cc +++ b/source/numerics/data_out_rotation.cc @@ -542,7 +542,7 @@ DataOutRotation::build_patches( [this]( const std::vector> &new_patches) { - internal::DataOutRotationImplementation :: + internal::DataOutRotationImplementation:: append_patch_to_list(new_patches, this->patches); }, diff --git a/tests/bits/step-4_dg_periodic.cc b/tests/bits/step-4_dg_periodic.cc index 2d6ac93b62..17786f705c 100644 --- a/tests/bits/step-4_dg_periodic.cc +++ b/tests/bits/step-4_dg_periodic.cc @@ -82,7 +82,7 @@ MatrixIntegrator::boundary( typename MeshWorker::IntegrationInfo &info) const { const unsigned int deg = info.fe_values(0).get_fe().degree; - LocalIntegrators::Laplace ::nitsche_matrix( + LocalIntegrators::Laplace::nitsche_matrix( dinfo.matrix(0, false).matrix, info.fe_values(0), LocalIntegrators::Laplace::compute_penalty(dinfo, dinfo, deg, deg)); @@ -97,7 +97,7 @@ MatrixIntegrator::face( typename MeshWorker::IntegrationInfo &info2) const { const unsigned int deg = info1.fe_values(0).get_fe().degree; - LocalIntegrators::Laplace ::ip_matrix( + LocalIntegrators::Laplace::ip_matrix( dinfo1.matrix(0, false).matrix, dinfo1.matrix(0, true).matrix, dinfo2.matrix(0, true).matrix, diff --git a/tests/bits/step-4_dg_periodic_coupling.cc b/tests/bits/step-4_dg_periodic_coupling.cc index f1c24c946b..c8dad5d4e2 100644 --- a/tests/bits/step-4_dg_periodic_coupling.cc +++ b/tests/bits/step-4_dg_periodic_coupling.cc @@ -82,7 +82,7 @@ MatrixIntegrator::boundary( typename MeshWorker::IntegrationInfo &info) const { const unsigned int deg = info.fe_values(0).get_fe().degree; - LocalIntegrators::Laplace ::nitsche_matrix( + LocalIntegrators::Laplace::nitsche_matrix( dinfo.matrix(0, false).matrix, info.fe_values(0), LocalIntegrators::Laplace::compute_penalty(dinfo, dinfo, deg, deg)); @@ -97,7 +97,7 @@ MatrixIntegrator::face( typename MeshWorker::IntegrationInfo &info2) const { const unsigned int deg = info1.fe_values(0).get_fe().degree; - LocalIntegrators::Laplace ::ip_matrix( + LocalIntegrators::Laplace::ip_matrix( dinfo1.matrix(0, false).matrix, dinfo1.matrix(0, true).matrix, dinfo2.matrix(0, true).matrix, diff --git a/tests/fail/fe_nothing_04.cc b/tests/fail/fe_nothing_04.cc index 874747e8e3..5a299b10bd 100644 --- a/tests/fail/fe_nothing_04.cc +++ b/tests/fail/fe_nothing_04.cc @@ -48,7 +48,7 @@ void test() { Triangulation triangulation; - GridGenerator ::hyper_cube(triangulation, -0.5, 0.5); + GridGenerator::hyper_cube(triangulation, -0.5, 0.5); triangulation.refine_global(4); hp::FECollection fe_collection; diff --git a/tests/matrix_free/matrix_vector_faces_common.h b/tests/matrix_free/matrix_vector_faces_common.h index 71e2691928..0756b64cc2 100644 --- a/tests/matrix_free/matrix_vector_faces_common.h +++ b/tests/matrix_free/matrix_vector_faces_common.h @@ -708,13 +708,13 @@ MatrixIntegrator::face( info1.fe_values(0).normal_vector(0))); double penalty = 0.5 * (normal_volume_fraction1 + normal_volume_fraction2) * std::max(1U, deg) * (deg + 1.0); - LocalIntegrators::Laplace ::ip_matrix(dinfo1.matrix(0, false).matrix, - dinfo1.matrix(0, true).matrix, - dinfo2.matrix(0, true).matrix, - dinfo2.matrix(0, false).matrix, - info1.fe_values(0), - info2.fe_values(0), - penalty); + LocalIntegrators::Laplace::ip_matrix(dinfo1.matrix(0, false).matrix, + dinfo1.matrix(0, true).matrix, + dinfo2.matrix(0, true).matrix, + dinfo2.matrix(0, false).matrix, + info1.fe_values(0), + info2.fe_values(0), + penalty); } @@ -733,9 +733,9 @@ MatrixIntegrator::boundary( [GeometryInfo::unit_normal_direction[dinfo.face_number]] * info.fe_values(0).normal_vector(0))); double penalty = normal_volume_fraction * std::max(1U, deg) * (deg + 1.0); - LocalIntegrators::Laplace ::nitsche_matrix(dinfo.matrix(0, false).matrix, - info.fe_values(0), - penalty); + LocalIntegrators::Laplace::nitsche_matrix(dinfo.matrix(0, false).matrix, + info.fe_values(0), + penalty); } diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc index 49a93173a1..1f195ed9aa 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_01.cc @@ -79,7 +79,7 @@ test() // 4 cells with the highest error // have 20+19+18+17=74, for a total // fraction of 74/210 - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_fraction( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_fraction( tr, indicators, 74. / 210 + 1e-5, 10. / 210 - 1e-5); // now count number of cells diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc index 375617bd70..35ef37b0ba 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_02.cc @@ -88,7 +88,7 @@ test() // set the thresholds slightly // above or below what we'd really // like - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_fraction( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_fraction( tr, indicators, 30.00000000001 / total_error * std::pow(2, (double)16), diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc index 621b29b4b5..91b2922f95 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_03.cc @@ -77,7 +77,7 @@ test() AssertThrow(my_cell_index == 20, ExcInternalError()); } - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_fraction( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_fraction( tr, indicators, (74. + 0.5) / 210, 0); // now count number of cells diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc index 36592b419a..ce3f2c7f88 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_04.cc @@ -69,7 +69,7 @@ test() // use one strategy to compute // thresholds and obtain those // thresholds - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_fraction( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_fraction( tr, indicators, 2. / 3, 1. / 6); { float coarsen_indicator = min_indicator - 1, @@ -103,10 +103,10 @@ test() // only works because we are // working on only a single // processor - dealii::GridRefinement ::refine_and_coarsen_fixed_fraction(tr, - indicators, - 2. / 3, - 1. / 6); + dealii::GridRefinement::refine_and_coarsen_fixed_fraction(tr, + indicators, + 2. / 3, + 1. / 6); { float coarsen_indicator = min_indicator - 1, refine_indicator = max_indicator + 1; diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc index 15f367b99d..74bf4b8d3a 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_05.cc @@ -66,7 +66,7 @@ test() // use one strategy to compute // thresholds and obtain those // thresholds - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_fraction( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_fraction( tr, indicators, 2. / 3, 1. / 6); { float coarsen_indicator = min_indicator - 1, @@ -100,10 +100,10 @@ test() // only works because we are // working on only a single // processor - dealii::GridRefinement ::refine_and_coarsen_fixed_fraction(tr, - indicators, - 2. / 3, - 1. / 6); + dealii::GridRefinement::refine_and_coarsen_fixed_fraction(tr, + indicators, + 2. / 3, + 1. / 6); { float coarsen_indicator = min_indicator - 1, refine_indicator = max_indicator + 1; diff --git a/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc b/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc index d9a429faf1..2824c55a91 100644 --- a/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc +++ b/tests/mpi/refine_and_coarsen_fixed_fraction_06.cc @@ -81,7 +81,7 @@ test() // use one strategy to compute // thresholds and obtain those // thresholds - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_fraction( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_fraction( tr, indicators, 0.6, 0.2); { float coarsen_indicator = min_indicator - 1, @@ -115,10 +115,10 @@ test() // only works because we are // working on only a single // processor - dealii::GridRefinement ::refine_and_coarsen_fixed_fraction(tr, - indicators, - 0.6, - 0.2); + dealii::GridRefinement::refine_and_coarsen_fixed_fraction(tr, + indicators, + 0.6, + 0.2); { float coarsen_indicator = min_indicator - 1, refine_indicator = max_indicator + 1; diff --git a/tests/mpi/refine_and_coarsen_fixed_number_01.cc b/tests/mpi/refine_and_coarsen_fixed_number_01.cc index a66ec7091e..ca75650a3b 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_01.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_01.cc @@ -68,7 +68,7 @@ test() } - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_number( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( tr, indicators, 0.2, 0.2); // now count number of cells diff --git a/tests/mpi/refine_and_coarsen_fixed_number_02.cc b/tests/mpi/refine_and_coarsen_fixed_number_02.cc index d0ab2e64df..6bc309ce24 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_02.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_02.cc @@ -69,7 +69,7 @@ test() } - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_number( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( tr, indicators, 0.2, 0.2); // now count number of cells diff --git a/tests/mpi/refine_and_coarsen_fixed_number_03.cc b/tests/mpi/refine_and_coarsen_fixed_number_03.cc index 3d27b30f24..57da69cd18 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_03.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_03.cc @@ -66,7 +66,7 @@ test() } - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_number( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( tr, indicators, 0.2, 0); // now count number of cells diff --git a/tests/mpi/refine_and_coarsen_fixed_number_04.cc b/tests/mpi/refine_and_coarsen_fixed_number_04.cc index 2bec0f9d12..e941d64566 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_04.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_04.cc @@ -69,7 +69,7 @@ test() // use one strategy to compute // thresholds and obtain those // thresholds - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_number( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( tr, indicators, 2. / 3, 1. / 6); { float coarsen_indicator = min_indicator - 1, @@ -103,10 +103,10 @@ test() // only works because we are // working on only a single // processor - dealii::GridRefinement ::refine_and_coarsen_fixed_number(tr, - indicators, - 2. / 3, - 1. / 6); + dealii::GridRefinement::refine_and_coarsen_fixed_number(tr, + indicators, + 2. / 3, + 1. / 6); { float coarsen_indicator = min_indicator - 1, refine_indicator = max_indicator + 1; diff --git a/tests/mpi/refine_and_coarsen_fixed_number_05.cc b/tests/mpi/refine_and_coarsen_fixed_number_05.cc index c3e1bce5a7..fb467fb2a4 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_05.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_05.cc @@ -67,7 +67,7 @@ test() // use one strategy to compute // thresholds and obtain those // thresholds - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_number( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( tr, indicators, 2. / 3, 1. / 6); { float coarsen_indicator = min_indicator - 1, @@ -101,10 +101,10 @@ test() // only works because we are // working on only a single // processor - dealii::GridRefinement ::refine_and_coarsen_fixed_number(tr, - indicators, - 2. / 3, - 1. / 6); + dealii::GridRefinement::refine_and_coarsen_fixed_number(tr, + indicators, + 2. / 3, + 1. / 6); { float coarsen_indicator = min_indicator - 1, refine_indicator = max_indicator + 1; diff --git a/tests/mpi/refine_and_coarsen_fixed_number_07.cc b/tests/mpi/refine_and_coarsen_fixed_number_07.cc index ca7c127f37..bf82ad9e9c 100644 --- a/tests/mpi/refine_and_coarsen_fixed_number_07.cc +++ b/tests/mpi/refine_and_coarsen_fixed_number_07.cc @@ -68,7 +68,7 @@ test(const double max_n_cell_ratio) const auto max_n_cell = static_cast(max_n_cell_ratio * tr.n_global_active_cells()); - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_number( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( tr, indicators, 0.2, 0.2, max_n_cell); // now count number of cells diff --git a/tests/mpi/tria_ghost_owners_01.cc b/tests/mpi/tria_ghost_owners_01.cc index a963507e11..a35ba789c8 100644 --- a/tests/mpi/tria_ghost_owners_01.cc +++ b/tests/mpi/tria_ghost_owners_01.cc @@ -129,7 +129,7 @@ test() Assert(neighbors == ghost_owners, ExcInternalError()); - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_number( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( tr, indicators, 0.3, 0.0); tr.execute_coarsening_and_refinement(); if (myid == 0) diff --git a/tests/mpi/tria_ghost_owners_02.cc b/tests/mpi/tria_ghost_owners_02.cc index 03abb3f42b..bad2ded69d 100644 --- a/tests/mpi/tria_ghost_owners_02.cc +++ b/tests/mpi/tria_ghost_owners_02.cc @@ -123,7 +123,7 @@ test() Assert(neighbors == ghost_owners, ExcInternalError()); - parallel::distributed::GridRefinement ::refine_and_coarsen_fixed_number( + parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( tr, indicators, 0.3, 0.0); tr.execute_coarsening_and_refinement(); if (myid == 0) diff --git a/tests/trilinos/precondition_amg_dgp_01.cc b/tests/trilinos/precondition_amg_dgp_01.cc index 1ea4c6e0d5..9fd2e9b85a 100644 --- a/tests/trilinos/precondition_amg_dgp_01.cc +++ b/tests/trilinos/precondition_amg_dgp_01.cc @@ -82,7 +82,7 @@ MatrixIntegrator::boundary( typename MeshWorker::IntegrationInfo &info) const { const unsigned int deg = info.fe_values(0).get_fe().degree; - LocalIntegrators::Laplace ::nitsche_matrix( + LocalIntegrators::Laplace::nitsche_matrix( dinfo.matrix(0, false).matrix, info.fe_values(0), LocalIntegrators::Laplace::compute_penalty(dinfo, dinfo, deg, deg)); @@ -97,7 +97,7 @@ MatrixIntegrator::face( typename MeshWorker::IntegrationInfo &info2) const { const unsigned int deg = info1.fe_values(0).get_fe().degree; - LocalIntegrators::Laplace ::ip_matrix( + LocalIntegrators::Laplace::ip_matrix( dinfo1.matrix(0, false).matrix, dinfo1.matrix(0, true).matrix, dinfo2.matrix(0, true).matrix, diff --git a/tests/trilinos/precondition_amg_dgp_03.cc b/tests/trilinos/precondition_amg_dgp_03.cc index 1fcf871403..c75e1ee7bf 100644 --- a/tests/trilinos/precondition_amg_dgp_03.cc +++ b/tests/trilinos/precondition_amg_dgp_03.cc @@ -85,7 +85,7 @@ MatrixIntegrator::boundary( typename MeshWorker::IntegrationInfo &info) const { const unsigned int deg = info.fe_values(0).get_fe().degree; - LocalIntegrators::Laplace ::nitsche_matrix( + LocalIntegrators::Laplace::nitsche_matrix( dinfo.matrix(0, false).matrix, info.fe_values(0), LocalIntegrators::Laplace::compute_penalty(dinfo, dinfo, deg, deg)); @@ -100,7 +100,7 @@ MatrixIntegrator::face( typename MeshWorker::IntegrationInfo &info2) const { const unsigned int deg = info1.fe_values(0).get_fe().degree; - LocalIntegrators::Laplace ::ip_matrix( + LocalIntegrators::Laplace::ip_matrix( dinfo1.matrix(0, false).matrix, dinfo1.matrix(0, true).matrix, dinfo2.matrix(0, true).matrix, diff --git a/tests/trilinos/precondition_muelu_dgp.cc b/tests/trilinos/precondition_muelu_dgp.cc index 0ac2521a38..2e260dfc25 100644 --- a/tests/trilinos/precondition_muelu_dgp.cc +++ b/tests/trilinos/precondition_muelu_dgp.cc @@ -82,7 +82,7 @@ MatrixIntegrator::boundary( typename MeshWorker::IntegrationInfo &info) const { const unsigned int deg = info.fe_values(0).get_fe().degree; - LocalIntegrators::Laplace ::nitsche_matrix( + LocalIntegrators::Laplace::nitsche_matrix( dinfo.matrix(0, false).matrix, info.fe_values(0), LocalIntegrators::Laplace::compute_penalty(dinfo, dinfo, deg, deg)); @@ -97,7 +97,7 @@ MatrixIntegrator::face( typename MeshWorker::IntegrationInfo &info2) const { const unsigned int deg = info1.fe_values(0).get_fe().degree; - LocalIntegrators::Laplace ::ip_matrix( + LocalIntegrators::Laplace::ip_matrix( dinfo1.matrix(0, false).matrix, dinfo1.matrix(0, true).matrix, dinfo2.matrix(0, true).matrix,