From 0b76bb198629791eef15924d65b96aa0e3fbd2dd Mon Sep 17 00:00:00 2001 From: "denis.davydov" Date: Wed, 5 Mar 2014 15:41:10 +0000 Subject: [PATCH] fixed wrong template names used to instantiate fe_values git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@32618 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/fe/fe_values.decl.1.inst.in | 4 ++-- deal.II/source/fe/fe_values.decl.2.inst.in | 4 ++-- deal.II/source/fe/fe_values.impl.1.inst.in | 4 ++-- deal.II/source/fe/fe_values.impl.2.inst.in | 4 ++-- deal.II/source/fe/fe_values.inst.in | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/deal.II/source/fe/fe_values.decl.1.inst.in b/deal.II/source/fe/fe_values.decl.1.inst.in index 99a4856d08..7d5a603596 100644 --- a/deal.II/source/fe/fe_values.decl.1.inst.in +++ b/deal.II/source/fe/fe_values.decl.1.inst.in @@ -19,7 +19,7 @@ // Declarations of member functions of FEValuesBase::CellIteratorBase // and derived classes -for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS) +for (VEC : REAL_SERIAL_VECTORS; S: REAL_SCALARS) { /// Call /// @p get_interpolated_dof_values @@ -31,7 +31,7 @@ for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS) Vector &out) const = 0; } -for (VEC : SERIAL_VECTORS_COMPLEX) +for (VEC : COMPLEX_SERIAL_VECTORS) { /// Call /// @p get_interpolated_dof_values diff --git a/deal.II/source/fe/fe_values.decl.2.inst.in b/deal.II/source/fe/fe_values.decl.2.inst.in index 6a26e8e72f..0d40b9d98e 100644 --- a/deal.II/source/fe/fe_values.decl.2.inst.in +++ b/deal.II/source/fe/fe_values.decl.2.inst.in @@ -19,7 +19,7 @@ // Declarations of member functions of FEValuesBase::CellIteratorBase // and derived classes -for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS) +for (VEC : REAL_SERIAL_VECTORS; S: REAL_SCALARS) { /// Call /// @p get_interpolated_dof_values @@ -31,7 +31,7 @@ for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS) Vector &out) const; } -for (VEC : SERIAL_VECTORS_COMPLEX) +for (VEC : COMPLEX_SERIAL_VECTORS) { /// Call /// @p get_interpolated_dof_values diff --git a/deal.II/source/fe/fe_values.impl.1.inst.in b/deal.II/source/fe/fe_values.impl.1.inst.in index 96d4ee678b..7c264ea94b 100644 --- a/deal.II/source/fe/fe_values.impl.1.inst.in +++ b/deal.II/source/fe/fe_values.impl.1.inst.in @@ -15,7 +15,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS) +for (VEC : REAL_SERIAL_VECTORS; S: REAL_SCALARS) { template template @@ -28,7 +28,7 @@ for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS) \} } -for (VEC : SERIAL_VECTORS_COMPLEX) +for (VEC : COMPLEX_SERIAL_VECTORS) { template template diff --git a/deal.II/source/fe/fe_values.impl.2.inst.in b/deal.II/source/fe/fe_values.impl.2.inst.in index 368c147d48..1d9b4b714e 100644 --- a/deal.II/source/fe/fe_values.impl.2.inst.in +++ b/deal.II/source/fe/fe_values.impl.2.inst.in @@ -15,7 +15,7 @@ // --------------------------------------------------------------------- -for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS) +for (VEC : REAL_SERIAL_VECTORS; S: REAL_SCALARS) { template void @@ -27,7 +27,7 @@ for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS) \} } -for (VEC : SERIAL_VECTORS_COMPLEX) +for (VEC : COMPLEX_SERIAL_VECTORS) { template void diff --git a/deal.II/source/fe/fe_values.inst.in b/deal.II/source/fe/fe_values.inst.in index be28a92084..24d7a11837 100644 --- a/deal.II/source/fe/fe_values.inst.in +++ b/deal.II/source/fe/fe_values.inst.in @@ -64,7 +64,7 @@ for (dof_handler : DOFHANDLER_TEMPLATES; deal_II_dimension : DIMENSIONS; deal_II -for (VEC : SERIAL_VECTORS_REAL; 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 #if (deal_II_space_dimension == DIM_A) || (deal_II_space_dimension == DIM_B) @@ -137,7 +137,7 @@ for (VEC : SERIAL_VECTORS_REAL; deal_II_dimension : DIMENSIONS; deal_II_space_di -for (VEC : SERIAL_VECTORS_REAL; 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 #if (deal_II_space_dimension == DIM_A) || (deal_II_space_dimension == DIM_B) @@ -254,7 +254,7 @@ for (VEC : SERIAL_VECTORS_REAL; deal_II_dimension : DIMENSIONS; deal_II_space_di #endif } -for (VEC : SERIAL_VECTORS_COMPLEX; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +for (VEC : COMPLEX_SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension #if (deal_II_space_dimension == DIM_A) || (deal_II_space_dimension == DIM_B) -- 2.39.5