From 5c99131ea8cf3c74dd840f1abc8c84b18b1c350e Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 4 Feb 2025 15:54:27 -0700 Subject: [PATCH] Tighten up the paths in which include files are found. --- cmake/macros/macro_populate_target_properties.cmake | 5 +++-- source/CMakeLists.txt | 7 ------- source/algorithms/operator.cc | 2 +- source/arborx/access_traits.cc | 2 +- source/base/bounding_box.cc | 2 +- source/base/data_out_base.cc | 2 +- source/base/function.cc | 2 +- source/base/function_restriction.cc | 2 +- source/base/function_signed_distance.cc | 2 +- source/base/function_time.cc | 2 +- source/base/function_tools.cc | 2 +- source/base/geometric_utilities.cc | 2 +- source/base/incremental_function.cc | 2 +- source/base/mpi.cc | 2 +- source/base/mpi_noncontiguous_partitioner.cc | 2 +- source/base/mpi_remote_point_evaluation.cc | 2 +- source/base/mu_parser_internal.cc | 2 +- source/base/partitioner.cc | 2 +- source/base/polynomials_rannacher_turek.cc | 2 +- source/base/symbolic_function.cc | 2 +- source/base/symmetric_tensor.cc | 2 +- source/base/tensor_function.cc | 2 +- source/base/tensor_function_parser.cc | 2 +- source/base/time_stepping.cc | 2 +- source/cgal/intersections.cc | 2 +- source/cgal/surface_mesh.cc | 2 +- source/differentiation/ad/ad_drivers.cc | 6 +++--- source/differentiation/ad/ad_helpers.cc | 6 +++--- source/differentiation/ad/adolc_number_types.cc | 2 +- source/differentiation/ad/sacado_number_types.cc | 4 ++-- .../sd/symengine_number_visitor_internal.cc | 2 +- source/differentiation/sd/symengine_optimizer.cc | 2 +- source/differentiation/sd/symengine_tensor_operations.cc | 2 +- source/distributed/cell_data_transfer.cc | 2 +- source/distributed/cell_weights.cc | 2 +- source/distributed/field_transfer.cc | 2 +- source/distributed/fully_distributed_tria.cc | 2 +- source/distributed/grid_refinement.cc | 2 +- source/distributed/p4est_wrappers.cc | 2 +- source/distributed/repartitioning_policy_tools.cc | 2 +- source/distributed/shared_tria.cc | 2 +- source/distributed/tria.cc | 2 +- source/distributed/tria_base.cc | 2 +- source/dofs/block_info.cc | 2 +- source/dofs/dof_accessor.cc | 2 +- source/dofs/dof_accessor_get.cc | 2 +- source/dofs/dof_accessor_set.cc | 2 +- source/dofs/dof_handler.cc | 2 +- source/dofs/dof_handler_policy.cc | 2 +- source/dofs/dof_objects.cc | 2 +- source/dofs/dof_renumbering.cc | 2 +- source/dofs/dof_tools.cc | 2 +- source/dofs/dof_tools_constraints.cc | 2 +- source/dofs/dof_tools_sparsity.cc | 2 +- source/fe/fe.cc | 2 +- source/fe/fe_abf.cc | 2 +- source/fe/fe_bdm.cc | 2 +- source/fe/fe_bernstein.cc | 2 +- source/fe/fe_dg_vector.cc | 2 +- source/fe/fe_dgp.cc | 2 +- source/fe/fe_dgp_monomial.cc | 2 +- source/fe/fe_dgp_nonparametric.cc | 2 +- source/fe/fe_dgq.cc | 2 +- source/fe/fe_enriched.cc | 2 +- source/fe/fe_face.cc | 2 +- source/fe/fe_hermite.cc | 2 +- source/fe/fe_nedelec.cc | 2 +- source/fe/fe_nedelec_sz.cc | 2 +- source/fe/fe_nothing.cc | 2 +- source/fe/fe_poly.cc | 2 +- source/fe/fe_poly_tensor.cc | 2 +- source/fe/fe_pyramid_p.cc | 2 +- source/fe/fe_q.cc | 2 +- source/fe/fe_q_base.cc | 2 +- source/fe/fe_q_bubbles.cc | 2 +- source/fe/fe_q_dg0.cc | 2 +- source/fe/fe_q_hierarchical.cc | 2 +- source/fe/fe_q_iso_q1.cc | 2 +- source/fe/fe_rannacher_turek.cc | 2 +- source/fe/fe_raviart_thomas.cc | 2 +- source/fe/fe_raviart_thomas_nodal.cc | 2 +- source/fe/fe_rt_bubbles.cc | 2 +- source/fe/fe_series_fourier.cc | 2 +- source/fe/fe_series_legendre.cc | 2 +- source/fe/fe_simplex_p.cc | 2 +- source/fe/fe_simplex_p_bubbles.cc | 2 +- source/fe/fe_system.cc | 2 +- source/fe/fe_tools.cc | 2 +- source/fe/fe_tools_extrapolate.cc | 2 +- source/fe/fe_tools_interpolate.cc | 2 +- source/fe/fe_trace.cc | 2 +- source/fe/fe_values.cc | 2 +- source/fe/fe_values_base.cc | 2 +- source/fe/fe_values_views.cc | 2 +- source/fe/fe_values_views_internal.cc | 2 +- source/fe/fe_wedge_p.cc | 2 +- source/fe/mapping.cc | 2 +- source/fe/mapping_c1.cc | 2 +- source/fe/mapping_cartesian.cc | 2 +- source/fe/mapping_fe.cc | 2 +- source/fe/mapping_fe_field.cc | 2 +- source/fe/mapping_manifold.cc | 2 +- source/fe/mapping_q.cc | 2 +- source/fe/mapping_q1.cc | 2 +- source/fe/mapping_q1_eulerian.cc | 2 +- source/fe/mapping_q_cache.cc | 2 +- source/fe/mapping_q_eulerian.cc | 2 +- source/fe/mapping_related_data.cc | 2 +- source/gmsh/utilities.cc | 2 +- source/grid/cell_id.cc | 2 +- source/grid/grid_generator.cc | 2 +- source/grid/grid_generator_cgal.cc | 2 +- source/grid/grid_generator_from_name.cc | 2 +- source/grid/grid_generator_pipe_junction.cc | 2 +- source/grid/grid_in.cc | 2 +- source/grid/grid_out.cc | 2 +- source/grid/grid_refinement.cc | 2 +- source/grid/grid_tools.cc | 2 +- source/grid/grid_tools_cache.cc | 2 +- source/grid/grid_tools_dof_handlers.cc | 2 +- source/grid/grid_tools_geometry.cc | 2 +- source/grid/grid_tools_topology.cc | 2 +- source/grid/intergrid_map.cc | 2 +- source/grid/manifold.cc | 2 +- source/grid/manifold_lib.cc | 2 +- source/grid/reference_cell.cc | 2 +- source/grid/tria.cc | 2 +- source/grid/tria_accessor.cc | 2 +- source/grid/tria_description.cc | 2 +- source/grid/tria_objects.cc | 2 +- source/hp/fe_collection.cc | 2 +- source/hp/fe_values.cc | 2 +- source/hp/mapping_collection.cc | 2 +- source/hp/refinement.cc | 2 +- source/lac/affine_constraints.cc | 2 +- source/lac/block_sparse_matrix.cc | 2 +- source/lac/block_vector.cc | 2 +- source/lac/chunk_sparse_matrix.cc | 2 +- source/lac/full_matrix.cc | 2 +- source/lac/la_parallel_block_vector.cc | 2 +- source/lac/la_parallel_vector.cc | 2 +- source/lac/lapack_full_matrix.cc | 2 +- source/lac/petsc_communication_pattern.cc | 2 +- source/lac/precondition_block.cc | 2 +- source/lac/read_write_vector.cc | 2 +- source/lac/relaxation_block.cc | 2 +- source/lac/scalapack.cc | 2 +- source/lac/solver.cc | 2 +- source/lac/solver_gmres.cc | 2 +- source/lac/sparse_matrix.cc | 2 +- source/lac/sparse_matrix_ez.cc | 2 +- source/lac/sparse_matrix_inst2.cc | 2 +- source/lac/tensor_product_matrix.cc | 2 +- source/lac/trilinos_sparse_matrix.cc | 2 +- source/lac/trilinos_vector.cc | 2 +- source/lac/vector.cc | 2 +- source/lac/vector_memory.cc | 4 ++-- source/matrix_free/evaluation_template_face_factory.cc | 2 +- source/matrix_free/evaluation_template_factory.cc | 2 +- .../evaluation_template_factory_hanging_nodes.cc | 2 +- source/matrix_free/fe_point_evaluation.cc | 2 +- source/matrix_free/mapping_info.cc | 2 +- source/matrix_free/matrix_free.cc | 2 +- source/matrix_free/shape_info.cc | 2 +- source/meshworker/mesh_worker_info.cc | 2 +- source/meshworker/mesh_worker_vector_selector.cc | 2 +- source/meshworker/scratch_data.cc | 2 +- source/multigrid/mg_base.cc | 2 +- source/multigrid/mg_constrained_dofs.cc | 2 +- source/multigrid/mg_level_global_transfer.cc | 2 +- source/multigrid/mg_tools.cc | 2 +- source/multigrid/mg_transfer_block.cc | 2 +- source/multigrid/mg_transfer_component.cc | 2 +- source/multigrid/mg_transfer_global_coarsening.cc | 2 +- source/multigrid/mg_transfer_internal.cc | 2 +- source/multigrid/mg_transfer_matrix_free.cc | 2 +- source/multigrid/mg_transfer_prebuilt.cc | 2 +- source/multigrid/multigrid.cc | 2 +- source/non_matching/coupling.cc | 2 +- source/non_matching/fe_immersed_values.cc | 2 +- source/non_matching/fe_values.cc | 2 +- source/non_matching/mesh_classifier.cc | 2 +- source/non_matching/quadrature_generator.cc | 2 +- source/numerics/cell_data_transfer.cc | 2 +- source/numerics/data_out.cc | 2 +- source/numerics/data_out_dof_data.cc | 2 +- source/numerics/data_out_dof_data_codim.cc | 2 +- source/numerics/data_out_dof_data_inst2.cc | 2 +- source/numerics/data_out_faces.cc | 2 +- source/numerics/data_out_resample.cc | 2 +- source/numerics/data_out_rotation.cc | 2 +- source/numerics/data_out_stack.cc | 2 +- source/numerics/data_postprocessor.cc | 2 +- source/numerics/derivative_approximation.cc | 2 +- source/numerics/dof_output_operator.cc | 2 +- source/numerics/error_estimator.cc | 2 +- source/numerics/error_estimator_1d.cc | 2 +- source/numerics/error_estimator_inst2.cc | 2 +- source/numerics/fe_field_function.cc | 2 +- source/numerics/matrix_creator.cc | 2 +- source/numerics/matrix_tools.cc | 2 +- source/numerics/point_value_history.cc | 2 +- source/numerics/smoothness_estimator.cc | 2 +- source/numerics/solution_transfer.cc | 2 +- source/numerics/time_dependent.cc | 2 +- source/numerics/vector_tools_boundary.cc | 2 +- source/numerics/vector_tools_constraints.cc | 2 +- source/numerics/vector_tools_integrate_difference.cc | 2 +- source/numerics/vector_tools_interpolate.cc | 2 +- source/numerics/vector_tools_mean_value.cc | 2 +- source/numerics/vector_tools_point_gradient.cc | 2 +- source/numerics/vector_tools_point_value.cc | 2 +- source/numerics/vector_tools_project.cc | 2 +- source/numerics/vector_tools_project_codim.cc | 2 +- source/numerics/vector_tools_project_hp.cc | 2 +- source/numerics/vector_tools_project_qp.cc | 2 +- source/numerics/vector_tools_project_qpmf.cc | 2 +- source/numerics/vector_tools_rhs.cc | 2 +- source/opencascade/manifold_lib.cc | 2 +- source/opencascade/utilities.cc | 2 +- source/particles/data_out.cc | 2 +- source/particles/generators.cc | 2 +- source/particles/particle.cc | 2 +- source/particles/particle_handler.cc | 2 +- source/particles/utilities.cc | 2 +- source/physics/elasticity/kinematics.cc | 2 +- source/physics/elasticity/standard_tensors.cc | 2 +- source/physics/transformations.cc | 2 +- source/sundials/n_vector.cc | 2 +- source/trilinos/nox.cc | 2 +- 230 files changed, 237 insertions(+), 243 deletions(-) diff --git a/cmake/macros/macro_populate_target_properties.cmake b/cmake/macros/macro_populate_target_properties.cmake index 7223089c5b..bb5295ca6e 100644 --- a/cmake/macros/macro_populate_target_properties.cmake +++ b/cmake/macros/macro_populate_target_properties.cmake @@ -58,8 +58,9 @@ function(populate_target_properties _target _build) # Build-directory specific includes: target_include_directories(${_target} PRIVATE - ${CMAKE_BINARY_DIR}/include - ${CMAKE_SOURCE_DIR}/include + ${CMAKE_BINARY_DIR}/include # e.g., deal.II/base/config.h that has been placed into the binary dir + ${CMAKE_BINARY_DIR}/source # all of the .inst files that have been placed into the binary dir + ${CMAKE_SOURCE_DIR}/include # all unprocessed header files ) # diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index a82416c08a..4cf5018a83 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -34,13 +34,6 @@ endif() # Compile the deal.II library # -# -# Automatically add the current source and binary directory as include -# directory. The binary directory is needed in order to find the expanded -# .inst include files. -# -set(CMAKE_INCLUDE_CURRENT_DIR true) - # # List the directories where we have source files. the ones with the longest # compile jobs come first so that 'make -j N' saturates many processors also diff --git a/source/algorithms/operator.cc b/source/algorithms/operator.cc index 2c69d39d1a..18bd961c38 100644 --- a/source/algorithms/operator.cc +++ b/source/algorithms/operator.cc @@ -48,7 +48,7 @@ namespace Algorithms notifications.clear(); } -#include "operator.inst" +#include "algorithms/operator.inst" } // namespace Algorithms DEAL_II_NAMESPACE_CLOSE diff --git a/source/arborx/access_traits.cc b/source/arborx/access_traits.cc index 1d59a089af..b191ca2754 100644 --- a/source/arborx/access_traits.cc +++ b/source/arborx/access_traits.cc @@ -313,6 +313,6 @@ namespace ArborX } // namespace ArborX // ----------------------- Instantiations --------------------// -# include "access_traits.inst" +# include "arborx/access_traits.inst" #endif diff --git a/source/base/bounding_box.cc b/source/base/bounding_box.cc index 549dfbad8a..60a5a58c9b 100644 --- a/source/base/bounding_box.cc +++ b/source/base/bounding_box.cc @@ -403,5 +403,5 @@ create_unit_bounding_box() } -#include "bounding_box.inst" +#include "base/bounding_box.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc index 650859e762..556950333e 100644 --- a/source/base/data_out_base.cc +++ b/source/base/data_out_base.cc @@ -9722,6 +9722,6 @@ namespace DataOutBase // explicit instantiations -#include "data_out_base.inst" +#include "base/data_out_base.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/function.cc b/source/base/function.cc index 644f4fdbc3..d73940ae4a 100644 --- a/source/base/function.cc +++ b/source/base/function.cc @@ -17,6 +17,6 @@ DEAL_II_NAMESPACE_OPEN // explicit instantiations -#include "function.inst" +#include "base/function.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/function_restriction.cc b/source/base/function_restriction.cc index 6ad5675194..41ead77080 100644 --- a/source/base/function_restriction.cc +++ b/source/base/function_restriction.cc @@ -199,5 +199,5 @@ namespace Functions } // namespace Functions -#include "function_restriction.inst" +#include "base/function_restriction.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/function_signed_distance.cc b/source/base/function_signed_distance.cc index 6db966c099..752826da17 100644 --- a/source/base/function_signed_distance.cc +++ b/source/base/function_signed_distance.cc @@ -416,6 +416,6 @@ namespace Functions } // namespace SignedDistance } // namespace Functions -#include "function_signed_distance.inst" +#include "base/function_signed_distance.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/function_time.cc b/source/base/function_time.cc index ae3b061b84..127fe8adac 100644 --- a/source/base/function_time.cc +++ b/source/base/function_time.cc @@ -17,6 +17,6 @@ DEAL_II_NAMESPACE_OPEN // explicit instantiation -#include "function_time.inst" +#include "base/function_time.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/function_tools.cc b/source/base/function_tools.cc index d42839c5bb..edc66effb6 100644 --- a/source/base/function_tools.cc +++ b/source/base/function_tools.cc @@ -67,6 +67,6 @@ namespace FunctionTools } // namespace FunctionTools -#include "function_tools.inst" +#include "base/function_tools.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/geometric_utilities.cc b/source/base/geometric_utilities.cc index e75d869f19..48822349a2 100644 --- a/source/base/geometric_utilities.cc +++ b/source/base/geometric_utilities.cc @@ -109,7 +109,7 @@ namespace GeometricUtilities } // explicit instantiations -#include "geometric_utilities.inst" +#include "base/geometric_utilities.inst" } // namespace Coordinates } // namespace GeometricUtilities diff --git a/source/base/incremental_function.cc b/source/base/incremental_function.cc index bb6d548376..b756a84d9a 100644 --- a/source/base/incremental_function.cc +++ b/source/base/incremental_function.cc @@ -102,6 +102,6 @@ namespace Functions // Explicit instantiations -#include "incremental_function.inst" +#include "base/incremental_function.inst" } // namespace Functions DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/mpi.cc b/source/base/mpi.cc index 1b42e2403d..3d33cdfbd3 100644 --- a/source/base/mpi.cc +++ b/source/base/mpi.cc @@ -2092,7 +2092,7 @@ namespace Utilities compute_set_union(const std::set &set, const MPI_Comm comm); #endif -#include "mpi.inst" +#include "base/mpi.inst" } // end of namespace MPI } // end of namespace Utilities diff --git a/source/base/mpi_noncontiguous_partitioner.cc b/source/base/mpi_noncontiguous_partitioner.cc index 28ccc8e8a8..9effc1f79f 100644 --- a/source/base/mpi_noncontiguous_partitioner.cc +++ b/source/base/mpi_noncontiguous_partitioner.cc @@ -230,6 +230,6 @@ namespace Utilities } // namespace MPI } // namespace Utilities -#include "mpi_noncontiguous_partitioner.inst" +#include "base/mpi_noncontiguous_partitioner.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/mpi_remote_point_evaluation.cc b/source/base/mpi_remote_point_evaluation.cc index e2cfc9018a..6a71e7fc7b 100644 --- a/source/base/mpi_remote_point_evaluation.cc +++ b/source/base/mpi_remote_point_evaluation.cc @@ -403,6 +403,6 @@ namespace Utilities } // end of namespace MPI } // end of namespace Utilities -#include "mpi_remote_point_evaluation.inst" +#include "base/mpi_remote_point_evaluation.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/mu_parser_internal.cc b/source/base/mu_parser_internal.cc index 739a56d01e..fa2bbd03c7 100644 --- a/source/base/mu_parser_internal.cc +++ b/source/base/mu_parser_internal.cc @@ -507,7 +507,7 @@ namespace internal } // explicit instantiations -#include "mu_parser_internal.inst" +#include "base/mu_parser_internal.inst" } // namespace FunctionParser } // namespace internal diff --git a/source/base/partitioner.cc b/source/base/partitioner.cc index df63e75eb6..1dd1fcb597 100644 --- a/source/base/partitioner.cc +++ b/source/base/partitioner.cc @@ -554,6 +554,6 @@ namespace Utilities #endif // explicit instantiations from .templates.h file -#include "partitioner.inst" +#include "base/partitioner.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/polynomials_rannacher_turek.cc b/source/base/polynomials_rannacher_turek.cc index b4a49d09e8..1c1e422693 100644 --- a/source/base/polynomials_rannacher_turek.cc +++ b/source/base/polynomials_rannacher_turek.cc @@ -215,6 +215,6 @@ PolynomialsRannacherTurek::clone() const // explicit instantiations -#include "polynomials_rannacher_turek.inst" +#include "base/polynomials_rannacher_turek.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/symbolic_function.cc b/source/base/symbolic_function.cc index 0a06d1573d..21fc619567 100644 --- a/source/base/symbolic_function.cc +++ b/source/base/symbolic_function.cc @@ -19,7 +19,7 @@ DEAL_II_NAMESPACE_OPEN namespace Functions { // explicit instantiations -# include "symbolic_function.inst" +# include "base/symbolic_function.inst" } // namespace Functions #endif DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/symmetric_tensor.cc b/source/base/symmetric_tensor.cc index 8c9fb0a3d3..7fecd5262d 100644 --- a/source/base/symmetric_tensor.cc +++ b/source/base/symmetric_tensor.cc @@ -159,7 +159,7 @@ eigenvectors<3, adtl::adouble>(const SymmetricTensor<2, 3, adtl::adouble> &, #endif // explicit instantiations -#include "symmetric_tensor.inst" +#include "base/symmetric_tensor.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/tensor_function.cc b/source/base/tensor_function.cc index f688ccb28b..c300c3eb74 100644 --- a/source/base/tensor_function.cc +++ b/source/base/tensor_function.cc @@ -17,6 +17,6 @@ DEAL_II_NAMESPACE_OPEN // explicit instantiations -#include "tensor_function.inst" +#include "base/tensor_function.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/tensor_function_parser.cc b/source/base/tensor_function_parser.cc index c33e7bc1ca..b533b9cdc4 100644 --- a/source/base/tensor_function_parser.cc +++ b/source/base/tensor_function_parser.cc @@ -131,6 +131,6 @@ TensorFunctionParser::value_list( } // explicit instantiations -#include "tensor_function_parser.inst" +#include "base/tensor_function_parser.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/time_stepping.cc b/source/base/time_stepping.cc index a1a208b4c2..3f83d15454 100644 --- a/source/base/time_stepping.cc +++ b/source/base/time_stepping.cc @@ -28,6 +28,6 @@ DEAL_II_NAMESPACE_OPEN namespace TimeStepping { -#include "time_stepping.inst" +#include "base/time_stepping.inst" } DEAL_II_NAMESPACE_CLOSE diff --git a/source/cgal/intersections.cc b/source/cgal/intersections.cc index c7d010f829..bb7d80a3a6 100644 --- a/source/cgal/intersections.cc +++ b/source/cgal/intersections.cc @@ -865,7 +865,7 @@ namespace CGALWrappers vertices0, vertices1, tol); } -# include "intersections.inst" +# include "cgal/intersections.inst" } // namespace CGALWrappers diff --git a/source/cgal/surface_mesh.cc b/source/cgal/surface_mesh.cc index 6b7af56d82..c9b3802826 100644 --- a/source/cgal/surface_mesh.cc +++ b/source/cgal/surface_mesh.cc @@ -189,7 +189,7 @@ namespace CGALWrappers Assert(false, ExcImpossibleInDimSpacedim(dim, spacedim)); } } // explicit instantiations -# include "surface_mesh.inst" +# include "cgal/surface_mesh.inst" } // namespace CGALWrappers # endif diff --git a/source/differentiation/ad/ad_drivers.cc b/source/differentiation/ad/ad_drivers.cc index 961989bc7a..b284a80467 100644 --- a/source/differentiation/ad/ad_drivers.cc +++ b/source/differentiation/ad/ad_drivers.cc @@ -2171,12 +2171,12 @@ namespace Differentiation /* --- Explicit instantiations --- */ -# include "ad_drivers.inst" +# include "differentiation/ad/ad_drivers.inst" # ifdef DEAL_II_WITH_ADOLC -# include "ad_drivers.inst1" +# include "differentiation/ad/ad_drivers.inst1" # endif # ifdef DEAL_II_TRILINOS_WITH_SACADO -# include "ad_drivers.inst2" +# include "differentiation/ad/ad_drivers.inst2" # endif diff --git a/source/differentiation/ad/ad_helpers.cc b/source/differentiation/ad/ad_helpers.cc index dd20154a72..d4512359c0 100644 --- a/source/differentiation/ad/ad_helpers.cc +++ b/source/differentiation/ad/ad_helpers.cc @@ -1881,13 +1881,13 @@ namespace Differentiation /* --- Explicit instantiations --- */ -# include "ad_helpers.inst" +# include "differentiation/ad/ad_helpers.inst" # ifdef DEAL_II_WITH_ADOLC -# include "ad_helpers.inst1" +# include "differentiation/ad/ad_helpers.inst1" # endif # ifdef DEAL_II_TRILINOS_WITH_SACADO -# include "ad_helpers.inst2" +# include "differentiation/ad/ad_helpers.inst2" # endif diff --git a/source/differentiation/ad/adolc_number_types.cc b/source/differentiation/ad/adolc_number_types.cc index 3cd1f0c4e0..aa5becd45a 100644 --- a/source/differentiation/ad/adolc_number_types.cc +++ b/source/differentiation/ad/adolc_number_types.cc @@ -82,7 +82,7 @@ namespace numbers /*---------------------- Explicit Instantiations ----------------------*/ -# include "adolc_number_types.inst" +# include "differentiation/ad/adolc_number_types.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/differentiation/ad/sacado_number_types.cc b/source/differentiation/ad/sacado_number_types.cc index d5bb8762dc..0c3a784bcf 100644 --- a/source/differentiation/ad/sacado_number_types.cc +++ b/source/differentiation/ad/sacado_number_types.cc @@ -23,9 +23,9 @@ DEAL_II_NAMESPACE_OPEN /*---------------------- Explicit Instantiations ----------------------*/ -# include "sacado_number_types.inst1" +# include "differentiation/ad/sacado_number_types.inst1" # ifdef DEAL_II_TRILINOS_CXX_SUPPORTS_SACADO_COMPLEX_RAD -# include "sacado_number_types.inst2" +# include "differentiation/ad/sacado_number_types.inst2" # endif DEAL_II_NAMESPACE_CLOSE diff --git a/source/differentiation/sd/symengine_number_visitor_internal.cc b/source/differentiation/sd/symengine_number_visitor_internal.cc index 3aaf7a7adf..0b1bec5f60 100644 --- a/source/differentiation/sd/symengine_number_visitor_internal.cc +++ b/source/differentiation/sd/symengine_number_visitor_internal.cc @@ -21,7 +21,7 @@ DEAL_II_NAMESPACE_OPEN /* --- Explicit instantiations --- */ -# include "symengine_number_visitor_internal.inst" +# include "differentiation/sd/symengine_number_visitor_internal.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/differentiation/sd/symengine_optimizer.cc b/source/differentiation/sd/symengine_optimizer.cc index 3ea611ff7d..8d1e67f8cb 100644 --- a/source/differentiation/sd/symengine_optimizer.cc +++ b/source/differentiation/sd/symengine_optimizer.cc @@ -831,7 +831,7 @@ namespace Differentiation /* --- Explicit instantiations --- */ -# include "symengine_optimizer.inst" +# include "differentiation/sd/symengine_optimizer.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/differentiation/sd/symengine_tensor_operations.cc b/source/differentiation/sd/symengine_tensor_operations.cc index b27b9eb954..bc103e16a2 100644 --- a/source/differentiation/sd/symengine_tensor_operations.cc +++ b/source/differentiation/sd/symengine_tensor_operations.cc @@ -289,7 +289,7 @@ namespace Differentiation /* --- Explicit instantiations --- */ -# include "symengine_tensor_operations.inst" +# include "differentiation/sd/symengine_tensor_operations.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/distributed/cell_data_transfer.cc b/source/distributed/cell_data_transfer.cc index 9a3c5afd51..91a80d415b 100644 --- a/source/distributed/cell_data_transfer.cc +++ b/source/distributed/cell_data_transfer.cc @@ -19,7 +19,7 @@ DEAL_II_NAMESPACE_OPEN // explicit instantiations -# include "cell_data_transfer.inst" +# include "distributed/cell_data_transfer.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/distributed/cell_weights.cc b/source/distributed/cell_weights.cc index 16a88760f4..251f14f7da 100644 --- a/source/distributed/cell_weights.cc +++ b/source/distributed/cell_weights.cc @@ -218,6 +218,6 @@ namespace parallel // explicit instantiations -#include "cell_weights.inst" +#include "distributed/cell_weights.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/distributed/field_transfer.cc b/source/distributed/field_transfer.cc index 507d4ca25e..41e2385f04 100644 --- a/source/distributed/field_transfer.cc +++ b/source/distributed/field_transfer.cc @@ -319,7 +319,7 @@ namespace parallel } // namespace parallel // explicit instantiations -# include "field_transfer.inst" +# include "distributed/field_transfer.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/distributed/fully_distributed_tria.cc b/source/distributed/fully_distributed_tria.cc index 480ddff33d..6ea13a67fe 100644 --- a/source/distributed/fully_distributed_tria.cc +++ b/source/distributed/fully_distributed_tria.cc @@ -779,7 +779,7 @@ namespace parallel /*-------------- Explicit Instantiations -------------------------------*/ -#include "fully_distributed_tria.inst" +#include "distributed/fully_distributed_tria.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/distributed/grid_refinement.cc b/source/distributed/grid_refinement.cc index 5800fae1e4..7008f1e6a9 100644 --- a/source/distributed/grid_refinement.cc +++ b/source/distributed/grid_refinement.cc @@ -637,7 +637,7 @@ namespace parallel // explicit instantiations -# include "grid_refinement.inst" +# include "distributed/grid_refinement.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/distributed/p4est_wrappers.cc b/source/distributed/p4est_wrappers.cc index 77a4420c6b..49e128803a 100644 --- a/source/distributed/p4est_wrappers.cc +++ b/source/distributed/p4est_wrappers.cc @@ -967,7 +967,7 @@ namespace internal #endif // DEAL_II_WITH_P4EST /*-------------- Explicit Instantiations -------------------------------*/ -#include "p4est_wrappers.inst" +#include "distributed/p4est_wrappers.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/distributed/repartitioning_policy_tools.cc b/source/distributed/repartitioning_policy_tools.cc index 7430a8fc36..2340c61056 100644 --- a/source/distributed/repartitioning_policy_tools.cc +++ b/source/distributed/repartitioning_policy_tools.cc @@ -313,6 +313,6 @@ namespace RepartitioningPolicyTools /*-------------- Explicit Instantiations -------------------------------*/ -#include "repartitioning_policy_tools.inst" +#include "distributed/repartitioning_policy_tools.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/distributed/shared_tria.cc b/source/distributed/shared_tria.cc index f3bc4f3246..e4ee70b431 100644 --- a/source/distributed/shared_tria.cc +++ b/source/distributed/shared_tria.cc @@ -591,6 +591,6 @@ namespace internal /*-------------- Explicit Instantiations -------------------------------*/ -#include "shared_tria.inst" +#include "distributed/shared_tria.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc index 70a46d6274..7444bdcfaa 100644 --- a/source/distributed/tria.cc +++ b/source/distributed/tria.cc @@ -4335,7 +4335,7 @@ namespace parallel /*-------------- Explicit Instantiations -------------------------------*/ -#include "tria.inst" +#include "distributed/tria.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/distributed/tria_base.cc b/source/distributed/tria_base.cc index 821ebbd25f..262d588239 100644 --- a/source/distributed/tria_base.cc +++ b/source/distributed/tria_base.cc @@ -724,6 +724,6 @@ namespace parallel /*-------------- Explicit Instantiations -------------------------------*/ -#include "tria_base.inst" +#include "distributed/tria_base.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/dofs/block_info.cc b/source/dofs/block_info.cc index 94b94c1936..ce174fe33a 100644 --- a/source/dofs/block_info.cc +++ b/source/dofs/block_info.cc @@ -77,6 +77,6 @@ BlockInfo::initialize_local(const DoFHandler &dof) } // explicit instantiations -#include "block_info.inst" +#include "dofs/block_info.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/dofs/dof_accessor.cc b/source/dofs/dof_accessor.cc index 260f14e414..e7d035542c 100644 --- a/source/dofs/dof_accessor.cc +++ b/source/dofs/dof_accessor.cc @@ -320,6 +320,6 @@ DoFCellAccessor:: // -------------------------------------------------------------------------- // explicit instantiations -#include "dof_accessor.inst" +#include "dofs/dof_accessor.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/dofs/dof_accessor_get.cc b/source/dofs/dof_accessor_get.cc index 44568d9b07..345e9305f6 100644 --- a/source/dofs/dof_accessor_get.cc +++ b/source/dofs/dof_accessor_get.cc @@ -184,6 +184,6 @@ DoFCellAccessor::get_interpolated_dof_values( // -------------------------------------------------------------------------- // explicit instantiations -#include "dof_accessor_get.inst" +#include "dofs/dof_accessor_get.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/dofs/dof_accessor_set.cc b/source/dofs/dof_accessor_set.cc index 53bfb7d101..f78bf150ed 100644 --- a/source/dofs/dof_accessor_set.cc +++ b/source/dofs/dof_accessor_set.cc @@ -311,6 +311,6 @@ DoFCellAccessor:: // -------------------------------------------------------------------------- // explicit instantiations -#include "dof_accessor_set.inst" +#include "dofs/dof_accessor_set.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/dofs/dof_handler.cc b/source/dofs/dof_handler.cc index e01d299e4a..6a666f5e5b 100644 --- a/source/dofs/dof_handler.cc +++ b/source/dofs/dof_handler.cc @@ -3193,7 +3193,7 @@ unsigned int DoFHandler::MGVertexDoFs::get_finest_level() const } #endif /*-------------- Explicit Instantiations -------------------------------*/ -#include "dof_handler.inst" +#include "dofs/dof_handler.inst" diff --git a/source/dofs/dof_handler_policy.cc b/source/dofs/dof_handler_policy.cc index d1e4204f63..886f96ef49 100644 --- a/source/dofs/dof_handler_policy.cc +++ b/source/dofs/dof_handler_policy.cc @@ -4225,7 +4225,7 @@ namespace internal /*-------------- Explicit Instantiations -------------------------------*/ -#include "dof_handler_policy.inst" +#include "dofs/dof_handler_policy.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/dofs/dof_objects.cc b/source/dofs/dof_objects.cc index a90f5bd887..10368097cb 100644 --- a/source/dofs/dof_objects.cc +++ b/source/dofs/dof_objects.cc @@ -41,7 +41,7 @@ namespace internal { namespace DoFHandlerImplementation { -#include "dof_objects.inst" +#include "dofs/dof_objects.inst" } } // namespace internal diff --git a/source/dofs/dof_renumbering.cc b/source/dofs/dof_renumbering.cc index 9f1b4af83b..7f6e492bf1 100644 --- a/source/dofs/dof_renumbering.cc +++ b/source/dofs/dof_renumbering.cc @@ -2905,7 +2905,7 @@ namespace DoFRenumbering /*-------------- Explicit Instantiations -------------------------------*/ -#include "dof_renumbering.inst" +#include "dofs/dof_renumbering.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc index 4178e69159..13fe524a42 100644 --- a/source/dofs/dof_tools.cc +++ b/source/dofs/dof_tools.cc @@ -3154,7 +3154,7 @@ namespace DoFTools // explicit instantiations -#include "dof_tools.inst" +#include "dofs/dof_tools.inst" diff --git a/source/dofs/dof_tools_constraints.cc b/source/dofs/dof_tools_constraints.cc index 2744172bd5..a5abaf041b 100644 --- a/source/dofs/dof_tools_constraints.cc +++ b/source/dofs/dof_tools_constraints.cc @@ -4846,7 +4846,7 @@ namespace DoFTools // explicit instantiations -#include "dof_tools_constraints.inst" +#include "dofs/dof_tools_constraints.inst" diff --git a/source/dofs/dof_tools_sparsity.cc b/source/dofs/dof_tools_sparsity.cc index bfce5678e1..acbd336cad 100644 --- a/source/dofs/dof_tools_sparsity.cc +++ b/source/dofs/dof_tools_sparsity.cc @@ -1144,7 +1144,7 @@ namespace DoFTools // --------------------------------------------------- explicit instantiations -#include "dof_tools_sparsity.inst" +#include "dofs/dof_tools_sparsity.inst" diff --git a/source/fe/fe.cc b/source/fe/fe.cc index d1e918d19f..318e1e9a4a 100644 --- a/source/fe/fe.cc +++ b/source/fe/fe.cc @@ -1432,7 +1432,7 @@ FiniteElement::base_element(const unsigned int index) const #endif /*------------------------------- Explicit Instantiations -------------*/ -#include "fe.inst" +#include "fe/fe.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_abf.cc b/source/fe/fe_abf.cc index ee2c917ada..f947e12b07 100644 --- a/source/fe/fe_abf.cc +++ b/source/fe/fe_abf.cc @@ -654,6 +654,6 @@ FE_ABF::memory_consumption() const /*-------------- Explicit Instantiations -------------------------------*/ -#include "fe_abf.inst" +#include "fe/fe_abf.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_bdm.cc b/source/fe/fe_bdm.cc index 547e159928..f52a220f4e 100644 --- a/source/fe/fe_bdm.cc +++ b/source/fe/fe_bdm.cc @@ -429,6 +429,6 @@ FE_BDM::initialize_support_points(const unsigned int deg) /*-------------- Explicit Instantiations -------------------------------*/ -#include "fe_bdm.inst" +#include "fe/fe_bdm.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_bernstein.cc b/source/fe/fe_bernstein.cc index 81e95083d5..cfdc65e08f 100644 --- a/source/fe/fe_bernstein.cc +++ b/source/fe/fe_bernstein.cc @@ -381,6 +381,6 @@ FE_Bernstein::renumber_bases(const unsigned int deg) // explicit instantiations -#include "fe_bernstein.inst" +#include "fe/fe_bernstein.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_dg_vector.cc b/source/fe/fe_dg_vector.cc index 1a30796ee1..07346da907 100644 --- a/source/fe/fe_dg_vector.cc +++ b/source/fe/fe_dg_vector.cc @@ -100,6 +100,6 @@ FE_DGBDM::get_name() const } -#include "fe_dg_vector.inst" +#include "fe/fe_dg_vector.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_dgp.cc b/source/fe/fe_dgp.cc index 23c1d6bf16..2268a53c39 100644 --- a/source/fe/fe_dgp.cc +++ b/source/fe/fe_dgp.cc @@ -292,7 +292,7 @@ FE_DGP::memory_consumption() const // explicit instantiations -#include "fe_dgp.inst" +#include "fe/fe_dgp.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_dgp_monomial.cc b/source/fe/fe_dgp_monomial.cc index c5f856616d..c2304cdcb5 100644 --- a/source/fe/fe_dgp_monomial.cc +++ b/source/fe/fe_dgp_monomial.cc @@ -510,7 +510,7 @@ FE_DGPMonomial::memory_consumption() const // explicit instantiations -#include "fe_dgp_monomial.inst" +#include "fe/fe_dgp_monomial.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_dgp_nonparametric.cc b/source/fe/fe_dgp_nonparametric.cc index 69e78b7ab9..d4964fd272 100644 --- a/source/fe/fe_dgp_nonparametric.cc +++ b/source/fe/fe_dgp_nonparametric.cc @@ -667,7 +667,7 @@ FE_DGPNonparametric::get_degree() const // explicit instantiations -#include "fe_dgp_nonparametric.inst" +#include "fe/fe_dgp_nonparametric.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_dgq.cc b/source/fe/fe_dgq.cc index c068a1989a..bdd4ebcf01 100644 --- a/source/fe/fe_dgq.cc +++ b/source/fe/fe_dgq.cc @@ -1078,7 +1078,7 @@ FE_DGQHermite::clone() const // explicit instantiations -#include "fe_dgq.inst" +#include "fe/fe_dgq.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_enriched.cc b/source/fe/fe_enriched.cc index 62372c1c4c..754b0bb2fa 100644 --- a/source/fe/fe_enriched.cc +++ b/source/fe/fe_enriched.cc @@ -1526,6 +1526,6 @@ namespace ColorEnriched // explicit instantiations -#include "fe_enriched.inst" +#include "fe/fe_enriched.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_face.cc b/source/fe/fe_face.cc index 78b4f7d5d1..538b89b158 100644 --- a/source/fe/fe_face.cc +++ b/source/fe/fe_face.cc @@ -1019,7 +1019,7 @@ FE_FaceP<1, spacedim>::get_name() const // explicit instantiations -#include "fe_face.inst" +#include "fe/fe_face.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_hermite.cc b/source/fe/fe_hermite.cc index 12b9e1e493..d3d2856ce0 100644 --- a/source/fe/fe_hermite.cc +++ b/source/fe/fe_hermite.cc @@ -956,6 +956,6 @@ FE_Hermite::fill_fe_face_values( // Explicit instantiations -#include "fe_hermite.inst" +#include "fe/fe_hermite.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_nedelec.cc b/source/fe/fe_nedelec.cc index 03e731201a..dcb7f97ee6 100644 --- a/source/fe/fe_nedelec.cc +++ b/source/fe/fe_nedelec.cc @@ -4522,7 +4522,7 @@ FE_Nedelec::get_embedding_dofs(const unsigned int sub_degree) const // explicit instantiations -#include "fe_nedelec.inst" +#include "fe/fe_nedelec.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_nedelec_sz.cc b/source/fe/fe_nedelec_sz.cc index a60a787c9b..b7ae1f7074 100644 --- a/source/fe/fe_nedelec_sz.cc +++ b/source/fe/fe_nedelec_sz.cc @@ -3372,6 +3372,6 @@ FE_NedelecSZ::get_prolongation_matrix( } // explicit instantiations -#include "fe_nedelec_sz.inst" +#include "fe/fe_nedelec_sz.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_nothing.cc b/source/fe/fe_nothing.cc index 0b88ed2507..edb7a616a1 100644 --- a/source/fe/fe_nothing.cc +++ b/source/fe/fe_nothing.cc @@ -339,7 +339,7 @@ FE_Nothing::get_constant_modes() const // explicit instantiations -#include "fe_nothing.inst" +#include "fe/fe_nothing.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_poly.cc b/source/fe/fe_poly.cc index a9bb853f10..68ca48da51 100644 --- a/source/fe/fe_poly.cc +++ b/source/fe/fe_poly.cc @@ -633,6 +633,6 @@ FE_Poly::memory_consumption() const #endif -#include "fe_poly.inst" +#include "fe/fe_poly.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_poly_tensor.cc b/source/fe/fe_poly_tensor.cc index 9fda6d6a9a..6b5c3f739f 100644 --- a/source/fe/fe_poly_tensor.cc +++ b/source/fe/fe_poly_tensor.cc @@ -2605,7 +2605,7 @@ FE_PolyTensor::requires_update_flags( #endif // explicit instantiations -#include "fe_poly_tensor.inst" +#include "fe/fe_poly_tensor.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_pyramid_p.cc b/source/fe/fe_pyramid_p.cc index 053798fc69..a7d40d558a 100644 --- a/source/fe/fe_pyramid_p.cc +++ b/source/fe/fe_pyramid_p.cc @@ -340,6 +340,6 @@ FE_PyramidDGP::get_name() const } // explicit instantiations -#include "fe_pyramid_p.inst" +#include "fe/fe_pyramid_p.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_q.cc b/source/fe/fe_q.cc index 0a28ebea61..35cf173f0b 100644 --- a/source/fe/fe_q.cc +++ b/source/fe/fe_q.cc @@ -273,6 +273,6 @@ FE_Q::compare_for_domination( // explicit instantiations -#include "fe_q.inst" +#include "fe/fe_q.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_q_base.cc b/source/fe/fe_q_base.cc index 4bd1ab1c53..def431961b 100644 --- a/source/fe/fe_q_base.cc +++ b/source/fe/fe_q_base.cc @@ -1694,6 +1694,6 @@ FE_Q_Base::get_constant_modes() const #endif // explicit instantiations -#include "fe_q_base.inst" +#include "fe/fe_q_base.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_q_bubbles.cc b/source/fe/fe_q_bubbles.cc index 441ec19831..629e863ce4 100644 --- a/source/fe/fe_q_bubbles.cc +++ b/source/fe/fe_q_bubbles.cc @@ -554,6 +554,6 @@ FE_Q_Bubbles::compare_for_domination( // explicit instantiations -#include "fe_q_bubbles.inst" +#include "fe/fe_q_bubbles.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_q_dg0.cc b/source/fe/fe_q_dg0.cc index c8c110206f..ad9331444b 100644 --- a/source/fe/fe_q_dg0.cc +++ b/source/fe/fe_q_dg0.cc @@ -338,6 +338,6 @@ FE_Q_DG0::compare_for_domination( // explicit instantiations -#include "fe_q_dg0.inst" +#include "fe/fe_q_dg0.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_q_hierarchical.cc b/source/fe/fe_q_hierarchical.cc index 074a5c3f4e..4de8831d48 100644 --- a/source/fe/fe_q_hierarchical.cc +++ b/source/fe/fe_q_hierarchical.cc @@ -2458,7 +2458,7 @@ FE_Q_Hierarchical::memory_consumption() const // explicit instantiations -#include "fe_q_hierarchical.inst" +#include "fe/fe_q_hierarchical.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_q_iso_q1.cc b/source/fe/fe_q_iso_q1.cc index 3f3ec7e262..31bd9ee88b 100644 --- a/source/fe/fe_q_iso_q1.cc +++ b/source/fe/fe_q_iso_q1.cc @@ -218,6 +218,6 @@ FE_Q_iso_Q1::compare_for_domination( // explicit instantiations -#include "fe_q_iso_q1.inst" +#include "fe/fe_q_iso_q1.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_rannacher_turek.cc b/source/fe/fe_rannacher_turek.cc index 1e79321053..74cd8df901 100644 --- a/source/fe/fe_rannacher_turek.cc +++ b/source/fe/fe_rannacher_turek.cc @@ -135,6 +135,6 @@ FE_RannacherTurek::convert_generalized_support_point_values_to_dof_values( // explicit instantiations -#include "fe_rannacher_turek.inst" +#include "fe/fe_rannacher_turek.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_raviart_thomas.cc b/source/fe/fe_raviart_thomas.cc index 4449d51a8d..a8ef14b910 100644 --- a/source/fe/fe_raviart_thomas.cc +++ b/source/fe/fe_raviart_thomas.cc @@ -738,7 +738,7 @@ FE_RaviartThomas::memory_consumption() const // explicit instantiations -#include "fe_raviart_thomas.inst" +#include "fe/fe_raviart_thomas.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_raviart_thomas_nodal.cc b/source/fe/fe_raviart_thomas_nodal.cc index 33c0c5c7ee..92f1c758ef 100644 --- a/source/fe/fe_raviart_thomas_nodal.cc +++ b/source/fe/fe_raviart_thomas_nodal.cc @@ -787,7 +787,7 @@ FE_RaviartThomasNodal::get_restriction_matrix( // explicit instantiations -#include "fe_raviart_thomas_nodal.inst" +#include "fe/fe_raviart_thomas_nodal.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_rt_bubbles.cc b/source/fe/fe_rt_bubbles.cc index 598564db24..1f9769b8c6 100644 --- a/source/fe/fe_rt_bubbles.cc +++ b/source/fe/fe_rt_bubbles.cc @@ -349,7 +349,7 @@ FE_RT_Bubbles::convert_generalized_support_point_values_to_dof_values( // explicit instantiations -#include "fe_rt_bubbles.inst" +#include "fe/fe_rt_bubbles.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_series_fourier.cc b/source/fe/fe_series_fourier.cc index 1a97af4c73..e9b029ba15 100644 --- a/source/fe/fe_series_fourier.cc +++ b/source/fe/fe_series_fourier.cc @@ -315,6 +315,6 @@ namespace FESeries // explicit instantiations -#include "fe_series_fourier.inst" +#include "fe/fe_series_fourier.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_series_legendre.cc b/source/fe/fe_series_legendre.cc index eec5dff165..65190bba7a 100644 --- a/source/fe/fe_series_legendre.cc +++ b/source/fe/fe_series_legendre.cc @@ -318,6 +318,6 @@ namespace FESeries // explicit instantiations -#include "fe_series_legendre.inst" +#include "fe/fe_series_legendre.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_simplex_p.cc b/source/fe/fe_simplex_p.cc index bc27b22098..85c16369f7 100644 --- a/source/fe/fe_simplex_p.cc +++ b/source/fe/fe_simplex_p.cc @@ -1184,6 +1184,6 @@ FE_SimplexDGP::get_restriction_matrix( } // explicit instantiations -#include "fe_simplex_p.inst" +#include "fe/fe_simplex_p.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_simplex_p_bubbles.cc b/source/fe/fe_simplex_p_bubbles.cc index a2f1837a8c..8ba986b41c 100644 --- a/source/fe/fe_simplex_p_bubbles.cc +++ b/source/fe/fe_simplex_p_bubbles.cc @@ -295,6 +295,6 @@ FE_SimplexP_Bubbles::clone() const } // explicit instantiations -#include "fe_simplex_p_bubbles.inst" +#include "fe/fe_simplex_p_bubbles.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_system.cc b/source/fe/fe_system.cc index 1bd3216963..5c29ee4dcd 100644 --- a/source/fe/fe_system.cc +++ b/source/fe/fe_system.cc @@ -2815,6 +2815,6 @@ FESystem::memory_consumption() const #endif // explicit instantiations -#include "fe_system.inst" +#include "fe/fe_system.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_tools.cc b/source/fe/fe_tools.cc index 8a2a536965..acee0c345e 100644 --- a/source/fe/fe_tools.cc +++ b/source/fe/fe_tools.cc @@ -31,7 +31,7 @@ namespace FETools /*-------------- Explicit Instantiations -------------------------------*/ -#include "fe_tools.inst" +#include "fe/fe_tools.inst" // these do not fit into the templates of the dimension in the inst file namespace FETools diff --git a/source/fe/fe_tools_extrapolate.cc b/source/fe/fe_tools_extrapolate.cc index 350b38ab4a..30396faee1 100644 --- a/source/fe/fe_tools_extrapolate.cc +++ b/source/fe/fe_tools_extrapolate.cc @@ -17,7 +17,7 @@ DEAL_II_NAMESPACE_OPEN /*-------------- Explicit Instantiations -------------------------------*/ -#include "fe_tools_extrapolate.inst" +#include "fe/fe_tools_extrapolate.inst" /*---------------------------- fe_tools.cc ---------------------------*/ diff --git a/source/fe/fe_tools_interpolate.cc b/source/fe/fe_tools_interpolate.cc index caa05aff99..125369453f 100644 --- a/source/fe/fe_tools_interpolate.cc +++ b/source/fe/fe_tools_interpolate.cc @@ -18,6 +18,6 @@ DEAL_II_NAMESPACE_OPEN /*-------------- Explicit Instantiations -------------------------------*/ -#include "fe_tools_interpolate.inst" +#include "fe/fe_tools_interpolate.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_trace.cc b/source/fe/fe_trace.cc index 7b398b7ab2..ab4247d22b 100644 --- a/source/fe/fe_trace.cc +++ b/source/fe/fe_trace.cc @@ -289,7 +289,7 @@ FE_TraceQ<1, spacedim>::get_name() const // explicit instantiations -#include "fe_trace.inst" +#include "fe/fe_trace.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc index c88d547bf8..fe69ddca62 100644 --- a/source/fe/fe_values.cc +++ b/source/fe/fe_values.cc @@ -997,6 +997,6 @@ FESubfaceValues::do_reinit(const unsigned int face_no, /*------------------------- Explicit Instantiations --------------------------*/ -#include "fe_values.inst" +#include "fe/fe_values.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_values_base.cc b/source/fe/fe_values_base.cc index 3b389cddf0..20aa3d6e32 100644 --- a/source/fe/fe_values_base.cc +++ b/source/fe/fe_values_base.cc @@ -1468,6 +1468,6 @@ const unsigned int FEValuesBase::space_dimension; /*-------------------------- Explicit Instantiations -------------------------*/ -#include "fe_values_base.inst" +#include "fe/fe_values_base.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_values_views.cc b/source/fe/fe_values_views.cc index 8394cc2084..39ab945feb 100644 --- a/source/fe/fe_values_views.cc +++ b/source/fe/fe_values_views.cc @@ -1383,6 +1383,6 @@ namespace internal /*------------------------------- Explicit Instantiations -------------*/ -#include "fe_values_views.inst" +#include "fe/fe_values_views.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_values_views_internal.cc b/source/fe/fe_values_views_internal.cc index f93a79ba9c..75f235f310 100644 --- a/source/fe/fe_values_views_internal.cc +++ b/source/fe/fe_values_views_internal.cc @@ -1166,6 +1166,6 @@ namespace FEValuesViews /*------------------------------- Explicit Instantiations -------------*/ -#include "fe_values_views_internal.inst" +#include "fe/fe_values_views_internal.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/fe_wedge_p.cc b/source/fe/fe_wedge_p.cc index c3004825e4..7ceab98ffc 100644 --- a/source/fe/fe_wedge_p.cc +++ b/source/fe/fe_wedge_p.cc @@ -360,6 +360,6 @@ FE_WedgeDGP::get_name() const } // explicit instantiations -#include "fe_wedge_p.inst" +#include "fe/fe_wedge_p.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/mapping.cc b/source/fe/mapping.cc index 5bf7e72eb1..441567fd76 100644 --- a/source/fe/mapping.cc +++ b/source/fe/mapping.cc @@ -332,7 +332,7 @@ get_default_linear_mapping(const Triangulation &triangulation) // explicit instantiations -#include "mapping.inst" +#include "fe/mapping.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/mapping_c1.cc b/source/fe/mapping_c1.cc index f27c76787d..d810586c5c 100644 --- a/source/fe/mapping_c1.cc +++ b/source/fe/mapping_c1.cc @@ -210,7 +210,7 @@ MappingC1::clone() const // explicit instantiations -#include "mapping_c1.inst" +#include "fe/mapping_c1.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/mapping_cartesian.cc b/source/fe/mapping_cartesian.cc index 04e752a27d..7f4033fd09 100644 --- a/source/fe/mapping_cartesian.cc +++ b/source/fe/mapping_cartesian.cc @@ -1262,7 +1262,7 @@ MappingCartesian::clone() const //--------------------------------------------------------------------------- // explicit instantiations -#include "mapping_cartesian.inst" +#include "fe/mapping_cartesian.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/mapping_fe.cc b/source/fe/mapping_fe.cc index 563045675c..65be199d1e 100644 --- a/source/fe/mapping_fe.cc +++ b/source/fe/mapping_fe.cc @@ -2403,7 +2403,7 @@ MappingFE::is_compatible_with( //--------------------------- Explicit instantiations ----------------------- -#include "mapping_fe.inst" +#include "fe/mapping_fe.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/mapping_fe_field.cc b/source/fe/mapping_fe_field.cc index b8e4f2a058..cc9d3aa8fc 100644 --- a/source/fe/mapping_fe_field.cc +++ b/source/fe/mapping_fe_field.cc @@ -2460,7 +2460,7 @@ MappingFEField::update_internal_dofs( #ifndef SPLIT_INSTANTIATIONS_INDEX # define SPLIT_INSTANTIATIONS_INDEX 0 #endif -#include "mapping_fe_field.inst" +#include "fe/mapping_fe_field.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/mapping_manifold.cc b/source/fe/mapping_manifold.cc index b291507932..42af2fbd59 100644 --- a/source/fe/mapping_manifold.cc +++ b/source/fe/mapping_manifold.cc @@ -1438,7 +1438,7 @@ MappingManifold::transform( } //--------------------------- Explicit instantiations ----------------------- -#include "mapping_manifold.inst" +#include "fe/mapping_manifold.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc index 7f141c1a9c..40e4b358a1 100644 --- a/source/fe/mapping_q.cc +++ b/source/fe/mapping_q.cc @@ -1855,7 +1855,7 @@ MappingQ::is_compatible_with( //--------------------------- Explicit instantiations ----------------------- -#include "mapping_q.inst" +#include "fe/mapping_q.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/mapping_q1.cc b/source/fe/mapping_q1.cc index 64f7de20c4..2fb76b296c 100644 --- a/source/fe/mapping_q1.cc +++ b/source/fe/mapping_q1.cc @@ -35,7 +35,7 @@ MappingQ1::clone() const } //--------------------------- Explicit instantiations ----------------------- -#include "mapping_q1.inst" +#include "fe/mapping_q1.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/mapping_q1_eulerian.cc b/source/fe/mapping_q1_eulerian.cc index a8a2076b1c..cfc969d06e 100644 --- a/source/fe/mapping_q1_eulerian.cc +++ b/source/fe/mapping_q1_eulerian.cc @@ -163,7 +163,7 @@ MappingQ1Eulerian::fill_fe_values( // explicit instantiations -#include "mapping_q1_eulerian.inst" +#include "fe/mapping_q1_eulerian.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/mapping_q_cache.cc b/source/fe/mapping_q_cache.cc index 353a483963..16dd292b50 100644 --- a/source/fe/mapping_q_cache.cc +++ b/source/fe/mapping_q_cache.cc @@ -758,7 +758,7 @@ MappingQCache::get_vertices( //--------------------------- Explicit instantiations ----------------------- -#include "mapping_q_cache.inst" +#include "fe/mapping_q_cache.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/mapping_q_eulerian.cc b/source/fe/mapping_q_eulerian.cc index 9f8bec794c..0e6983a0cb 100644 --- a/source/fe/mapping_q_eulerian.cc +++ b/source/fe/mapping_q_eulerian.cc @@ -222,7 +222,7 @@ MappingQEulerian::fill_fe_values( // explicit instantiations -#include "mapping_q_eulerian.inst" +#include "fe/mapping_q_eulerian.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/fe/mapping_related_data.cc b/source/fe/mapping_related_data.cc index d45c615deb..0705af1d7f 100644 --- a/source/fe/mapping_related_data.cc +++ b/source/fe/mapping_related_data.cc @@ -108,6 +108,6 @@ namespace internal } // namespace FEValuesImplementation } // namespace internal -#include "mapping_related_data.inst" +#include "fe/mapping_related_data.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/gmsh/utilities.cc b/source/gmsh/utilities.cc index 5f91972556..03b589e79e 100644 --- a/source/gmsh/utilities.cc +++ b/source/gmsh/utilities.cc @@ -142,7 +142,7 @@ namespace Gmsh // explicit instantiations # ifdef DEAL_II_WITH_OPENCASCADE -# include "utilities.inst" +# include "gmsh/utilities.inst" # endif } // namespace Gmsh diff --git a/source/grid/cell_id.cc b/source/grid/cell_id.cc index e1ef8279c5..47a41642ef 100644 --- a/source/grid/cell_id.cc +++ b/source/grid/cell_id.cc @@ -162,6 +162,6 @@ CellId::to_string() const // explicit instantiations -#include "cell_id.inst" +#include "grid/cell_id.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc index 285c66f11c..5f8bc68054 100644 --- a/source/grid/grid_generator.cc +++ b/source/grid/grid_generator.cc @@ -9134,7 +9134,7 @@ namespace GridGenerator } // namespace GridGenerator // explicit instantiations -# include "grid_generator.inst" +# include "grid/grid_generator.inst" #endif // DOXYGEN diff --git a/source/grid/grid_generator_cgal.cc b/source/grid/grid_generator_cgal.cc index 92c238ff93..ad775dfe64 100644 --- a/source/grid/grid_generator_cgal.cc +++ b/source/grid/grid_generator_cgal.cc @@ -214,7 +214,7 @@ namespace GridGenerator } // namespace GridGenerator // explicit instantiations -# include "grid_generator_cgal.inst" +# include "grid/grid_generator_cgal.inst" #endif // DOXYGEN diff --git a/source/grid/grid_generator_from_name.cc b/source/grid/grid_generator_from_name.cc index 28e3fe7b37..a412efd99d 100644 --- a/source/grid/grid_generator_from_name.cc +++ b/source/grid/grid_generator_from_name.cc @@ -403,6 +403,6 @@ namespace GridGenerator } } // namespace GridGenerator -#include "grid_generator_from_name.inst" +#include "grid/grid_generator_from_name.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/grid_generator_pipe_junction.cc b/source/grid/grid_generator_pipe_junction.cc index 133a19940a..bad74ee667 100644 --- a/source/grid/grid_generator_pipe_junction.cc +++ b/source/grid/grid_generator_pipe_junction.cc @@ -639,6 +639,6 @@ namespace GridGenerator // explicit instantiations -#include "grid_generator_pipe_junction.inst" +#include "grid/grid_generator_pipe_junction.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/grid_in.cc b/source/grid/grid_in.cc index 0d14a63839..b44074905b 100644 --- a/source/grid/grid_in.cc +++ b/source/grid/grid_in.cc @@ -5016,6 +5016,6 @@ namespace // explicit instantiations -#include "grid_in.inst" +#include "grid/grid_in.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/grid_out.cc b/source/grid/grid_out.cc index 48cb66acd4..95ec435824 100644 --- a/source/grid/grid_out.cc +++ b/source/grid/grid_out.cc @@ -5203,7 +5203,7 @@ GridOut::write(const Triangulation &tria, // explicit instantiations -#include "grid_out.inst" +#include "grid/grid_out.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/grid_refinement.cc b/source/grid/grid_refinement.cc index a1ddf52441..b43b1af63e 100644 --- a/source/grid/grid_refinement.cc +++ b/source/grid/grid_refinement.cc @@ -492,6 +492,6 @@ GridRefinement::refine_and_coarsen_optimize(Triangulation &tria, // explicit instantiations -#include "grid_refinement.inst" +#include "grid/grid_refinement.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc index 2586c5c07d..4a8450efcc 100644 --- a/source/grid/grid_tools.cc +++ b/source/grid/grid_tools.cc @@ -5656,6 +5656,6 @@ namespace GridTools // explicit instantiations -#include "grid_tools.inst" +#include "grid/grid_tools.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/grid_tools_cache.cc b/source/grid/grid_tools_cache.cc index 70095d85d9..4f2bc55d7c 100644 --- a/source/grid/grid_tools_cache.cc +++ b/source/grid/grid_tools_cache.cc @@ -359,7 +359,7 @@ namespace GridTools return vertices_with_ghost_neighbors; } -#include "grid_tools_cache.inst" +#include "grid/grid_tools_cache.inst" } // namespace GridTools diff --git a/source/grid/grid_tools_dof_handlers.cc b/source/grid/grid_tools_dof_handlers.cc index ea88f877fb..a32a74f8c2 100644 --- a/source/grid/grid_tools_dof_handlers.cc +++ b/source/grid/grid_tools_dof_handlers.cc @@ -2498,7 +2498,7 @@ namespace GridTools } // namespace GridTools -#include "grid_tools_dof_handlers.inst" +#include "grid/grid_tools_dof_handlers.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/grid_tools_geometry.cc b/source/grid/grid_tools_geometry.cc index 183ff6c3dc..b2c61369e5 100644 --- a/source/grid/grid_tools_geometry.cc +++ b/source/grid/grid_tools_geometry.cc @@ -437,6 +437,6 @@ namespace GridTools // explicit instantiations -#include "grid_tools_geometry.inst" +#include "grid/grid_tools_geometry.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/grid_tools_topology.cc b/source/grid/grid_tools_topology.cc index 926cd924ec..d6c880c1f8 100644 --- a/source/grid/grid_tools_topology.cc +++ b/source/grid/grid_tools_topology.cc @@ -1957,6 +1957,6 @@ namespace GridTools } /* namespace GridTools */ // explicit instantiations -#include "grid_tools_topology.inst" +#include "grid/grid_tools_topology.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/intergrid_map.cc b/source/grid/intergrid_map.cc index 001ef0ed89..cce57024ee 100644 --- a/source/grid/intergrid_map.cc +++ b/source/grid/intergrid_map.cc @@ -212,6 +212,6 @@ std::size_t InterGridMap::memory_consumption() const // explicit instantiations -#include "intergrid_map.inst" +#include "grid/intergrid_map.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/manifold.cc b/source/grid/manifold.cc index 665f3139d8..5e8af0ee0d 100644 --- a/source/grid/manifold.cc +++ b/source/grid/manifold.cc @@ -1122,6 +1122,6 @@ ChartManifold::get_periodicity() const } // explicit instantiations -#include "manifold.inst" +#include "grid/manifold.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/manifold_lib.cc b/source/grid/manifold_lib.cc index 24b3316824..e4c4b9bbf0 100644 --- a/source/grid/manifold_lib.cc +++ b/source/grid/manifold_lib.cc @@ -2609,6 +2609,6 @@ TransfiniteInterpolationManifold::get_new_points( // explicit instantiations -#include "manifold_lib.inst" +#include "grid/manifold_lib.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/reference_cell.cc b/source/grid/reference_cell.cc index 0641515c04..090792d502 100644 --- a/source/grid/reference_cell.cc +++ b/source/grid/reference_cell.cc @@ -1176,6 +1176,6 @@ ReferenceCell::get_gauss_type_quadrature(const unsigned n_points_1D) const; template const Quadrature<0> & ReferenceCell::get_nodal_type_quadrature() const; -#include "reference_cell.inst" +#include "grid/reference_cell.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/tria.cc b/source/grid/tria.cc index 9390242464..8e2738e5cd 100644 --- a/source/grid/tria.cc +++ b/source/grid/tria.cc @@ -18016,6 +18016,6 @@ Triangulation::DistortedCellList::~DistortedCellList() noexcept = #endif // explicit instantiations -#include "tria.inst" +#include "grid/tria.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/tria_accessor.cc b/source/grid/tria_accessor.cc index cb41374763..c7378ccfdc 100644 --- a/source/grid/tria_accessor.cc +++ b/source/grid/tria_accessor.cc @@ -3481,6 +3481,6 @@ InvalidAccessor::index() // explicit instantiations -#include "tria_accessor.inst" +#include "grid/tria_accessor.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/tria_description.cc b/source/grid/tria_description.cc index 52770bdcce..5e59980736 100644 --- a/source/grid/tria_description.cc +++ b/source/grid/tria_description.cc @@ -1170,7 +1170,7 @@ namespace TriangulationDescription /*-------------- Explicit Instantiations -------------------------------*/ -#include "tria_description.inst" +#include "grid/tria_description.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/grid/tria_objects.cc b/source/grid/tria_objects.cc index 0d012c1121..485c256bdd 100644 --- a/source/grid/tria_objects.cc +++ b/source/grid/tria_objects.cc @@ -78,7 +78,7 @@ namespace internal // explicit instantiations #ifndef DOXYGEN -# include "tria_objects.inst" +# include "grid/tria_objects.inst" #endif } // namespace TriangulationImplementation } // namespace internal diff --git a/source/hp/fe_collection.cc b/source/hp/fe_collection.cc index 2669f7e7e6..4d817485bc 100644 --- a/source/hp/fe_collection.cc +++ b/source/hp/fe_collection.cc @@ -861,7 +861,7 @@ namespace hp // explicit instantiations -#include "fe_collection.inst" +#include "hp/fe_collection.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/hp/fe_values.cc b/source/hp/fe_values.cc index 5cac943197..06ae36ab44 100644 --- a/source/hp/fe_values.cc +++ b/source/hp/fe_values.cc @@ -639,7 +639,7 @@ namespace hp // explicit instantiations -#include "fe_values.inst" +#include "hp/fe_values.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/hp/mapping_collection.cc b/source/hp/mapping_collection.cc index ad75813822..ce7e8f330c 100644 --- a/source/hp/mapping_collection.cc +++ b/source/hp/mapping_collection.cc @@ -57,7 +57,7 @@ namespace hp // explicit instantiations -#include "mapping_collection.inst" +#include "hp/mapping_collection.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/hp/refinement.cc b/source/hp/refinement.cc index eaa21b6a80..045c0f5e03 100644 --- a/source/hp/refinement.cc +++ b/source/hp/refinement.cc @@ -1069,6 +1069,6 @@ namespace hp // explicit instantiations -#include "refinement.inst" +#include "hp/refinement.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/affine_constraints.cc b/source/lac/affine_constraints.cc index e051e03b83..97d07f6aec 100644 --- a/source/lac/affine_constraints.cc +++ b/source/lac/affine_constraints.cc @@ -18,7 +18,7 @@ DEAL_II_NAMESPACE_OPEN -#include "affine_constraints.inst" +#include "lac/affine_constraints.inst" /* * Note: You probably do not want to add your custom instantiation down diff --git a/source/lac/block_sparse_matrix.cc b/source/lac/block_sparse_matrix.cc index c17f0247c8..de9fc4bc1a 100644 --- a/source/lac/block_sparse_matrix.cc +++ b/source/lac/block_sparse_matrix.cc @@ -17,6 +17,6 @@ DEAL_II_NAMESPACE_OPEN -#include "block_sparse_matrix.inst" +#include "lac/block_sparse_matrix.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/block_vector.cc b/source/lac/block_vector.cc index 5349512013..d01f605740 100644 --- a/source/lac/block_vector.cc +++ b/source/lac/block_vector.cc @@ -17,7 +17,7 @@ DEAL_II_NAMESPACE_OPEN -#include "block_vector.inst" +#include "lac/block_vector.inst" #ifndef DOXYGEN // these functions can't be generated by the preprocessor since diff --git a/source/lac/chunk_sparse_matrix.cc b/source/lac/chunk_sparse_matrix.cc index 8883c36feb..7af74229b1 100644 --- a/source/lac/chunk_sparse_matrix.cc +++ b/source/lac/chunk_sparse_matrix.cc @@ -16,5 +16,5 @@ #include DEAL_II_NAMESPACE_OPEN -#include "chunk_sparse_matrix.inst" +#include "lac/chunk_sparse_matrix.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/full_matrix.cc b/source/lac/full_matrix.cc index 9f5880cfcc..3017337d10 100644 --- a/source/lac/full_matrix.cc +++ b/source/lac/full_matrix.cc @@ -18,7 +18,7 @@ DEAL_II_NAMESPACE_OPEN -#include "full_matrix.inst" +#include "lac/full_matrix.inst" #ifndef DOXYGEN diff --git a/source/lac/la_parallel_block_vector.cc b/source/lac/la_parallel_block_vector.cc index d38ab1982b..a8aa8d4b29 100644 --- a/source/lac/la_parallel_block_vector.cc +++ b/source/lac/la_parallel_block_vector.cc @@ -19,7 +19,7 @@ DEAL_II_NAMESPACE_OPEN -#include "la_parallel_block_vector.inst" +#include "lac/la_parallel_block_vector.inst" // do a few functions that currently don't fit the scheme because they have // two template arguments that need to be different (the case of same diff --git a/source/lac/la_parallel_vector.cc b/source/lac/la_parallel_vector.cc index c2649a1b61..df29605685 100644 --- a/source/lac/la_parallel_vector.cc +++ b/source/lac/la_parallel_vector.cc @@ -17,7 +17,7 @@ DEAL_II_NAMESPACE_OPEN -#include "la_parallel_vector.inst" +#include "lac/la_parallel_vector.inst" // do a few functions that currently don't fit the scheme because they have // two template arguments that need to be different (the case of same diff --git a/source/lac/lapack_full_matrix.cc b/source/lac/lapack_full_matrix.cc index 38d52117bf..34f34eec46 100644 --- a/source/lac/lapack_full_matrix.cc +++ b/source/lac/lapack_full_matrix.cc @@ -2651,7 +2651,7 @@ PreconditionLU::Tvmult(BlockVector &dst, -#include "lapack_full_matrix.inst" +#include "lac/lapack_full_matrix.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/petsc_communication_pattern.cc b/source/lac/petsc_communication_pattern.cc index b8dcb27605..3053f1d3d1 100644 --- a/source/lac/petsc_communication_pattern.cc +++ b/source/lac/petsc_communication_pattern.cc @@ -533,7 +533,7 @@ namespace PETScWrappers } // namespace PETScWrappers // Explicit instantiations -# include "petsc_communication_pattern.inst" +# include "lac/petsc_communication_pattern.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/precondition_block.cc b/source/lac/precondition_block.cc index 96a9ce8671..20388214d6 100644 --- a/source/lac/precondition_block.cc +++ b/source/lac/precondition_block.cc @@ -16,5 +16,5 @@ #include DEAL_II_NAMESPACE_OPEN -#include "precondition_block.inst" +#include "lac/precondition_block.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/read_write_vector.cc b/source/lac/read_write_vector.cc index a46256e693..1a0b524e05 100644 --- a/source/lac/read_write_vector.cc +++ b/source/lac/read_write_vector.cc @@ -17,7 +17,7 @@ DEAL_II_NAMESPACE_OPEN -#include "read_write_vector.inst" +#include "lac/read_write_vector.inst" namespace LinearAlgebra { diff --git a/source/lac/relaxation_block.cc b/source/lac/relaxation_block.cc index 0c71c3cb49..61859d10cd 100644 --- a/source/lac/relaxation_block.cc +++ b/source/lac/relaxation_block.cc @@ -17,5 +17,5 @@ #include DEAL_II_NAMESPACE_OPEN -#include "relaxation_block.inst" +#include "lac/relaxation_block.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/scalapack.cc b/source/lac/scalapack.cc index 9c4789bba5..953d9c1514 100644 --- a/source/lac/scalapack.cc +++ b/source/lac/scalapack.cc @@ -3522,7 +3522,7 @@ ScaLAPACKMatrix::scale_rows(const InputVector &factors) // instantiations -# include "scalapack.inst" +# include "lac/scalapack.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/solver.cc b/source/lac/solver.cc index b18898cc03..35ae14db51 100644 --- a/source/lac/solver.cc +++ b/source/lac/solver.cc @@ -28,6 +28,6 @@ DEAL_II_NAMESPACE_OPEN -#include "solver.inst" +#include "lac/solver.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/solver_gmres.cc b/source/lac/solver_gmres.cc index ee93a3a376..d82b47d748 100644 --- a/source/lac/solver_gmres.cc +++ b/source/lac/solver_gmres.cc @@ -480,6 +480,6 @@ namespace internal } // namespace SolverGMRESImplementation } // namespace internal -#include "solver_gmres.inst" +#include "lac/solver_gmres.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/sparse_matrix.cc b/source/lac/sparse_matrix.cc index b203988d08..a2d6a4acaa 100644 --- a/source/lac/sparse_matrix.cc +++ b/source/lac/sparse_matrix.cc @@ -20,6 +20,6 @@ DEAL_II_NAMESPACE_OPEN #define SPLIT_INSTANTIATIONS_COUNT 2 #define SPLIT_INSTANTIATIONS_INDEX 0 -#include "sparse_matrix.inst" +#include "lac/sparse_matrix.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/sparse_matrix_ez.cc b/source/lac/sparse_matrix_ez.cc index 3bc039714c..039e7e5da8 100644 --- a/source/lac/sparse_matrix_ez.cc +++ b/source/lac/sparse_matrix_ez.cc @@ -16,5 +16,5 @@ #include DEAL_II_NAMESPACE_OPEN -#include "sparse_matrix_ez.inst" +#include "lac/sparse_matrix_ez.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/sparse_matrix_inst2.cc b/source/lac/sparse_matrix_inst2.cc index 428ff0178d..42fd967020 100644 --- a/source/lac/sparse_matrix_inst2.cc +++ b/source/lac/sparse_matrix_inst2.cc @@ -21,6 +21,6 @@ DEAL_II_NAMESPACE_OPEN #define SPLIT_INSTANTIATIONS_COUNT 2 #define SPLIT_INSTANTIATIONS_INDEX 1 -#include "sparse_matrix.inst" +#include "lac/sparse_matrix.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/tensor_product_matrix.cc b/source/lac/tensor_product_matrix.cc index 330594f30e..560996e2d4 100644 --- a/source/lac/tensor_product_matrix.cc +++ b/source/lac/tensor_product_matrix.cc @@ -20,7 +20,7 @@ namespace internal { namespace TensorProductMatrixSymmetricSum { -#include "tensor_product_matrix.inst" +#include "lac/tensor_product_matrix.inst" } } // namespace internal diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc index 7bc5c9db89..5684d47199 100644 --- a/source/lac/trilinos_sparse_matrix.cc +++ b/source/lac/trilinos_sparse_matrix.cc @@ -3007,7 +3007,7 @@ namespace TrilinosWrappers // explicit instantiations -# include "trilinos_sparse_matrix.inst" +# include "lac/trilinos_sparse_matrix.inst" # ifndef DOXYGEN // TODO: put these instantiations into generic file diff --git a/source/lac/trilinos_vector.cc b/source/lac/trilinos_vector.cc index 8c18173170..9aef10ad7a 100644 --- a/source/lac/trilinos_vector.cc +++ b/source/lac/trilinos_vector.cc @@ -906,7 +906,7 @@ namespace TrilinosWrappers // explicit instantiations # ifndef DOXYGEN -# include "trilinos_vector.inst" +# include "lac/trilinos_vector.inst" # endif } // namespace MPI } // namespace TrilinosWrappers diff --git a/source/lac/vector.cc b/source/lac/vector.cc index 7bbed57d59..974278222b 100644 --- a/source/lac/vector.cc +++ b/source/lac/vector.cc @@ -17,7 +17,7 @@ DEAL_II_NAMESPACE_OPEN #ifndef DOXYGEN -# include "vector.inst" +# include "lac/vector.inst" # ifndef DEAL_II_WITH_COMPLEX_VALUES // instantiate for std::complex since we are using it internally in diff --git a/source/lac/vector_memory.cc b/source/lac/vector_memory.cc index c12a2b1afe..b61e62ac11 100644 --- a/source/lac/vector_memory.cc +++ b/source/lac/vector_memory.cc @@ -27,7 +27,7 @@ DEAL_II_NAMESPACE_OPEN -#include "vector_memory.inst" +#include "lac/vector_memory.inst" template class VectorMemory< LinearAlgebra::distributed::Vector>; template class VectorMemory< @@ -44,7 +44,7 @@ namespace internal void release_all_unused_memory() { -#include "vector_memory_release.inst" +#include "lac/vector_memory_release.inst" dealii::GrowingVectorMemory>::release_unused_memory(); diff --git a/source/matrix_free/evaluation_template_face_factory.cc b/source/matrix_free/evaluation_template_face_factory.cc index 24683aec58..42917cec36 100644 --- a/source/matrix_free/evaluation_template_face_factory.cc +++ b/source/matrix_free/evaluation_template_face_factory.cc @@ -22,6 +22,6 @@ DEAL_II_NAMESPACE_OPEN # define SPLIT_INSTANTIATIONS_INDEX 0 #endif -#include "evaluation_template_face_factory.inst" +#include "matrix_free/evaluation_template_face_factory.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/matrix_free/evaluation_template_factory.cc b/source/matrix_free/evaluation_template_factory.cc index 0f72ccfebb..7239376b99 100644 --- a/source/matrix_free/evaluation_template_factory.cc +++ b/source/matrix_free/evaluation_template_factory.cc @@ -22,6 +22,6 @@ DEAL_II_NAMESPACE_OPEN # define SPLIT_INSTANTIATIONS_INDEX 0 #endif -#include "evaluation_template_factory.inst" +#include "matrix_free/evaluation_template_factory.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/matrix_free/evaluation_template_factory_hanging_nodes.cc b/source/matrix_free/evaluation_template_factory_hanging_nodes.cc index 7f8a71cb5b..491b32cfbe 100644 --- a/source/matrix_free/evaluation_template_factory_hanging_nodes.cc +++ b/source/matrix_free/evaluation_template_factory_hanging_nodes.cc @@ -17,6 +17,6 @@ DEAL_II_NAMESPACE_OPEN -#include "evaluation_template_factory_hanging_nodes.inst" +#include "matrix_free/evaluation_template_factory_hanging_nodes.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/matrix_free/fe_point_evaluation.cc b/source/matrix_free/fe_point_evaluation.cc index 149569b8fa..0a6527dcfa 100644 --- a/source/matrix_free/fe_point_evaluation.cc +++ b/source/matrix_free/fe_point_evaluation.cc @@ -116,7 +116,7 @@ namespace internal // explicit instantiations -#include "fe_point_evaluation.inst" +#include "matrix_free/fe_point_evaluation.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/matrix_free/mapping_info.cc b/source/matrix_free/mapping_info.cc index 97d0ff1380..0de5389d6a 100644 --- a/source/matrix_free/mapping_info.cc +++ b/source/matrix_free/mapping_info.cc @@ -26,6 +26,6 @@ DEAL_II_NAMESPACE_OPEN #ifndef SPLIT_INSTANTIATIONS_INDEX # define SPLIT_INSTANTIATIONS_INDEX 0 #endif -#include "mapping_info.inst" +#include "matrix_free/mapping_info.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/matrix_free/matrix_free.cc b/source/matrix_free/matrix_free.cc index 651283ded2..83c535cd7f 100644 --- a/source/matrix_free/matrix_free.cc +++ b/source/matrix_free/matrix_free.cc @@ -23,6 +23,6 @@ DEAL_II_NAMESPACE_OPEN -#include "matrix_free.inst" +#include "matrix_free/matrix_free.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/matrix_free/shape_info.cc b/source/matrix_free/shape_info.cc index 8e53446d8b..ff02f2334f 100644 --- a/source/matrix_free/shape_info.cc +++ b/source/matrix_free/shape_info.cc @@ -23,7 +23,7 @@ DEAL_II_NAMESPACE_OPEN -#include "shape_info.inst" +#include "matrix_free/shape_info.inst" template struct internal::MatrixFreeFunctions::ShapeInfo; template struct internal::MatrixFreeFunctions::ShapeInfo; diff --git a/source/meshworker/mesh_worker_info.cc b/source/meshworker/mesh_worker_info.cc index 7c190efe97..a0bdd4620e 100644 --- a/source/meshworker/mesh_worker_info.cc +++ b/source/meshworker/mesh_worker_info.cc @@ -24,7 +24,7 @@ DEAL_II_NAMESPACE_OPEN // explicit instantiations -#include "mesh_worker_info.inst" +#include "meshworker/mesh_worker_info.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/meshworker/mesh_worker_vector_selector.cc b/source/meshworker/mesh_worker_vector_selector.cc index 3f9410c3ea..75c1beae0a 100644 --- a/source/meshworker/mesh_worker_vector_selector.cc +++ b/source/meshworker/mesh_worker_vector_selector.cc @@ -26,7 +26,7 @@ DEAL_II_NAMESPACE_OPEN -#include "mesh_worker_vector_selector.inst" +#include "meshworker/mesh_worker_vector_selector.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/meshworker/scratch_data.cc b/source/meshworker/scratch_data.cc index 3925f7adfd..3e433864e0 100644 --- a/source/meshworker/scratch_data.cc +++ b/source/meshworker/scratch_data.cc @@ -1028,6 +1028,6 @@ DEAL_II_NAMESPACE_CLOSE DEAL_II_NAMESPACE_OPEN namespace MeshWorker { -#include "scratch_data.inst" +#include "meshworker/scratch_data.inst" } DEAL_II_NAMESPACE_CLOSE diff --git a/source/multigrid/mg_base.cc b/source/multigrid/mg_base.cc index caaa655507..a13a8dd5e4 100644 --- a/source/multigrid/mg_base.cc +++ b/source/multigrid/mg_base.cc @@ -29,6 +29,6 @@ DEAL_II_NAMESPACE_OPEN // Explicit instantiations -#include "mg_base.inst" +#include "multigrid/mg_base.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/multigrid/mg_constrained_dofs.cc b/source/multigrid/mg_constrained_dofs.cc index 15c7ff799d..7a1635526a 100644 --- a/source/multigrid/mg_constrained_dofs.cc +++ b/source/multigrid/mg_constrained_dofs.cc @@ -296,7 +296,7 @@ MGConstrainedDoFs::merge_constraints(AffineConstraints &constraints, constraints.close(); } -#include "mg_constrained_dofs.inst" +#include "multigrid/mg_constrained_dofs.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/multigrid/mg_level_global_transfer.cc b/source/multigrid/mg_level_global_transfer.cc index 85943e942f..e5e036baf9 100644 --- a/source/multigrid/mg_level_global_transfer.cc +++ b/source/multigrid/mg_level_global_transfer.cc @@ -458,6 +458,6 @@ MGLevelGlobalTransfer>:: // explicit instantiation -#include "mg_level_global_transfer.inst" +#include "multigrid/mg_level_global_transfer.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/multigrid/mg_tools.cc b/source/multigrid/mg_tools.cc index ca836cc430..8c21c0de5b 100644 --- a/source/multigrid/mg_tools.cc +++ b/source/multigrid/mg_tools.cc @@ -1813,6 +1813,6 @@ namespace MGTools // explicit instantiations -#include "mg_tools.inst" +#include "multigrid/mg_tools.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/multigrid/mg_transfer_block.cc b/source/multigrid/mg_transfer_block.cc index 178368cb1a..786622b1fa 100644 --- a/source/multigrid/mg_transfer_block.cc +++ b/source/multigrid/mg_transfer_block.cc @@ -639,7 +639,7 @@ MGTransferBlock::build(const DoFHandler &dof_handler, // explicit instantiations -#include "mg_transfer_block.inst" +#include "multigrid/mg_transfer_block.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/multigrid/mg_transfer_component.cc b/source/multigrid/mg_transfer_component.cc index 93c5073d6e..d4f9f89eae 100644 --- a/source/multigrid/mg_transfer_component.cc +++ b/source/multigrid/mg_transfer_component.cc @@ -694,7 +694,7 @@ MGTransferSelect::build( // explicit instantiations -#include "mg_transfer_component.inst" +#include "multigrid/mg_transfer_component.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/multigrid/mg_transfer_global_coarsening.cc b/source/multigrid/mg_transfer_global_coarsening.cc index c65d9dac5b..40f1f6aa05 100644 --- a/source/multigrid/mg_transfer_global_coarsening.cc +++ b/source/multigrid/mg_transfer_global_coarsening.cc @@ -56,6 +56,6 @@ namespace MGTransferGlobalCoarseningTools } } // namespace MGTransferGlobalCoarseningTools -#include "mg_transfer_global_coarsening.inst" +#include "multigrid/mg_transfer_global_coarsening.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/multigrid/mg_transfer_internal.cc b/source/multigrid/mg_transfer_internal.cc index e9bd7d7840..b79adad727 100644 --- a/source/multigrid/mg_transfer_internal.cc +++ b/source/multigrid/mg_transfer_internal.cc @@ -1030,6 +1030,6 @@ namespace internal // Explicit instantiations -#include "mg_transfer_internal.inst" +#include "multigrid/mg_transfer_internal.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/multigrid/mg_transfer_matrix_free.cc b/source/multigrid/mg_transfer_matrix_free.cc index 31f3e26199..c914315831 100644 --- a/source/multigrid/mg_transfer_matrix_free.cc +++ b/source/multigrid/mg_transfer_matrix_free.cc @@ -807,7 +807,7 @@ MGTransferBlockMatrixFree::clear() // explicit instantiation -#include "mg_transfer_matrix_free.inst" +#include "multigrid/mg_transfer_matrix_free.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/multigrid/mg_transfer_prebuilt.cc b/source/multigrid/mg_transfer_prebuilt.cc index 6c0e7252e0..813f5812dd 100644 --- a/source/multigrid/mg_transfer_prebuilt.cc +++ b/source/multigrid/mg_transfer_prebuilt.cc @@ -367,7 +367,7 @@ MGTransferPrebuilt::memory_consumption() const // explicit instantiation -#include "mg_transfer_prebuilt.inst" +#include "multigrid/mg_transfer_prebuilt.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/multigrid/multigrid.cc b/source/multigrid/multigrid.cc index 1743e9126c..07c4b6529f 100644 --- a/source/multigrid/multigrid.cc +++ b/source/multigrid/multigrid.cc @@ -300,7 +300,7 @@ MGTransferBlockSelect::restrict_and_add(const unsigned int from_level, // Explicit instantiations -#include "multigrid.inst" +#include "multigrid/multigrid.inst" template class MGTransferBlock; template class MGTransferBlock; diff --git a/source/non_matching/coupling.cc b/source/non_matching/coupling.cc index 8a1e65c6a3..b034da1254 100644 --- a/source/non_matching/coupling.cc +++ b/source/non_matching/coupling.cc @@ -955,7 +955,7 @@ namespace NonMatching } } #ifndef DOXYGEN -# include "coupling.inst" +# include "non_matching/coupling.inst" #endif } // namespace NonMatching diff --git a/source/non_matching/fe_immersed_values.cc b/source/non_matching/fe_immersed_values.cc index db2b01c0a0..f55ca9287a 100644 --- a/source/non_matching/fe_immersed_values.cc +++ b/source/non_matching/fe_immersed_values.cc @@ -220,7 +220,7 @@ namespace NonMatching #ifndef DOXYGEN -# include "fe_immersed_values.inst" +# include "non_matching/fe_immersed_values.inst" #endif } // namespace NonMatching diff --git a/source/non_matching/fe_values.cc b/source/non_matching/fe_values.cc index 9805736583..84e46159a0 100644 --- a/source/non_matching/fe_values.cc +++ b/source/non_matching/fe_values.cc @@ -555,7 +555,7 @@ namespace NonMatching } -#include "fe_values.inst" +#include "non_matching/fe_values.inst" } // namespace NonMatching DEAL_II_NAMESPACE_CLOSE diff --git a/source/non_matching/mesh_classifier.cc b/source/non_matching/mesh_classifier.cc index 8978857c1e..5b55a01398 100644 --- a/source/non_matching/mesh_classifier.cc +++ b/source/non_matching/mesh_classifier.cc @@ -507,6 +507,6 @@ namespace NonMatching } // namespace NonMatching -#include "mesh_classifier.inst" +#include "non_matching/mesh_classifier.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/non_matching/quadrature_generator.cc b/source/non_matching/quadrature_generator.cc index dead7e2415..2fb01920e5 100644 --- a/source/non_matching/quadrature_generator.cc +++ b/source/non_matching/quadrature_generator.cc @@ -2308,5 +2308,5 @@ namespace NonMatching face_index); } } // namespace NonMatching -#include "quadrature_generator.inst" +#include "non_matching/quadrature_generator.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/cell_data_transfer.cc b/source/numerics/cell_data_transfer.cc index 8056d6a8dc..a131c16ff7 100644 --- a/source/numerics/cell_data_transfer.cc +++ b/source/numerics/cell_data_transfer.cc @@ -19,6 +19,6 @@ DEAL_II_NAMESPACE_OPEN // explicit instantiations -#include "cell_data_transfer.inst" +#include "numerics/cell_data_transfer.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/data_out.cc b/source/numerics/data_out.cc index f8261cd83e..f382d42159 100644 --- a/source/numerics/data_out.cc +++ b/source/numerics/data_out.cc @@ -1334,6 +1334,6 @@ DataOut::get_cell_selection() const // explicit instantiations -#include "data_out.inst" +#include "numerics/data_out.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/data_out_dof_data.cc b/source/numerics/data_out_dof_data.cc index f523bc57f9..6d44472d70 100644 --- a/source/numerics/data_out_dof_data.cc +++ b/source/numerics/data_out_dof_data.cc @@ -29,6 +29,6 @@ DEAL_II_NAMESPACE_OPEN #define SPLIT_INSTANTIATIONS_COUNT 2 #define SPLIT_INSTANTIATIONS_INDEX 0 -#include "data_out_dof_data.inst" +#include "numerics/data_out_dof_data.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/data_out_dof_data_codim.cc b/source/numerics/data_out_dof_data_codim.cc index 9addaad9e6..d67f147c7a 100644 --- a/source/numerics/data_out_dof_data_codim.cc +++ b/source/numerics/data_out_dof_data_codim.cc @@ -28,6 +28,6 @@ DEAL_II_NAMESPACE_OPEN -#include "data_out_dof_data_codim.inst" +#include "numerics/data_out_dof_data_codim.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/data_out_dof_data_inst2.cc b/source/numerics/data_out_dof_data_inst2.cc index 7030b88a8e..bc1ffb7b95 100644 --- a/source/numerics/data_out_dof_data_inst2.cc +++ b/source/numerics/data_out_dof_data_inst2.cc @@ -29,6 +29,6 @@ DEAL_II_NAMESPACE_OPEN #define SPLIT_INSTANTIATIONS_COUNT 2 #define SPLIT_INSTANTIATIONS_INDEX 1 -#include "data_out_dof_data.inst" +#include "numerics/data_out_dof_data.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/data_out_faces.cc b/source/numerics/data_out_faces.cc index b3d3758a5c..77029b8df8 100644 --- a/source/numerics/data_out_faces.cc +++ b/source/numerics/data_out_faces.cc @@ -498,6 +498,6 @@ DataOutFaces::next_face(const FaceDescriptor &old_face) // explicit instantiations -#include "data_out_faces.inst" +#include "numerics/data_out_faces.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/data_out_resample.cc b/source/numerics/data_out_resample.cc index 0715c29a09..04b1d14833 100644 --- a/source/numerics/data_out_resample.cc +++ b/source/numerics/data_out_resample.cc @@ -204,6 +204,6 @@ DataOutResample::get_patches() const // explicit instantiations -#include "data_out_resample.inst" +#include "numerics/data_out_resample.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/data_out_rotation.cc b/source/numerics/data_out_rotation.cc index 7846925054..4156c75517 100644 --- a/source/numerics/data_out_rotation.cc +++ b/source/numerics/data_out_rotation.cc @@ -579,7 +579,7 @@ DataOutRotation::next_cell(const cell_iterator &cell) // explicit instantiations -#include "data_out_rotation.inst" +#include "numerics/data_out_rotation.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/data_out_stack.cc b/source/numerics/data_out_stack.cc index ed293102c4..6f5a722e56 100644 --- a/source/numerics/data_out_stack.cc +++ b/source/numerics/data_out_stack.cc @@ -493,7 +493,7 @@ DataOutStack::get_dataset_names() const // explicit instantiations -#include "data_out_stack.inst" +#include "numerics/data_out_stack.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/data_postprocessor.cc b/source/numerics/data_postprocessor.cc index 83dcb4c373..756df257e0 100644 --- a/source/numerics/data_postprocessor.cc +++ b/source/numerics/data_postprocessor.cc @@ -232,7 +232,7 @@ namespace DataPostprocessors // explicit instantiation -#include "data_postprocessor.inst" +#include "numerics/data_postprocessor.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/derivative_approximation.cc b/source/numerics/derivative_approximation.cc index 61154c2b1a..44ba70ac7d 100644 --- a/source/numerics/derivative_approximation.cc +++ b/source/numerics/derivative_approximation.cc @@ -1138,7 +1138,7 @@ namespace DerivativeApproximation // --------------------------- explicit instantiations --------------------- -#include "derivative_approximation.inst" +#include "numerics/derivative_approximation.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/dof_output_operator.cc b/source/numerics/dof_output_operator.cc index 0a2e83fea3..47c6c4610a 100644 --- a/source/numerics/dof_output_operator.cc +++ b/source/numerics/dof_output_operator.cc @@ -33,7 +33,7 @@ DEAL_II_NAMESPACE_OPEN namespace Algorithms { -#include "dof_output_operator.inst" +#include "numerics/dof_output_operator.inst" } DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/error_estimator.cc b/source/numerics/error_estimator.cc index 44a8f6198c..2bebe65fc3 100644 --- a/source/numerics/error_estimator.cc +++ b/source/numerics/error_estimator.cc @@ -18,6 +18,6 @@ DEAL_II_NAMESPACE_OPEN #define SPLIT_INSTANTIATIONS_COUNT 2 #define SPLIT_INSTANTIATIONS_INDEX 0 -#include "error_estimator.inst" +#include "numerics/error_estimator.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/error_estimator_1d.cc b/source/numerics/error_estimator_1d.cc index 2a4f71fded..d94611beaa 100644 --- a/source/numerics/error_estimator_1d.cc +++ b/source/numerics/error_estimator_1d.cc @@ -558,7 +558,7 @@ KellyErrorEstimator<1, spacedim>::estimate( // explicit instantiations -#include "error_estimator_1d.inst" +#include "numerics/error_estimator_1d.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/error_estimator_inst2.cc b/source/numerics/error_estimator_inst2.cc index 598060393a..c01a00b007 100644 --- a/source/numerics/error_estimator_inst2.cc +++ b/source/numerics/error_estimator_inst2.cc @@ -18,6 +18,6 @@ DEAL_II_NAMESPACE_OPEN #define SPLIT_INSTANTIATIONS_COUNT 2 #define SPLIT_INSTANTIATIONS_INDEX 1 -#include "error_estimator.inst" +#include "numerics/error_estimator.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/fe_field_function.cc b/source/numerics/fe_field_function.cc index 416835d6e4..7ad158776c 100644 --- a/source/numerics/fe_field_function.cc +++ b/source/numerics/fe_field_function.cc @@ -30,7 +30,7 @@ DEAL_II_NAMESPACE_OPEN -#include "fe_field_function.inst" +#include "numerics/fe_field_function.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/matrix_creator.cc b/source/numerics/matrix_creator.cc index 4d7b38170b..6e5187f529 100644 --- a/source/numerics/matrix_creator.cc +++ b/source/numerics/matrix_creator.cc @@ -22,6 +22,6 @@ DEAL_II_NAMESPACE_OPEN #ifndef SPLIT_INSTANTIATIONS_INDEX # define SPLIT_INSTANTIATIONS_INDEX 0 #endif -#include "matrix_creator.inst" +#include "numerics/matrix_creator.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/matrix_tools.cc b/source/numerics/matrix_tools.cc index 7398048480..64f6455f34 100644 --- a/source/numerics/matrix_tools.cc +++ b/source/numerics/matrix_tools.cc @@ -611,7 +611,7 @@ namespace MatrixTools // explicit instantiations -#include "matrix_tools.inst" +#include "numerics/matrix_tools.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/point_value_history.cc b/source/numerics/point_value_history.cc index 2958c2a455..f348cb8e54 100644 --- a/source/numerics/point_value_history.cc +++ b/source/numerics/point_value_history.cc @@ -1502,7 +1502,7 @@ PointValueHistory::tria_change_listener() // explicit instantiations -#include "point_value_history.inst" +#include "numerics/point_value_history.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/smoothness_estimator.cc b/source/numerics/smoothness_estimator.cc index b3bb5b2845..7a978a57e8 100644 --- a/source/numerics/smoothness_estimator.cc +++ b/source/numerics/smoothness_estimator.cc @@ -620,6 +620,6 @@ namespace SmoothnessEstimator // explicit instantiations -#include "smoothness_estimator.inst" +#include "numerics/smoothness_estimator.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/solution_transfer.cc b/source/numerics/solution_transfer.cc index 0cd0ded5d5..acf7d015f8 100644 --- a/source/numerics/solution_transfer.cc +++ b/source/numerics/solution_transfer.cc @@ -1124,6 +1124,6 @@ namespace Legacy #ifndef SPLIT_INSTANTIATIONS_INDEX # define SPLIT_INSTANTIATIONS_INDEX 0 #endif -#include "solution_transfer.inst" +#include "numerics/solution_transfer.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/time_dependent.cc b/source/numerics/time_dependent.cc index e5f4b8cfbf..8c5e021456 100644 --- a/source/numerics/time_dependent.cc +++ b/source/numerics/time_dependent.cc @@ -1268,7 +1268,7 @@ TimeStepBase_Tria_Flags::RefinementData::RefinementData( /*-------------- Explicit Instantiations -------------------------------*/ -#include "time_dependent.inst" +#include "numerics/time_dependent.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/vector_tools_boundary.cc b/source/numerics/vector_tools_boundary.cc index a9d25b5299..2cde841c5f 100644 --- a/source/numerics/vector_tools_boundary.cc +++ b/source/numerics/vector_tools_boundary.cc @@ -18,6 +18,6 @@ DEAL_II_NAMESPACE_OPEN // ---------------------------- explicit instantiations -------------------- -#include "vector_tools_boundary.inst" +#include "numerics/vector_tools_boundary.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/vector_tools_constraints.cc b/source/numerics/vector_tools_constraints.cc index 68ff8f8f1f..2876176aee 100644 --- a/source/numerics/vector_tools_constraints.cc +++ b/source/numerics/vector_tools_constraints.cc @@ -18,6 +18,6 @@ DEAL_II_NAMESPACE_OPEN // ---------------------------- explicit instantiations -------------------- -#include "vector_tools_constraints.inst" +#include "numerics/vector_tools_constraints.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/vector_tools_integrate_difference.cc b/source/numerics/vector_tools_integrate_difference.cc index 3bf19414fe..3707e0611c 100644 --- a/source/numerics/vector_tools_integrate_difference.cc +++ b/source/numerics/vector_tools_integrate_difference.cc @@ -18,6 +18,6 @@ DEAL_II_NAMESPACE_OPEN // ---------------------------- explicit instantiations -------------------- -#include "vector_tools_integrate_difference.inst" +#include "numerics/vector_tools_integrate_difference.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/vector_tools_interpolate.cc b/source/numerics/vector_tools_interpolate.cc index 7cfe0cd31b..b47a8563ad 100644 --- a/source/numerics/vector_tools_interpolate.cc +++ b/source/numerics/vector_tools_interpolate.cc @@ -18,6 +18,6 @@ DEAL_II_NAMESPACE_OPEN // ---------------------------- explicit instantiations -------------------- -#include "vector_tools_interpolate.inst" +#include "numerics/vector_tools_interpolate.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/vector_tools_mean_value.cc b/source/numerics/vector_tools_mean_value.cc index 815e3426af..8825860707 100644 --- a/source/numerics/vector_tools_mean_value.cc +++ b/source/numerics/vector_tools_mean_value.cc @@ -18,6 +18,6 @@ DEAL_II_NAMESPACE_OPEN // ---------------------------- explicit instantiations -------------------- -#include "vector_tools_mean_value.inst" +#include "numerics/vector_tools_mean_value.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/vector_tools_point_gradient.cc b/source/numerics/vector_tools_point_gradient.cc index 6513f104ef..dd37b265f3 100644 --- a/source/numerics/vector_tools_point_gradient.cc +++ b/source/numerics/vector_tools_point_gradient.cc @@ -18,6 +18,6 @@ DEAL_II_NAMESPACE_OPEN // ---------------------------- explicit instantiations -------------------- -#include "vector_tools_point_gradient.inst" +#include "numerics/vector_tools_point_gradient.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/vector_tools_point_value.cc b/source/numerics/vector_tools_point_value.cc index 99ca4bac30..c76e967bfc 100644 --- a/source/numerics/vector_tools_point_value.cc +++ b/source/numerics/vector_tools_point_value.cc @@ -18,6 +18,6 @@ DEAL_II_NAMESPACE_OPEN // ---------------------------- explicit instantiations -------------------- -#include "vector_tools_point_value.inst" +#include "numerics/vector_tools_point_value.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/vector_tools_project.cc b/source/numerics/vector_tools_project.cc index 3be624c6d8..cd5f9b874e 100644 --- a/source/numerics/vector_tools_project.cc +++ b/source/numerics/vector_tools_project.cc @@ -18,6 +18,6 @@ DEAL_II_NAMESPACE_OPEN // ---------------------------- explicit instantiations -------------------- -#include "vector_tools_project.inst" +#include "numerics/vector_tools_project.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/vector_tools_project_codim.cc b/source/numerics/vector_tools_project_codim.cc index 8904233a58..962c77d726 100644 --- a/source/numerics/vector_tools_project_codim.cc +++ b/source/numerics/vector_tools_project_codim.cc @@ -19,6 +19,6 @@ DEAL_II_NAMESPACE_OPEN // ---------------------------- explicit instantiations -------------------- -#include "vector_tools_project_codim.inst" +#include "numerics/vector_tools_project_codim.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/vector_tools_project_hp.cc b/source/numerics/vector_tools_project_hp.cc index 867bbfdd2d..0aee411787 100644 --- a/source/numerics/vector_tools_project_hp.cc +++ b/source/numerics/vector_tools_project_hp.cc @@ -20,6 +20,6 @@ DEAL_II_NAMESPACE_OPEN // ---------------------------- explicit instantiations -------------------- -#include "vector_tools_project_hp.inst" +#include "numerics/vector_tools_project_hp.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/vector_tools_project_qp.cc b/source/numerics/vector_tools_project_qp.cc index 7e72560106..df99fa393a 100644 --- a/source/numerics/vector_tools_project_qp.cc +++ b/source/numerics/vector_tools_project_qp.cc @@ -19,6 +19,6 @@ DEAL_II_NAMESPACE_OPEN // ---------------------------- explicit instantiations -------------------- -#include "vector_tools_project_qp.inst" +#include "numerics/vector_tools_project_qp.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/vector_tools_project_qpmf.cc b/source/numerics/vector_tools_project_qpmf.cc index ee4eeb4ba9..97262cba3a 100644 --- a/source/numerics/vector_tools_project_qpmf.cc +++ b/source/numerics/vector_tools_project_qpmf.cc @@ -18,6 +18,6 @@ DEAL_II_NAMESPACE_OPEN // ---------------------------- explicit instantiations -------------------- -#include "vector_tools_project_qpmf.inst" +#include "numerics/vector_tools_project_qpmf.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/numerics/vector_tools_rhs.cc b/source/numerics/vector_tools_rhs.cc index 5fc09f4983..13ebbca089 100644 --- a/source/numerics/vector_tools_rhs.cc +++ b/source/numerics/vector_tools_rhs.cc @@ -53,6 +53,6 @@ namespace VectorTools } // namespace VectorTools // ---------------------------- explicit instantiations -------------------- -#include "vector_tools_rhs.inst" +#include "numerics/vector_tools_rhs.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/opencascade/manifold_lib.cc b/source/opencascade/manifold_lib.cc index d250795abd..19187a72d8 100644 --- a/source/opencascade/manifold_lib.cc +++ b/source/opencascade/manifold_lib.cc @@ -565,7 +565,7 @@ namespace OpenCASCADE } // Explicit instantiations -# include "manifold_lib.inst" +# include "opencascade/manifold_lib.inst" } // end namespace OpenCASCADE DEAL_II_NAMESPACE_CLOSE diff --git a/source/opencascade/utilities.cc b/source/opencascade/utilities.cc index deff5ab703..3bde476df2 100644 --- a/source/opencascade/utilities.cc +++ b/source/opencascade/utilities.cc @@ -917,7 +917,7 @@ namespace OpenCASCADE tria.create_triangulation(vertices, cells, t); } -# include "utilities.inst" +# include "opencascade/utilities.inst" } // namespace OpenCASCADE diff --git a/source/particles/data_out.cc b/source/particles/data_out.cc index 90f201bd47..22c7f889b7 100644 --- a/source/particles/data_out.cc +++ b/source/particles/data_out.cc @@ -253,6 +253,6 @@ namespace Particles } // namespace Particles -#include "data_out.inst" +#include "particles/data_out.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/particles/generators.cc b/source/particles/generators.cc index 77e7380bcf..c444540322 100644 --- a/source/particles/generators.cc +++ b/source/particles/generators.cc @@ -504,6 +504,6 @@ namespace Particles } // namespace Generators } // namespace Particles -#include "generators.inst" +#include "particles/generators.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/particles/particle.cc b/source/particles/particle.cc index d6b837e86b..8c6bf31fa1 100644 --- a/source/particles/particle.cc +++ b/source/particles/particle.cc @@ -337,6 +337,6 @@ DEAL_II_NAMESPACE_CLOSE DEAL_II_NAMESPACE_OPEN -#include "particle.inst" +#include "particles/particle.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/particles/particle_handler.cc b/source/particles/particle_handler.cc index 62fb5c8a1f..9ba6713e90 100644 --- a/source/particles/particle_handler.cc +++ b/source/particles/particle_handler.cc @@ -2477,6 +2477,6 @@ namespace Particles } } // namespace Particles -#include "particle_handler.inst" +#include "particles/particle_handler.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/particles/utilities.cc b/source/particles/utilities.cc index 6db2de7ce0..3412617826 100644 --- a/source/particles/utilities.cc +++ b/source/particles/utilities.cc @@ -206,7 +206,7 @@ namespace Particles matrix.compress(VectorOperation::add); } -#include "utilities.inst" +#include "particles/utilities.inst" } // namespace Utilities } // namespace Particles diff --git a/source/physics/elasticity/kinematics.cc b/source/physics/elasticity/kinematics.cc index 4f52e416e1..527ac1073c 100644 --- a/source/physics/elasticity/kinematics.cc +++ b/source/physics/elasticity/kinematics.cc @@ -17,6 +17,6 @@ DEAL_II_NAMESPACE_OPEN // explicit instantiations -#include "kinematics.inst" +#include "physics/elasticity/kinematics.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/physics/elasticity/standard_tensors.cc b/source/physics/elasticity/standard_tensors.cc index 318455ff72..abce03a735 100644 --- a/source/physics/elasticity/standard_tensors.cc +++ b/source/physics/elasticity/standard_tensors.cc @@ -61,6 +61,6 @@ DEAL_II_CONSTEXPR const SymmetricTensor<4, dim> #endif // DOXYGEN // explicit instantiations -#include "standard_tensors.inst" +#include "physics/elasticity/standard_tensors.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/physics/transformations.cc b/source/physics/transformations.cc index f766a6e8fd..d7d764f787 100644 --- a/source/physics/transformations.cc +++ b/source/physics/transformations.cc @@ -17,6 +17,6 @@ DEAL_II_NAMESPACE_OPEN // explicit instantiations -#include "transformations.inst" +#include "physics/transformations.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/sundials/n_vector.cc b/source/sundials/n_vector.cc index 3e5ff6e3c6..32d8f610af 100644 --- a/source/sundials/n_vector.cc +++ b/source/sundials/n_vector.cc @@ -23,7 +23,7 @@ DEAL_II_NAMESPACE_OPEN -# include "n_vector.inst" +# include "sundials/n_vector.inst" DEAL_II_NAMESPACE_CLOSE diff --git a/source/trilinos/nox.cc b/source/trilinos/nox.cc index 05bb92e5c8..37641186f4 100644 --- a/source/trilinos/nox.cc +++ b/source/trilinos/nox.cc @@ -36,7 +36,7 @@ DEAL_II_NAMESPACE_OPEN namespace TrilinosWrappers { -# include "nox.inst" +# include "trilinos/nox.inst" } DEAL_II_NAMESPACE_CLOSE -- 2.39.5