class.
- The deprecated constructor of MPI_InitFinalize
- The MPI support functions in namespace Utilities and Utilities::System.
-
+- Deprecated members of namespace types
+- Namespace deal_II_numbers.
<!-- ----------- GENERAL IMPROVEMENTS ----------------- -->
:
is_compressed (true),
index_space_size (0),
- largest_range (deal_II_numbers::invalid_unsigned_int)
+ largest_range (numbers::invalid_unsigned_int)
{}
:
is_compressed (true),
index_space_size (size),
- largest_range (deal_II_numbers::invalid_unsigned_int)
+ largest_range (numbers::invalid_unsigned_int)
{}
const std::vector<std::string>::const_iterator
i = std::find(names.begin(), names.end(), name);
if (i == names.end())
- return deal_II_numbers::invalid_unsigned_int;
+ return numbers::invalid_unsigned_int;
return i - names.begin();
}
}
-//TODO[WB]: eventually remove this namespace alias
-/*
- * Namespace alias with the old name for the numbers namespace. The namespace
- * was originally called numbers, but has since been renamed to
- * dealii::numbers when everything was moved into namespace dealii.
- *
- * @deprecated
- */
-namespace deal_II_numbers = numbers;
-
-
// --------------- inline and template functions ---------------- //
namespace numbers
#include <deal.II/base/config.h>
#include <cstddef>
+
+
DEAL_II_NAMESPACE_OPEN
/**
*/
typedef unsigned int subdomain_id;
- /**
- * @deprecated Old name for the typedef above.
- */
- typedef subdomain_id subdomain_id_t DEAL_II_DEPRECATED;
-
- /**
- * @deprecated Use numbers::invalid_subdomain_id
- */
- const unsigned int invalid_subdomain_id DEAL_II_DEPRECATED = static_cast<subdomain_id>(-1);
-
- /**
- * @deprecated Use numbers::artificial_subdomain_id
- */
- const unsigned int artificial_subdomain_id DEAL_II_DEPRECATED = static_cast<subdomain_id>(-2);
-
#ifdef DEAL_II_WITH_64BIT_INDICES
/**
* The type used for global indices of degrees of freedom. While in
# define DEAL_II_DOF_INDEX_MPI_TYPE MPI_UNSIGNED
#endif
-
- /**
- * @deprecated Use numbers::invalid_dof_index
- */
- const global_dof_index invalid_dof_index DEAL_II_DEPRECATED = static_cast<global_dof_index>(-1);
-
/**
* The type used to denote boundary indicators associated with every piece
* of the boundary and, in the case of meshes that describe manifolds in
*/
typedef unsigned int manifold_id;
-
- /**
- * @deprecated Old name for the typedef above.
- */
- typedef boundary_id boundary_id_t DEAL_II_DEPRECATED;
-
/**
* The type used to denote material indicators associated with every cell.
*
* indicate an invalid value of this type.
*/
typedef unsigned char material_id;
-
- /**
- * @deprecated Old name for the typedef above.
- */
- typedef material_id material_id_t DEAL_II_DEPRECATED;
-
}
namespace TrilinosWrappers
inline
MatrixBlock<MATRIX>::MatrixBlock()
:
- row(deal_II_numbers::invalid_size_type),
- column(deal_II_numbers::invalid_size_type)
+ row(numbers::invalid_size_type),
+ column(numbers::invalid_size_type)
{}
FPArrayComparator<double> >::iterator,
bool> it = constraints.insert(next_constraint);
- types::global_dof_index insert_position = deal_II_numbers::invalid_dof_index;
+ types::global_dof_index insert_position = numbers::invalid_dof_index;
if (it.second == false)
insert_position = it.first->second;
else
/**
* The number of the current face on the current cell.
*
- * This number is deal_II_numbers::invalid_unsigned_int if the info object
+ * This number is numbers::invalid_unsigned_int if the info object
* was initialized with a cell.
*/
unsigned int face_number;
/**
* The number of the current subface on the current face
*
- * This number is deal_II_numbers::invalid_unsigned_int if the info object
+ * This number is numbers::invalid_unsigned_int if the info object
* was not initialized with a subface.
*/
unsigned int sub_number;
level_cell = c->is_level_cell();
cell = typename Triangulation<dim,spacedim>::cell_iterator(*c);
- face_number = deal_II_numbers::invalid_unsigned_int;
- sub_number = deal_II_numbers::invalid_unsigned_int;
+ face_number = numbers::invalid_unsigned_int;
+ sub_number = numbers::invalid_unsigned_int;
if (block_info)
LocalResults<number>::reinit(block_info->local());
else
{
face = static_cast<typename Triangulation<dim>::face_iterator> (f);
face_number = face_no;
- sub_number = deal_II_numbers::invalid_unsigned_int;
+ sub_number = numbers::invalid_unsigned_int;
}
{
BlockVector<double> *v;
if (separate_faces &&
- info.face_number != deal_II_numbers::invalid_unsigned_int)
+ info.face_number != numbers::invalid_unsigned_int)
v = results.entry<BlockVector<double>*>(1);
else
v = results.entry<BlockVector<double>*>(0);
for (unsigned int i=0; i<fevalv.size(); ++i)
{
FEValuesBase<dim, spacedim> &febase = *fevalv[i];
- if (info.sub_number != deal_II_numbers::invalid_unsigned_int)
+ if (info.sub_number != numbers::invalid_unsigned_int)
{
// This is a subface
FESubfaceValues<dim> &fe = dynamic_cast<FESubfaceValues<dim>&> (febase);
fe.reinit(info.cell, info.face_number, info.sub_number);
}
- else if (info.face_number != deal_II_numbers::invalid_unsigned_int)
+ else if (info.face_number != numbers::invalid_unsigned_int)
{
// This is a face
FEFaceValues<dim> &fe = dynamic_cast<FEFaceValues<dim>&> (febase);
// indices tell, which global coordinate
// (0->x, 1->y, 2->z) corresponds to which
// local one
- unsigned int xi_index = deal_II_numbers::invalid_unsigned_int,
- eta_index = deal_II_numbers::invalid_unsigned_int,
+ unsigned int xi_index = numbers::invalid_unsigned_int,
+ eta_index = numbers::invalid_unsigned_int,
const_index = face_no/2;
// the xi and eta values have to be scaled
// (by factor 0.5 or factor 1.0) depending on
// ones.
// first, define an invalid number
- static const unsigned int e = deal_II_numbers::invalid_unsigned_int;
+ static const unsigned int e = numbers::invalid_unsigned_int;
static const RefinementCase<dim-1>
equivalent_refine_case[internal::SubfaceCase<dim>::case_isotropic+1][GeometryInfo<3>::max_children_per_face]
p_data=&data;
const unsigned int n_q_points=q.size();
- this->compute_fill_face (cell, face_no, deal_II_numbers::invalid_unsigned_int,
+ this->compute_fill_face (cell, face_no, numbers::invalid_unsigned_int,
n_q_points,
QProjector<dim>::DataSetDescriptor::
face (face_no,
{
JxW_values[i] = boundary_forms[i].norm() * weights[i];
- if (subface_no!=deal_II_numbers::invalid_unsigned_int)
+ if (subface_no!=numbers::invalid_unsigned_int)
{
const double area_ratio=GeometryInfo<dim>::subface_ratio(
cell->subface_case(face_no), subface_no);
const unsigned int n_q_points = q.size();
- compute_fill_face (cell, face_no, deal_II_numbers::invalid_unsigned_int,
+ compute_fill_face (cell, face_no, numbers::invalid_unsigned_int,
n_q_points,
DataSetDescriptor::face (face_no,
cell->face_orientation(face_no),
const bool first_child_has_children=face->child(0)->has_children();
- static const unsigned int e = deal_II_numbers::invalid_unsigned_int;
+ static const unsigned int e = numbers::invalid_unsigned_int;
// array containing the translation of the
// numbers,
// since then we did not find
// our way back...
Assert (false, ExcInternalError());
- return std::make_pair (deal_II_numbers::invalid_unsigned_int,
- deal_II_numbers::invalid_unsigned_int);
+ return std::make_pair (numbers::invalid_unsigned_int,
+ numbers::invalid_unsigned_int);
}
case 3:
for (unsigned int i=0; i<select.size(); ++i)
{
deallog << "Selection " << i << ':';
- if (select(i) != deal_II_numbers::invalid_unsigned_int)
+ if (select(i) != numbers::invalid_unsigned_int)
deallog << data.name(select(i)) << ' ' << *data(select(i));
deallog << std::endl;
}
{
double sum = 0;
for (unsigned int d=0; d<dim; ++d)
- sum += std::sin(deal_II_numbers::PI*p[d]);
+ sum += std::sin(numbers::PI*p[d]);
return sum;
}
{
double sum = 0;
for (unsigned int d=0; d<dim; ++d)
- sum += std::sin(deal_II_numbers::PI*p[d]);
+ sum += std::sin(numbers::PI*p[d]);
return sum;
}
{
double sum = 0;
for (unsigned int d=0; d<dim; ++d)
- sum += std::sin(deal_II_numbers::PI*p[d]);
+ sum += std::sin(numbers::PI*p[d]);
return sum;
}
{
double sum = 0;
for (unsigned int d=0; d<dim; ++d)
- sum += std::sin(deal_II_numbers::PI*p[d]);
+ sum += std::sin(numbers::PI*p[d]);
return sum;
}
{
double sum = 0;
for (unsigned int d=0; d<dim; ++d)
- sum += std::sin(deal_II_numbers::PI*p[d]);
+ sum += std::sin(numbers::PI*p[d]);
return sum;
}
{
double sum = 0;
for (unsigned int d=0; d<dim; ++d)
- sum += std::sin(deal_II_numbers::PI*p[d]);
+ sum += std::sin(numbers::PI*p[d]);
return sum;
}
{
double sum = 0;
for (unsigned int d=0; d<dim; ++d)
- sum += std::sin(deal_II_numbers::PI*p[d]);
+ sum += std::sin(numbers::PI*p[d]);
return sum;
}
{
double sum = 0;
for (unsigned int d=0; d<dim; ++d)
- sum += std::sin(deal_II_numbers::PI*p[d]);
+ sum += std::sin(numbers::PI*p[d]);
return sum;
}
{
double sum = 0;
for (unsigned int d=0; d<dim; ++d)
- sum += std::sin(deal_II_numbers::PI*p[d]);
+ sum += std::sin(numbers::PI*p[d]);
return sum;
}
{
double sum = 0;
for (unsigned int d=0; d<dim; ++d)
- sum += std::sin(deal_II_numbers::PI*p[d]);
+ sum += std::sin(numbers::PI*p[d]);
return sum;
}
{
double sum = 0;
for (unsigned int d=0; d<dim; ++d)
- sum += std::sin(deal_II_numbers::PI*p[d]);
+ sum += std::sin(numbers::PI*p[d]);
return sum;
}
{
double sum = 0;
for (unsigned int d=0; d<dim; ++d)
- sum += std::sin(deal_II_numbers::PI*p[d]);
+ sum += std::sin(numbers::PI*p[d]);
return sum;
}