From fa0ac7a1c65e674c7f8e19c597149f1c4d5648ea Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 9 Nov 2017 08:08:54 -0700 Subject: [PATCH] Rename class groups in template-arguments.in. The previous name no longer adequately represented what these classes were. Fix this. --- cmake/config/template-arguments.in | 9 ++++----- source/algorithms/operator.inst.in | 2 +- source/dofs/dof_accessor_get.inst.in | 4 ++-- source/dofs/dof_accessor_set.inst.in | 4 ++-- source/fe/fe_tools_extrapolate.inst.in | 2 +- source/fe/fe_tools_interpolate.inst.in | 4 ++-- source/fe/fe_values.decl.1.inst.in | 2 +- source/fe/fe_values.decl.2.inst.in | 2 +- source/fe/fe_values.impl.1.inst.in | 2 +- source/fe/fe_values.impl.2.inst.in | 2 +- source/fe/fe_values.inst.in | 4 ++-- source/fe/mapping_fe_field.inst.in | 2 +- source/fe/mapping_q1_eulerian.inst.in | 2 +- source/fe/mapping_q_eulerian.inst.in | 2 +- source/lac/constraint_matrix.inst.in | 2 +- source/lac/solver.inst.in | 2 +- source/lac/vector_memory.inst.in | 2 +- source/lac/vector_memory_release.inst.in | 2 +- source/meshworker/mesh_worker_vector_selector.inst.in | 2 +- source/multigrid/mg_base.inst.in | 2 +- source/multigrid/multigrid.inst.in | 2 +- source/numerics/data_out_dof_data.inst.in | 2 +- source/numerics/data_out_dof_data_codim.inst.in | 2 +- source/numerics/derivative_approximation.inst.in | 2 +- source/numerics/dof_output_operator.inst.in | 2 +- source/numerics/error_estimator.inst.in | 2 +- source/numerics/error_estimator_1d.inst.in | 2 +- source/numerics/fe_field_function.inst.in | 2 +- source/numerics/point_value_history.inst.in | 8 ++++---- source/numerics/solution_transfer.inst.in | 2 +- .../numerics/vector_tools_integrate_difference.inst.in | 2 +- source/numerics/vector_tools_interpolate.inst.in | 6 +++--- source/numerics/vector_tools_mean_value.inst.in | 4 ++-- source/numerics/vector_tools_point_gradient.inst.in | 2 +- source/numerics/vector_tools_point_value.inst.in | 2 +- source/numerics/vector_tools_project.inst.in | 2 +- source/numerics/vector_tools_project_codim.inst.in | 2 +- source/numerics/vector_tools_project_hp.inst.in | 2 +- source/numerics/vector_tools_rhs.inst.in | 2 +- 39 files changed, 52 insertions(+), 53 deletions(-) diff --git a/cmake/config/template-arguments.in b/cmake/config/template-arguments.in index d68088cebc..7fb48127df 100644 --- a/cmake/config/template-arguments.in +++ b/cmake/config/template-arguments.in @@ -58,9 +58,8 @@ MPI_SCALARS := { int; // S=REAL_SCALARS for example DEAL_II_VEC_TEMPLATES := { Vector; BlockVector } -// Serial vector types, based on real or complex scalars -// TODO: why are parallel vectors in here? -SERIAL_VECTORS := { Vector; +// All vector types, based on real or complex scalars +VECTOR_TYPES := { Vector; Vector ; Vector >; @@ -98,9 +97,9 @@ SERIAL_VECTORS := { Vector; @DEAL_II_EXPAND_PETSC_MPI_BLOCKVECTOR@; } -// same as SERIAL_VECTORS but only real-valued vectors (and only with PETSc +// same as VECTOR_TYPES but only real-valued vectors (and only with PETSc // vectors if the PETScScalar data type is real-valued) -REAL_SERIAL_VECTORS := { Vector; +REAL_VECTOR_TYPES := { Vector; Vector ; BlockVector; diff --git a/source/algorithms/operator.inst.in b/source/algorithms/operator.inst.in index 744b984003..4d14bf2690 100644 --- a/source/algorithms/operator.inst.in +++ b/source/algorithms/operator.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS) +for (VEC : VECTOR_TYPES) { template class OutputOperator; template class Newton; diff --git a/source/dofs/dof_accessor_get.inst.in b/source/dofs/dof_accessor_get.inst.in index c27a4f50e7..68b7338d6b 100644 --- a/source/dofs/dof_accessor_get.inst.in +++ b/source/dofs/dof_accessor_get.inst.in @@ -15,7 +15,7 @@ -for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; lda : BOOL) +for (VEC : VECTOR_TYPES; deal_II_dimension : DIMENSIONS; lda : BOOL) { template void @@ -46,7 +46,7 @@ for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; lda : BOOL) } -for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; lda : BOOL) +for (VEC : VECTOR_TYPES; deal_II_dimension : DIMENSIONS; lda : BOOL) { template void diff --git a/source/dofs/dof_accessor_set.inst.in b/source/dofs/dof_accessor_set.inst.in index 4dbc3ee0f0..ecc9fc633d 100644 --- a/source/dofs/dof_accessor_set.inst.in +++ b/source/dofs/dof_accessor_set.inst.in @@ -15,7 +15,7 @@ -for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; lda : BOOL) +for (VEC : VECTOR_TYPES; deal_II_dimension : DIMENSIONS; lda : BOOL) { template void @@ -46,7 +46,7 @@ for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; lda : BOOL) } -for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; lda : BOOL) +for (VEC : VECTOR_TYPES; deal_II_dimension : DIMENSIONS; lda : BOOL) { template void diff --git a/source/fe/fe_tools_extrapolate.inst.in b/source/fe/fe_tools_extrapolate.inst.in index 32eea51849..6df0181929 100644 --- a/source/fe/fe_tools_extrapolate.inst.in +++ b/source/fe/fe_tools_extrapolate.inst.in @@ -15,7 +15,7 @@ -for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; VEC : SERIAL_VECTORS) +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; VEC : VECTOR_TYPES) { namespace FETools \{ diff --git a/source/fe/fe_tools_interpolate.inst.in b/source/fe/fe_tools_interpolate.inst.in index 20570c94f8..3d2bfeda50 100644 --- a/source/fe/fe_tools_interpolate.inst.in +++ b/source/fe/fe_tools_interpolate.inst.in @@ -15,7 +15,7 @@ -for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; Vector : SERIAL_VECTORS) +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; Vector : VECTOR_TYPES) { namespace FETools \{ @@ -64,7 +64,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS \} } -for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; VEC : SERIAL_VECTORS) +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; VEC : VECTOR_TYPES) { namespace FETools \{ diff --git a/source/fe/fe_values.decl.1.inst.in b/source/fe/fe_values.decl.1.inst.in index 16d9fe6b3c..08d6210d66 100644 --- a/source/fe/fe_values.decl.1.inst.in +++ b/source/fe/fe_values.decl.1.inst.in @@ -18,7 +18,7 @@ // Declarations of member functions of FEValuesBase::CellIteratorBase // and derived classes -for (VEC : SERIAL_VECTORS) +for (VEC : VECTOR_TYPES) { /// Call /// @p get_interpolated_dof_values diff --git a/source/fe/fe_values.decl.2.inst.in b/source/fe/fe_values.decl.2.inst.in index d3913ca141..f675215962 100644 --- a/source/fe/fe_values.decl.2.inst.in +++ b/source/fe/fe_values.decl.2.inst.in @@ -18,7 +18,7 @@ // Declarations of member functions of FEValuesBase::CellIteratorBase // and derived classes -for (VEC : SERIAL_VECTORS) +for (VEC : VECTOR_TYPES) { /// Call /// @p get_interpolated_dof_values diff --git a/source/fe/fe_values.impl.1.inst.in b/source/fe/fe_values.impl.1.inst.in index 745c9d2866..aa4a051947 100644 --- a/source/fe/fe_values.impl.1.inst.in +++ b/source/fe/fe_values.impl.1.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS) +for (VEC : VECTOR_TYPES) { template template diff --git a/source/fe/fe_values.impl.2.inst.in b/source/fe/fe_values.impl.2.inst.in index 726b3f5892..9bfcfc8fdf 100644 --- a/source/fe/fe_values.impl.2.inst.in +++ b/source/fe/fe_values.impl.2.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS) +for (VEC : VECTOR_TYPES) { template void diff --git a/source/fe/fe_values.inst.in b/source/fe/fe_values.inst.in index aa9f5a8e08..d3fac7e6c6 100644 --- a/source/fe/fe_values.inst.in +++ b/source/fe/fe_values.inst.in @@ -61,7 +61,7 @@ for (dof_handler : DOFHANDLER_TEMPLATES; deal_II_dimension : DIMENSIONS; deal_II -for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : VECTOR_TYPES; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension template @@ -239,7 +239,7 @@ for (VEC : GENERAL_CONTAINER_TYPES; } -for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : VECTOR_TYPES; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension diff --git a/source/fe/mapping_fe_field.inst.in b/source/fe/mapping_fe_field.inst.in index 7041afe7fa..08502ce5ac 100644 --- a/source/fe/mapping_fe_field.inst.in +++ b/source/fe/mapping_fe_field.inst.in @@ -16,7 +16,7 @@ -for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; VEC : REAL_SERIAL_VECTORS) +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; VEC : REAL_VECTOR_TYPES) { #if deal_II_dimension <= deal_II_space_dimension template class MappingFEField; diff --git a/source/fe/mapping_q_eulerian.inst.in b/source/fe/mapping_q_eulerian.inst.in index c7971c67f9..b397ad3b67 100644 --- a/source/fe/mapping_q_eulerian.inst.in +++ b/source/fe/mapping_q_eulerian.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; VEC : REAL_SERIAL_VECTORS) +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; VEC : REAL_VECTOR_TYPES) { #if deal_II_dimension <= deal_II_space_dimension template class MappingQEulerian; diff --git a/source/lac/constraint_matrix.inst.in b/source/lac/constraint_matrix.inst.in index b99e631eb9..9244eed2fb 100644 --- a/source/lac/constraint_matrix.inst.in +++ b/source/lac/constraint_matrix.inst.in @@ -72,7 +72,7 @@ for (S1 : COMPLEX_SCALARS) } -for (Vec : SERIAL_VECTORS) +for (Vec : VECTOR_TYPES) { template void ConstraintMatrix::distribute(Vec &) const; } diff --git a/source/lac/solver.inst.in b/source/lac/solver.inst.in index 659b6783bb..17177cb3b9 100644 --- a/source/lac/solver.inst.in +++ b/source/lac/solver.inst.in @@ -15,7 +15,7 @@ -for (S : SERIAL_VECTORS) +for (S : VECTOR_TYPES) { template class Solver; } diff --git a/source/lac/vector_memory.inst.in b/source/lac/vector_memory.inst.in index 28f51735c9..f8ce104bfc 100644 --- a/source/lac/vector_memory.inst.in +++ b/source/lac/vector_memory.inst.in @@ -15,7 +15,7 @@ -for (VECTOR : SERIAL_VECTORS) +for (VECTOR : VECTOR_TYPES) { template class VectorMemory; template class GrowingVectorMemory; diff --git a/source/lac/vector_memory_release.inst.in b/source/lac/vector_memory_release.inst.in index cbf8653ae9..0bfaf6a5ce 100644 --- a/source/lac/vector_memory_release.inst.in +++ b/source/lac/vector_memory_release.inst.in @@ -15,7 +15,7 @@ -for (VECTOR : SERIAL_VECTORS) +for (VECTOR : VECTOR_TYPES) { dealii::GrowingVectorMemory::release_unused_memory(); } diff --git a/source/meshworker/mesh_worker_vector_selector.inst.in b/source/meshworker/mesh_worker_vector_selector.inst.in index e6490ba128..47e4caac4f 100644 --- a/source/meshworker/mesh_worker_vector_selector.inst.in +++ b/source/meshworker/mesh_worker_vector_selector.inst.in @@ -25,7 +25,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS \} } -for (VECTOR : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VECTOR : VECTOR_TYPES; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { namespace MeshWorker \{ diff --git a/source/multigrid/mg_base.inst.in b/source/multigrid/mg_base.inst.in index 6c5823cfd7..6f75b03045 100644 --- a/source/multigrid/mg_base.inst.in +++ b/source/multigrid/mg_base.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS) +for (VEC : VECTOR_TYPES) { template class MGTransferBase< VEC >; template class MGMatrixBase< VEC >; diff --git a/source/multigrid/multigrid.inst.in b/source/multigrid/multigrid.inst.in index 55c1bcd829..f8693941d8 100644 --- a/source/multigrid/multigrid.inst.in +++ b/source/multigrid/multigrid.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS) +for (VEC : VECTOR_TYPES) { template class Multigrid< VEC >; } diff --git a/source/numerics/data_out_dof_data.inst.in b/source/numerics/data_out_dof_data.inst.in index be26c154ed..c6d4c3d498 100644 --- a/source/numerics/data_out_dof_data.inst.in +++ b/source/numerics/data_out_dof_data.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS; DH : DOFHANDLER_TEMPLATES; deal_II_dimension : DIMENSIONS) +for (VEC : VECTOR_TYPES; DH : DOFHANDLER_TEMPLATES; deal_II_dimension : DIMENSIONS) { template void DataOut_DoFData,deal_II_dimension,deal_II_dimension>:: diff --git a/source/numerics/data_out_dof_data_codim.inst.in b/source/numerics/data_out_dof_data_codim.inst.in index f7e709b7af..5dc45e7326 100644 --- a/source/numerics/data_out_dof_data_codim.inst.in +++ b/source/numerics/data_out_dof_data_codim.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : REAL_SERIAL_VECTORS; DH : DOFHANDLER_TEMPLATES; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS) +for (VEC : REAL_VECTOR_TYPES; DH : DOFHANDLER_TEMPLATES; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS) { #if deal_II_dimension < deal_II_space_dimension template void diff --git a/source/numerics/derivative_approximation.inst.in b/source/numerics/derivative_approximation.inst.in index 6cbc7e72c8..2b10ccfab7 100644 --- a/source/numerics/derivative_approximation.inst.in +++ b/source/numerics/derivative_approximation.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (deal_II_dimension : DIMENSIONS ; VEC : REAL_SERIAL_VECTORS ; DH : DOFHANDLER_TEMPLATES) +for (deal_II_dimension : DIMENSIONS ; VEC : REAL_VECTOR_TYPES ; DH : DOFHANDLER_TEMPLATES) { namespace DerivativeApproximation \{ diff --git a/source/numerics/dof_output_operator.inst.in b/source/numerics/dof_output_operator.inst.in index afb7f59d27..408d112e17 100644 --- a/source/numerics/dof_output_operator.inst.in +++ b/source/numerics/dof_output_operator.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) +for (VEC : REAL_VECTOR_TYPES ; deal_II_dimension : DIMENSIONS) { template class DoFOutputOperator; } diff --git a/source/numerics/error_estimator.inst.in b/source/numerics/error_estimator.inst.in index dd57268a94..4fac2a9289 100644 --- a/source/numerics/error_estimator.inst.in +++ b/source/numerics/error_estimator.inst.in @@ -21,7 +21,7 @@ for (deal_II_dimension : DIMENSIONS ; deal_II_space_dimension : SPACE_DIMENSIONS #endif } -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; DH : DOFHANDLER_TEMPLATES ) +for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; DH : DOFHANDLER_TEMPLATES ) { #if deal_II_dimension != 1 && deal_II_dimension <= deal_II_space_dimension diff --git a/source/numerics/error_estimator_1d.inst.in b/source/numerics/error_estimator_1d.inst.in index ff93b0db6d..d337d86e90 100644 --- a/source/numerics/error_estimator_1d.inst.in +++ b/source/numerics/error_estimator_1d.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; DH : DOFHANDLER_TEMPLATES ) +for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; DH : DOFHANDLER_TEMPLATES ) { #if deal_II_dimension == 1 && deal_II_dimension <= deal_II_space_dimension diff --git a/source/numerics/fe_field_function.inst.in b/source/numerics/fe_field_function.inst.in index 65fa6d9a54..55acc6a83a 100644 --- a/source/numerics/fe_field_function.inst.in +++ b/source/numerics/fe_field_function.inst.in @@ -15,7 +15,7 @@ -for (VECTOR : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) +for (VECTOR : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS) { template class FEFieldFunction, diff --git a/source/numerics/point_value_history.inst.in b/source/numerics/point_value_history.inst.in index 3c6795287d..1888b76f16 100644 --- a/source/numerics/point_value_history.inst.in +++ b/source/numerics/point_value_history.inst.in @@ -21,7 +21,7 @@ for (deal_II_dimension : DIMENSIONS) } -for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) +for (VEC : REAL_VECTOR_TYPES ; deal_II_dimension : DIMENSIONS) { template void PointValueHistory::evaluate_field @@ -30,7 +30,7 @@ for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) } -for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) +for (VEC : REAL_VECTOR_TYPES ; deal_II_dimension : DIMENSIONS) { template void PointValueHistory::evaluate_field_at_requested_location @@ -38,7 +38,7 @@ for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) const VEC &); } -for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) +for (VEC : REAL_VECTOR_TYPES ; deal_II_dimension : DIMENSIONS) { template void PointValueHistory::evaluate_field @@ -48,7 +48,7 @@ for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) const Quadrature &); } -for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) +for (VEC : REAL_VECTOR_TYPES ; deal_II_dimension : DIMENSIONS) { template void PointValueHistory::evaluate_field diff --git a/source/numerics/solution_transfer.inst.in b/source/numerics/solution_transfer.inst.in index da017a3454..552c9cc848 100644 --- a/source/numerics/solution_transfer.inst.in +++ b/source/numerics/solution_transfer.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : VECTOR_TYPES; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension template class SolutionTransfer >; diff --git a/source/numerics/vector_tools_integrate_difference.inst.in b/source/numerics/vector_tools_integrate_difference.inst.in index 4f79e3f2d6..03523ce2b9 100644 --- a/source/numerics/vector_tools_integrate_difference.inst.in +++ b/source/numerics/vector_tools_integrate_difference.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension namespace VectorTools \{ diff --git a/source/numerics/vector_tools_interpolate.inst.in b/source/numerics/vector_tools_interpolate.inst.in index b8e1bf7964..ad4287c7f5 100644 --- a/source/numerics/vector_tools_interpolate.inst.in +++ b/source/numerics/vector_tools_interpolate.inst.in @@ -15,7 +15,7 @@ -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension namespace VectorTools \{ @@ -57,7 +57,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens //TODO[SP]: replace by // where applicable and move to codimension cases above also when applicable -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension == deal_II_space_dimension @@ -96,7 +96,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens } -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension namespace VectorTools \{ diff --git a/source/numerics/vector_tools_mean_value.inst.in b/source/numerics/vector_tools_mean_value.inst.in index 167a0833be..cbdd9d8e9c 100644 --- a/source/numerics/vector_tools_mean_value.inst.in +++ b/source/numerics/vector_tools_mean_value.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension namespace VectorTools \{ @@ -40,7 +40,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens -for (VEC : SERIAL_VECTORS) +for (VEC : VECTOR_TYPES) { namespace VectorTools \{ template diff --git a/source/numerics/vector_tools_point_gradient.inst.in b/source/numerics/vector_tools_point_gradient.inst.in index 3122d92044..bc95800829 100644 --- a/source/numerics/vector_tools_point_gradient.inst.in +++ b/source/numerics/vector_tools_point_gradient.inst.in @@ -13,7 +13,7 @@ // // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension == deal_II_space_dimension diff --git a/source/numerics/vector_tools_point_value.inst.in b/source/numerics/vector_tools_point_value.inst.in index 63fbfcf183..570e56351b 100644 --- a/source/numerics/vector_tools_point_value.inst.in +++ b/source/numerics/vector_tools_point_value.inst.in @@ -16,7 +16,7 @@ //TODO[SP]: replace by // where applicable and move to codimension cases above also when applicable -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension == deal_II_space_dimension diff --git a/source/numerics/vector_tools_project.inst.in b/source/numerics/vector_tools_project.inst.in index d80f65c789..35d99404a7 100644 --- a/source/numerics/vector_tools_project.inst.in +++ b/source/numerics/vector_tools_project.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : REAL_VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension == deal_II_space_dimension namespace VectorTools \{ diff --git a/source/numerics/vector_tools_project_codim.inst.in b/source/numerics/vector_tools_project_codim.inst.in index e68a3a0604..b1c2f285b2 100644 --- a/source/numerics/vector_tools_project_codim.inst.in +++ b/source/numerics/vector_tools_project_codim.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : REAL_VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension < deal_II_space_dimension namespace VectorTools \{ diff --git a/source/numerics/vector_tools_project_hp.inst.in b/source/numerics/vector_tools_project_hp.inst.in index b4a093efcf..44a6267d5c 100644 --- a/source/numerics/vector_tools_project_hp.inst.in +++ b/source/numerics/vector_tools_project_hp.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : REAL_VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension namespace VectorTools \{ diff --git a/source/numerics/vector_tools_rhs.inst.in b/source/numerics/vector_tools_rhs.inst.in index 1389d52e9d..ed36b7d9d3 100644 --- a/source/numerics/vector_tools_rhs.inst.in +++ b/source/numerics/vector_tools_rhs.inst.in @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -for (VEC : REAL_SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : REAL_VECTOR_TYPES; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension namespace VectorTools \{ -- 2.39.5