Commit 90651ab1 authored by Dennis Gläser's avatar Dennis Gläser
Browse files

Merge branch 'feature/python-networks-with-polygons' into 'master'

Feature/python networks with polygons

See merge request tools/frackit!169
parents 82dff093 5860a56b
...@@ -92,19 +92,28 @@ namespace Detail { ...@@ -92,19 +92,28 @@ namespace Detail {
// types for which this ought to be able to evaluate // types for which this ought to be able to evaluate
using Disk = Frackit::Disk<ctype>; using Disk = Frackit::Disk<ctype>;
using Quad_3 = Frackit::Quadrilateral<ctype, 3>; using Quad_3 = Frackit::Quadrilateral<ctype, 3>;
using Poly_3 = Frackit::Polygon<ctype, 3>;
using Face = FaceWrapper; using Face = FaceWrapper;
registerBinaryEvaluator<Disk, Disk>(cls); registerBinaryEvaluator<Disk, Disk>(cls);
registerBinaryEvaluator<Disk, Quad_3>(cls); registerBinaryEvaluator<Disk, Quad_3>(cls);
registerBinaryEvaluator<Disk, Poly_3>(cls);
registerBinaryEvaluator<Disk, Face>(cls); registerBinaryEvaluator<Disk, Face>(cls);
registerBinaryEvaluator<Quad_3, Quad_3>(cls); registerBinaryEvaluator<Quad_3, Quad_3>(cls);
registerBinaryEvaluator<Quad_3, Poly_3>(cls);
registerBinaryEvaluator<Quad_3, Disk>(cls); registerBinaryEvaluator<Quad_3, Disk>(cls);
registerBinaryEvaluator<Quad_3, Face>(cls); registerBinaryEvaluator<Quad_3, Face>(cls);
registerBinaryEvaluator<Poly_3, Poly_3>(cls);
registerBinaryEvaluator<Poly_3, Quad_3>(cls);
registerBinaryEvaluator<Poly_3, Disk>(cls);
registerBinaryEvaluator<Poly_3, Face>(cls);
registerBinaryEvaluator<Face, Face>(cls); registerBinaryEvaluator<Face, Face>(cls);
registerBinaryEvaluator<Face, Disk>(cls); registerBinaryEvaluator<Face, Disk>(cls);
registerBinaryEvaluator<Face, Quad_3>(cls); registerBinaryEvaluator<Face, Quad_3>(cls);
registerBinaryEvaluator<Face, Poly_3>(cls);
} }
} // end namespace Detail } // end namespace Detail
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
// (currently) supported entity geometries // (currently) supported entity geometries
#include <frackit/geometry/disk.hh> #include <frackit/geometry/disk.hh>
#include <frackit/geometry/polygon.hh>
#include <frackit/geometry/quadrilateral.hh> #include <frackit/geometry/quadrilateral.hh>
#include <frackit/python/geometry/brepwrapper.hh> #include <frackit/python/geometry/brepwrapper.hh>
...@@ -76,6 +77,7 @@ namespace Detail { ...@@ -76,6 +77,7 @@ namespace Detail {
{ {
registerSubDomainEntityAdder< Disk<ctype> >(cls); registerSubDomainEntityAdder< Disk<ctype> >(cls);
registerSubDomainEntityAdder< Quadrilateral<ctype, 3> >(cls); registerSubDomainEntityAdder< Quadrilateral<ctype, 3> >(cls);
registerSubDomainEntityAdder< Polygon<ctype, 3> >(cls);
registerSubDomainEntityAdder< FaceWrapper >(cls); registerSubDomainEntityAdder< FaceWrapper >(cls);
} }
...@@ -84,6 +86,7 @@ namespace Detail { ...@@ -84,6 +86,7 @@ namespace Detail {
{ {
registerEntityAdder< Disk<ctype> >(cls); registerEntityAdder< Disk<ctype> >(cls);
registerEntityAdder< Quadrilateral<ctype, 3> >(cls); registerEntityAdder< Quadrilateral<ctype, 3> >(cls);
registerEntityAdder< Polygon<ctype, 3> >(cls);
registerEntityAdder< FaceWrapper >(cls); registerEntityAdder< FaceWrapper >(cls);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment