namespace OpenCASCADE
{
/**
- * A Boundary object based on OpenCASCADE TopoDS_Shape where where new
- * points are first computed by averaging the surrounding points in the same
- * way as FlatManifold does, and are then projected in the normal direction
- * using OpenCASCADE utilities.
+ * A Manifold object based on OpenCASCADE TopoDS_Shape where new points are
+ * first computed by averaging the surrounding points in the same way as
+ * FlatManifold does, and are then projected in the normal direction using
+ * OpenCASCADE utilities.
*
* This class makes no assumptions on the shape you pass to it, and the
* topological dimension of the Manifold is inferred from the TopoDS_Shape
* face would be collapsed to the edge, and your surrounding points would
* not be lying on the given shape, raising an exception.
*
- * @deprecated This class has been deprecated in favor of the equivalent
- * Manifold class.
- *
* @author Luca Heltai, Andrea Mola, 2011--2014.
*/
template <int dim, int spacedim>
- class DEAL_II_DEPRECATED NormalProjectionBoundary : public Boundary<dim,spacedim>
+ class NormalProjectionBoundary : public FlatManifold<dim,spacedim>
{
public:
};
/**
- * A Boundary object based on OpenCASCADE TopoDS_Shape where new points are
+ * A Manifold object based on OpenCASCADE TopoDS_Shape where new points are
* first computed by averaging the surrounding points in the same way as
* FlatManifold does, and then projecting them onto the manifold along the
* direction specified at construction time using OpenCASCADE utilities.
* points leaves them untouched. If this is not the case, an
* ExcPointNotOnManifold is thrown.
*
- * Notice that this type of Boundary descriptor may fail to give results if
+ * Notice that this type of Manifold descriptor may fail to give results if
* the triangulation to be refined is close to the boundary of the given
* TopoDS_Shape, or when the direction you use at construction time does not
* intersect the shape. An exception is thrown when this happens.
*
- * @deprecated This class has been deprecated in favor of the equivalent
- * Manifold class.
- *
* @author Luca Heltai, Andrea Mola, 2011--2014.
*/
template <int dim, int spacedim>
- class DEAL_II_DEPRECATED DirectionalProjectionBoundary : public Boundary<dim,spacedim>
+ class DirectionalProjectionBoundary : public FlatManifold<dim,spacedim>
{
public:
/**
- * Construct a Boundary object which will project points on the
+ * Construct a Manifold object which will project points on the
* TopoDS_Shape @p sh, along the given @p direction.
*/
DirectionalProjectionBoundary(const TopoDS_Shape &sh,
/**
- * A Boundary object based on OpenCASCADE TopoDS_Shape where new points are
+ * A Manifold object based on OpenCASCADE TopoDS_Shape where new points are
* first computed by averaging the surrounding points in the same way as
* FlatManifold does, and then projecting them using OpenCASCADE utilities
* onto the manifold along a direction which is an estimation of the
* ExcPointNotOnManifold is thrown.
*
*
- * Notice that this type of Boundary descriptor may fail to give results if
+ * Notice that this type of Manifold descriptor may fail to give results if
* the triangulation to be refined is close to the boundary of the given
* TopoDS_Shape, or when the normal direction estimated from the surrounding
* points does not intersect the shape. An exception is thrown when this
* happens.
*
- * @deprecated This class has been deprecated in favor of the equivalent
- * Manifold class.
- *
* @author Luca Heltai, Andrea Mola, 2011--2014.
*/
template <int dim, int spacedim>
- class DEAL_II_DEPRECATED NormalToMeshProjectionBoundary : public Boundary<dim,spacedim>
+ class NormalToMeshProjectionBoundary : public FlatManifold<dim,spacedim>
{
public:
/**
- * Construct a Boundary object which will project points on the
+ * Construct a Manifold object which will project points on the
* TopoDS_Shape @p sh, along a direction which is approximately normal to
* the mesh cell.
*/
};
/**
- * A Boundary object based on OpenCASCADE TopoDS_Shape objects which have
+ * A Manifold object based on OpenCASCADE TopoDS_Shape objects which have
* topological dimension equal to one (TopoDS_Edge or TopoDS_Wire) where new
* points are located at the arclength average of the surrounding points. If
* the given TopoDS_Shape can be casted to a periodic (closed) curve, then
#include <deal.II/grid/tria.h>
#include <deal.II/grid/grid_generator.h>
#include <deal.II/grid/grid_out.h>
-#include <deal.II/grid/tria_boundary_lib.h>
+#include <deal.II/grid/manifold_lib.h>
#include <string>
-std::ofstream logfile("output");
-
-
int main ()
{
const int dim = 2;
const int spacedim = 3;
- deallog.attach(logfile);
+ initlog();
- TorusBoundary<dim, spacedim> boundary (1.5, .5);
+ TorusManifold<dim> boundary (1.5, .5);
Triangulation<dim, spacedim> tria;
- tria.set_boundary (0, boundary);
+ tria.set_manifold (0, boundary);
GridGenerator::torus (tria, 1.5, .5);
tria.refine_global(2);
GridOut grid_out;
- grid_out.write_gnuplot (tria, logfile);
+ grid_out.write_gnuplot (tria, deallog.get_file_stream());
return 0;
}
GridGenerator::hyper_cube(tria);
// Set the exterior boundary
- tria.set_boundary(0, boundary_line);
+ tria.set_manifold(0, boundary_line);
// This is here to ignore the
// points created in the interior
GridGenerator::hyper_cube(tria);
// Set the exterior boundary
- tria.set_boundary(0, boundary_line);
+ tria.set_manifold(0, boundary_line);
// This is here to ignore the points created in the interior of the
// face.
79 0.0669873 0.5 0.5
80 0.5 0.933013 0.5
81 0.5 0.0669873 0.5
-82 0.183268 -0.241189 0.183268
-83 0.183268 -0.241189 0.816732
-84 0.816732 -0.241189 0.183268
-85 0.816732 -0.241189 0.816732
-86 0.183268 0.183268 -0.241189
-87 0.816732 0.183268 -0.241189
-88 0.183268 0.816732 -0.241189
-89 0.816732 0.816732 -0.241189
-90 -0.241189 0.183268 0.183268
-91 -0.241189 0.816732 0.183268
-92 -0.241189 0.183268 0.816732
-93 -0.241189 0.816732 0.816732
-94 1.24119 0.183268 0.183268
-95 1.24119 0.816732 0.183268
-96 1.24119 0.183268 0.816732
-97 1.24119 0.816732 0.816732
-98 0.183268 1.24119 0.183268
-99 0.183268 1.24119 0.816732
-100 0.816732 1.24119 0.183268
-101 0.816732 1.24119 0.816732
-102 0.183268 0.183268 1.24119
-103 0.816732 0.183268 1.24119
-104 0.183268 0.816732 1.24119
-105 0.816732 0.816732 1.24119
+82 0.186191 -0.243672 0.186191
+83 0.186191 -0.243672 0.813809
+84 0.813809 -0.243672 0.186191
+85 0.813809 -0.243672 0.813809
+86 0.186191 0.186191 -0.243672
+87 0.813809 0.186191 -0.243672
+88 0.186191 0.813809 -0.243672
+89 0.813809 0.813809 -0.243672
+90 -0.243672 0.186191 0.186191
+91 -0.243672 0.813809 0.186191
+92 -0.243672 0.186191 0.813809
+93 -0.243672 0.813809 0.813809
+94 1.24367 0.186191 0.186191
+95 1.24367 0.813809 0.186191
+96 1.24367 0.186191 0.813809
+97 1.24367 0.813809 0.813809
+98 0.186191 1.24367 0.186191
+99 0.186191 1.24367 0.813809
+100 0.813809 1.24367 0.186191
+101 0.813809 1.24367 0.813809
+102 0.186191 0.186191 1.24367
+103 0.813809 0.186191 1.24367
+104 0.186191 0.813809 1.24367
+105 0.813809 0.813809 1.24367
106 0.912665 0.912665 0.5
107 0.0873347 0.912665 0.5
108 0.912665 0.0873347 0.5
115 0.5 0.0873347 0.912665
116 0.5 0.912665 0.0873347
117 0.5 0.0873347 0.0873347
-118 0.107556 0.107556 0.107556
-119 0.892444 0.107556 0.107556
-120 0.107556 0.892444 0.107556
-121 0.892444 0.892444 0.107556
-122 0.107556 0.107556 0.892444
-123 0.892444 0.107556 0.892444
-124 0.107556 0.892444 0.892444
-125 0.892444 0.892444 0.892444
+118 0.109238 0.109238 0.109238
+119 0.890762 0.109238 0.109238
+120 0.109238 0.890762 0.109238
+121 0.890762 0.890762 0.109238
+122 0.109238 0.109238 0.890762
+123 0.890762 0.109238 0.890762
+124 0.109238 0.890762 0.890762
+125 0.890762 0.890762 0.890762
$ENDNOD
$ELM
64