<li> Changed: The argument material_id of the estimate-functions of
the KellyErrorEstimator class is now of type types::material_id
-with default value types::invalid_material_id, instead of type
+with default value numbers::invalid_material_id, instead of type
unsigned int with default value numbers::invalid_unsigned_int. This
should not make a difference to most users unless you specified the
argument's default value by hand.
<ol>
<li>
-New: we now support parallel output using HDF5/xdmf.
+New: We now support parallel output using HDF5/xdmf.
<br>
(Eric Heien, Timo Heister, 2012/08/28)
<li>
-New: we are now compatible with Trilinos 10.4.2, 10.8.5, and 10.12.2. See the
+New: We are now compatible with Trilinos 10.4.2, 10.8.5, and 10.12.2. See the
readme for more information.
<br>
(Timo Heister, 2012/08/24)
to <code>types::material_id</code>
resp. <code>types::boundary_id</code>, both typedefs of unsigned
char. Internal faces are now characterized by
-types::internal_face_boundary_id(<code>=static_cast@<types::boundary_id@>(-1)</code>)
+numbers::internal_face_boundary_id(<code>=static_cast@<types::boundary_id@>(-1)</code>)
instead of 255, so we get rid of that mysterious number in the source
code. Material_ids are also assumed to lie in the range from 0 to
-types::invalid_material_id-1 (where <code>types::invalid_material_id =
+numbers::invalid_material_id-1 (where <code>numbers::invalid_material_id =
static_cast<types::material_id>(-1)</code>). With this change, it is now
much easier to extend the range of boundary or material ids, if
needed.
*
* See the @ref GlossSubdomainId
* "glossary" for more information.
+ *
+ * There is a special value,
+ * numbers::invalid_subdomain_id
+ * that is used to indicate an
+ * invalid value of this type.
*/
typedef unsigned int subdomain_id;
* The type used to denote boundary indicators associated with every
* piece of the boundary and, in the case of meshes that describe
* manifolds in higher dimensions, associated with every cell.
+ *
+ * There is a special value, numbers::internal_face_boundary_id
+ * that is used to indicate an invalid value of this type and that
+ * is used as the boundary indicator for faces that are in the interior
+ * of the domain and therefore not part of any addressable boundary
+ * component.
*/
typedef unsigned char boundary_id;
*/
typedef boundary_id boundary_id_t;
- /**
- * @deprecated Use numbers::internal_face_boundary_id
- */
- const boundary_id internal_face_boundary_id = static_cast<boundary_id>(-1);
-
/**
* The type used to denote material indicators associated with every
* cell.
+ *
+ * There is a special value, numbers::invalid_material_id
+ * that is used to indicate an invalid value of this type.
*/
typedef unsigned char material_id;
*/
typedef material_id material_id_t;
- /**
- * @deprecated Use numbers::invalid_material_id
- */
- const material_id invalid_material_id = static_cast<material_id>(-1);
-
}
* these faces are explicitly printed
* in the <tt>write_*</tt> functions;
* all faces with indicator
- * types::internal_face_boundary_id are
+ * numbers::internal_face_boundary_id are
* interior ones and an indicator with
* value zero for faces at the boundary
* are considered default.
* these lines are explicitly printed
* in the <tt>write_*</tt> functions;
* all lines with indicator
- * types::internal_face_boundary_id are
+ * numbers::internal_face_boundary_id are
* interior ones and an indicator with
* value zero for faces at the boundary
* are considered default.
* number describing the boundary condition to hold on this part of the
* boundary. The triangulation creation function gives lines not in this
* list either the boundary indicator zero (if on the boundary) or
- * types::internal_face_boundary_id (if in the interior). Explicitely giving a
- * line the indicator types::internal_face_boundary_id will result in an error, as well as giving
+ * numbers::internal_face_boundary_id (if in the interior). Explicitely giving a
+ * line the indicator numbers::internal_face_boundary_id will result in an error, as well as giving
* an interior line a boundary indicator.
*
* @ingroup grid
* use is like the material id of cells).
* Boundary indicators may be in the range from zero to
- * types::internal_face_boundary_id-1. The value
- * types::internal_face_boundary_id is reserved to denote interior lines (in 2D)
+ * numbers::internal_face_boundary_id-1. The value
+ * numbers::internal_face_boundary_id is reserved to denote interior lines (in 2D)
* and interior lines and quads (in 3D), which do not have a
* boundary indicator. This way, a program can easily
* determine, whether such an object is at the boundary or not.
- * Material indicators may be in the range from zero to types::invalid_material_id-1.
+ * Material indicators may be in the range from zero to numbers::invalid_material_id-1.
*
* Lines in two dimensions and quads in three dimensions inherit their
* boundary indicator to their children upon refinement. You should therefore
* object.
*
* If the return value is the special
- * value types::internal_face_boundary_id,
+ * value numbers::internal_face_boundary_id,
* then this object is in the
* interior of the domain.
*/
* (a face not at the boundary of the
* domain), or set set the boundary
* indicator of an exterior face to
- * types::internal_face_boundary_id
+ * numbers::internal_face_boundary_id
* (this value is reserved for another
* purpose). Algorithms may not work or
* produce very confusing results if
* boundary cells have a boundary
- * indicator of types::internal_face_boundary_id
+ * indicator of numbers::internal_face_boundary_id
* or if interior cells have boundary
- * indicators other than types::internal_face_boundary_id.
+ * indicators other than numbers::internal_face_boundary_id.
* Unfortunately, the current object
* has no means of finding out whether it
* really is at the boundary of the
* boundary indicator one.
*
* If the return value is the special
- * value types::internal_face_boundary_id,
+ * value numbers::internal_face_boundary_id,
* then this object is in the
* interior of the domain.
*/
* (a face not at the boundary of the
* domain), or set set the boundary
* indicator of an exterior face to
- * types::internal_face_boundary_id
+ * numbers::internal_face_boundary_id
* (this value is reserved for another
* purpose). Algorithms may not work or
* produce very confusing results if
* boundary cells have a boundary
- * indicator of types::internal_face_boundary_id
+ * indicator of numbers::internal_face_boundary_id
* or if interior cells have boundary
- * indicators other than types::internal_face_boundary_id.
+ * indicators other than numbers::internal_face_boundary_id.
* Unfortunately, the current object
* has no means of finding out whether it
* really is at the boundary of the
{
// error checking is done
// in boundary_indicator()
- return (boundary_indicator() != types::internal_face_boundary_id);
+ return (boundary_indicator() != numbers::internal_face_boundary_id);
}
}
default:
- return types::internal_face_boundary_id;
+ return numbers::internal_face_boundary_id;
}
}
* example, in one dimension, this field
* stores the material id of a line, which
* is a number between 0 and
- * types::invalid_material_id-1. In more
+ * numbers::invalid_material_id-1. In more
* than one dimension, lines have no
* material id, but they may be at the
* boundary; then, we store the
* boundary conditions hold on this
* part. The boundary indicator also
* is a number between zero and
- * types::internal_face_boundary_id-1;
- * the id types::internal_face_boundary_id
+ * numbers::internal_face_boundary_id-1;
+ * the id numbers::internal_face_boundary_id
* is reserved for lines
* in the interior and may be used
* to check whether a line is at the
inline
TriaObjects<G>::BoundaryOrMaterialId::BoundaryOrMaterialId ()
{
- material_id = types::invalid_material_id;
+ material_id = numbers::invalid_material_id;
}
*
* The @p material_id parameter has a similar
* meaning: if not set to its default value
- * (which is types::invalid_material_id),
+ * (which is numbers::invalid_material_id),
* it means that indicators will only be
* computed for cells with this particular
* material id.
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = numbers::invalid_unsigned_int,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
* Calls the @p estimate
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
* Same function as above, but
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
* Calls the @p estimate
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
const Function<spacedim>* coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
* Calls the @p estimate
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
* Same function as above, but
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
* Calls the @p estimate
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
const Function<spacedim> *coefficients = 0,
const unsigned int n_threads = multithread_info.n_default_threads,
const types::subdomain_id subdomain_id = types::invalid_subdomain_id,
- const types::material_id material_id = types::invalid_material_id);
+ const types::material_id material_id = numbers::invalid_material_id);
/**
* Exception
* the trace of the function to the boundary is done with the
* VectorTools::project_boundary_values() (see below) function,
* which is called with a map of boundary functions FunctioMap in
- * which all boundary indicators from zero to types::internal_face_boundary_id-1
- * (types::internal_face_boundary_id is used for other purposes,
+ * which all boundary indicators from zero to numbers::internal_face_boundary_id-1
+ * (numbers::internal_face_boundary_id is used for other purposes,
* see the Triangulation class documentation) point
* to the function to be projected. The projection to the boundary
* takes place using a second quadrature formula on the boundary
* keys of this map
* correspond to the number
* @p boundary_indicator of the
- * face. types::internal_face_boundary_id
+ * face. numbers::internal_face_boundary_id
* is an illegal value for this key since
* it is reserved for interior faces.
*
* The parameter @p boundary_component
* corresponds to the number @p
* boundary_indicator of the face.
- * types::internal_face_boundary_id
+ * numbers::internal_face_boundary_id
* is an illegal value, since it is
* reserved for interior faces.
*
* The parameter @p boundary_component
* corresponds to the number
* @p boundary_indicator of the face.
- * types::internal_face_boundary_id
+ * numbers::internal_face_boundary_id
* is an illegal value, since it is
* reserved for interior faces.
*
* The parameter @p boundary_component
* corresponds to the number
* @p boundary_indicator of the face.
- * types::internal_face_boundary_id
+ * numbers::internal_face_boundary_id
* is an illegal value, since it is
* reserved for interior faces.
*
// count, how often we have
// added to this dof
- Assert (touch_count[local_dof_indices[j]] < types::internal_face_boundary_id,
+ Assert (touch_count[local_dof_indices[j]] < numbers::internal_face_boundary_id,
ExcInternalError());
++touch_count[local_dof_indices[j]];
};
// function to hold on
// all parts of the boundary
typename FunctionMap<spacedim>::type boundary_functions;
- for (types::boundary_id c=0; c<types::internal_face_boundary_id; ++c)
+ for (types::boundary_id c=0; c<numbers::internal_face_boundary_id; ++c)
boundary_functions[c] = &function;
project_boundary_values (dof, boundary_functions, q_boundary,
boundary_values);
if (function_map.size() == 0)
return;
- Assert (function_map.find(types::internal_face_boundary_id) == function_map.end(),
+ Assert (function_map.find(numbers::internal_face_boundary_id) == function_map.end(),
ExcInvalidBoundaryIndicator());
const unsigned int n_components = DoFTools::n_components(dof);
unsigned int
DoFHandler<dim,spacedim>::n_boundary_dofs (const FunctionMap &boundary_indicators) const
{
- Assert (boundary_indicators.find(types::internal_face_boundary_id) == boundary_indicators.end(),
+ Assert (boundary_indicators.find(numbers::internal_face_boundary_id) == boundary_indicators.end(),
ExcInvalidBoundaryIndicator());
std::set<int> boundary_dofs;
unsigned int
DoFHandler<dim,spacedim>::n_boundary_dofs (const std::set<types::boundary_id> &boundary_indicators) const
{
- Assert (boundary_indicators.find (types::internal_face_boundary_id) == boundary_indicators.end(),
+ Assert (boundary_indicators.find (numbers::internal_face_boundary_id) == boundary_indicators.end(),
ExcInvalidBoundaryIndicator());
std::set<int> boundary_dofs;
const unsigned int n_dofs = dof.n_dofs();
AssertDimension (dof_to_boundary_mapping.size(), n_dofs);
- Assert (boundary_indicators.find(types::internal_face_boundary_id) == boundary_indicators.end(),
+ Assert (boundary_indicators.find(numbers::internal_face_boundary_id) == boundary_indicators.end(),
typename DH::ExcInvalidBoundaryIndicator());
Assert (sparsity.n_rows() == dof.n_boundary_dofs (boundary_indicators),
ExcDimensionMismatch (sparsity.n_rows(), dof.n_boundary_dofs (boundary_indicators)));
const std::set<types::boundary_id> &boundary_indicators)
{
AssertDimension (component_select.size(), n_components(dof_handler));
- Assert (boundary_indicators.find (types::internal_face_boundary_id) == boundary_indicators.end(),
+ Assert (boundary_indicators.find (numbers::internal_face_boundary_id) == boundary_indicators.end(),
ExcInvalidBoundaryIndicator());
const unsigned int dim=DH::dimension;
const std::set<types::boundary_id> &boundary_indicators)
{
AssertDimension (component_select.size(), n_components(dof_handler));
- Assert (boundary_indicators.find (types::internal_face_boundary_id) == boundary_indicators.end(),
+ Assert (boundary_indicators.find (numbers::internal_face_boundary_id) == boundary_indicators.end(),
ExcInvalidBoundaryIndicator());
// let's see whether we have to
std::vector<unsigned int> &mapping)
{
Assert (&dof_handler.get_fe() != 0, ExcNoFESelected());
- Assert (boundary_indicators.find (types::internal_face_boundary_id) == boundary_indicators.end(),
+ Assert (boundary_indicators.find (numbers::internal_face_boundary_id) == boundary_indicators.end(),
ExcInvalidBoundaryIndicator());
mapping.clear ();
// create the cells
unsigned int n_val_cells = 0;
for (unsigned int i=0; i<n_cells; i++)
- if (material_id[i]!=types::invalid_material_id) n_val_cells++;
+ if (material_id[i]!=numbers::invalid_material_id) n_val_cells++;
std::vector<CellData<1> > cells(n_val_cells);
unsigned int id = 0;
for (unsigned int x=0; x<n_cells; ++x)
- if (material_id[x] != types::invalid_material_id)
+ if (material_id[x] != numbers::invalid_material_id)
{
cells[id].vertices[0] = x;
cells[id].vertices[1] = x+1;
unsigned int n_val_cells = 0;
for (unsigned int i=0; i<material_id.size(0); i++)
for (unsigned int j=0; j<material_id.size(1); j++)
- if (material_id[i][j] != types::invalid_material_id)
+ if (material_id[i][j] != numbers::invalid_material_id)
n_val_cells++;
std::vector<CellData<2> > cells(n_val_cells);
unsigned int id = 0;
for (unsigned int y=0; y<repetitions[1]; ++y)
for (unsigned int x=0; x<repetitions[0]; ++x)
- if (material_id[x][y]!=types::invalid_material_id)
+ if (material_id[x][y]!=numbers::invalid_material_id)
{
cells[id].vertices[0] = y*(repetitions[0]+1)+x;
cells[id].vertices[1] = y*(repetitions[0]+1)+x+1;
for (unsigned int i=0; i<material_id.size(0); i++)
for (unsigned int j=0; j<material_id.size(1); j++)
for (unsigned int k=0; k<material_id.size(2); k++)
- if (material_id[i][j][k]!=types::invalid_material_id)
+ if (material_id[i][j][k]!=numbers::invalid_material_id)
n_val_cells++;
std::vector<CellData<dim> > cells(n_val_cells);
for (unsigned int z=0; z<repetitions[2]; ++z)
for (unsigned int y=0; y<repetitions[1]; ++y)
for (unsigned int x=0; x<repetitions[0]; ++x)
- if (material_id[x][y][z]!=types::invalid_material_id)
+ if (material_id[x][y][z]!=numbers::invalid_material_id)
{
cells[id].vertices[0] = z*n_xy + y*n_x + x;
cells[id].vertices[1] = z*n_xy + y*n_x + x+1;
{
for (unsigned int i=0;i<GeometryInfo<2>::faces_per_cell;++i)
{
- if (cell->face(i)->boundary_indicator() == types::internal_face_boundary_id)
+ if (cell->face(i)->boundary_indicator() == numbers::internal_face_boundary_id)
continue;
// If x is zero, then this is part of the plane
// to make sure that the cast wont fail
Assert(material_id<= std::numeric_limits<types::material_id>::max(),
ExcIndexRange(material_id,0,std::numeric_limits<types::material_id>::max()));
- // we use only material_ids in the range from 0 to types::invalid_material_id-1
- Assert(material_id < types::invalid_material_id,
- ExcIndexRange(material_id,0,types::invalid_material_id));
+ // we use only material_ids in the range from 0 to numbers::invalid_material_id-1
+ Assert(material_id < numbers::invalid_material_id,
+ ExcIndexRange(material_id,0,numbers::invalid_material_id));
cells.back().material_id = static_cast<types::material_id>(material_id);
// to make sure that the cast wont fail
Assert(material_id<= std::numeric_limits<types::boundary_id>::max(),
ExcIndexRange(material_id,0,std::numeric_limits<types::boundary_id>::max()));
- // we use only boundary_ids in the range from 0 to types::internal_face_boundary_id-1
- Assert(material_id < types::internal_face_boundary_id,
- ExcIndexRange(material_id,0,types::internal_face_boundary_id));
+ // we use only boundary_ids in the range from 0 to numbers::internal_face_boundary_id-1
+ Assert(material_id < numbers::internal_face_boundary_id,
+ ExcIndexRange(material_id,0,numbers::internal_face_boundary_id));
subcelldata.boundary_lines.back().boundary_id
= static_cast<types::boundary_id>(material_id);
// to make sure that the cast wont fail
Assert(material_id<= std::numeric_limits<types::boundary_id>::max(),
ExcIndexRange(material_id,0,std::numeric_limits<types::boundary_id>::max()));
- // we use only boundary_ids in the range from 0 to types::internal_face_boundary_id-1
- Assert(material_id < types::internal_face_boundary_id,
- ExcIndexRange(material_id,0,types::internal_face_boundary_id));
+ // we use only boundary_ids in the range from 0 to numbers::internal_face_boundary_id-1
+ Assert(material_id < numbers::internal_face_boundary_id,
+ ExcIndexRange(material_id,0,numbers::internal_face_boundary_id));
subcelldata.boundary_quads.back().boundary_id
= static_cast<types::boundary_id>(material_id);
// to make sure that the cast wont fail
Assert(material_id<= std::numeric_limits<types::material_id>::max(),
ExcIndexRange(material_id,0,std::numeric_limits<types::material_id>::max()));
- // we use only material_ids in the range from 0 to types::invalid_material_id-1
- Assert(material_id < types::invalid_material_id,
- ExcIndexRange(material_id,0,types::invalid_material_id));
+ // we use only material_ids in the range from 0 to numbers::invalid_material_id-1
+ Assert(material_id < numbers::invalid_material_id,
+ ExcIndexRange(material_id,0,numbers::invalid_material_id));
cells.back().material_id = static_cast<types::material_id>(material_id);
// to make sure that the cast wont fail
Assert(material_id<= std::numeric_limits<types::boundary_id>::max(),
ExcIndexRange(material_id,0,std::numeric_limits<types::boundary_id>::max()));
- // we use only boundary_ids in the range from 0 to types::internal_face_boundary_id-1
- Assert(material_id < types::internal_face_boundary_id,
- ExcIndexRange(material_id,0,types::internal_face_boundary_id));
+ // we use only boundary_ids in the range from 0 to numbers::internal_face_boundary_id-1
+ Assert(material_id < numbers::internal_face_boundary_id,
+ ExcIndexRange(material_id,0,numbers::internal_face_boundary_id));
subcelldata.boundary_lines.back().boundary_id
= static_cast<types::boundary_id>(material_id);
// to make sure that the cast wont fail
Assert(material_id<= std::numeric_limits<types::boundary_id>::max(),
ExcIndexRange(material_id,0,std::numeric_limits<types::boundary_id>::max()));
- // we use only boundary_ids in the range from 0 to types::internal_face_boundary_id-1
- Assert(material_id < types::internal_face_boundary_id,
- ExcIndexRange(material_id,0,types::internal_face_boundary_id));
+ // we use only boundary_ids in the range from 0 to numbers::internal_face_boundary_id-1
+ Assert(material_id < numbers::internal_face_boundary_id,
+ ExcIndexRange(material_id,0,numbers::internal_face_boundary_id));
subcelldata.boundary_quads.back().boundary_id
= static_cast<types::boundary_id>(material_id);
// we only handle boundary
// indicators that fit into an
// types::boundary_id. Also, we don't
- // take types::internal_face_boundary_id
+ // take numbers::internal_face_boundary_id
// as it denotes an internal face
for (unsigned int i=0; i<bmarker.size(); ++i)
- Assert(0<=bmarker[i] && bmarker[i]<types::internal_face_boundary_id, ExcIO());
+ Assert(0<=bmarker[i] && bmarker[i]<numbers::internal_face_boundary_id, ExcIO());
// finally we setup the boundary
// information
Triangulation<dim>::face_iterator
face = cell->face(face_reorder[f]);
const types::boundary_id bi = face->boundary_indicator();
- if (bi != types::internal_face_boundary_id)
+ if (bi != numbers::internal_face_boundary_id)
{
// Code for polyline
out << "2 1 "
if (n_adj_cells == 1)
line->set_boundary_indicator (0);
else
- // interior line -> types::internal_face_boundary_id
- line->set_boundary_indicator (types::internal_face_boundary_id);
+ // interior line -> numbers::internal_face_boundary_id
+ line->set_boundary_indicator (numbers::internal_face_boundary_id);
}
// set boundary indicators where
// assert that we only set
// boundary info once
AssertThrow (! (line->boundary_indicator() != 0 &&
- line->boundary_indicator() != types::internal_face_boundary_id),
+ line->boundary_indicator() != numbers::internal_face_boundary_id),
ExcMultiplySetLineInfoOfLine(line_vertices.first,
line_vertices.second));
// Assert that only exterior lines
// are given a boundary indicator
- AssertThrow (! (line->boundary_indicator() == types::internal_face_boundary_id),
+ AssertThrow (! (line->boundary_indicator() == numbers::internal_face_boundary_id),
ExcInteriorLineCantBeBoundary());
line->set_boundary_indicator (boundary_line->boundary_id);
if (n_adj_cells == 1)
quad->set_boundary_indicator (0);
else
- // interior quad -> types::internal_face_boundary_id
- quad->set_boundary_indicator (types::internal_face_boundary_id);
+ // interior quad -> numbers::internal_face_boundary_id
+ quad->set_boundary_indicator (numbers::internal_face_boundary_id);
}
/////////////////////////////////////////
// as interior
for (typename Triangulation<dim,spacedim>::line_iterator
line=triangulation.begin_line(); line!=triangulation.end_line(); ++line)
- line->set_boundary_indicator (types::internal_face_boundary_id);
+ line->set_boundary_indicator (numbers::internal_face_boundary_id);
// next reset all lines bounding
// boundary quads as on the
// boundary also. note that since
new_lines[l]->clear_user_data();
new_lines[l]->clear_children();
// interior line
- new_lines[l]->set_boundary_indicator(types::internal_face_boundary_id);
+ new_lines[l]->set_boundary_indicator(numbers::internal_face_boundary_id);
}
// Now add the four (two)
new_lines[i]->clear_user_data();
new_lines[i]->clear_children();
// interior line
- new_lines[i]->set_boundary_indicator(types::internal_face_boundary_id);
+ new_lines[i]->set_boundary_indicator(numbers::internal_face_boundary_id);
}
// find some space for the newly to
new_quads[i]->clear_user_data();
new_quads[i]->clear_children();
// interior quad
- new_quads[i]->set_boundary_indicator (types::internal_face_boundary_id);
+ new_quads[i]->set_boundary_indicator (numbers::internal_face_boundary_id);
// set all line orientation
// flags to true by default,
// change this afterwards, if
Triangulation<dim, spacedim>::set_boundary (const types::boundary_id number,
const Boundary<dim, spacedim>& boundary_object)
{
- Assert(number < types::internal_face_boundary_id, ExcIndexRange(number,0,types::internal_face_boundary_id));
+ Assert(number < numbers::internal_face_boundary_id, ExcIndexRange(number,0,numbers::internal_face_boundary_id));
boundary[number] = &boundary_object;
}
void
Triangulation<dim, spacedim>::set_boundary (const types::boundary_id number)
{
- Assert(number < types::internal_face_boundary_id, ExcIndexRange(number,0,types::internal_face_boundary_id));
+ Assert(number < numbers::internal_face_boundary_id, ExcIndexRange(number,0,numbers::internal_face_boundary_id));
//delete the entry located at number.
boundary.erase(number);
const Boundary<dim, spacedim> &
Triangulation<dim, spacedim>::get_boundary (const types::boundary_id number) const
{
- Assert(number<types::internal_face_boundary_id, ExcIndexRange(number,0,types::internal_face_boundary_id));
+ Assert(number<numbers::internal_face_boundary_id, ExcIndexRange(number,0,numbers::internal_face_boundary_id));
//look, if there is a boundary stored at
//boundary_id number.
{
//TODO: if boundary_id_t is a real integer type, this might become
//a humongously large array...
- std::vector<bool> bi_exists(types::internal_face_boundary_id, false);
+ std::vector<bool> bi_exists(numbers::internal_face_boundary_id, false);
active_cell_iterator cell=begin_active();
for (; cell!=end(); ++cell)
for (unsigned int face=0; face<GeometryInfo<dim>::faces_per_cell; ++face)
void CellAccessor<dim, spacedim>::set_material_id (const types::material_id mat_id) const
{
Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed());
- Assert ( mat_id < types::invalid_material_id, ExcIndexRange(mat_id,0,types::invalid_material_id));
+ Assert ( mat_id < numbers::invalid_material_id, ExcIndexRange(mat_id,0,numbers::invalid_material_id));
this->tria->levels[this->present_level]->cells.boundary_or_material_id[this->present_index].material_id = mat_id;
}
DoFHandler<dim,spacedim>::n_boundary_dofs (const FunctionMap &boundary_indicators) const
{
Assert (finite_elements != 0, ExcNoFESelected());
- Assert (boundary_indicators.find(types::internal_face_boundary_id) == boundary_indicators.end(),
+ Assert (boundary_indicators.find(numbers::internal_face_boundary_id) == boundary_indicators.end(),
ExcInvalidBoundaryIndicator());
// same as above, but with
DoFHandler<dim,spacedim>::n_boundary_dofs (const std::set<types::boundary_id> &boundary_indicators) const
{
Assert (finite_elements != 0, ExcNoFESelected());
- Assert (boundary_indicators.find (types::internal_face_boundary_id) == boundary_indicators.end(),
+ Assert (boundary_indicators.find (numbers::internal_face_boundary_id) == boundary_indicators.end(),
ExcInvalidBoundaryIndicator());
// same as above, but with
||
(cell->subdomain_id() == subdomain_id))
&&
- ((material_id == types::invalid_material_id)
+ ((material_id == numbers::invalid_material_id)
||
(cell->material_id() == material_id))) )
{
&&
((cell->neighbor(face_no)->material_id()
== material_id) ||
- (material_id == types::invalid_material_id));
+ (material_id == numbers::invalid_material_id));
else
{
for (unsigned int sf=0; sf<face->n_children(); ++sf)
->subdomain_id() == subdomain_id)
&&
(material_id ==
- types::invalid_material_id))
+ numbers::invalid_material_id))
||
((cell->neighbor_child_on_subface(face_no,sf)
->material_id() == material_id)
const unsigned int n_solution_vectors = solutions.size();
// sanity checks
- Assert (neumann_bc.find(types::internal_face_boundary_id) == neumann_bc.end(),
+ Assert (neumann_bc.find(numbers::internal_face_boundary_id) == neumann_bc.end(),
ExcInvalidBoundaryIndicator());
for (typename FunctionMap<spacedim>::type::const_iterator i=neumann_bc.begin();
||
(cell->subdomain_id() == subdomain_id))
&&
- ((material_id == types::invalid_material_id)
+ ((material_id == numbers::invalid_material_id)
||
(cell->material_id() == material_id)))
{
||
(cell->subdomain_id() == subdomain_id))
&&
- ((material_id == types::invalid_material_id)
+ ((material_id == numbers::invalid_material_id)
||
(cell->material_id() == material_id)))
{
projects / dealii-svn.git / commitdiff