The previous name no longer adequately represented what these classes were. Fix this.
// 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<double>;
+// All vector types, based on real or complex scalars
+VECTOR_TYPES := { Vector<double>;
Vector<float> ;
Vector<std::complex<double> >;
@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<double>;
+REAL_VECTOR_TYPES := { Vector<double>;
Vector<float> ;
BlockVector<double>;
// ---------------------------------------------------------------------
-for (VEC : SERIAL_VECTORS)
+for (VEC : VECTOR_TYPES)
{
template class OutputOperator<VEC>;
template class Newton<VEC>;
-for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; lda : BOOL)
+for (VEC : VECTOR_TYPES; deal_II_dimension : DIMENSIONS; lda : BOOL)
{
template
void
}
-for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; lda : BOOL)
+for (VEC : VECTOR_TYPES; deal_II_dimension : DIMENSIONS; lda : BOOL)
{
template
void
-for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; lda : BOOL)
+for (VEC : VECTOR_TYPES; deal_II_dimension : DIMENSIONS; lda : BOOL)
{
template
void
}
-for (VEC : SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; lda : BOOL)
+for (VEC : VECTOR_TYPES; deal_II_dimension : DIMENSIONS; lda : BOOL)
{
template
void
-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
\{
-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
\{
\}
}
-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
\{
// Declarations of member functions of FEValuesBase::CellIteratorBase
// and derived classes
-for (VEC : SERIAL_VECTORS)
+for (VEC : VECTOR_TYPES)
{
/// Call
/// @p get_interpolated_dof_values
// Declarations of member functions of FEValuesBase::CellIteratorBase
// and derived classes
-for (VEC : SERIAL_VECTORS)
+for (VEC : VECTOR_TYPES)
{
/// Call
/// @p get_interpolated_dof_values
// ---------------------------------------------------------------------
-for (VEC : SERIAL_VECTORS)
+for (VEC : VECTOR_TYPES)
{
template <int dim, int spacedim>
template <typename CI>
// ---------------------------------------------------------------------
-for (VEC : SERIAL_VECTORS)
+for (VEC : VECTOR_TYPES)
{
template <int dim, int spacedim>
void
-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
}
-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
-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<deal_II_dimension, deal_II_space_dimension, VEC,
// ---------------------------------------------------------------------
-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 MappingQ1Eulerian<deal_II_dimension, VEC, deal_II_space_dimension>;
// ---------------------------------------------------------------------
-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<deal_II_dimension, VEC, deal_II_space_dimension>;
}
-for (Vec : SERIAL_VECTORS)
+for (Vec : VECTOR_TYPES)
{
template void ConstraintMatrix::distribute<Vec>(Vec &) const;
}
-for (S : SERIAL_VECTORS)
+for (S : VECTOR_TYPES)
{
template class Solver<S>;
}
-for (VECTOR : SERIAL_VECTORS)
+for (VECTOR : VECTOR_TYPES)
{
template class VectorMemory<VECTOR>;
template class GrowingVectorMemory<VECTOR>;
-for (VECTOR : SERIAL_VECTORS)
+for (VECTOR : VECTOR_TYPES)
{
dealii::GrowingVectorMemory<dealii::VECTOR>::release_unused_memory();
}
\}
}
-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
\{
// ---------------------------------------------------------------------
-for (VEC : SERIAL_VECTORS)
+for (VEC : VECTOR_TYPES)
{
template class MGTransferBase< VEC >;
template class MGMatrixBase< VEC >;
// ---------------------------------------------------------------------
-for (VEC : SERIAL_VECTORS)
+for (VEC : VECTOR_TYPES)
{
template class Multigrid< VEC >;
}
// ---------------------------------------------------------------------
-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<DH<deal_II_dimension,deal_II_dimension>,deal_II_dimension,deal_II_dimension>::
// ---------------------------------------------------------------------
-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
// ---------------------------------------------------------------------
-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
\{
// ---------------------------------------------------------------------
-for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS)
+for (VEC : REAL_VECTOR_TYPES ; deal_II_dimension : DIMENSIONS)
{
template class DoFOutputOperator<VEC, deal_II_dimension, deal_II_dimension>;
}
#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
// ---------------------------------------------------------------------
-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
-for (VECTOR : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS)
+for (VECTOR : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS)
{
template class FEFieldFunction<deal_II_dimension,
DoFHandler<deal_II_dimension>,
}
-for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS)
+for (VEC : REAL_VECTOR_TYPES ; deal_II_dimension : DIMENSIONS)
{
template
void PointValueHistory<deal_II_dimension>::evaluate_field
}
-for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS)
+for (VEC : REAL_VECTOR_TYPES ; deal_II_dimension : DIMENSIONS)
{
template
void PointValueHistory<deal_II_dimension>::evaluate_field_at_requested_location
const VEC &);
}
-for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS)
+for (VEC : REAL_VECTOR_TYPES ; deal_II_dimension : DIMENSIONS)
{
template
void PointValueHistory<deal_II_dimension>::evaluate_field
const Quadrature<deal_II_dimension> &);
}
-for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS)
+for (VEC : REAL_VECTOR_TYPES ; deal_II_dimension : DIMENSIONS)
{
template
void PointValueHistory<deal_II_dimension>::evaluate_field
// ---------------------------------------------------------------------
-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<deal_II_dimension, VEC, DoFHandler<deal_II_dimension, deal_II_space_dimension> >;
// ---------------------------------------------------------------------
-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 \{
-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 \{
//TODO[SP]: replace <deal_II_dimension> by <deal_II_dimension, deal_II_space_dimension>
// 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
}
-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 \{
// ---------------------------------------------------------------------
-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 \{
-for (VEC : SERIAL_VECTORS)
+for (VEC : VECTOR_TYPES)
{
namespace VectorTools \{
template
//
// ---------------------------------------------------------------------
-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
//TODO[SP]: replace <deal_II_dimension> by <deal_II_dimension, deal_II_space_dimension>
// 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
// ---------------------------------------------------------------------
-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 \{
// ---------------------------------------------------------------------
-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 \{
// ---------------------------------------------------------------------
-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 \{
// ---------------------------------------------------------------------
-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 \{