From 143888e124906c2997f0e90c8233d3649d2e9a20 Mon Sep 17 00:00:00 2001 From: "denis.davydov" Date: Wed, 5 Mar 2014 15:43:10 +0000 Subject: [PATCH] masked numerous parts of the library via instantiating for REAL_SERIAL_VECTORS only git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@32619 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/fe/mapping_q_eulerian.inst.in | 2 ++ deal.II/source/numerics/data_out_dof_data.inst.in | 2 +- deal.II/source/numerics/derivative_approximation.inst.in | 2 +- deal.II/source/numerics/dof_output_operator.inst.in | 2 +- deal.II/source/numerics/error_estimator.inst.in | 2 +- deal.II/source/numerics/error_estimator_1d.inst.in | 2 +- deal.II/source/numerics/fe_field_function.inst.in | 2 +- deal.II/source/numerics/point_value_history.inst.in | 8 ++++---- .../numerics/vector_tools_integrate_difference.inst.in | 2 +- deal.II/source/numerics/vector_tools_mean_value.inst.in | 2 +- deal.II/source/numerics/vector_tools_point_value.inst.in | 2 +- 11 files changed, 15 insertions(+), 13 deletions(-) diff --git a/deal.II/source/fe/mapping_q_eulerian.inst.in b/deal.II/source/fe/mapping_q_eulerian.inst.in index 439ef92f51..0111d20a13 100644 --- a/deal.II/source/fe/mapping_q_eulerian.inst.in +++ b/deal.II/source/fe/mapping_q_eulerian.inst.in @@ -20,10 +20,12 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS #if deal_II_dimension <= deal_II_space_dimension template class MappingQEulerian, deal_II_space_dimension>; # ifdef DEAL_II_WITH_PETSC +# ifndef PETSC_USE_COMPLEX template class MappingQEulerian; template class MappingQEulerian; +# endif # endif # ifdef DEAL_II_WITH_TRILINOS template class MappingQEulerian; } diff --git a/deal.II/source/numerics/error_estimator.inst.in b/deal.II/source/numerics/error_estimator.inst.in index 8ca601fbcf..b996b3b9a9 100644 --- a/deal.II/source/numerics/error_estimator.inst.in +++ b/deal.II/source/numerics/error_estimator.inst.in @@ -22,7 +22,7 @@ template class KellyErrorEstimator; #endif } -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; DH : DOFHANDLER_TEMPLATES ) +for (VEC : REAL_SERIAL_VECTORS ; 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/deal.II/source/numerics/error_estimator_1d.inst.in b/deal.II/source/numerics/error_estimator_1d.inst.in index 66b0c787bc..c4479b124f 100644 --- a/deal.II/source/numerics/error_estimator_1d.inst.in +++ b/deal.II/source/numerics/error_estimator_1d.inst.in @@ -15,7 +15,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS; DH : DOFHANDLER_TEMPLATES ) +for (VEC : REAL_SERIAL_VECTORS ; 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/deal.II/source/numerics/fe_field_function.inst.in b/deal.II/source/numerics/fe_field_function.inst.in index e124e5cce3..020807cd95 100644 --- a/deal.II/source/numerics/fe_field_function.inst.in +++ b/deal.II/source/numerics/fe_field_function.inst.in @@ -16,7 +16,7 @@ -for (VECTOR : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) +for (VECTOR : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) { template class FEFieldFunction, diff --git a/deal.II/source/numerics/point_value_history.inst.in b/deal.II/source/numerics/point_value_history.inst.in index c3ae1f0896..c2aa6fc697 100644 --- a/deal.II/source/numerics/point_value_history.inst.in +++ b/deal.II/source/numerics/point_value_history.inst.in @@ -22,7 +22,7 @@ for (deal_II_dimension : DIMENSIONS) } -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) +for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) { template void PointValueHistory::evaluate_field @@ -31,7 +31,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) } -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) +for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) { template void PointValueHistory::evaluate_field_at_requested_location @@ -39,7 +39,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) const VEC &); } -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) +for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) { template void PointValueHistory::evaluate_field @@ -49,7 +49,7 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) const Quadrature &); } -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) +for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS) { template void PointValueHistory::evaluate_field diff --git a/deal.II/source/numerics/vector_tools_integrate_difference.inst.in b/deal.II/source/numerics/vector_tools_integrate_difference.inst.in index 4ad4fe0ec4..281b6fa145 100644 --- a/deal.II/source/numerics/vector_tools_integrate_difference.inst.in +++ b/deal.II/source/numerics/vector_tools_integrate_difference.inst.in @@ -15,7 +15,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension namespace VectorTools \{ diff --git a/deal.II/source/numerics/vector_tools_mean_value.inst.in b/deal.II/source/numerics/vector_tools_mean_value.inst.in index 89e5be1545..9993c3eb62 100644 --- a/deal.II/source/numerics/vector_tools_mean_value.inst.in +++ b/deal.II/source/numerics/vector_tools_mean_value.inst.in @@ -15,7 +15,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension namespace VectorTools \{ diff --git a/deal.II/source/numerics/vector_tools_point_value.inst.in b/deal.II/source/numerics/vector_tools_point_value.inst.in index 8dd47f73e0..907bec2601 100644 --- a/deal.II/source/numerics/vector_tools_point_value.inst.in +++ b/deal.II/source/numerics/vector_tools_point_value.inst.in @@ -17,7 +17,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 : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension == deal_II_space_dimension -- 2.39.5