From a2077d20205edbb3ea0730034ef61144778dbb3e Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Sun, 12 Oct 2008 19:25:52 +0000 Subject: [PATCH] *** empty log message *** --- Common/Makefile | 7 +- Fltk/Callbacks.cpp | 9 +- Fltk/Makefile | 52 +- Geo/MElement.h | 4 +- Geo/Makefile | 59 +- Graphics/Makefile | 11 +- Mesh/Makefile | 147 ++--- Mesh/qualityMeasures.cpp | 1 + Parser/Makefile | 2 +- Post/Makefile | 33 +- benchmarks/stl/sp2tmp01.geo | 12 + benchmarks/stl/sp2tmp01_1.stl | 1157 +++++++++++++++++++++++++++++++++ benchmarks/stl/sp2tmp01_2.stl | 163 +++++ benchmarks/stl/sp2tmp01_3.stl | 1157 +++++++++++++++++++++++++++++++++ utils/misc/driver.cpp | 2 +- 15 files changed, 2631 insertions(+), 185 deletions(-) create mode 100644 benchmarks/stl/sp2tmp01.geo create mode 100644 benchmarks/stl/sp2tmp01_1.stl create mode 100644 benchmarks/stl/sp2tmp01_2.stl create mode 100644 benchmarks/stl/sp2tmp01_3.stl diff --git a/Common/Makefile b/Common/Makefile index 4261e5100a..4c73102f61 100644 --- a/Common/Makefile +++ b/Common/Makefile @@ -105,9 +105,7 @@ Gmsh.o: Gmsh.cpp GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \ ../Numeric/NumericEmbedded.h ../Mesh/Generator.h ../Mesh/Field.h \ ../Post/PView.h Context.h ../Geo/CGNSOptions.h \ ../Mesh/PartitionOptions.h ../Mesh/Partition.h \ - ../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Options.h \ - ../Common/Message.h ../Post/PViewDataList.h ../Post/PViewData.h \ - ../Common/ListUtils.h ../Common/GmshMatrix.h + ../Plugin/PluginManager.h OS.o: OS.cpp Message.h OpenFile.o: OpenFile.cpp Message.h ../Geo/Geo.h ../Common/GmshDefines.h \ ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \ @@ -165,8 +163,7 @@ Visibility.o: Visibility.cpp Visibility.h GmshDefines.h ../Geo/GVertex.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - ../Parser/Parser.h + ../Common/Message.h ../Parser/Parser.h Trackball.o: Trackball.cpp Trackball.h VertexArray.o: VertexArray.cpp VertexArray.h ../Geo/SVector3.h \ ../Geo/SPoint3.h Context.h ../Geo/CGNSOptions.h \ diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp index 02da887acf..dedc32b446 100644 --- a/Fltk/Callbacks.cpp +++ b/Fltk/Callbacks.cpp @@ -1863,6 +1863,7 @@ void statistics_histogram_cb(CALLBACK_ARGS) GModel::current()->getEntities(entities); std::map<int, std::vector<double> > d; for(unsigned int i = 0; i < entities.size(); i++){ + if(entities[i]->dim() < 2) continue; for(unsigned int j = 0; j < entities[i]->getNumMeshElements(); j++){ MElement *e = entities[i]->getMeshElement(j); if(name == "Gamma3D") @@ -1877,14 +1878,6 @@ void statistics_histogram_cb(CALLBACK_ARGS) } name.resize(name.size() - 2); new PView(name, "ElementData", GModel::current(), d); - /* - GMSH_PluginManager::instance()->setPluginOption("CutPlane", "A", 1.); - GMSH_PluginManager::instance()->setPluginOption("CutPlane", "B", 0.); - GMSH_PluginManager::instance()->setPluginOption("CutPlane", "C", 0.); - GMSH_PluginManager::instance()->setPluginOption("CutPlane", "D", -0.05); - GMSH_PluginManager::instance()->setPluginOption("CutPlane", "iView", 0.); - GMSH_PluginManager::instance()->action("CutPlane", "Run", 0); - */ } WID->update_views(); diff --git a/Fltk/Makefile b/Fltk/Makefile index 6eba8e4c4f..8d0f3dc81e 100644 --- a/Fltk/Makefile +++ b/Fltk/Makefile @@ -62,15 +62,14 @@ Main.o: Main.cpp GUI.h Opengl_Window.h Colorbar_Window.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ ../Common/Options.h ../Parser/Parser.h ../Common/OpenFile.h \ ../Common/CommandLine.h Solvers.h ../Plugin/PluginManager.h \ - ../Plugin/Plugin.h ../Post/PViewDataList.h ../Post/PViewData.h \ - ../Common/ListUtils.h ../Common/GmshMatrix.h ../Geo/GModel.h \ - ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \ - ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \ - ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \ - ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \ - ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \ - ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Mesh/BackgroundMesh.h + ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ + ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \ + ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ + ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \ + ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \ + ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ + ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ + ../Geo/SBoundingBox3d.h ../Mesh/BackgroundMesh.h GUI.o: GUI.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \ ../Common/Message.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ @@ -115,12 +114,12 @@ GUI_Projection.o: GUI_Projection.cpp ../Geo/GModelIO_Fourier.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - ../Graphics/Draw.h ../Common/Options.h ../Post/ColorTable.h \ - ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ - ../Common/StringUtils.h ../Graphics/SelectBuffer.h GUI_Projection.h \ - ../Common/GmshUI.h ../Geo/fourierProjectionFace.h ../Geo/GModel.h \ - ../Geo/Range.h GUI.h Opengl_Window.h Colorbar_Window.h Popup_Button.h \ + ../Common/Message.h ../Graphics/Draw.h ../Common/Options.h \ + ../Post/ColorTable.h ../Common/Context.h ../Geo/CGNSOptions.h \ + ../Mesh/PartitionOptions.h ../Common/StringUtils.h \ + ../Graphics/SelectBuffer.h GUI_Projection.h ../Common/GmshUI.h \ + ../Geo/fourierProjectionFace.h ../Geo/GModel.h ../Geo/Range.h GUI.h \ + Opengl_Window.h Colorbar_Window.h Popup_Button.h \ SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \ Shortcut_Window.h GUI_Extras.h ../Geo/fourierFace.h ../Geo/GFace.h \ ../Geo/GModel.h ../Geo/Range.h ../Geo/fourierEdge.h ../Geo/GEdge.h \ @@ -137,12 +136,11 @@ GUI_Classifier.o: GUI_Classifier.cpp GUI_Classifier.h ../Common/GmshUI.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - GUI.h Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h \ - Popup_Button.h SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \ - Shortcut_Window.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \ - ../Graphics/Draw.h ../Common/Options.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ + ../Common/Message.h GUI.h Opengl_Window.h Colorbar_Window.h \ + ../Post/ColorTable.h Popup_Button.h SpherePosition_Widget.h \ + ../Mesh/Field.h ../Post/PView.h Shortcut_Window.h ../Numeric/Numeric.h \ + ../Numeric/NumericEmbedded.h ../Graphics/Draw.h ../Common/Options.h \ + ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ ../Graphics/SelectBuffer.h GUI_Projection.h \ ../Geo/fourierProjectionFace.h ../Geo/GModel.h ../Geo/Range.h \ GUI_Extras.h ../Mesh/meshGFaceDelaunayInsertion.h \ @@ -161,7 +159,6 @@ Callbacks.o: Callbacks.cpp ../Common/GmshUI.h ../Common/Message.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ ../Geo/GeoStringInterface.h ../Geo/findLinks.h ../Mesh/Generator.h \ ../Mesh/HighOrder.h ../Graphics/Draw.h ../Graphics/SelectBuffer.h \ ../Post/PView.h ../Post/PViewOptions.h ../Post/ColorTable.h \ @@ -170,10 +167,11 @@ Callbacks.o: Callbacks.cpp ../Common/GmshUI.h ../Common/Message.h \ ../Mesh/PartitionOptions.h ../Common/Options.h GUI.h Opengl_Window.h \ Colorbar_Window.h Popup_Button.h SpherePosition_Widget.h \ ../Mesh/Field.h GUI_Extras.h Callbacks.h ../Plugin/Plugin.h \ - ../Post/PViewDataList.h ../Post/PViewData.h ../Plugin/PluginManager.h \ - ../Plugin/Plugin.h ../Common/Visibility.h ../Common/GmshDefines.h \ - ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h Solvers.h \ - ../Common/OS.h ../Mesh/BackgroundMesh.h + ../Post/PViewDataList.h ../Post/PViewData.h ../Common/GmshMatrix.h \ + ../Plugin/PluginManager.h ../Common/Visibility.h \ + ../Common/GmshDefines.h ../Numeric/Numeric.h \ + ../Numeric/NumericEmbedded.h Solvers.h ../Common/OS.h \ + ../Mesh/BackgroundMesh.h Opengl.o: Opengl.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Graphics/Draw.h \ @@ -202,7 +200,7 @@ Opengl_Window.o: Opengl_Window.cpp ../Common/GmshUI.h \ SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \ ../Geo/MElement.h ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \ - ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h + ../Geo/SVector3.h Colorbar_Window.o: Colorbar_Window.cpp ../Common/GmshUI.h GUI.h \ Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \ SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \ diff --git a/Geo/MElement.h b/Geo/MElement.h index 9368ed4c17..3e0db7e9cc 100644 --- a/Geo/MElement.h +++ b/Geo/MElement.h @@ -14,13 +14,13 @@ #include "MEdge.h" #include "MFace.h" #include "Message.h" -#include "FunctionSpace.h" struct IntPt{ double pt[3]; double weight; }; +class gmshFunctionSpace; class GFace; // A mesh element. @@ -1196,9 +1196,7 @@ class MTetrahedron : public MElement { virtual double distoShapeMeasure(); virtual double etaShapeMeasure(); void xyz2uvw(double xyz[3], double uvw[3]); - virtual const gmshFunctionSpace* getFunctionSpace(int=-1) const; - virtual bool isInside(double u, double v, double w, double tol=1.e-8) { if(u < (-tol) || v < (-tol) || w < (-tol) || u > ((1. + tol) - v - w)) diff --git a/Geo/Makefile b/Geo/Makefile index b09968effa..667e108510 100644 --- a/Geo/Makefile +++ b/Geo/Makefile @@ -70,20 +70,17 @@ depend: GEntity.o: GEntity.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \ - MVertex.h MEdge.h MFace.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - ../Common/VertexArray.h ../Geo/SVector3.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h + MVertex.h MEdge.h MFace.h ../Common/Message.h ../Common/VertexArray.h \ + ../Geo/SVector3.h ../Common/Context.h ../Geo/CGNSOptions.h \ + ../Mesh/PartitionOptions.h GVertex.o: GVertex.cpp GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GFace.h GEdgeLoop.h GEdge.h \ SVector3.h Pair.h MElement.h ../Common/GmshDefines.h MVertex.h MEdge.h \ - MFace.h ../Common/Message.h ../Numeric/FunctionSpace.h \ - ../Common/GmshMatrix.h + MFace.h ../Common/Message.h GEdge.o: GEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \ MVertex.h MEdge.h MFace.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ ../Numeric/GaussLegendre1D.h GEdgeLoop.o: GEdgeLoop.cpp GEdgeLoop.h GEdge.h GEntity.h Range.h \ SPoint3.h SBoundingBox3d.h GVertex.h GPoint.h SPoint2.h SVector3.h \ @@ -91,16 +88,14 @@ GEdgeLoop.o: GEdgeLoop.cpp GEdgeLoop.h GEdge.h GEntity.h Range.h \ GFace.o: GFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \ - MVertex.h MEdge.h MFace.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - ../Common/VertexArray.h ../Geo/SVector3.h ../Numeric/Numeric.h \ - ../Numeric/NumericEmbedded.h ../Numeric/GaussLegendre1D.h \ - ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h + MVertex.h MEdge.h MFace.h ../Common/Message.h ../Common/VertexArray.h \ + ../Geo/SVector3.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \ + ../Numeric/GaussLegendre1D.h ../Common/Context.h ../Geo/CGNSOptions.h \ + ../Mesh/PartitionOptions.h GRegion.o: GRegion.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \ - MVertex.h MEdge.h MFace.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h + MVertex.h MEdge.h MFace.h ../Common/Message.h gmshVertex.o: gmshVertex.cpp GFace.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h SPoint2.h \ SVector3.h Pair.h gmshVertex.h Geo.h ../Common/GmshDefines.h \ @@ -108,7 +103,7 @@ gmshVertex.o: gmshVertex.cpp GFace.h GEntity.h Range.h SPoint3.h \ ../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \ ../Common/ListUtils.h ExtrudeParams.h ../Common/SmoothData.h \ GeoInterpolation.h ../Common/Message.h MVertex.h MElement.h MEdge.h \ - MFace.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h + MFace.h gmshEdge.o: gmshEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h gmshEdge.h Geo.h ../Common/GmshDefines.h \ @@ -138,8 +133,7 @@ gmshSurface.o: gmshSurface.cpp gmshSurface.h Pair.h Range.h SPoint2.h \ OCCVertex.o: OCCVertex.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h MVertex.h MElement.h \ - ../Common/GmshDefines.h MEdge.h MFace.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h OCCVertex.h \ + ../Common/GmshDefines.h MEdge.h MFace.h ../Common/Message.h OCCVertex.h \ OCCIncludes.h OCCEdge.h OCCFace.h OCCEdge.o: OCCEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ @@ -192,8 +186,7 @@ fourierProjectionFace.o: fourierProjectionFace.cpp \ GModel.o: GModel.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \ - MVertex.h MEdge.h MFace.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h discreteRegion.h \ + MVertex.h MEdge.h MFace.h ../Common/Message.h discreteRegion.h \ discreteFace.h discreteEdge.h discreteVertex.h gmshSurface.h \ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Octree.h \ ../Common/OctreeInternals.h ../Common/SmoothData.h ../Mesh/Field.h \ @@ -211,8 +204,7 @@ GModelIO_Geo.o: GModelIO_Geo.cpp GModel.h GVertex.h GEntity.h Range.h \ GModelIO_Mesh.o: GModelIO_Mesh.cpp GModel.h GVertex.h GEntity.h Range.h \ SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h \ GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshDefines.h MElement.h \ - MVertex.h MEdge.h MFace.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h discreteRegion.h \ + MVertex.h MEdge.h MFace.h ../Common/Message.h discreteRegion.h \ discreteFace.h ../Common/StringUtils.h GModelIO_OCC.o: GModelIO_OCC.cpp GModelIO_OCC.h GModel.h GVertex.h \ GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \ @@ -220,7 +212,7 @@ GModelIO_OCC.o: GModelIO_OCC.cpp GModelIO_OCC.h GModel.h GVertex.h \ ../Common/Message.h ../Common/Context.h ../Geo/CGNSOptions.h \ ../Mesh/PartitionOptions.h OCCVertex.h OCCEdge.h OCCFace.h OCCRegion.h \ MElement.h ../Common/GmshDefines.h MVertex.h MEdge.h MFace.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Common/OpenFile.h + ../Common/OpenFile.h GModelIO_Fourier.o: GModelIO_Fourier.cpp GModel.h GVertex.h GEntity.h \ Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \ SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/Message.h \ @@ -273,32 +265,27 @@ MVertex.o: MVertex.cpp MVertex.h SPoint3.h GEdge.h GEntity.h Range.h \ GEdgeLoop.h Pair.h ../Common/Message.h ../Common/StringUtils.h GaussQuadratureTri.o: GaussQuadratureTri.cpp MElement.h \ ../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - GaussLegendreSimplex.h + ../Common/Message.h GaussLegendreSimplex.h GaussQuadratureQuad.o: GaussQuadratureQuad.cpp MElement.h \ ../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h + ../Common/Message.h GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h GaussQuadratureTet.o: GaussQuadratureTet.cpp MElement.h \ ../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - GaussLegendreSimplex.h + ../Common/Message.h GaussLegendreSimplex.h GaussQuadratureHex.o: GaussQuadratureHex.cpp MElement.h \ ../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h + ../Common/Message.h GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h GaussLegendreSimplex.o: GaussLegendreSimplex.cpp MElement.h \ ../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h + ../Common/Message.h GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h MFace.o: MFace.cpp MFace.h MVertex.h SPoint3.h SVector3.h \ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h MElement.o: MElement.cpp MElement.h ../Common/GmshDefines.h MVertex.h \ - SPoint3.h MEdge.h SVector3.h MFace.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h GEntity.h Range.h \ - SBoundingBox3d.h GFace.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h \ - SPoint2.h Pair.h ../Common/StringUtils.h ../Numeric/Numeric.h \ + SPoint3.h MEdge.h SVector3.h MFace.h ../Common/Message.h GEntity.h \ + Range.h SBoundingBox3d.h GFace.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h \ + SPoint2.h Pair.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + ../Common/StringUtils.h ../Numeric/Numeric.h \ ../Numeric/NumericEmbedded.h ../Numeric/GaussLegendre1D.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ ../Mesh/qualityMeasures.h ../Mesh/meshGFaceDelaunayInsertion.h \ diff --git a/Graphics/Makefile b/Graphics/Makefile index 0664926a26..413f850ee3 100644 --- a/Graphics/Makefile +++ b/Graphics/Makefile @@ -80,10 +80,10 @@ Mesh.o: Mesh.cpp ../Common/Message.h ../Common/GmshUI.h ../Geo/GModel.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h Draw.h \ - ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ - ../Common/OS.h gl2ps.h ../Common/VertexArray.h ../Common/SmoothData.h \ - ../Post/PView.h ../Post/PViewData.h + Draw.h ../Common/Context.h ../Geo/CGNSOptions.h \ + ../Mesh/PartitionOptions.h ../Common/OS.h gl2ps.h \ + ../Common/VertexArray.h ../Common/SmoothData.h ../Post/PView.h \ + ../Post/PViewData.h Geom.o: Geom.cpp ../Common/GmshUI.h Draw.h ../Geo/SBoundingBox3d.h \ ../Geo/SPoint3.h ../Common/Context.h ../Geo/CGNSOptions.h \ ../Mesh/PartitionOptions.h gl2ps.h ../Common/VertexArray.h \ @@ -113,8 +113,7 @@ SelectBuffer.o: SelectBuffer.cpp ../Common/Message.h ../Common/GmshUI.h \ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h Draw.h \ + ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h Draw.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ SelectBuffer.h ../Common/VertexArray.h Iso.o: Iso.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h diff --git a/Mesh/Makefile b/Mesh/Makefile index 3e8d0ba076..afc7c89c55 100644 --- a/Mesh/Makefile +++ b/Mesh/Makefile @@ -86,8 +86,7 @@ Generator.o: Generator.cpp ../Common/Message.h ../Numeric/Numeric.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h meshGEdge.h \ - meshGFace.h meshGFaceBDS.h meshGRegion.h BackgroundMesh.h \ + meshGEdge.h meshGFace.h meshGFaceBDS.h meshGRegion.h BackgroundMesh.h \ BoundaryLayers.h HighOrder.h ../Post/PView.h ../Post/PViewData.h Field.o: Field.cpp ../Common/Context.h ../Geo/CGNSOptions.h \ ../Mesh/PartitionOptions.h Field.h ../Post/PView.h ../Geo/SPoint3.h \ @@ -118,8 +117,7 @@ meshGEdge.o: meshGEdge.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/SBoundingBox3d.h meshGEdge.h ../Geo/MElement.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \ - ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h BackgroundMesh.h \ + ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h BackgroundMesh.h \ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h meshGEdgeExtruded.o: meshGEdgeExtruded.cpp ../Geo/GModel.h \ @@ -133,26 +131,24 @@ meshGEdgeExtruded.o: meshGEdgeExtruded.cpp ../Geo/GModel.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - ../Geo/ExtrudeParams.h ../Common/SmoothData.h + ../Common/Message.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h meshGFace.o: meshGFace.cpp meshGFace.h meshGFaceBDS.h \ meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h \ - ../Geo/SVector3.h ../Common/Message.h ../Numeric/FunctionSpace.h \ - ../Common/GmshMatrix.h meshGFaceQuadrilateralize.h meshGFaceOptimize.h \ - DivideAndConquer.h BackgroundMesh.h ../Geo/GVertex.h ../Geo/GEntity.h \ - ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \ - ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \ - ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \ - ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \ - ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \ - ../Geo/Pair.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h \ - ../Geo/GFace.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \ - ../Numeric/NumericEmbedded.h BDS.h ../Post/PView.h qualityMeasures.h \ - Field.h ../Common/OS.h + ../Geo/SVector3.h ../Common/Message.h meshGFaceQuadrilateralize.h \ + meshGFaceOptimize.h DivideAndConquer.h BackgroundMesh.h \ + ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ + ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ + ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ + ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h \ + ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \ + ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GModel.h \ + ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h \ + ../Geo/GEntity.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \ + ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ + ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.h ../Post/PView.h \ + qualityMeasures.h Field.h ../Common/OS.h meshGFaceTransfinite.o: meshGFaceTransfinite.cpp meshGFace.h \ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -163,9 +159,8 @@ meshGFaceTransfinite.o: meshGFaceTransfinite.cpp meshGFace.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MElement.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \ - ../Geo/SVector3.h ../Common/Message.h ../Numeric/FunctionSpace.h \ - ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \ + ../Geo/SVector3.h ../Common/Message.h ../Common/Context.h \ + ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \ ../Numeric/NumericEmbedded.h meshGFaceExtruded.o: meshGFaceExtruded.cpp ../Geo/GModel.h \ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ @@ -178,16 +173,14 @@ meshGFaceExtruded.o: meshGFaceExtruded.cpp ../Geo/GModel.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h + ../Common/Message.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \ + ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h meshGFaceBDS.o: meshGFaceBDS.cpp meshGFace.h meshGFaceOptimize.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - meshGFaceDelaunayInsertion.h BackgroundMesh.h ../Geo/GVertex.h \ - ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ + ../Common/Message.h meshGFaceDelaunayInsertion.h BackgroundMesh.h \ + ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h \ @@ -208,17 +201,15 @@ meshGFaceDelaunayInsertion.o: meshGFaceDelaunayInsertion.cpp BDS.h \ BackgroundMesh.h meshGFaceDelaunayInsertion.h ../Geo/MElement.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \ - ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/FunctionSpace.h \ - ../Common/GmshMatrix.h meshGFaceOptimize.h meshGFace.h \ + ../Geo/MVertex.h ../Geo/SVector3.h meshGFaceOptimize.h meshGFace.h \ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h meshGFaceOptimize.o: meshGFaceOptimize.cpp meshGFaceOptimize.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - meshGFaceDelaunayInsertion.h qualityMeasures.h ../Geo/GFace.h \ - ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ + ../Common/Message.h meshGFaceDelaunayInsertion.h qualityMeasures.h \ + ../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \ @@ -230,27 +221,26 @@ meshGFaceQuadrilateralize.o: meshGFaceQuadrilateralize.cpp \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h meshGFaceOptimize.h \ - meshGFaceBDS.h BDS.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h \ - ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ - ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h \ - ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h \ - ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h \ - ../Geo/SVector3.h ../Geo/Pair.h ../Post/PView.h + meshGFaceOptimize.h meshGFaceBDS.h BDS.h ../Geo/GFace.h \ + ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ + ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ + ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ + ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \ + ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h ../Geo/SVector3.h \ + ../Geo/Pair.h ../Post/PView.h meshGRegion.o: meshGRegion.cpp meshGRegion.h \ meshGRegionDelaunayInsertion.h ../Geo/MElement.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \ - ../Numeric/NumericEmbedded.h BackgroundMesh.h qualityMeasures.h \ - ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ - ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ - ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \ - ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \ - ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \ - ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ - ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ + ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BackgroundMesh.h \ + qualityMeasures.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \ + ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \ + ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \ + ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \ + ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \ + ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \ + ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/gmshRegion.h ../Geo/Geo.h \ ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \ ../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SBoundingBox3d.h \ @@ -264,15 +254,15 @@ meshGRegionDelaunayInsertion.o: meshGRegionDelaunayInsertion.cpp \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \ - ../Numeric/NumericEmbedded.h qualityMeasures.h ../Geo/GModel.h \ - ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ - ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ - ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h \ - ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \ - ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h \ - ../Geo/GEntity.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h + ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h qualityMeasures.h \ + ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ + ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ + ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \ + ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \ + ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \ + ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ + ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ + ../Geo/SBoundingBox3d.h meshGRegionTransfinite.o: meshGRegionTransfinite.cpp meshGFace.h \ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -283,9 +273,8 @@ meshGRegionTransfinite.o: meshGRegionTransfinite.cpp meshGFace.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MElement.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \ - ../Geo/SVector3.h ../Common/Message.h ../Numeric/FunctionSpace.h \ - ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/PartitionOptions.h + ../Geo/SVector3.h ../Common/Message.h ../Common/Context.h \ + ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h meshGRegionExtruded.o: meshGRegionExtruded.cpp ../Geo/GModel.h \ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -297,9 +286,9 @@ meshGRegionExtruded.o: meshGRegionExtruded.cpp ../Geo/GModel.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - ../Geo/ExtrudeParams.h ../Common/SmoothData.h meshGFace.h meshGRegion.h \ - ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h + ../Common/Message.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \ + meshGFace.h meshGRegion.h ../Common/Context.h ../Geo/CGNSOptions.h \ + ../Mesh/PartitionOptions.h meshGRegionCarveHole.o: meshGRegionCarveHole.cpp ../Geo/GModel.h \ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -311,17 +300,16 @@ meshGRegionCarveHole.o: meshGRegionCarveHole.cpp ../Geo/GModel.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h + ../Common/Message.h meshGRegionLocalMeshMod.o: meshGRegionLocalMeshMod.cpp \ meshGRegionLocalMeshMod.h meshGRegionDelaunayInsertion.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BackgroundMesh.h \ - qualityMeasures.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GRegion.h \ - ../Geo/GEntity.h + ../Common/Message.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \ + BackgroundMesh.h qualityMeasures.h ../Geo/GEntity.h ../Geo/Range.h \ + ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ + ../Geo/GRegion.h ../Geo/GEntity.h DivideAndConquer.o: DivideAndConquer.cpp ../Common/Message.h \ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h DivideAndConquer.h \ ../Common/MallocUtils.h @@ -347,8 +335,8 @@ qualityMeasures.o: qualityMeasures.cpp qualityMeasures.h BDS.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MElement.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \ - ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h + ../Geo/SVector3.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h BoundaryLayers.o: BoundaryLayers.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -360,9 +348,8 @@ BoundaryLayers.o: BoundaryLayers.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - BoundaryLayers.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \ - meshGEdge.h meshGFace.h + ../Common/Message.h BoundaryLayers.h ../Geo/ExtrudeParams.h \ + ../Common/SmoothData.h meshGEdge.h meshGFace.h BDS.o: BDS.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.h \ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -373,7 +360,7 @@ BDS.o: BDS.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.h \ meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h qualityMeasures.h + qualityMeasures.h HighOrder.o: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -386,10 +373,10 @@ HighOrder.o: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ meshGFaceDelaunayInsertion.h ../Common/OS.h ../Numeric/Numeric.h \ ../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/PartitionOptions.h + ../Mesh/PartitionOptions.h ../Common/GmshMatrix.h \ + ../Numeric/FunctionSpace.h Partition.o: Partition.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -402,4 +389,4 @@ Partition.o: Partition.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h PartitionOptions.h + PartitionOptions.h diff --git a/Mesh/qualityMeasures.cpp b/Mesh/qualityMeasures.cpp index 7eb0bf020b..157bdd3cba 100644 --- a/Mesh/qualityMeasures.cpp +++ b/Mesh/qualityMeasures.cpp @@ -8,6 +8,7 @@ #include "MVertex.h" #include "MElement.h" #include "Numeric.h" +#include "FunctionSpace.h" #include "Message.h" double qmTriangle(const BDS_Point *p1, const BDS_Point *p2, const BDS_Point *p3, diff --git a/Parser/Makefile b/Parser/Makefile index 4417434848..00dc30357d 100644 --- a/Parser/Makefile +++ b/Parser/Makefile @@ -74,7 +74,7 @@ Gmsh.tab.o: Gmsh.tab.cpp ../Common/Message.h ../Common/MallocUtils.h \ ../Common/CommandLine.h FunctionManager.h ../Common/OS.h \ ../Common/CreateFile.h ../Mesh/Field.h ../Post/PView.h \ ../Mesh/BackgroundMesh.h ../Post/PViewDataList.h ../Post/PViewData.h \ - ../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/GmshMatrix.h + ../Plugin/PluginManager.h Gmsh.yy.o: Gmsh.yy.cpp ../Common/Message.h ../Geo/Geo.h \ ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \ ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \ diff --git a/Post/Makefile b/Post/Makefile index 721fe95c04..4f258269ed 100644 --- a/Post/Makefile +++ b/Post/Makefile @@ -49,18 +49,18 @@ depend: rm -f Makefile.new # DO NOT DELETE THIS LINE -PView.o: PView.cpp PView.h ../Geo/SPoint3.h PViewOptions.h ColorTable.h \ - ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h PViewData.h PViewDataList.h \ - ../Common/ListUtils.h PViewDataGModel.h ../Geo/GModel.h \ - ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \ - ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \ - ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \ - ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \ - ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \ - ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Common/VertexArray.h \ - ../Common/SmoothData.h adaptiveData.h ../Common/GmshMatrix.h \ - ../Common/Message.h +PView.o: PView.cpp PView.h ../Geo/SPoint3.h PViewDataList.h PViewData.h \ + ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \ + PViewDataGModel.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \ + ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \ + ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ + ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \ + ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \ + ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ + ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ + ../Geo/SBoundingBox3d.h PViewOptions.h ColorTable.h \ + ../Common/VertexArray.h ../Common/SmoothData.h adaptiveData.h \ + ../Common/GmshMatrix.h ../Common/Message.h PViewIO.o: PViewIO.cpp PView.h ../Geo/SPoint3.h PViewDataList.h \ PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ ../Common/ListUtils.h PViewDataGModel.h ../Geo/GModel.h \ @@ -101,8 +101,7 @@ PViewDataGModel.o: PViewDataGModel.cpp PViewDataGModel.h PViewData.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \ - ../Numeric/NumericEmbedded.h + ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h PViewDataGModelIO.o: PViewDataGModelIO.cpp ../Common/Message.h \ PViewDataGModel.h PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ @@ -115,8 +114,7 @@ PViewDataGModelIO.o: PViewDataGModelIO.cpp ../Common/Message.h \ ../Geo/SBoundingBox3d.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \ - ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/FunctionSpace.h \ - ../Common/GmshMatrix.h ../Numeric/Numeric.h \ + ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \ ../Numeric/NumericEmbedded.h ../Common/StringUtils.h PViewOptions.o: PViewOptions.cpp PViewOptions.h ColorTable.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/Message.h @@ -139,8 +137,7 @@ OctreePost.o: OctreePost.cpp ../Common/Octree.h \ ../Numeric/NumericEmbedded.h ../Common/Message.h shapeFunctions.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h + ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ColorTable.o: ColorTable.cpp ../Common/Message.h ColorTable.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h diff --git a/benchmarks/stl/sp2tmp01.geo b/benchmarks/stl/sp2tmp01.geo new file mode 100644 index 0000000000..c53c2f9fe9 --- /dev/null +++ b/benchmarks/stl/sp2tmp01.geo @@ -0,0 +1,12 @@ + +Merge "sp2tmp01_1.stl"; +Merge "sp2tmp01_2.stl"; +Merge "sp2tmp01_3.stl"; + +// remove duplicate mesh vertices +Coherence Mesh; + +Surface Loop(1)={1,2}; +Surface Loop(2)={-2,3}; +Volume(1)={1}; +Volume(2)={2}; diff --git a/benchmarks/stl/sp2tmp01_1.stl b/benchmarks/stl/sp2tmp01_1.stl new file mode 100644 index 0000000000..b128f8a3c5 --- /dev/null +++ b/benchmarks/stl/sp2tmp01_1.stl @@ -0,0 +1,1157 @@ +solid +facet normal 0.338759 0.907484 0.248426 +outer loop +vertex -0.813225 0.986989 0.00145098 +vertex -1.20031 1.04779 0.300161 +vertex -0.750704 0.832744 0.460963 +endloop +endfacet +facet normal -0.0825151 0.0868342 -0.9928 +outer loop +vertex -1.67162 -0.0188104 -1.0246 +vertex -1.15939 0.347031 -1.028 +vertex -1.17189 -0.114525 -1.08062 +endloop +endfacet +facet normal -0.756177 0.644117 0.115369 +outer loop +vertex -2.25294 0.52265 0.0990987 +vertex -2.05445 0.692431 0.364671 +vertex -2.004 0.818697 -0.142977 +endloop +endfacet +facet normal -0.33006 -0.0478383 0.942747 +outer loop +vertex -1.61789 0.186815 1.02445 +vertex -1.87318 0.0326255 0.925958 +vertex -1.56753 -0.29889 1.01578 +endloop +endfacet +facet normal -0.951946 -0.306257 -0.00252369 +outer loop +vertex -2.29699 -0.425292 0.0574065 +vertex -2.38 -0.163667 0.092099 +vertex -2.38 -0.162127 -0.094784 +endloop +endfacet +facet normal -0.0263671 -0.755108 0.65507 +outer loop +vertex -1.18299 -0.970434 0.492957 +vertex -1.16044 -0.624212 0.888444 +vertex -1.62598 -0.768682 0.702091 +endloop +endfacet +facet normal -1 0 0 +outer loop +vertex -2.38 4.8e-05 8.3e-05 +vertex -2.38 0 -0.187801 +vertex -2.38 -0.162127 -0.094784 +endloop +endfacet +facet normal 0.435162 -0.597044 0.673923 +outer loop +vertex -6.67823e-07 -0.229354 0.437003 +vertex -0.447386 -0.407697 0.573692 +vertex 9.82205e-06 -0.409342 0.281944 +endloop +endfacet +facet normal -0.786587 -0.608872 -0.102747 +outer loop +vertex -2.29699 -0.425292 0.0574065 +vertex -2.18688 -0.55051 -0.317577 +vertex -1.97513 -0.854147 -0.0283029 +endloop +endfacet +facet normal 0.435161 0.215467 0.87419 +outer loop +vertex -0.471933 0.273833 0.666308 +vertex -2.05781e-06 0.00303042 0.500226 +vertex -1.99456e-07 0.229355 0.437005 +endloop +endfacet +facet normal 0.435162 -0.841844 0.319268 +outer loop +vertex 1.72528e-05 -0.494802 0.0704928 +vertex 9.82205e-06 -0.409342 0.281944 +vertex -0.468438 -0.637995 0.332245 +endloop +endfacet +facet normal 0.169551 0.55741 -0.81274 +outer loop +vertex -1.15939 0.347031 -1.028 +vertex -1.16111 0.824685 -0.708338 +vertex -0.819701 0.548127 -0.822711 +endloop +endfacet +facet normal 0.435162 -0.418415 -0.797222 +outer loop +vertex 7.70095e-06 -0.12171 -0.48618 +vertex 1.77066e-06 -0.329418 -0.371835 +vertex -0.454616 -0.410606 -0.579413 +endloop +endfacet +facet normal 0.435161 0.597045 0.673923 +outer loop +vertex -1.99456e-07 0.229355 0.437005 +vertex -9.70682e-08 0.4092 0.279581 +vertex -0.445531 0.520142 0.471702 +endloop +endfacet +facet normal 0.672491 0.420428 0.609095 +outer loop +vertex -0.445531 0.520142 0.471702 +vertex -0.737242 0.52359 0.786302 +vertex -0.471933 0.273833 0.666308 +endloop +endfacet +facet normal -0.932544 0.312091 0.181551 +outer loop +vertex -2.28754 0.32666 0.305952 +vertex -2.25294 0.52265 0.0990987 +vertex -2.38 0.163666 0.092102 +endloop +endfacet +facet normal 0.39166 -0.688712 0.610146 +outer loop +vertex 9.82205e-06 -0.409342 0.281944 +vertex -0.447386 -0.407697 0.573692 +vertex -0.468438 -0.637995 0.332245 +endloop +endfacet +facet normal -0.825077 0.495749 0.271074 +outer loop +vertex -2.25294 0.52265 0.0990987 +vertex -2.28754 0.32666 0.305952 +vertex -2.05445 0.692431 0.364671 +endloop +endfacet +facet normal -0.152442 -0.0451601 0.98728 +outer loop +vertex -1.17725 -0.116168 1.08219 +vertex -1.61789 0.186815 1.02445 +vertex -1.56753 -0.29889 1.01578 +endloop +endfacet +facet normal -0.00278926 -0.67927 -0.733883 +outer loop +vertex -1.16894 -0.89104 -0.621246 +vertex -1.53842 -0.565721 -0.904267 +vertex -1.05341 -0.605908 -0.877994 +endloop +endfacet +facet normal 0.214855 0.0932591 -0.972183 +outer loop +vertex -0.790791 0.123093 -0.96759 +vertex -1.17189 -0.114525 -1.08062 +vertex -1.15939 0.347031 -1.028 +endloop +endfacet +facet normal 0.435162 -0.740975 -0.511459 +outer loop +vertex -0.467777 -0.641896 -0.319599 +vertex 1.77066e-06 -0.329418 -0.371835 +vertex 4.36854e-06 -0.465372 -0.197645 +endloop +endfacet +facet normal 0.652377 -0.735872 0.181377 +outer loop +vertex -0.435888 -0.693023 0.00800908 +vertex -0.468438 -0.637995 0.332245 +vertex -0.774606 -0.943665 0.201906 +endloop +endfacet +facet normal 0.39166 -0.688712 -0.610146 +outer loop +vertex 1.77066e-06 -0.329418 -0.371835 +vertex -0.467777 -0.641896 -0.319599 +vertex -0.454616 -0.410606 -0.579413 +endloop +endfacet +facet normal 0.337742 0.914508 -0.222723 +outer loop +vertex -1.15448 1.05494 -0.247742 +vertex -0.813225 0.986989 0.00145098 +vertex -0.808228 0.88034 -0.435885 +endloop +endfacet +facet normal 0.391661 -0.893373 -0.220195 +outer loop +vertex -0.435888 -0.693023 0.00800908 +vertex -0.467777 -0.641896 -0.319599 +vertex 4.36854e-06 -0.465372 -0.197645 +endloop +endfacet +facet normal 0.204296 -0.928197 -0.310986 +outer loop +vertex -0.795668 -0.938486 -0.268115 +vertex -1.22571 -1.09058 -0.0778793 +vertex -1.16894 -0.89104 -0.621246 +endloop +endfacet +facet normal 0.435161 0.841844 0.31927 +outer loop +vertex -9.70682e-08 0.4092 0.279581 +vertex 1.40708e-06 0.498259 0.082869 +vertex -0.447594 0.685836 0.156862 +endloop +endfacet +facet normal -0.0367991 -0.980564 0.192718 +outer loop +vertex -1.22571 -1.09058 -0.0778793 +vertex -1.18299 -0.970434 0.492957 +vertex -1.60151 -1.03985 0.139722 +endloop +endfacet +facet normal 0.593203 -0.452017 -0.666176 +outer loop +vertex -0.454616 -0.410606 -0.579413 +vertex -0.769749 -0.710982 -0.651297 +vertex -0.748969 -0.333674 -0.891059 +endloop +endfacet +facet normal -0.402793 -0.481354 0.778496 +outer loop +vertex -1.96278 -0.456474 0.728413 +vertex -1.62598 -0.768682 0.702091 +vertex -1.56753 -0.29889 1.01578 +endloop +endfacet +facet normal 0.576298 -0.458128 0.676757 +outer loop +vertex -0.755516 -0.313945 0.90001 +vertex -0.78593 -0.735764 0.63457 +vertex -0.447386 -0.407697 0.573692 +endloop +endfacet +facet normal 0.435162 0.740975 -0.511459 +outer loop +vertex 2.8877e-06 0.323241 -0.36924 +vertex -0.448375 0.52031 -0.474458 +vertex -5.08934e-07 0.463445 -0.1851 +endloop +endfacet +facet normal -0.782747 0.218388 0.582764 +outer loop +vertex -2.28754 0.32666 0.305952 +vertex -2.23895 0.0118177 0.547852 +vertex -2.00463 0.314407 0.763898 +endloop +endfacet +facet normal -0.93117 0.340067 -0.13144 +outer loop +vertex -2.25294 0.52265 0.0990987 +vertex -2.20264 0.522667 -0.304044 +vertex -2.38 0.162115 -0.094804 +endloop +endfacet +facet normal -0.717212 0.134457 0.683761 +outer loop +vertex -2.00463 0.314407 0.763898 +vertex -2.23895 0.0118177 0.547852 +vertex -1.87318 0.0326255 0.925958 +endloop +endfacet +facet normal -0.930777 -0.0825468 0.356146 +outer loop +vertex -2.38 -0.003101 0.187775 +vertex -2.2877 -0.306048 0.351482 +vertex -2.23895 0.0118177 0.547852 +endloop +endfacet +facet normal 0.582226 -0.0827959 -0.8088 +outer loop +vertex -0.748969 -0.333674 -0.891059 +vertex -0.790791 0.123093 -0.96759 +vertex -0.460011 -0.0822694 -0.705108 +endloop +endfacet +facet normal -0.953175 0.15049 0.262318 +outer loop +vertex -2.38 -0.003101 0.187775 +vertex -2.28754 0.32666 0.305952 +vertex -2.38 0.163666 0.092102 +endloop +endfacet +facet normal -0.239471 -0.95983 -0.146217 +outer loop +vertex -1.60151 -1.03985 0.139722 +vertex -1.68806 -0.927254 -0.423391 +vertex -1.22571 -1.09058 -0.0778793 +endloop +endfacet +facet normal -0.930171 0.0733818 0.359719 +outer loop +vertex -2.28754 0.32666 0.305952 +vertex -2.38 -0.003101 0.187775 +vertex -2.23895 0.0118177 0.547852 +endloop +endfacet +facet normal 0.391659 0.110908 0.913402 +outer loop +vertex -2.05781e-06 0.00303042 0.500226 +vertex -0.471933 0.273833 0.666308 +vertex -0.455493 -0.0942704 0.704131 +endloop +endfacet +facet normal -0.536857 -0.173656 -0.825608 +outer loop +vertex -1.91723 -0.370113 -0.812942 +vertex -2.04584 -0.126952 -0.779775 +vertex -1.67162 -0.0188104 -1.0246 +endloop +endfacet +facet normal 0.39166 -0.326276 -0.860317 +outer loop +vertex -0.454616 -0.410606 -0.579413 +vertex -0.460011 -0.0822694 -0.705108 +vertex 7.70095e-06 -0.12171 -0.48618 +endloop +endfacet +facet normal -0.482374 0.22245 0.847249 +outer loop +vertex -2.00463 0.314407 0.763898 +vertex -1.87318 0.0326255 0.925958 +vertex -1.61789 0.186815 1.02445 +endloop +endfacet +facet normal 0.262787 -0.702379 -0.661519 +outer loop +vertex -1.05341 -0.605908 -0.877994 +vertex -0.769749 -0.710982 -0.651297 +vertex -1.16894 -0.89104 -0.621246 +endloop +endfacet +facet normal 0.204984 -0.741098 0.639339 +outer loop +vertex -1.16044 -0.624212 0.888444 +vertex -1.18299 -0.970434 0.492957 +vertex -0.78593 -0.735764 0.63457 +endloop +endfacet +facet normal 0.656961 -0.267345 0.704932 +outer loop +vertex -0.455493 -0.0942704 0.704131 +vertex -0.755516 -0.313945 0.90001 +vertex -0.447386 -0.407697 0.573692 +endloop +endfacet +facet normal 0.356232 -0.114514 -0.927354 +outer loop +vertex -0.748969 -0.333674 -0.891059 +vertex -1.17189 -0.114525 -1.08062 +vertex -0.790791 0.123093 -0.96759 +endloop +endfacet +facet normal 0.196341 0.979367 0.0478673 +outer loop +vertex -1.20031 1.04779 0.300161 +vertex -0.813225 0.986989 0.00145098 +vertex -1.15448 1.05494 -0.247742 +endloop +endfacet +facet normal 0.39166 0.110905 -0.913402 +outer loop +vertex -2.37072e-06 0.128665 -0.485787 +vertex -0.460011 -0.0822694 -0.705108 +vertex -0.457918 0.254552 -0.665597 +endloop +endfacet +facet normal -0.734427 0.467157 -0.492323 +outer loop +vertex -1.92855 0.425014 -0.78165 +vertex -2.20264 0.522667 -0.304044 +vertex -1.91493 0.688753 -0.577776 +endloop +endfacet +facet normal 0.638323 0.437279 -0.633507 +outer loop +vertex -0.448375 0.52031 -0.474458 +vertex -0.457918 0.254552 -0.665597 +vertex -0.819701 0.548127 -0.822711 +endloop +endfacet +facet normal 0.435162 0.418415 -0.797222 +outer loop +vertex 2.8877e-06 0.323241 -0.36924 +vertex -2.37072e-06 0.128665 -0.485787 +vertex -0.457918 0.254552 -0.665597 +endloop +endfacet +facet normal 0.328221 -0.943813 -0.0385875 +outer loop +vertex -0.774606 -0.943665 0.201906 +vertex -1.22571 -1.09058 -0.0778793 +vertex -0.795668 -0.938486 -0.268115 +endloop +endfacet +facet normal 0.355556 -0.83441 0.421117 +outer loop +vertex -1.18299 -0.970434 0.492957 +vertex -0.774606 -0.943665 0.201906 +vertex -0.78593 -0.735764 0.63457 +endloop +endfacet +facet normal 0.575921 -0.730174 0.367642 +outer loop +vertex -0.774606 -0.943665 0.201906 +vertex -0.468438 -0.637995 0.332245 +vertex -0.78593 -0.735764 0.63457 +endloop +endfacet +facet normal -1 0 0 +outer loop +vertex -2.38 0 -0.187801 +vertex -2.38 4.8e-05 8.3e-05 +vertex -2.38 0.162115 -0.094804 +endloop +endfacet +facet normal 0.391659 0.522683 0.757236 +outer loop +vertex -0.445531 0.520142 0.471702 +vertex -0.471933 0.273833 0.666308 +vertex -1.99456e-07 0.229355 0.437005 +endloop +endfacet +facet normal -0.954966 0.147643 -0.257375 +outer loop +vertex -2.38 0 -0.187801 +vertex -2.38 0.162115 -0.094804 +vertex -2.2711 0.178569 -0.441273 +endloop +endfacet +facet normal -0.399192 0.816813 0.416488 +outer loop +vertex -1.60515 1.03273 0.156373 +vertex -2.05445 0.692431 0.364671 +vertex -1.61515 0.763927 0.713478 +endloop +endfacet +facet normal 0.197084 0.883409 -0.425143 +outer loop +vertex -1.16111 0.824685 -0.708338 +vertex -1.15448 1.05494 -0.247742 +vertex -0.808228 0.88034 -0.435885 +endloop +endfacet +facet normal -0.188275 0.767055 -0.613335 +outer loop +vertex -1.58073 0.956506 -0.448333 +vertex -1.16111 0.824685 -0.708338 +vertex -1.63255 0.634168 -0.823567 +endloop +endfacet +facet normal 0.577464 -0.81577 -0.0324826 +outer loop +vertex -0.435888 -0.693023 0.00800908 +vertex -0.774606 -0.943665 0.201906 +vertex -0.795668 -0.938486 -0.268115 +endloop +endfacet +facet normal 0.355616 0.342174 0.869744 +outer loop +vertex -1.15755 0.436411 0.992817 +vertex -0.76439 0.127286 0.951331 +vertex -0.737242 0.52359 0.786302 +endloop +endfacet +facet normal 0.653567 -0.566524 0.501897 +outer loop +vertex -0.468438 -0.637995 0.332245 +vertex -0.447386 -0.407697 0.573692 +vertex -0.78593 -0.735764 0.63457 +endloop +endfacet +facet normal 0.363297 -0.091794 0.92714 +outer loop +vertex -1.17725 -0.116168 1.08219 +vertex -0.755516 -0.313945 0.90001 +vertex -0.76439 0.127286 0.951331 +endloop +endfacet +facet normal -0.380193 -0.295017 -0.876595 +outer loop +vertex -1.91723 -0.370113 -0.812942 +vertex -1.67162 -0.0188104 -1.0246 +vertex -1.53842 -0.565721 -0.904267 +endloop +endfacet +facet normal -0.548091 -0.814253 0.19128 +outer loop +vertex -1.60151 -1.03985 0.139722 +vertex -2.04105 -0.716181 0.352918 +vertex -1.97513 -0.854147 -0.0283029 +endloop +endfacet +facet normal 0.578435 0.303424 -0.757197 +outer loop +vertex -0.457918 0.254552 -0.665597 +vertex -0.790791 0.123093 -0.96759 +vertex -0.819701 0.548127 -0.822711 +endloop +endfacet +facet normal 0.331224 0.329095 -0.8843 +outer loop +vertex -0.790791 0.123093 -0.96759 +vertex -1.15939 0.347031 -1.028 +vertex -0.819701 0.548127 -0.822711 +endloop +endfacet +facet normal 0.593142 0.599526 0.537356 +outer loop +vertex -0.737242 0.52359 0.786302 +vertex -0.445531 0.520142 0.471702 +vertex -0.750704 0.832744 0.460963 +endloop +endfacet +facet normal -0.934589 -0.318129 0.159176 +outer loop +vertex -2.29699 -0.425292 0.0574065 +vertex -2.2877 -0.306048 0.351482 +vertex -2.38 -0.163667 0.092099 +endloop +endfacet +facet normal -0.820315 -0.501619 0.274702 +outer loop +vertex -2.2877 -0.306048 0.351482 +vertex -2.29699 -0.425292 0.0574065 +vertex -2.04105 -0.716181 0.352918 +endloop +endfacet +facet normal -0.954921 -0.151957 0.255019 +outer loop +vertex -2.2877 -0.306048 0.351482 +vertex -2.38 -0.003101 0.187775 +vertex -2.38 -0.163667 0.092099 +endloop +endfacet +facet normal -0.488997 -0.25976 0.83271 +outer loop +vertex -1.96278 -0.456474 0.728413 +vertex -1.56753 -0.29889 1.01578 +vertex -1.87318 0.0326255 0.925958 +endloop +endfacet +facet normal -0.413909 -0.645721 -0.641657 +outer loop +vertex -1.91723 -0.370113 -0.812942 +vertex -1.53842 -0.565721 -0.904267 +vertex -1.68806 -0.927254 -0.423391 +endloop +endfacet +facet normal -0.515202 0.525554 -0.677023 +outer loop +vertex -1.63255 0.634168 -0.823567 +vertex -1.92855 0.425014 -0.78165 +vertex -1.91493 0.688753 -0.577776 +endloop +endfacet +facet normal -0.74147 0.45877 0.489645 +outer loop +vertex -2.28754 0.32666 0.305952 +vertex -2.00463 0.314407 0.763898 +vertex -2.05445 0.692431 0.364671 +endloop +endfacet +facet normal -0.36764 0.451423 0.813055 +outer loop +vertex -2.00463 0.314407 0.763898 +vertex -1.61789 0.186815 1.02445 +vertex -1.61515 0.763927 0.713478 +endloop +endfacet +facet normal 0.435161 -0.215469 0.87419 +outer loop +vertex -2.05781e-06 0.00303042 0.500226 +vertex -0.455493 -0.0942704 0.704131 +vertex -6.67823e-07 -0.229354 0.437003 +endloop +endfacet +facet normal 0.39166 -0.326275 0.860318 +outer loop +vertex -0.455493 -0.0942704 0.704131 +vertex -0.447386 -0.407697 0.573692 +vertex -6.67823e-07 -0.229354 0.437003 +endloop +endfacet +facet normal 0.642522 0.766267 -0 +outer loop +vertex -0.430693 0.671374 -0.155654 +vertex -0.813225 0.986989 0.00145098 +vertex -0.447594 0.685836 0.156862 +endloop +endfacet +facet normal 0.269824 0.525384 0.806949 +outer loop +vertex -1.15755 0.436411 0.992817 +vertex -0.737242 0.52359 0.786302 +vertex -1.10706 0.757868 0.766113 +endloop +endfacet +facet normal 0.395466 0.675188 0.622677 +outer loop +vertex -1.10706 0.757868 0.766113 +vertex -0.737242 0.52359 0.786302 +vertex -0.750704 0.832744 0.460963 +endloop +endfacet +facet normal 0.587921 -0.082625 0.804687 +outer loop +vertex -0.455493 -0.0942704 0.704131 +vertex -0.76439 0.127286 0.951331 +vertex -0.755516 -0.313945 0.90001 +endloop +endfacet +facet normal 0.662734 0.663078 0.348011 +outer loop +vertex -0.750704 0.832744 0.460963 +vertex -0.445531 0.520142 0.471702 +vertex -0.447594 0.685836 0.156862 +endloop +endfacet +facet normal 0.39166 -0.893373 0.220197 +outer loop +vertex -0.435888 -0.693023 0.00800908 +vertex 1.72528e-05 -0.494802 0.0704928 +vertex -0.468438 -0.637995 0.332245 +endloop +endfacet +facet normal 0.574052 0.796589 -0.189502 +outer loop +vertex -0.430693 0.671374 -0.155654 +vertex -0.808228 0.88034 -0.435885 +vertex -0.813225 0.986989 0.00145098 +endloop +endfacet +facet normal -1 0 -0 +outer loop +vertex -2.38 -0.003101 0.187775 +vertex -2.38 4.8e-05 8.3e-05 +vertex -2.38 -0.163667 0.092099 +endloop +endfacet +facet normal -0.751142 -0.238619 -0.615505 +outer loop +vertex -2.04584 -0.126952 -0.779775 +vertex -1.91723 -0.370113 -0.812942 +vertex -2.21804 -0.294892 -0.496726 +endloop +endfacet +facet normal 0.64577 0.676074 -0.354832 +outer loop +vertex -0.430693 0.671374 -0.155654 +vertex -0.448375 0.52031 -0.474458 +vertex -0.808228 0.88034 -0.435885 +endloop +endfacet +facet normal 0.341004 0.705363 -0.621434 +outer loop +vertex -1.16111 0.824685 -0.708338 +vertex -0.808228 0.88034 -0.435885 +vertex -0.819701 0.548127 -0.822711 +endloop +endfacet +facet normal 0.569965 0.610237 -0.550228 +outer loop +vertex -0.808228 0.88034 -0.435885 +vertex -0.448375 0.52031 -0.474458 +vertex -0.819701 0.548127 -0.822711 +endloop +endfacet +facet normal 0.337263 -0.813392 -0.47397 +outer loop +vertex -1.16894 -0.89104 -0.621246 +vertex -0.769749 -0.710982 -0.651297 +vertex -0.795668 -0.938486 -0.268115 +endloop +endfacet +facet normal 0.0248603 -0.332815 0.942664 +outer loop +vertex -1.17725 -0.116168 1.08219 +vertex -1.56753 -0.29889 1.01578 +vertex -1.16044 -0.624212 0.888444 +endloop +endfacet +facet normal -0.932492 0.262289 -0.24832 +outer loop +vertex -2.20264 0.522667 -0.304044 +vertex -2.2711 0.178569 -0.441273 +vertex -2.38 0.162115 -0.094804 +endloop +endfacet +facet normal -0.793702 -0.243868 0.557285 +outer loop +vertex -2.2877 -0.306048 0.351482 +vertex -1.96278 -0.456474 0.728413 +vertex -2.23895 0.0118177 0.547852 +endloop +endfacet +facet normal -0.198558 -0.883924 0.423382 +outer loop +vertex -1.18299 -0.970434 0.492957 +vertex -1.62598 -0.768682 0.702091 +vertex -1.60151 -1.03985 0.139722 +endloop +endfacet +facet normal 0.362266 -0.51821 0.77474 +outer loop +vertex -0.755516 -0.313945 0.90001 +vertex -1.16044 -0.624212 0.888444 +vertex -0.78593 -0.735764 0.63457 +endloop +endfacet +facet normal -1 0 0 +outer loop +vertex -2.38 -0.163667 0.092099 +vertex -2.38 4.8e-05 8.3e-05 +vertex -2.38 -0.162127 -0.094784 +endloop +endfacet +facet normal -0.956196 0.292718 -0.00242905 +outer loop +vertex -2.38 0.163666 0.092102 +vertex -2.25294 0.52265 0.0990987 +vertex -2.38 0.162115 -0.094804 +endloop +endfacet +facet normal 0.408594 -0.511272 -0.756077 +outer loop +vertex -1.05341 -0.605908 -0.877994 +vertex -0.748969 -0.333674 -0.891059 +vertex -0.769749 -0.710982 -0.651297 +endloop +endfacet +facet normal 0.219538 -0.331167 0.917677 +outer loop +vertex -1.17725 -0.116168 1.08219 +vertex -1.16044 -0.624212 0.888444 +vertex -0.755516 -0.313945 0.90001 +endloop +endfacet +facet normal 0.594553 0.27704 0.754821 +outer loop +vertex -0.737242 0.52359 0.786302 +vertex -0.76439 0.127286 0.951331 +vertex -0.471933 0.273833 0.666308 +endloop +endfacet +facet normal -0.0462558 0.583004 0.811152 +outer loop +vertex -1.15755 0.436411 0.992817 +vertex -1.10706 0.757868 0.766113 +vertex -1.61515 0.763927 0.713478 +endloop +endfacet +facet normal -0.529597 0.606613 0.592915 +outer loop +vertex -2.05445 0.692431 0.364671 +vertex -2.00463 0.314407 0.763898 +vertex -1.61515 0.763927 0.713478 +endloop +endfacet +facet normal -0.197282 0.882783 0.42635 +outer loop +vertex -1.20031 1.04779 0.300161 +vertex -1.60515 1.03273 0.156373 +vertex -1.61515 0.763927 0.713478 +endloop +endfacet +facet normal -0.00571026 0.14098 0.989996 +outer loop +vertex -1.61789 0.186815 1.02445 +vertex -1.17725 -0.116168 1.08219 +vertex -1.15755 0.436411 0.992817 +endloop +endfacet +facet normal -0.0590828 0.847787 0.527036 +outer loop +vertex -1.61515 0.763927 0.713478 +vertex -1.10706 0.757868 0.766113 +vertex -1.20031 1.04779 0.300161 +endloop +endfacet +facet normal -0.185123 -0.247353 -0.951076 +outer loop +vertex -1.67162 -0.0188104 -1.0246 +vertex -1.17189 -0.114525 -1.08062 +vertex -1.53842 -0.565721 -0.904267 +endloop +endfacet +facet normal -0.511351 0.806637 -0.296406 +outer loop +vertex -2.004 0.818697 -0.142977 +vertex -1.58073 0.956506 -0.448333 +vertex -1.91493 0.688753 -0.577776 +endloop +endfacet +facet normal -0.015841 0.567202 -0.823426 +outer loop +vertex -1.16111 0.824685 -0.708338 +vertex -1.15939 0.347031 -1.028 +vertex -1.63255 0.634168 -0.823567 +endloop +endfacet +facet normal -0.348878 0.736547 -0.579467 +outer loop +vertex -1.58073 0.956506 -0.448333 +vertex -1.63255 0.634168 -0.823567 +vertex -1.91493 0.688753 -0.577776 +endloop +endfacet +facet normal -0.711715 0.642305 -0.284439 +outer loop +vertex -2.20264 0.522667 -0.304044 +vertex -2.004 0.818697 -0.142977 +vertex -1.91493 0.688753 -0.577776 +endloop +endfacet +facet normal -0.420972 0.292277 -0.858695 +outer loop +vertex -1.63255 0.634168 -0.823567 +vertex -1.67162 -0.0188104 -1.0246 +vertex -1.92855 0.425014 -0.78165 +endloop +endfacet +facet normal -0.22616 0.290677 -0.929709 +outer loop +vertex -1.15939 0.347031 -1.028 +vertex -1.67162 -0.0188104 -1.0246 +vertex -1.63255 0.634168 -0.823567 +endloop +endfacet +facet normal 0.263335 -0.317641 -0.910911 +outer loop +vertex -1.05341 -0.605908 -0.877994 +vertex -1.17189 -0.114525 -1.08062 +vertex -0.748969 -0.333674 -0.891059 +endloop +endfacet +facet normal -0.915673 -0.324865 -0.236658 +outer loop +vertex -2.21804 -0.294892 -0.496726 +vertex -2.18688 -0.55051 -0.317577 +vertex -2.38 -0.162127 -0.094784 +endloop +endfacet +facet normal -0.394609 -0.910332 -0.12482 +outer loop +vertex -1.68806 -0.927254 -0.423391 +vertex -1.60151 -1.03985 0.139722 +vertex -1.97513 -0.854147 -0.0283029 +endloop +endfacet +facet normal -0.915215 -0.36541 -0.169872 +outer loop +vertex -2.18688 -0.55051 -0.317577 +vertex -2.29699 -0.425292 0.0574065 +vertex -2.38 -0.162127 -0.094784 +endloop +endfacet +facet normal -0.0130406 0.901115 -0.433383 +outer loop +vertex -1.16111 0.824685 -0.708338 +vertex -1.58073 0.956506 -0.448333 +vertex -1.15448 1.05494 -0.247742 +endloop +endfacet +facet normal 0.659557 0.0906023 0.746174 +outer loop +vertex -0.76439 0.127286 0.951331 +vertex -0.455493 -0.0942704 0.704131 +vertex -0.471933 0.273833 0.666308 +endloop +endfacet +facet normal 0.576938 0.794467 0.189644 +outer loop +vertex -0.813225 0.986989 0.00145098 +vertex -0.750704 0.832744 0.460963 +vertex -0.447594 0.685836 0.156862 +endloop +endfacet +facet normal -0.161017 0.484964 0.859583 +outer loop +vertex -1.61515 0.763927 0.713478 +vertex -1.61789 0.186815 1.02445 +vertex -1.15755 0.436411 0.992817 +endloop +endfacet +facet normal 0.435162 0 -0.900352 +outer loop +vertex -0.460011 -0.0822694 -0.705108 +vertex -2.37072e-06 0.128665 -0.485787 +vertex 7.70095e-06 -0.12171 -0.48618 +endloop +endfacet +facet normal -1 0 0 +outer loop +vertex -2.38 4.8e-05 8.3e-05 +vertex -2.38 0.163666 0.092102 +vertex -2.38 0.162115 -0.094804 +endloop +endfacet +facet normal -1 0 0 +outer loop +vertex -2.38 -0.003101 0.187775 +vertex -2.38 0.163666 0.092102 +vertex -2.38 4.8e-05 8.3e-05 +endloop +endfacet +facet normal -0.746802 -0.651908 0.13154 +outer loop +vertex -2.29699 -0.425292 0.0574065 +vertex -1.97513 -0.854147 -0.0283029 +vertex -2.04105 -0.716181 0.352918 +endloop +endfacet +facet normal -0.767791 -0.38026 -0.515655 +outer loop +vertex -1.91723 -0.370113 -0.812942 +vertex -2.18688 -0.55051 -0.317577 +vertex -2.21804 -0.294892 -0.496726 +endloop +endfacet +facet normal 0.39166 0.814716 -0.427597 +outer loop +vertex -0.448375 0.52031 -0.474458 +vertex -0.430693 0.671374 -0.155654 +vertex -5.08934e-07 0.463445 -0.1851 +endloop +endfacet +facet normal -0.553341 0.145251 -0.820193 +outer loop +vertex -1.67162 -0.0188104 -1.0246 +vertex -2.04584 -0.126952 -0.779775 +vertex -1.92855 0.425014 -0.78165 +endloop +endfacet +facet normal 0.234725 0.146833 0.960908 +outer loop +vertex -1.17725 -0.116168 1.08219 +vertex -0.76439 0.127286 0.951331 +vertex -1.15755 0.436411 0.992817 +endloop +endfacet +facet normal -0.801009 0.587966 -0.112607 +outer loop +vertex -2.20264 0.522667 -0.304044 +vertex -2.25294 0.52265 0.0990987 +vertex -2.004 0.818697 -0.142977 +endloop +endfacet +facet normal 0.651863 -0.736301 -0.181481 +outer loop +vertex -0.435888 -0.693023 0.00800908 +vertex -0.795668 -0.938486 -0.268115 +vertex -0.467777 -0.641896 -0.319599 +endloop +endfacet +facet normal 0.391659 0.522683 -0.757236 +outer loop +vertex -0.448375 0.52031 -0.474458 +vertex 2.8877e-06 0.323241 -0.36924 +vertex -0.457918 0.254552 -0.665597 +endloop +endfacet +facet normal 0.652096 0.0913815 -0.752609 +outer loop +vertex -0.460011 -0.0822694 -0.705108 +vertex -0.790791 0.123093 -0.96759 +vertex -0.457918 0.254552 -0.665597 +endloop +endfacet +facet normal -0.844526 -0.00795442 -0.535456 +outer loop +vertex -2.04584 -0.126952 -0.779775 +vertex -2.21804 -0.294892 -0.496726 +vertex -2.2711 0.178569 -0.441273 +endloop +endfacet +facet normal 0.591508 -0.705036 -0.391207 +outer loop +vertex -0.795668 -0.938486 -0.268115 +vertex -0.769749 -0.710982 -0.651297 +vertex -0.467777 -0.641896 -0.319599 +endloop +endfacet +facet normal 0.664307 -0.559481 -0.495658 +outer loop +vertex -0.769749 -0.710982 -0.651297 +vertex -0.454616 -0.410606 -0.579413 +vertex -0.467777 -0.641896 -0.319599 +endloop +endfacet +facet normal 0.665634 -0.264635 -0.697782 +outer loop +vertex -0.460011 -0.0822694 -0.705108 +vertex -0.454616 -0.410606 -0.579413 +vertex -0.748969 -0.333674 -0.891059 +endloop +endfacet +facet normal -0.778629 0.167915 -0.6046 +outer loop +vertex -1.92855 0.425014 -0.78165 +vertex -2.04584 -0.126952 -0.779775 +vertex -2.2711 0.178569 -0.441273 +endloop +endfacet +facet normal -0.797026 0.352385 -0.490484 +outer loop +vertex -2.20264 0.522667 -0.304044 +vertex -1.92855 0.425014 -0.78165 +vertex -2.2711 0.178569 -0.441273 +endloop +endfacet +facet normal -0.540515 -0.612368 0.576931 +outer loop +vertex -1.96278 -0.456474 0.728413 +vertex -2.04105 -0.716181 0.352918 +vertex -1.62598 -0.768682 0.702091 +endloop +endfacet +facet normal -0.186526 -0.755487 -0.62805 +outer loop +vertex -1.68806 -0.927254 -0.423391 +vertex -1.53842 -0.565721 -0.904267 +vertex -1.16894 -0.89104 -0.621246 +endloop +endfacet +facet normal -0.608259 -0.725975 -0.320908 +outer loop +vertex -1.68806 -0.927254 -0.423391 +vertex -1.97513 -0.854147 -0.0283029 +vertex -2.18688 -0.55051 -0.317577 +endloop +endfacet +facet normal 0.0044706 -0.383575 -0.923499 +outer loop +vertex -1.05341 -0.605908 -0.877994 +vertex -1.53842 -0.565721 -0.904267 +vertex -1.17189 -0.114525 -1.08062 +endloop +endfacet +facet normal -0.581635 -0.640363 -0.501633 +outer loop +vertex -1.68806 -0.927254 -0.423391 +vertex -2.18688 -0.55051 -0.317577 +vertex -1.91723 -0.370113 -0.812942 +endloop +endfacet +facet normal 0.391659 0.814717 0.427597 +outer loop +vertex -0.445531 0.520142 0.471702 +vertex -9.70682e-08 0.4092 0.279581 +vertex -0.447594 0.685836 0.156862 +endloop +endfacet +facet normal 0.39166 0.92011 -0 +outer loop +vertex -0.430693 0.671374 -0.155654 +vertex -0.447594 0.685836 0.156862 +vertex 1.40708e-06 0.498259 0.082869 +endloop +endfacet +facet normal 0.194391 -0.96579 0.171644 +outer loop +vertex -0.774606 -0.943665 0.201906 +vertex -1.18299 -0.970434 0.492957 +vertex -1.22571 -1.09058 -0.0778793 +endloop +endfacet +facet normal -0.761806 -0.457021 0.459113 +outer loop +vertex -2.04105 -0.716181 0.352918 +vertex -1.96278 -0.456474 0.728413 +vertex -2.2877 -0.306048 0.351482 +endloop +endfacet +facet normal -0.424258 -0.814878 0.394942 +outer loop +vertex -1.60151 -1.03985 0.139722 +vertex -1.62598 -0.768682 0.702091 +vertex -2.04105 -0.716181 0.352918 +endloop +endfacet +facet normal -0.0916985 -0.937993 -0.334306 +outer loop +vertex -1.68806 -0.927254 -0.423391 +vertex -1.16894 -0.89104 -0.621246 +vertex -1.22571 -1.09058 -0.0778793 +endloop +endfacet +facet normal 0.238677 0.852946 0.464238 +outer loop +vertex -1.20031 1.04779 0.300161 +vertex -1.10706 0.757868 0.766113 +vertex -0.750704 0.832744 0.460963 +endloop +endfacet +facet normal -0.952502 -0.151547 -0.264145 +outer loop +vertex -2.38 0 -0.187801 +vertex -2.21804 -0.294892 -0.496726 +vertex -2.38 -0.162127 -0.094784 +endloop +endfacet +facet normal -0.181011 0.977162 -0.111309 +outer loop +vertex -1.15448 1.05494 -0.247742 +vertex -1.58073 0.956506 -0.448333 +vertex -1.60515 1.03273 0.156373 +endloop +endfacet +facet normal -0.0645279 0.99714 0.0393437 +outer loop +vertex -1.60515 1.03273 0.156373 +vertex -1.20031 1.04779 0.300161 +vertex -1.15448 1.05494 -0.247742 +endloop +endfacet +facet normal -0.935715 -0.0156367 -0.352411 +outer loop +vertex -2.21804 -0.294892 -0.496726 +vertex -2.38 0 -0.187801 +vertex -2.2711 0.178569 -0.441273 +endloop +endfacet +facet normal -0.712059 -0.158206 0.684063 +outer loop +vertex -1.87318 0.0326255 0.925958 +vertex -2.23895 0.0118177 0.547852 +vertex -1.96278 -0.456474 0.728413 +endloop +endfacet +facet normal -0.413436 0.901782 -0.125938 +outer loop +vertex -1.58073 0.956506 -0.448333 +vertex -2.004 0.818697 -0.142977 +vertex -1.60515 1.03273 0.156373 +endloop +endfacet +facet normal -0.55958 0.813448 0.158657 +outer loop +vertex -2.004 0.818697 -0.142977 +vertex -2.05445 0.692431 0.364671 +vertex -1.60515 1.03273 0.156373 +endloop +endfacet +facet normal -0.167936 -0.55084 0.817541 +outer loop +vertex -1.62598 -0.768682 0.702091 +vertex -1.16044 -0.624212 0.888444 +vertex -1.56753 -0.29889 1.01578 +endloop +endfacet +facet normal 0.435162 -0.893787 -0.108526 +outer loop +vertex 4.36854e-06 -0.465372 -0.197645 +vertex 1.72528e-05 -0.494802 0.0704928 +vertex -0.435888 -0.693023 0.00800908 +endloop +endfacet +facet normal 0.435162 0.893788 -0.108523 +outer loop +vertex 1.40708e-06 0.498259 0.082869 +vertex -5.08934e-07 0.463445 -0.1851 +vertex -0.430693 0.671374 -0.155654 +endloop +endfacet +endsolid diff --git a/benchmarks/stl/sp2tmp01_2.stl b/benchmarks/stl/sp2tmp01_2.stl new file mode 100644 index 0000000000..bb1e763b19 --- /dev/null +++ b/benchmarks/stl/sp2tmp01_2.stl @@ -0,0 +1,163 @@ +solid +facet normal 1 0 0 +outer loop +vertex 1.54802e-06 0.200771 -0.236193 +vertex -2.37072e-06 0.128665 -0.485787 +vertex 2.8877e-06 0.323241 -0.36924 +endloop +endfacet +facet normal 1 0 -0 +outer loop +vertex -5.08934e-07 0.463445 -0.1851 +vertex 1.40708e-06 0.498259 0.082869 +vertex 1.87672e-07 0.220569 0.0357478 +endloop +endfacet +facet normal 1 -0 0 +outer loop +vertex -6.12208e-07 0.14805 0.264153 +vertex 1.87672e-07 0.220569 0.0357478 +vertex -9.70682e-08 0.4092 0.279581 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex -1.11652e-07 -0.0527337 -0.199559 +vertex -4.16363e-08 -0.279787 -0.0377962 +vertex 1.77066e-06 -0.329418 -0.371835 +endloop +endfacet +facet normal 1 0 -0 +outer loop +vertex 1.54802e-06 0.200771 -0.236193 +vertex 1.87672e-07 0.220569 0.0357478 +vertex -1.11652e-07 -0.0527337 -0.199559 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex -6.12208e-07 0.14805 0.264153 +vertex -2.05781e-06 0.00303042 0.500226 +vertex 1.3408e-07 -0.0956187 0.173943 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex 1.87672e-07 0.220569 0.0357478 +vertex 1.3408e-07 -0.0956187 0.173943 +vertex -1.11652e-07 -0.0527337 -0.199559 +endloop +endfacet +facet normal 1 -0 0 +outer loop +vertex 1.3408e-07 -0.0956187 0.173943 +vertex 1.87672e-07 0.220569 0.0357478 +vertex -6.12208e-07 0.14805 0.264153 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex 1.54802e-06 0.200771 -0.236193 +vertex -1.11652e-07 -0.0527337 -0.199559 +vertex -2.37072e-06 0.128665 -0.485787 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex -2.05781e-06 0.00303042 0.500226 +vertex -6.67823e-07 -0.229354 0.437003 +vertex 1.3408e-07 -0.0956187 0.173943 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex -4.16363e-08 -0.279787 -0.0377962 +vertex 1.72528e-05 -0.494802 0.0704928 +vertex 4.36854e-06 -0.465372 -0.197645 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex 9.82205e-06 -0.409342 0.281944 +vertex -4.16363e-08 -0.279787 -0.0377962 +vertex 1.3408e-07 -0.0956187 0.173943 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex -4.16363e-08 -0.279787 -0.0377962 +vertex 9.82205e-06 -0.409342 0.281944 +vertex 1.72528e-05 -0.494802 0.0704928 +endloop +endfacet +facet normal 1 0 -0 +outer loop +vertex -6.12208e-07 0.14805 0.264153 +vertex -1.99456e-07 0.229355 0.437005 +vertex -2.05781e-06 0.00303042 0.500226 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex -6.12208e-07 0.14805 0.264153 +vertex -9.70682e-08 0.4092 0.279581 +vertex -1.99456e-07 0.229355 0.437005 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex -6.67823e-07 -0.229354 0.437003 +vertex 9.82205e-06 -0.409342 0.281944 +vertex 1.3408e-07 -0.0956187 0.173943 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex -4.16363e-08 -0.279787 -0.0377962 +vertex 4.36854e-06 -0.465372 -0.197645 +vertex 1.77066e-06 -0.329418 -0.371835 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex -1.11652e-07 -0.0527337 -0.199559 +vertex 1.3408e-07 -0.0956187 0.173943 +vertex -4.16363e-08 -0.279787 -0.0377962 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex 1.87672e-07 0.220569 0.0357478 +vertex 1.40708e-06 0.498259 0.082869 +vertex -9.70682e-08 0.4092 0.279581 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex 1.54802e-06 0.200771 -0.236193 +vertex -5.08934e-07 0.463445 -0.1851 +vertex 1.87672e-07 0.220569 0.0357478 +endloop +endfacet +facet normal 1 0 -0 +outer loop +vertex 2.8877e-06 0.323241 -0.36924 +vertex -5.08934e-07 0.463445 -0.1851 +vertex 1.54802e-06 0.200771 -0.236193 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex -1.11652e-07 -0.0527337 -0.199559 +vertex 1.77066e-06 -0.329418 -0.371835 +vertex 7.70095e-06 -0.12171 -0.48618 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex 7.70095e-06 -0.12171 -0.48618 +vertex -2.37072e-06 0.128665 -0.485787 +vertex -1.11652e-07 -0.0527337 -0.199559 +endloop +endfacet +endsolid diff --git a/benchmarks/stl/sp2tmp01_3.stl b/benchmarks/stl/sp2tmp01_3.stl new file mode 100644 index 0000000000..28e5ed2f02 --- /dev/null +++ b/benchmarks/stl/sp2tmp01_3.stl @@ -0,0 +1,1157 @@ +solid +facet normal -0.338759 0.907484 0.248426 +outer loop +vertex 1.20031 1.04779 0.300162 +vertex 0.813222 0.986985 0.00146013 +vertex 0.750801 0.832781 0.46098 +endloop +endfacet +facet normal 0.0825151 0.0868342 -0.9928 +outer loop +vertex 1.17187 -0.114527 -1.08062 +vertex 1.15947 0.34698 -1.02801 +vertex 1.67162 -0.0188089 -1.0246 +endloop +endfacet +facet normal 0.756177 0.644117 0.115369 +outer loop +vertex 2.004 0.818696 -0.142978 +vertex 2.05444 0.692441 0.36467 +vertex 2.25292 0.522684 0.0989963 +endloop +endfacet +facet normal 0.33006 -0.0478383 0.942747 +outer loop +vertex 1.61789 0.186819 1.02445 +vertex 1.56753 -0.298896 1.01577 +vertex 1.87318 0.0326275 0.925954 +endloop +endfacet +facet normal 0.951946 -0.306257 -0.00252369 +outer loop +vertex 2.38 -0.163667 0.092099 +vertex 2.29716 -0.423939 0.0597397 +vertex 2.38 -0.162127 -0.094784 +endloop +endfacet +facet normal 0.0263671 -0.755108 0.65507 +outer loop +vertex 1.18298 -0.970433 0.49296 +vertex 1.62598 -0.768682 0.702092 +vertex 1.16043 -0.624215 0.888443 +endloop +endfacet +facet normal 1 0 -0 +outer loop +vertex 2.38 0 -0.187801 +vertex 2.38 4.8e-05 8.3e-05 +vertex 2.38 -0.162127 -0.094784 +endloop +endfacet +facet normal -0.435162 -0.597044 0.673923 +outer loop +vertex -6.67823e-07 -0.229354 0.437003 +vertex 9.82205e-06 -0.409342 0.281944 +vertex 0.445578 -0.405248 0.573986 +endloop +endfacet +facet normal 0.786587 -0.608872 -0.102747 +outer loop +vertex 2.18608 -0.547885 -0.321427 +vertex 2.29716 -0.423939 0.0597397 +vertex 1.9731 -0.855512 -0.0270313 +endloop +endfacet +facet normal -0.435161 0.215467 0.87419 +outer loop +vertex 0.471925 0.27383 0.666304 +vertex -1.99456e-07 0.229355 0.437005 +vertex -2.05781e-06 0.00303042 0.500226 +endloop +endfacet +facet normal -0.435162 -0.841844 0.319268 +outer loop +vertex 1.72528e-05 -0.494802 0.0704928 +vertex 0.466283 -0.636931 0.330808 +vertex 9.82205e-06 -0.409342 0.281944 +endloop +endfacet +facet normal -0.169551 0.55741 -0.81274 +outer loop +vertex 0.819722 0.548169 -0.822676 +vertex 1.16129 0.824576 -0.708439 +vertex 1.15947 0.34698 -1.02801 +endloop +endfacet +facet normal -0.435162 -0.418415 -0.797222 +outer loop +vertex 7.70095e-06 -0.12171 -0.48618 +vertex 0.454614 -0.410595 -0.579419 +vertex 1.77066e-06 -0.329418 -0.371835 +endloop +endfacet +facet normal -0.435161 0.597045 0.673923 +outer loop +vertex -1.99456e-07 0.229355 0.437005 +vertex 0.44557 0.52015 0.471727 +vertex -9.70682e-08 0.4092 0.279581 +endloop +endfacet +facet normal -0.672491 0.420428 0.609095 +outer loop +vertex 0.737244 0.523591 0.786302 +vertex 0.44557 0.52015 0.471727 +vertex 0.471925 0.27383 0.666304 +endloop +endfacet +facet normal 0.932544 0.312091 0.181551 +outer loop +vertex 2.28751 0.326589 0.306035 +vertex 2.38 0.163666 0.092102 +vertex 2.25292 0.522684 0.0989963 +endloop +endfacet +facet normal -0.39166 -0.688712 0.610146 +outer loop +vertex 9.82205e-06 -0.409342 0.281944 +vertex 0.466283 -0.636931 0.330808 +vertex 0.445578 -0.405248 0.573986 +endloop +endfacet +facet normal 0.825077 0.495749 0.271074 +outer loop +vertex 2.25292 0.522684 0.0989963 +vertex 2.05444 0.692441 0.36467 +vertex 2.28751 0.326589 0.306035 +endloop +endfacet +facet normal 0.152442 -0.0451601 0.98728 +outer loop +vertex 1.61789 0.186819 1.02445 +vertex 1.17729 -0.116169 1.08218 +vertex 1.56753 -0.298896 1.01577 +endloop +endfacet +facet normal 0.00278926 -0.67927 -0.733883 +outer loop +vertex 1.05341 -0.605903 -0.877997 +vertex 1.53842 -0.565724 -0.904266 +vertex 1.16894 -0.891043 -0.621244 +endloop +endfacet +facet normal -0.214855 0.0932591 -0.972183 +outer loop +vertex 0.790801 0.123122 -0.967582 +vertex 1.15947 0.34698 -1.02801 +vertex 1.17187 -0.114527 -1.08062 +endloop +endfacet +facet normal -0.435162 -0.740975 -0.511459 +outer loop +vertex 0.467775 -0.641895 -0.319596 +vertex 4.36854e-06 -0.465372 -0.197645 +vertex 1.77066e-06 -0.329418 -0.371835 +endloop +endfacet +facet normal -0.652377 -0.735872 0.181377 +outer loop +vertex 0.435956 -0.693079 0.00801954 +vertex 0.774538 -0.943642 0.201888 +vertex 0.466283 -0.636931 0.330808 +endloop +endfacet +facet normal -0.39166 -0.688712 -0.610146 +outer loop +vertex 0.467775 -0.641895 -0.319596 +vertex 1.77066e-06 -0.329418 -0.371835 +vertex 0.454614 -0.410595 -0.579419 +endloop +endfacet +facet normal -0.337742 0.914508 -0.222723 +outer loop +vertex 1.15463 1.055 -0.247332 +vertex 0.808067 0.880218 -0.435849 +vertex 0.813222 0.986985 0.00146013 +endloop +endfacet +facet normal -0.391661 -0.893373 -0.220195 +outer loop +vertex 0.467775 -0.641895 -0.319596 +vertex 0.435956 -0.693079 0.00801954 +vertex 4.36854e-06 -0.465372 -0.197645 +endloop +endfacet +facet normal -0.204296 -0.928197 -0.310986 +outer loop +vertex 0.795674 -0.938491 -0.268115 +vertex 1.16894 -0.891043 -0.621244 +vertex 1.22571 -1.09058 -0.0778852 +endloop +endfacet +facet normal -0.435161 0.841844 0.31927 +outer loop +vertex -9.70682e-08 0.4092 0.279581 +vertex 0.4478 0.685966 0.156796 +vertex 1.40708e-06 0.498259 0.082869 +endloop +endfacet +facet normal 0.0367991 -0.980564 0.192718 +outer loop +vertex 1.60151 -1.03985 0.139722 +vertex 1.18298 -0.970433 0.49296 +vertex 1.22571 -1.09058 -0.0778852 +endloop +endfacet +facet normal -0.593203 -0.452017 -0.666176 +outer loop +vertex 0.454614 -0.410595 -0.579419 +vertex 0.74899 -0.33371 -0.891053 +vertex 0.769749 -0.710983 -0.651297 +endloop +endfacet +facet normal 0.402793 -0.481354 0.778496 +outer loop +vertex 1.56753 -0.298896 1.01577 +vertex 1.62598 -0.768682 0.702092 +vertex 1.96277 -0.456478 0.728412 +endloop +endfacet +facet normal -0.576298 -0.458128 0.676757 +outer loop +vertex 0.75549 -0.313976 0.899979 +vertex 0.445578 -0.405248 0.573986 +vertex 0.786232 -0.735745 0.634726 +endloop +endfacet +facet normal -0.435162 0.740975 -0.511459 +outer loop +vertex -5.08934e-07 0.463445 -0.1851 +vertex 0.448378 0.520318 -0.474451 +vertex 2.8877e-06 0.323241 -0.36924 +endloop +endfacet +facet normal 0.782747 0.218388 0.582764 +outer loop +vertex 2.28751 0.326589 0.306035 +vertex 2.00463 0.314407 0.7639 +vertex 2.23894 0.0118247 0.547858 +endloop +endfacet +facet normal 0.93117 0.340067 -0.13144 +outer loop +vertex 2.25292 0.522684 0.0989963 +vertex 2.38 0.162115 -0.094804 +vertex 2.20265 0.522664 -0.304037 +endloop +endfacet +facet normal 0.717212 0.134457 0.683761 +outer loop +vertex 2.00463 0.314407 0.7639 +vertex 1.87318 0.0326275 0.925954 +vertex 2.23894 0.0118247 0.547858 +endloop +endfacet +facet normal 0.930777 -0.0825468 0.356146 +outer loop +vertex 2.28772 -0.306074 0.351434 +vertex 2.38 -0.003101 0.187775 +vertex 2.23894 0.0118247 0.547858 +endloop +endfacet +facet normal -0.582226 -0.0827959 -0.8088 +outer loop +vertex 0.74899 -0.33371 -0.891053 +vertex 0.46014 -0.0822963 -0.70518 +vertex 0.790801 0.123122 -0.967582 +endloop +endfacet +facet normal 0.953175 0.15049 0.262318 +outer loop +vertex 2.28751 0.326589 0.306035 +vertex 2.38 -0.003101 0.187775 +vertex 2.38 0.163666 0.092102 +endloop +endfacet +facet normal 0.239471 -0.95983 -0.146217 +outer loop +vertex 1.68806 -0.927255 -0.42339 +vertex 1.60151 -1.03985 0.139722 +vertex 1.22571 -1.09058 -0.0778852 +endloop +endfacet +facet normal 0.930171 0.0733818 0.359719 +outer loop +vertex 2.28751 0.326589 0.306035 +vertex 2.23894 0.0118247 0.547858 +vertex 2.38 -0.003101 0.187775 +endloop +endfacet +facet normal -0.391659 0.110908 0.913402 +outer loop +vertex 0.471925 0.27383 0.666304 +vertex -2.05781e-06 0.00303042 0.500226 +vertex 0.455481 -0.0942932 0.704121 +endloop +endfacet +facet normal 0.536857 -0.173656 -0.825608 +outer loop +vertex 1.91724 -0.370103 -0.812943 +vertex 1.67162 -0.0188089 -1.0246 +vertex 2.04587 -0.126986 -0.779752 +endloop +endfacet +facet normal -0.39166 -0.326276 -0.860317 +outer loop +vertex 7.70095e-06 -0.12171 -0.48618 +vertex 0.46014 -0.0822963 -0.70518 +vertex 0.454614 -0.410595 -0.579419 +endloop +endfacet +facet normal 0.482374 0.22245 0.847249 +outer loop +vertex 1.61789 0.186819 1.02445 +vertex 1.87318 0.0326275 0.925954 +vertex 2.00463 0.314407 0.7639 +endloop +endfacet +facet normal -0.262787 -0.702379 -0.661519 +outer loop +vertex 1.05341 -0.605903 -0.877997 +vertex 1.16894 -0.891043 -0.621244 +vertex 0.769749 -0.710983 -0.651297 +endloop +endfacet +facet normal -0.204984 -0.741098 0.639339 +outer loop +vertex 1.18298 -0.970433 0.49296 +vertex 1.16043 -0.624215 0.888443 +vertex 0.786232 -0.735745 0.634726 +endloop +endfacet +facet normal -0.656961 -0.267345 0.704932 +outer loop +vertex 0.455481 -0.0942932 0.704121 +vertex 0.445578 -0.405248 0.573986 +vertex 0.75549 -0.313976 0.899979 +endloop +endfacet +facet normal -0.356232 -0.114514 -0.927354 +outer loop +vertex 0.74899 -0.33371 -0.891053 +vertex 0.790801 0.123122 -0.967582 +vertex 1.17187 -0.114527 -1.08062 +endloop +endfacet +facet normal -0.196341 0.979367 0.0478673 +outer loop +vertex 1.20031 1.04779 0.300162 +vertex 1.15463 1.055 -0.247332 +vertex 0.813222 0.986985 0.00146013 +endloop +endfacet +facet normal -0.39166 0.110905 -0.913402 +outer loop +vertex 0.457907 0.254527 -0.665593 +vertex 0.46014 -0.0822963 -0.70518 +vertex -2.37072e-06 0.128665 -0.485787 +endloop +endfacet +facet normal 0.734427 0.467157 -0.492323 +outer loop +vertex 1.92855 0.425012 -0.78165 +vertex 1.91493 0.688755 -0.577773 +vertex 2.20265 0.522664 -0.304037 +endloop +endfacet +facet normal -0.638323 0.437279 -0.633507 +outer loop +vertex 0.457907 0.254527 -0.665593 +vertex 0.448378 0.520318 -0.474451 +vertex 0.819722 0.548169 -0.822676 +endloop +endfacet +facet normal -0.435162 0.418415 -0.797222 +outer loop +vertex 2.8877e-06 0.323241 -0.36924 +vertex 0.457907 0.254527 -0.665593 +vertex -2.37072e-06 0.128665 -0.485787 +endloop +endfacet +facet normal -0.328221 -0.943813 -0.0385875 +outer loop +vertex 0.774538 -0.943642 0.201888 +vertex 0.795674 -0.938491 -0.268115 +vertex 1.22571 -1.09058 -0.0778852 +endloop +endfacet +facet normal -0.355556 -0.83441 0.421117 +outer loop +vertex 0.786232 -0.735745 0.634726 +vertex 0.774538 -0.943642 0.201888 +vertex 1.18298 -0.970433 0.49296 +endloop +endfacet +facet normal -0.575921 -0.730174 0.367642 +outer loop +vertex 0.786232 -0.735745 0.634726 +vertex 0.466283 -0.636931 0.330808 +vertex 0.774538 -0.943642 0.201888 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex 2.38 0 -0.187801 +vertex 2.38 0.162115 -0.094804 +vertex 2.38 4.8e-05 8.3e-05 +endloop +endfacet +facet normal -0.391659 0.522683 0.757236 +outer loop +vertex 0.471925 0.27383 0.666304 +vertex 0.44557 0.52015 0.471727 +vertex -1.99456e-07 0.229355 0.437005 +endloop +endfacet +facet normal 0.954966 0.147643 -0.257375 +outer loop +vertex 2.38 0 -0.187801 +vertex 2.27111 0.178539 -0.441276 +vertex 2.38 0.162115 -0.094804 +endloop +endfacet +facet normal 0.399192 0.816813 0.416488 +outer loop +vertex 1.60516 1.03273 0.156368 +vertex 1.61515 0.763926 0.71348 +vertex 2.05444 0.692441 0.36467 +endloop +endfacet +facet normal -0.197084 0.883409 -0.425143 +outer loop +vertex 1.15463 1.055 -0.247332 +vertex 1.16129 0.824576 -0.708439 +vertex 0.808067 0.880218 -0.435849 +endloop +endfacet +facet normal 0.188275 0.767055 -0.613335 +outer loop +vertex 1.63256 0.634161 -0.823568 +vertex 1.16129 0.824576 -0.708439 +vertex 1.5809 0.956466 -0.448255 +endloop +endfacet +facet normal -0.577464 -0.81577 -0.0324826 +outer loop +vertex 0.795674 -0.938491 -0.268115 +vertex 0.774538 -0.943642 0.201888 +vertex 0.435956 -0.693079 0.00801954 +endloop +endfacet +facet normal -0.355616 0.342174 0.869744 +outer loop +vertex 1.15755 0.436409 0.992817 +vertex 0.737244 0.523591 0.786302 +vertex 0.764374 0.127319 0.951309 +endloop +endfacet +facet normal -0.653567 -0.566524 0.501897 +outer loop +vertex 0.786232 -0.735745 0.634726 +vertex 0.445578 -0.405248 0.573986 +vertex 0.466283 -0.636931 0.330808 +endloop +endfacet +facet normal -0.363297 -0.091794 0.92714 +outer loop +vertex 0.75549 -0.313976 0.899979 +vertex 1.17729 -0.116169 1.08218 +vertex 0.764374 0.127319 0.951309 +endloop +endfacet +facet normal 0.380193 -0.295017 -0.876595 +outer loop +vertex 1.67162 -0.0188089 -1.0246 +vertex 1.91724 -0.370103 -0.812943 +vertex 1.53842 -0.565724 -0.904266 +endloop +endfacet +facet normal 0.548091 -0.814253 0.19128 +outer loop +vertex 1.60151 -1.03985 0.139722 +vertex 1.9731 -0.855512 -0.0270313 +vertex 2.04106 -0.716177 0.352916 +endloop +endfacet +facet normal -0.578435 0.303424 -0.757197 +outer loop +vertex 0.457907 0.254527 -0.665593 +vertex 0.819722 0.548169 -0.822676 +vertex 0.790801 0.123122 -0.967582 +endloop +endfacet +facet normal -0.331224 0.329095 -0.8843 +outer loop +vertex 0.819722 0.548169 -0.822676 +vertex 1.15947 0.34698 -1.02801 +vertex 0.790801 0.123122 -0.967582 +endloop +endfacet +facet normal -0.593142 0.599526 0.537356 +outer loop +vertex 0.737244 0.523591 0.786302 +vertex 0.750801 0.832781 0.46098 +vertex 0.44557 0.52015 0.471727 +endloop +endfacet +facet normal 0.934589 -0.318129 0.159176 +outer loop +vertex 2.28772 -0.306074 0.351434 +vertex 2.29716 -0.423939 0.0597397 +vertex 2.38 -0.163667 0.092099 +endloop +endfacet +facet normal 0.820315 -0.501619 0.274702 +outer loop +vertex 2.28772 -0.306074 0.351434 +vertex 2.04106 -0.716177 0.352916 +vertex 2.29716 -0.423939 0.0597397 +endloop +endfacet +facet normal 0.954921 -0.151957 0.255019 +outer loop +vertex 2.28772 -0.306074 0.351434 +vertex 2.38 -0.163667 0.092099 +vertex 2.38 -0.003101 0.187775 +endloop +endfacet +facet normal 0.488997 -0.25976 0.83271 +outer loop +vertex 1.96277 -0.456478 0.728412 +vertex 1.87318 0.0326275 0.925954 +vertex 1.56753 -0.298896 1.01577 +endloop +endfacet +facet normal 0.413909 -0.645721 -0.641657 +outer loop +vertex 1.53842 -0.565724 -0.904266 +vertex 1.91724 -0.370103 -0.812943 +vertex 1.68806 -0.927255 -0.42339 +endloop +endfacet +facet normal 0.515202 0.525554 -0.677023 +outer loop +vertex 1.63256 0.634161 -0.823568 +vertex 1.91493 0.688755 -0.577773 +vertex 1.92855 0.425012 -0.78165 +endloop +endfacet +facet normal 0.74147 0.45877 0.489645 +outer loop +vertex 2.28751 0.326589 0.306035 +vertex 2.05444 0.692441 0.36467 +vertex 2.00463 0.314407 0.7639 +endloop +endfacet +facet normal 0.36764 0.451423 0.813055 +outer loop +vertex 1.61789 0.186819 1.02445 +vertex 2.00463 0.314407 0.7639 +vertex 1.61515 0.763926 0.71348 +endloop +endfacet +facet normal -0.435161 -0.215469 0.87419 +outer loop +vertex 0.455481 -0.0942932 0.704121 +vertex -2.05781e-06 0.00303042 0.500226 +vertex -6.67823e-07 -0.229354 0.437003 +endloop +endfacet +facet normal -0.39166 -0.326275 0.860318 +outer loop +vertex 0.455481 -0.0942932 0.704121 +vertex -6.67823e-07 -0.229354 0.437003 +vertex 0.445578 -0.405248 0.573986 +endloop +endfacet +facet normal -0.642522 0.766267 0 +outer loop +vertex 0.813222 0.986985 0.00146013 +vertex 0.430701 0.671379 -0.155646 +vertex 0.4478 0.685966 0.156796 +endloop +endfacet +facet normal -0.269824 0.525384 0.806949 +outer loop +vertex 1.15755 0.436409 0.992817 +vertex 1.10706 0.757869 0.766111 +vertex 0.737244 0.523591 0.786302 +endloop +endfacet +facet normal -0.395466 0.675188 0.622677 +outer loop +vertex 0.737244 0.523591 0.786302 +vertex 1.10706 0.757869 0.766111 +vertex 0.750801 0.832781 0.46098 +endloop +endfacet +facet normal -0.587921 -0.082625 0.804687 +outer loop +vertex 0.75549 -0.313976 0.899979 +vertex 0.764374 0.127319 0.951309 +vertex 0.455481 -0.0942932 0.704121 +endloop +endfacet +facet normal -0.662734 0.663078 0.348011 +outer loop +vertex 0.750801 0.832781 0.46098 +vertex 0.4478 0.685966 0.156796 +vertex 0.44557 0.52015 0.471727 +endloop +endfacet +facet normal -0.39166 -0.893373 0.220197 +outer loop +vertex 1.72528e-05 -0.494802 0.0704928 +vertex 0.435956 -0.693079 0.00801954 +vertex 0.466283 -0.636931 0.330808 +endloop +endfacet +facet normal -0.574052 0.796589 -0.189502 +outer loop +vertex 0.808067 0.880218 -0.435849 +vertex 0.430701 0.671379 -0.155646 +vertex 0.813222 0.986985 0.00146013 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex 2.38 4.8e-05 8.3e-05 +vertex 2.38 -0.003101 0.187775 +vertex 2.38 -0.163667 0.092099 +endloop +endfacet +facet normal 0.751142 -0.238619 -0.615505 +outer loop +vertex 2.04587 -0.126986 -0.779752 +vertex 2.21802 -0.29487 -0.496771 +vertex 1.91724 -0.370103 -0.812943 +endloop +endfacet +facet normal -0.64577 0.676074 -0.354832 +outer loop +vertex 0.448378 0.520318 -0.474451 +vertex 0.430701 0.671379 -0.155646 +vertex 0.808067 0.880218 -0.435849 +endloop +endfacet +facet normal -0.341004 0.705363 -0.621434 +outer loop +vertex 0.808067 0.880218 -0.435849 +vertex 1.16129 0.824576 -0.708439 +vertex 0.819722 0.548169 -0.822676 +endloop +endfacet +facet normal -0.569965 0.610237 -0.550228 +outer loop +vertex 0.808067 0.880218 -0.435849 +vertex 0.819722 0.548169 -0.822676 +vertex 0.448378 0.520318 -0.474451 +endloop +endfacet +facet normal -0.337263 -0.813392 -0.47397 +outer loop +vertex 1.16894 -0.891043 -0.621244 +vertex 0.795674 -0.938491 -0.268115 +vertex 0.769749 -0.710983 -0.651297 +endloop +endfacet +facet normal -0.0248603 -0.332815 0.942664 +outer loop +vertex 1.56753 -0.298896 1.01577 +vertex 1.17729 -0.116169 1.08218 +vertex 1.16043 -0.624215 0.888443 +endloop +endfacet +facet normal 0.932492 0.262289 -0.24832 +outer loop +vertex 2.27111 0.178539 -0.441276 +vertex 2.20265 0.522664 -0.304037 +vertex 2.38 0.162115 -0.094804 +endloop +endfacet +facet normal 0.793702 -0.243868 0.557285 +outer loop +vertex 2.28772 -0.306074 0.351434 +vertex 2.23894 0.0118247 0.547858 +vertex 1.96277 -0.456478 0.728412 +endloop +endfacet +facet normal 0.198558 -0.883924 0.423382 +outer loop +vertex 1.18298 -0.970433 0.49296 +vertex 1.60151 -1.03985 0.139722 +vertex 1.62598 -0.768682 0.702092 +endloop +endfacet +facet normal -0.362266 -0.51821 0.77474 +outer loop +vertex 0.75549 -0.313976 0.899979 +vertex 0.786232 -0.735745 0.634726 +vertex 1.16043 -0.624215 0.888443 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex 2.38 -0.163667 0.092099 +vertex 2.38 -0.162127 -0.094784 +vertex 2.38 4.8e-05 8.3e-05 +endloop +endfacet +facet normal 0.956196 0.292718 -0.00242905 +outer loop +vertex 2.38 0.163666 0.092102 +vertex 2.38 0.162115 -0.094804 +vertex 2.25292 0.522684 0.0989963 +endloop +endfacet +facet normal -0.408594 -0.511272 -0.756077 +outer loop +vertex 0.769749 -0.710983 -0.651297 +vertex 0.74899 -0.33371 -0.891053 +vertex 1.05341 -0.605903 -0.877997 +endloop +endfacet +facet normal -0.219538 -0.331167 0.917677 +outer loop +vertex 1.17729 -0.116169 1.08218 +vertex 0.75549 -0.313976 0.899979 +vertex 1.16043 -0.624215 0.888443 +endloop +endfacet +facet normal -0.594553 0.27704 0.754821 +outer loop +vertex 0.737244 0.523591 0.786302 +vertex 0.471925 0.27383 0.666304 +vertex 0.764374 0.127319 0.951309 +endloop +endfacet +facet normal 0.0462558 0.583004 0.811152 +outer loop +vertex 1.15755 0.436409 0.992817 +vertex 1.61515 0.763926 0.71348 +vertex 1.10706 0.757869 0.766111 +endloop +endfacet +facet normal 0.529597 0.606613 0.592915 +outer loop +vertex 2.05444 0.692441 0.36467 +vertex 1.61515 0.763926 0.71348 +vertex 2.00463 0.314407 0.7639 +endloop +endfacet +facet normal 0.197282 0.882783 0.42635 +outer loop +vertex 1.20031 1.04779 0.300162 +vertex 1.61515 0.763926 0.71348 +vertex 1.60516 1.03273 0.156368 +endloop +endfacet +facet normal 0.00571026 0.14098 0.989996 +outer loop +vertex 1.61789 0.186819 1.02445 +vertex 1.15755 0.436409 0.992817 +vertex 1.17729 -0.116169 1.08218 +endloop +endfacet +facet normal 0.0590828 0.847787 0.527036 +outer loop +vertex 1.10706 0.757869 0.766111 +vertex 1.61515 0.763926 0.71348 +vertex 1.20031 1.04779 0.300162 +endloop +endfacet +facet normal 0.185123 -0.247353 -0.951076 +outer loop +vertex 1.17187 -0.114527 -1.08062 +vertex 1.67162 -0.0188089 -1.0246 +vertex 1.53842 -0.565724 -0.904266 +endloop +endfacet +facet normal 0.511351 0.806637 -0.296406 +outer loop +vertex 2.004 0.818696 -0.142978 +vertex 1.91493 0.688755 -0.577773 +vertex 1.5809 0.956466 -0.448255 +endloop +endfacet +facet normal 0.015841 0.567202 -0.823426 +outer loop +vertex 1.63256 0.634161 -0.823568 +vertex 1.15947 0.34698 -1.02801 +vertex 1.16129 0.824576 -0.708439 +endloop +endfacet +facet normal 0.348878 0.736547 -0.579467 +outer loop +vertex 1.63256 0.634161 -0.823568 +vertex 1.5809 0.956466 -0.448255 +vertex 1.91493 0.688755 -0.577773 +endloop +endfacet +facet normal 0.711715 0.642305 -0.284439 +outer loop +vertex 2.004 0.818696 -0.142978 +vertex 2.20265 0.522664 -0.304037 +vertex 1.91493 0.688755 -0.577773 +endloop +endfacet +facet normal 0.420972 0.292277 -0.858695 +outer loop +vertex 1.63256 0.634161 -0.823568 +vertex 1.92855 0.425012 -0.78165 +vertex 1.67162 -0.0188089 -1.0246 +endloop +endfacet +facet normal 0.22616 0.290677 -0.929709 +outer loop +vertex 1.63256 0.634161 -0.823568 +vertex 1.67162 -0.0188089 -1.0246 +vertex 1.15947 0.34698 -1.02801 +endloop +endfacet +facet normal -0.263335 -0.317641 -0.910911 +outer loop +vertex 1.05341 -0.605903 -0.877997 +vertex 0.74899 -0.33371 -0.891053 +vertex 1.17187 -0.114527 -1.08062 +endloop +endfacet +facet normal 0.915673 -0.324865 -0.236658 +outer loop +vertex 2.18608 -0.547885 -0.321427 +vertex 2.21802 -0.29487 -0.496771 +vertex 2.38 -0.162127 -0.094784 +endloop +endfacet +facet normal 0.394609 -0.910332 -0.12482 +outer loop +vertex 1.68806 -0.927255 -0.42339 +vertex 1.9731 -0.855512 -0.0270313 +vertex 1.60151 -1.03985 0.139722 +endloop +endfacet +facet normal 0.915215 -0.36541 -0.169872 +outer loop +vertex 2.18608 -0.547885 -0.321427 +vertex 2.38 -0.162127 -0.094784 +vertex 2.29716 -0.423939 0.0597397 +endloop +endfacet +facet normal 0.0130406 0.901115 -0.433383 +outer loop +vertex 1.15463 1.055 -0.247332 +vertex 1.5809 0.956466 -0.448255 +vertex 1.16129 0.824576 -0.708439 +endloop +endfacet +facet normal -0.659557 0.0906023 0.746174 +outer loop +vertex 0.471925 0.27383 0.666304 +vertex 0.455481 -0.0942932 0.704121 +vertex 0.764374 0.127319 0.951309 +endloop +endfacet +facet normal -0.576938 0.794467 0.189644 +outer loop +vertex 0.750801 0.832781 0.46098 +vertex 0.813222 0.986985 0.00146013 +vertex 0.4478 0.685966 0.156796 +endloop +endfacet +facet normal 0.161017 0.484964 0.859583 +outer loop +vertex 1.61515 0.763926 0.71348 +vertex 1.15755 0.436409 0.992817 +vertex 1.61789 0.186819 1.02445 +endloop +endfacet +facet normal -0.435162 0 -0.900352 +outer loop +vertex 7.70095e-06 -0.12171 -0.48618 +vertex -2.37072e-06 0.128665 -0.485787 +vertex 0.46014 -0.0822963 -0.70518 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex 2.38 0.163666 0.092102 +vertex 2.38 4.8e-05 8.3e-05 +vertex 2.38 0.162115 -0.094804 +endloop +endfacet +facet normal 1 0 0 +outer loop +vertex 2.38 0.163666 0.092102 +vertex 2.38 -0.003101 0.187775 +vertex 2.38 4.8e-05 8.3e-05 +endloop +endfacet +facet normal 0.746802 -0.651908 0.13154 +outer loop +vertex 1.9731 -0.855512 -0.0270313 +vertex 2.29716 -0.423939 0.0597397 +vertex 2.04106 -0.716177 0.352916 +endloop +endfacet +facet normal 0.767791 -0.38026 -0.515655 +outer loop +vertex 2.18608 -0.547885 -0.321427 +vertex 1.91724 -0.370103 -0.812943 +vertex 2.21802 -0.29487 -0.496771 +endloop +endfacet +facet normal -0.39166 0.814716 -0.427597 +outer loop +vertex -5.08934e-07 0.463445 -0.1851 +vertex 0.430701 0.671379 -0.155646 +vertex 0.448378 0.520318 -0.474451 +endloop +endfacet +facet normal 0.553341 0.145251 -0.820193 +outer loop +vertex 2.04587 -0.126986 -0.779752 +vertex 1.67162 -0.0188089 -1.0246 +vertex 1.92855 0.425012 -0.78165 +endloop +endfacet +facet normal -0.234725 0.146833 0.960908 +outer loop +vertex 0.764374 0.127319 0.951309 +vertex 1.17729 -0.116169 1.08218 +vertex 1.15755 0.436409 0.992817 +endloop +endfacet +facet normal 0.801009 0.587966 -0.112607 +outer loop +vertex 2.004 0.818696 -0.142978 +vertex 2.25292 0.522684 0.0989963 +vertex 2.20265 0.522664 -0.304037 +endloop +endfacet +facet normal -0.651863 -0.736301 -0.181481 +outer loop +vertex 0.467775 -0.641895 -0.319596 +vertex 0.795674 -0.938491 -0.268115 +vertex 0.435956 -0.693079 0.00801954 +endloop +endfacet +facet normal -0.391659 0.522683 -0.757236 +outer loop +vertex 0.457907 0.254527 -0.665593 +vertex 2.8877e-06 0.323241 -0.36924 +vertex 0.448378 0.520318 -0.474451 +endloop +endfacet +facet normal -0.652096 0.0913815 -0.752609 +outer loop +vertex 0.457907 0.254527 -0.665593 +vertex 0.790801 0.123122 -0.967582 +vertex 0.46014 -0.0822963 -0.70518 +endloop +endfacet +facet normal 0.844526 -0.00795442 -0.535456 +outer loop +vertex 2.04587 -0.126986 -0.779752 +vertex 2.27111 0.178539 -0.441276 +vertex 2.21802 -0.29487 -0.496771 +endloop +endfacet +facet normal -0.591508 -0.705036 -0.391207 +outer loop +vertex 0.467775 -0.641895 -0.319596 +vertex 0.769749 -0.710983 -0.651297 +vertex 0.795674 -0.938491 -0.268115 +endloop +endfacet +facet normal -0.664307 -0.559481 -0.495658 +outer loop +vertex 0.467775 -0.641895 -0.319596 +vertex 0.454614 -0.410595 -0.579419 +vertex 0.769749 -0.710983 -0.651297 +endloop +endfacet +facet normal -0.665634 -0.264635 -0.697782 +outer loop +vertex 0.46014 -0.0822963 -0.70518 +vertex 0.74899 -0.33371 -0.891053 +vertex 0.454614 -0.410595 -0.579419 +endloop +endfacet +facet normal 0.778629 0.167915 -0.6046 +outer loop +vertex 2.04587 -0.126986 -0.779752 +vertex 1.92855 0.425012 -0.78165 +vertex 2.27111 0.178539 -0.441276 +endloop +endfacet +facet normal 0.797026 0.352385 -0.490484 +outer loop +vertex 1.92855 0.425012 -0.78165 +vertex 2.20265 0.522664 -0.304037 +vertex 2.27111 0.178539 -0.441276 +endloop +endfacet +facet normal 0.540515 -0.612368 0.576931 +outer loop +vertex 1.62598 -0.768682 0.702092 +vertex 2.04106 -0.716177 0.352916 +vertex 1.96277 -0.456478 0.728412 +endloop +endfacet +facet normal 0.186526 -0.755487 -0.62805 +outer loop +vertex 1.53842 -0.565724 -0.904266 +vertex 1.68806 -0.927255 -0.42339 +vertex 1.16894 -0.891043 -0.621244 +endloop +endfacet +facet normal 0.608259 -0.725975 -0.320908 +outer loop +vertex 1.9731 -0.855512 -0.0270313 +vertex 1.68806 -0.927255 -0.42339 +vertex 2.18608 -0.547885 -0.321427 +endloop +endfacet +facet normal -0.0044706 -0.383575 -0.923499 +outer loop +vertex 1.17187 -0.114527 -1.08062 +vertex 1.53842 -0.565724 -0.904266 +vertex 1.05341 -0.605903 -0.877997 +endloop +endfacet +facet normal 0.581635 -0.640363 -0.501633 +outer loop +vertex 1.68806 -0.927255 -0.42339 +vertex 1.91724 -0.370103 -0.812943 +vertex 2.18608 -0.547885 -0.321427 +endloop +endfacet +facet normal -0.391659 0.814717 0.427597 +outer loop +vertex -9.70682e-08 0.4092 0.279581 +vertex 0.44557 0.52015 0.471727 +vertex 0.4478 0.685966 0.156796 +endloop +endfacet +facet normal -0.39166 0.92011 0 +outer loop +vertex 0.430701 0.671379 -0.155646 +vertex 1.40708e-06 0.498259 0.082869 +vertex 0.4478 0.685966 0.156796 +endloop +endfacet +facet normal -0.194391 -0.96579 0.171644 +outer loop +vertex 0.774538 -0.943642 0.201888 +vertex 1.22571 -1.09058 -0.0778852 +vertex 1.18298 -0.970433 0.49296 +endloop +endfacet +facet normal 0.761806 -0.457021 0.459113 +outer loop +vertex 2.28772 -0.306074 0.351434 +vertex 1.96277 -0.456478 0.728412 +vertex 2.04106 -0.716177 0.352916 +endloop +endfacet +facet normal 0.424258 -0.814878 0.394942 +outer loop +vertex 1.60151 -1.03985 0.139722 +vertex 2.04106 -0.716177 0.352916 +vertex 1.62598 -0.768682 0.702092 +endloop +endfacet +facet normal 0.0916985 -0.937993 -0.334306 +outer loop +vertex 1.16894 -0.891043 -0.621244 +vertex 1.68806 -0.927255 -0.42339 +vertex 1.22571 -1.09058 -0.0778852 +endloop +endfacet +facet normal -0.238677 0.852946 0.464238 +outer loop +vertex 1.20031 1.04779 0.300162 +vertex 0.750801 0.832781 0.46098 +vertex 1.10706 0.757869 0.766111 +endloop +endfacet +facet normal 0.952502 -0.151547 -0.264145 +outer loop +vertex 2.38 0 -0.187801 +vertex 2.38 -0.162127 -0.094784 +vertex 2.21802 -0.29487 -0.496771 +endloop +endfacet +facet normal 0.181011 0.977162 -0.111309 +outer loop +vertex 1.15463 1.055 -0.247332 +vertex 1.60516 1.03273 0.156368 +vertex 1.5809 0.956466 -0.448255 +endloop +endfacet +facet normal 0.0645279 0.99714 0.0393437 +outer loop +vertex 1.20031 1.04779 0.300162 +vertex 1.60516 1.03273 0.156368 +vertex 1.15463 1.055 -0.247332 +endloop +endfacet +facet normal 0.935715 -0.0156367 -0.352411 +outer loop +vertex 2.38 0 -0.187801 +vertex 2.21802 -0.29487 -0.496771 +vertex 2.27111 0.178539 -0.441276 +endloop +endfacet +facet normal 0.712059 -0.158206 0.684063 +outer loop +vertex 1.87318 0.0326275 0.925954 +vertex 1.96277 -0.456478 0.728412 +vertex 2.23894 0.0118247 0.547858 +endloop +endfacet +facet normal 0.413436 0.901782 -0.125938 +outer loop +vertex 2.004 0.818696 -0.142978 +vertex 1.5809 0.956466 -0.448255 +vertex 1.60516 1.03273 0.156368 +endloop +endfacet +facet normal 0.55958 0.813448 0.158657 +outer loop +vertex 2.004 0.818696 -0.142978 +vertex 1.60516 1.03273 0.156368 +vertex 2.05444 0.692441 0.36467 +endloop +endfacet +facet normal 0.167936 -0.55084 0.817541 +outer loop +vertex 1.16043 -0.624215 0.888443 +vertex 1.62598 -0.768682 0.702092 +vertex 1.56753 -0.298896 1.01577 +endloop +endfacet +facet normal -0.435162 -0.893787 -0.108526 +outer loop +vertex 4.36854e-06 -0.465372 -0.197645 +vertex 0.435956 -0.693079 0.00801954 +vertex 1.72528e-05 -0.494802 0.0704928 +endloop +endfacet +facet normal -0.435162 0.893788 -0.108523 +outer loop +vertex 1.40708e-06 0.498259 0.082869 +vertex 0.430701 0.671379 -0.155646 +vertex -5.08934e-07 0.463445 -0.1851 +endloop +endfacet +endsolid diff --git a/utils/misc/driver.cpp b/utils/misc/driver.cpp index 420daeb733..084c4555c9 100644 --- a/utils/misc/driver.cpp +++ b/utils/misc/driver.cpp @@ -13,7 +13,7 @@ int main(int argc, char **argv) { GmshInitialize(argc, argv); - GmshSetOption("Mesh", "Algorithm", 5); + //GmshSetOption("Mesh", "Algorithm", 5); GModel *m = new GModel(); m->readGEO("../../tutorial/t5.geo"); m->mesh(3); -- GitLab