diff --git a/Common/Makefile b/Common/Makefile
index 5c312357b9475c6cd733cb4ce217a082552cd6f1..3a3e3b8d30edafd8c8c002b7b7056dda06c53b69 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -59,21 +59,22 @@ depend:
# DO NOT DELETE THIS LINE
Context.o: Context.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
- Context.h ../Geo/CGNSOptions.h Trackball.h
+ Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h Trackball.h
Octree.o: Octree.cpp Octree.h OctreeInternals.h
OctreeInternals.o: OctreeInternals.cpp Message.h OctreeInternals.h
Options.o: Options.cpp GmshUI.h GmshDefines.h Message.h \
../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Mesh/Generator.h Context.h ../Geo/CGNSOptions.h Options.h \
- ../Post/ColorTable.h DefaultOptions.h ../Mesh/BackgroundMesh.h \
- ../Post/PView.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Post/PViewData.h ../Post/adaptiveData.h ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \
- ../Common/Options.h ../Common/Message.h ../Post/PViewDataList.h \
- ../Post/PViewData.h ../Fltk/Solvers.h ../Fltk/GUI.h \
- ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h ../Common/GmshUI.h \
- ../Fltk/Popup_Button.h ../Fltk/SpherePosition_Widget.h ../Mesh/Field.h \
- ../Geo/Geo.h ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
+ ../Mesh/Generator.h Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h Options.h ../Post/ColorTable.h \
+ DefaultOptions.h ../Mesh/BackgroundMesh.h ../Post/PView.h \
+ ../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewData.h \
+ ../Post/adaptiveData.h ../Common/ListUtils.h ../Common/GmshMatrix.h \
+ ../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Options.h \
+ ../Common/Message.h ../Post/PViewDataList.h ../Post/PViewData.h \
+ ../Fltk/Solvers.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \
+ ../Fltk/Colorbar_Window.h ../Common/GmshUI.h ../Fltk/Popup_Button.h \
+ ../Fltk/SpherePosition_Widget.h ../Mesh/Field.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 \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/TreeUtils.h ../Common/avl.h \
@@ -81,14 +82,14 @@ Options.o: Options.cpp GmshUI.h GmshDefines.h Message.h \
../Common/SmoothData.h
CommandLine.o: CommandLine.cpp GmshUI.h GmshDefines.h GmshVersion.h \
Message.h OpenFile.h CommandLine.h Context.h ../Geo/CGNSOptions.h \
- Options.h ../Post/ColorTable.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/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 \
+ ../Mesh/PartitionOptions.h Options.h ../Post/ColorTable.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/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 CreateFile.h OS.h ../Post/PView.h
Gmsh.o: Gmsh.cpp GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -106,9 +107,10 @@ Gmsh.o: Gmsh.cpp GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/SBoundingBox3d.h ../Common/ListUtils.h ../Common/TreeUtils.h \
../Common/avl.h ../Common/ListUtils.h ../Geo/SPoint2.h \
../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Post/PView.h Context.h \
- ../Geo/CGNSOptions.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \
- ../Common/Options.h ../Common/Message.h ../Post/PViewDataList.h \
- ../Post/PViewData.h ../Common/GmshMatrix.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Options.h \
+ ../Common/Message.h ../Post/PViewDataList.h ../Post/PViewData.h \
+ ../Common/GmshMatrix.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 \
@@ -124,12 +126,13 @@ OpenFile.o: OpenFile.cpp Message.h ../Geo/Geo.h ../Common/GmshDefines.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 Context.h \
- ../Geo/CGNSOptions.h OpenFile.h CommandLine.h ../Graphics/ReadImg.h \
- OS.h StringUtils.h ../Parser/Parser.h ../Post/PView.h \
- ../Post/PViewData.h GmshUI.h ../Graphics/Draw.h \
- ../Graphics/SelectBuffer.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \
- ../Fltk/Colorbar_Window.h ../Common/GmshUI.h ../Post/ColorTable.h \
- ../Fltk/Popup_Button.h ../Fltk/SpherePosition_Widget.h ../Mesh/Field.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h OpenFile.h \
+ CommandLine.h ../Graphics/ReadImg.h OS.h StringUtils.h \
+ ../Parser/Parser.h ../Post/PView.h ../Post/PViewData.h GmshUI.h \
+ ../Graphics/Draw.h ../Graphics/SelectBuffer.h ../Fltk/GUI.h \
+ ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h ../Common/GmshUI.h \
+ ../Post/ColorTable.h ../Fltk/Popup_Button.h \
+ ../Fltk/SpherePosition_Widget.h ../Mesh/Field.h
CreateFile.o: CreateFile.cpp Message.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 \
@@ -139,18 +142,20 @@ CreateFile.o: CreateFile.cpp Message.h ../Geo/GModel.h ../Geo/GVertex.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 GmshDefines.h StringUtils.h Context.h \
- ../Geo/CGNSOptions.h Options.h ../Post/ColorTable.h GmshUI.h \
- ../Graphics/gl2ps.h ../Graphics/gl2gif.h ../Graphics/PixelBuffer.h \
- ../Common/GmshUI.h ../Common/Message.h ../Common/MallocUtils.h \
- ../Graphics/Draw.h ../Graphics/gl2jpeg.h ../Graphics/PixelBuffer.h \
- ../Graphics/gl2png.h ../Graphics/PixelBuffer.h ../Graphics/gl2ppm.h \
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h Options.h \
+ ../Post/ColorTable.h GmshUI.h ../Graphics/gl2ps.h ../Graphics/gl2gif.h \
+ ../Graphics/PixelBuffer.h ../Common/GmshUI.h ../Common/Message.h \
+ ../Common/MallocUtils.h ../Graphics/Draw.h ../Graphics/gl2jpeg.h \
+ ../Graphics/PixelBuffer.h ../Graphics/gl2png.h \
+ ../Graphics/PixelBuffer.h ../Graphics/gl2ppm.h \
../Graphics/PixelBuffer.h ../Graphics/gl2yuv.h \
../Graphics/PixelBuffer.h
Message.o: Message.cpp Message.h Gmsh.h Options.h ../Post/ColorTable.h \
- Context.h ../Geo/CGNSOptions.h OS.h ../Fltk/GUI.h \
- ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h ../Common/GmshUI.h \
- ../Fltk/Popup_Button.h ../Fltk/SpherePosition_Widget.h ../Mesh/Field.h \
- ../Geo/Geo.h ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
+ Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h OS.h \
+ ../Fltk/GUI.h ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h \
+ ../Common/GmshUI.h ../Fltk/Popup_Button.h \
+ ../Fltk/SpherePosition_Widget.h ../Mesh/Field.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 \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/ListUtils.h \
@@ -172,7 +177,8 @@ Visibility.o: Visibility.cpp Visibility.h GmshDefines.h ../Geo/GVertex.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 ../Numeric/Numeric.h \
+ ../Geo/SPoint3.h Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
SmoothData.o: SmoothData.cpp SmoothData.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
diff --git a/Common/VertexArray.cpp b/Common/VertexArray.cpp
index ed9ea1aae65cc9a4df8d5c1b7825585eec4732df..4666c18339dde99c85482d42097f4616480546ad 100644
--- a/Common/VertexArray.cpp
+++ b/Common/VertexArray.cpp
@@ -10,6 +10,9 @@
extern Context_T CTX;
+template<int N> float ElementDataLessThan<N>::tolerance = 0.;
+float BarycenterLessThan::tolerance = 0.;
+
VertexArray::VertexArray(int numVerticesPerElement, int numElements)
: _numVerticesPerElement(numVerticesPerElement)
{
@@ -62,6 +65,7 @@ void VertexArray::add(double *x, double *y, double *z, SVector3 *n,
if(boundary && npe == 3){
ElementData<3> e(x, y, z, n, col, ele);
+ ElementDataLessThan<3>::tolerance = CTX.lc * 1.e-12;
std::set<ElementData<3>, ElementDataLessThan<3> >::iterator it = _data3.find(e);
if(it == _data3.end())
_data3.insert(e);
@@ -74,6 +78,7 @@ void VertexArray::add(double *x, double *y, double *z, SVector3 *n,
Barycenter pc(0., 0., 0.);
for(int i = 0; i < npe; i++)
pc += Barycenter(x[i], y[i], z[i]);
+ BarycenterLessThan::tolerance = CTX.lc * 1.e-12;
if(_barycenters.find(pc) != _barycenters.end())
return;
_barycenters.insert(pc);
diff --git a/Common/VertexArray.h b/Common/VertexArray.h
index c93da04955d53a35696e8261f91ba944abf24c66..834ad053fefd6cfca5b40175305ebadf0950c1a8 100644
--- a/Common/VertexArray.h
+++ b/Common/VertexArray.h
@@ -9,9 +9,6 @@
#include <vector>
#include <set>
#include "SVector3.h"
-#include "Context.h"
-
-extern Context_T CTX;
class MElement;
@@ -69,11 +66,11 @@ class ElementData {
template<int N>
class ElementDataLessThan{
public:
+ static float tolerance;
bool operator()(const ElementData<N> &e1, const ElementData<N> &e2) const
{
SPoint3 p1 = e1.barycenter();
SPoint3 p2 = e2.barycenter();
- float tolerance = CTX.lc * 1.e-12;
if(p1.x() - p2.x() > tolerance) return true;
if(p1.x() - p2.x() < -tolerance) return false;
if(p1.y() - p2.y() > tolerance) return true;
@@ -96,9 +93,9 @@ class Barycenter {
class BarycenterLessThan{
public:
+ static float tolerance;
bool operator()(const Barycenter &p1, const Barycenter &p2) const
{
- float tolerance = CTX.lc * 1.e-12;
if(p1.x() - p2.x() > tolerance) return true;
if(p1.x() - p2.x() < -tolerance) return false;
if(p1.y() - p2.y() > tolerance) return true;
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 69340da9547433f0bfcc5b604a2552900b7535da..a027a6767335c9814c28172c60f1c9abc77602eb 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -64,49 +64,50 @@ Main.o: Main.cpp GUI.h Opengl_Window.h Colorbar_Window.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
../Post/PView.h ../Common/Gmsh.h ../Common/Message.h ../Graphics/Draw.h \
- ../Common/Context.h ../Geo/CGNSOptions.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/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/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
+ ../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/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/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 ../Common/Options.h \
- ../Post/ColorTable.h ../Graphics/Draw.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h GUI.h Opengl_Window.h Colorbar_Window.h Popup_Button.h \
- SpherePosition_Widget.h ../Mesh/Field.h ../Geo/Geo.h \
- ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
- ../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Common/ListUtils.h ../Common/TreeUtils.h \
- ../Common/avl.h ../Common/ListUtils.h ../Geo/SPoint2.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Post/PView.h \
- Callbacks.h Win32Icon.h ../Common/OpenFile.h ../Common/CommandLine.h \
- ../Mesh/Generator.h Solvers.h ../Plugin/PluginManager.h \
- ../Plugin/Plugin.h ../Post/PViewDataList.h ../Post/PViewData.h \
- ../Common/GmshMatrix.h Shortcut_Window.h ../Post/PViewOptions.h \
- ../Post/ColorTable.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/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/GeoStringInterface.h
-GUI_Extras.o: GUI_Extras.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \
- ../Common/CreateFile.h ../Common/Options.h ../Post/ColorTable.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Graphics/Draw.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Graphics/Draw.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h GUI.h Opengl_Window.h \
Colorbar_Window.h Popup_Button.h SpherePosition_Widget.h \
../Mesh/Field.h ../Geo/Geo.h ../Geo/gmshSurface.h ../Geo/Pair.h \
../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Common/ListUtils.h \
+ ../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
+ ../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
+ ../Post/PView.h Callbacks.h Win32Icon.h ../Common/OpenFile.h \
+ ../Common/CommandLine.h ../Mesh/Generator.h Solvers.h \
+ ../Plugin/PluginManager.h ../Plugin/Plugin.h ../Post/PViewDataList.h \
+ ../Post/PViewData.h ../Common/GmshMatrix.h Shortcut_Window.h \
+ ../Post/PViewOptions.h ../Post/ColorTable.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/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/GeoStringInterface.h
+GUI_Extras.o: GUI_Extras.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \
+ ../Common/CreateFile.h ../Common/Options.h ../Post/ColorTable.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h GUI.h \
+ Opengl_Window.h Colorbar_Window.h Popup_Button.h \
+ SpherePosition_Widget.h ../Mesh/Field.h ../Geo/Geo.h \
+ ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
+ ../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/ListUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
@@ -130,10 +131,10 @@ GUI_Projection.o: GUI_Projection.cpp ../Geo/GModelIO_Fourier.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 \
../Graphics/Draw.h ../Common/Options.h ../Post/ColorTable.h \
- ../Common/Context.h ../Geo/CGNSOptions.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/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 ../Geo/Geo.h \
../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SBoundingBox3d.h \
@@ -164,7 +165,7 @@ GUI_Classifier.o: GUI_Classifier.cpp GUI_Classifier.h ../Common/GmshUI.h \
../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
../Post/PView.h Shortcut_Window.h ../Graphics/Draw.h \
../Common/Options.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Graphics/SelectBuffer.h GUI_Projection.h \
+ ../Mesh/PartitionOptions.h ../Graphics/SelectBuffer.h GUI_Projection.h \
../Geo/fourierProjectionFace.h ../Geo/GModel.h ../Geo/Range.h \
GUI_Extras.h ../Common/Message.h ../Mesh/meshGFaceDelaunayInsertion.h \
../Mesh/meshGFaceOptimize.h ../Mesh/meshGFaceDelaunayInsertion.h \
@@ -187,22 +188,23 @@ Callbacks.o: Callbacks.cpp ../Common/GmshUI.h ../Common/Message.h \
../Post/PView.h ../Post/PViewOptions.h ../Post/ColorTable.h \
../Post/PViewData.h ../Common/CreateFile.h ../Common/OpenFile.h \
../Common/CommandLine.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Common/Options.h GUI.h Opengl_Window.h Colorbar_Window.h \
- Popup_Button.h SpherePosition_Widget.h ../Mesh/Field.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 \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/TreeUtils.h \
- ../Common/avl.h ../Common/ListUtils.h ../Geo/SPoint2.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h GUI_Extras.h Callbacks.h \
- ../Plugin/Plugin.h ../Post/PViewDataList.h ../Post/PViewData.h \
- ../Common/GmshMatrix.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \
- ../Common/Visibility.h ../Common/GmshDefines.h Solvers.h ../Common/OS.h \
+ ../Mesh/PartitionOptions.h ../Common/Options.h GUI.h Opengl_Window.h \
+ Colorbar_Window.h Popup_Button.h SpherePosition_Widget.h \
+ ../Mesh/Field.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 ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h ../Common/TreeUtils.h ../Common/avl.h \
+ ../Common/ListUtils.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h GUI_Extras.h Callbacks.h ../Plugin/Plugin.h \
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Common/GmshMatrix.h \
+ ../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Visibility.h \
+ ../Common/GmshDefines.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 ../Graphics/Draw.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h ../Graphics/SelectBuffer.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Graphics/Draw.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Graphics/SelectBuffer.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 \
@@ -219,15 +221,15 @@ Opengl.o: Opengl.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \
Opengl_Window.o: Opengl_Window.cpp ../Common/GmshUI.h \
../Common/GmshDefines.h ../Common/Message.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Graphics/SelectBuffer.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 GUI.h Opengl_Window.h \
- Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
+ ../Mesh/PartitionOptions.h ../Graphics/Draw.h ../Geo/SBoundingBox3d.h \
+ ../Geo/SPoint3.h ../Graphics/SelectBuffer.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 GUI.h \
+ Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
SpherePosition_Widget.h ../Mesh/Field.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 \
@@ -245,7 +247,8 @@ Colorbar_Window.o: Colorbar_Window.cpp ../Common/GmshUI.h GUI.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/ListUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Post/PView.h ../Common/Context.h ../Geo/CGNSOptions.h
+ ../Post/PView.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h
Solvers.o: Solvers.cpp ../Common/Message.h ../Common/StringUtils.h \
Solvers.h GmshServer.h ../Common/OpenFile.h ../Common/GmshUI.h GUI.h \
Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
@@ -257,4 +260,4 @@ Solvers.o: Solvers.cpp ../Common/Message.h ../Common/StringUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
../Post/PView.h ../Graphics/Draw.h ../Common/Context.h \
- ../Geo/CGNSOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
diff --git a/Geo/Makefile b/Geo/Makefile
index b446ca9e1d634c1659ce96284fd953487a723113..7214875376b2a8f397d4e917a3769653eaf9f6f4 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -69,7 +69,7 @@ depend:
# DO NOT DELETE THIS LINE
GEntity.o: GEntity.cpp GEntity.h Range.h SPoint3.h SBoundingBox3d.h \
../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Common/Context.h ../Geo/CGNSOptions.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 MVertex.h ../Common/Message.h
@@ -87,7 +87,7 @@ GFace.o: GFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
MVertex.h MEdge.h MFace.h ../Common/Message.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/GaussLegendre1D.h \
../Common/VertexArray.h ../Geo/SVector3.h ../Common/Context.h \
- ../Geo/CGNSOptions.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 \
@@ -106,7 +106,7 @@ gmshEdge.o: gmshEdge.cpp GModel.h GVertex.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 ../Common/Context.h \
- ../Geo/CGNSOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
gmshFace.o: gmshFace.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 gmshFace.h Geo.h ../Common/GmshDefines.h \
@@ -114,7 +114,7 @@ gmshFace.o: gmshFace.cpp GModel.h GVertex.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 ../Common/Context.h \
- ../Geo/CGNSOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
gmshRegion.o: gmshRegion.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 gmshRegion.h Geo.h \
@@ -133,13 +133,13 @@ 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 \
GEdgeLoop.h Pair.h GRegion.h ../Common/Message.h OCCEdge.h OCCVertex.h \
OCCIncludes.h MVertex.h OCCFace.h ../Common/Context.h \
- ../Geo/CGNSOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
OCCFace.o: OCCFace.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 OCCVertex.h OCCIncludes.h MVertex.h \
OCCEdge.h OCCFace.h ../Common/Message.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/VertexArray.h ../Geo/SVector3.h \
- ../Common/Context.h ../Geo/CGNSOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
OCCRegion.o: OCCRegion.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 OCCVertex.h OCCIncludes.h MVertex.h \
@@ -168,7 +168,7 @@ discreteRegion.o: discreteRegion.cpp discreteRegion.h GModel.h GVertex.h \
fourierEdge.o: fourierEdge.cpp fourierEdge.h GEdge.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GVertex.h GPoint.h SPoint2.h SVector3.h \
GModel.h GFace.h GEdgeLoop.h Pair.h GRegion.h fourierVertex.h MVertex.h \
- ../Common/Context.h ../Geo/CGNSOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
fourierFace.o: fourierFace.cpp fourierVertex.h 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 fourierFace.h \
@@ -176,8 +176,7 @@ fourierFace.o: fourierFace.cpp fourierVertex.h GModel.h GVertex.h \
fourierProjectionFace.o: fourierProjectionFace.cpp \
fourierProjectionFace.h 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/VertexArray.h ../Geo/SVector3.h \
- ../Common/Context.h ../Geo/CGNSOptions.h
+ GEdgeLoop.h Pair.h GRegion.h ../Common/VertexArray.h ../Geo/SVector3.h
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 \
@@ -189,7 +188,7 @@ GModel.o: GModel.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
../Common/avl.h ../Common/ListUtils.h ../Geo/SPoint2.h \
../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Post/PView.h \
../Geo/SPoint3.h ../Mesh/Generator.h ../Common/Context.h \
- ../Geo/CGNSOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
GModelIO_Geo.o: GModelIO_Geo.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 Geo.h ../Common/GmshDefines.h \
@@ -209,8 +208,9 @@ 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 \
SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h OCCIncludes.h \
../Common/Message.h ../Common/Context.h ../Geo/CGNSOptions.h \
- OCCVertex.h MVertex.h OCCEdge.h OCCFace.h OCCRegion.h MElement.h \
- ../Common/GmshDefines.h MEdge.h MFace.h ../Common/OpenFile.h
+ ../Mesh/PartitionOptions.h OCCVertex.h MVertex.h OCCEdge.h OCCFace.h \
+ OCCRegion.h MElement.h ../Common/GmshDefines.h MEdge.h MFace.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 \
@@ -239,7 +239,7 @@ Geo.o: Geo.cpp ../Common/Message.h ../Numeric/Numeric.h \
ExtrudeParams.h ../Common/SmoothData.h GModel.h GVertex.h GEntity.h \
GPoint.h GEdge.h GFace.h GEdgeLoop.h GRegion.h GeoInterpolation.h \
../Mesh/Field.h ../Geo/Geo.h ../Post/PView.h ../Geo/SPoint3.h \
- ../Common/Context.h ../Geo/CGNSOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
GeoStringInterface.o: GeoStringInterface.cpp ../Common/Message.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/MallocUtils.h ../Common/StringUtils.h Geo.h \
@@ -247,9 +247,9 @@ GeoStringInterface.o: GeoStringInterface.cpp ../Common/Message.h \
SPoint3.h SVector3.h SBoundingBox3d.h ../Common/ListUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
ExtrudeParams.h ../Common/SmoothData.h GeoStringInterface.h \
- ../Common/OpenFile.h ../Common/Context.h ../Geo/CGNSOptions.h GModel.h \
- GVertex.h GEntity.h GPoint.h GEdge.h GFace.h GEdgeLoop.h GRegion.h \
- ../Parser/Parser.h
+ ../Common/OpenFile.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h GModel.h GVertex.h GEntity.h GPoint.h \
+ GEdge.h GFace.h GEdgeLoop.h GRegion.h ../Parser/Parser.h
GeoInterpolation.o: GeoInterpolation.cpp ../Common/Message.h Geo.h \
../Common/GmshDefines.h gmshSurface.h Pair.h Range.h SPoint2.h \
SPoint3.h SVector3.h SBoundingBox3d.h ../Numeric/Numeric.h \
@@ -281,14 +281,15 @@ GaussLegendreSimplex.o: GaussLegendreSimplex.cpp MElement.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
+ ../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 GEntity.h Range.h SBoundingBox3d.h \
GFace.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h SPoint2.h Pair.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
../Numeric/GaussLegendre1D.h ../Common/Message.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/qualityMeasures.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Mesh/qualityMeasures.h
MZone.o: MZone.cpp MZone.h MElement.h ../Common/GmshDefines.h MVertex.h \
SPoint3.h MEdge.h SVector3.h MFace.h GFace.h GEntity.h Range.h \
SBoundingBox3d.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h SPoint2.h \
diff --git a/Geo/OCCFace.cpp b/Geo/OCCFace.cpp
index 5a15b67d4f1f9b708c0b7c49902eae981683f095..4ce84f05ad6717c8a939dab113974f646e8dec30 100644
--- a/Geo/OCCFace.cpp
+++ b/Geo/OCCFace.cpp
@@ -11,6 +11,9 @@
#include "Message.h"
#include "Numeric.h"
#include "VertexArray.h"
+#include "Context.h"
+
+extern Context_T CTX;
#if defined(HAVE_OCC)
#include "Geom_CylindricalSurface.hxx"
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 72d28f25dc9b42fe3ec89cc5e6f3aaa382a36b19..3c09cea66eaa2f211e8763b95735b7817241505e 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -59,9 +59,9 @@ depend:
# DO NOT DELETE THIS LINE
Draw.o: Draw.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \
../Common/Message.h Draw.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Geo/GModel.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.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 \
@@ -80,25 +80,28 @@ 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 \
- Draw.h ../Common/Context.h ../Geo/CGNSOptions.h ../Common/OS.h gl2ps.h \
- ../Common/VertexArray.h ../Common/Context.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 gl2ps.h \
- ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Common/Context.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/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/SPoint3.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h gl2ps.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.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/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
Post.o: Post.cpp ../Common/Message.h ../Common/GmshUI.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h Draw.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h Iso.h ../Post/PView.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewData.h \
../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Common/SmoothData.h gl2ps.h
+ ../Common/SmoothData.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h gl2ps.h
SelectBuffer.o: SelectBuffer.cpp ../Common/Message.h ../Common/GmshUI.h \
../Common/GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -111,12 +114,13 @@ SelectBuffer.o: SelectBuffer.cpp ../Common/Message.h ../Common/GmshUI.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 Draw.h \
- ../Common/Context.h ../Geo/CGNSOptions.h SelectBuffer.h \
- ../Common/VertexArray.h ../Common/Context.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
Entity.o: Entity.cpp ../Common/GmshUI.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h Draw.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h ../Common/Context.h ../Geo/CGNSOptions.h gl2ps.h
+ ../Geo/SPoint3.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h gl2ps.h
ReadImg.o: ReadImg.cpp ReadImg.h ../Common/Message.h ../Common/GmshUI.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
@@ -124,11 +128,12 @@ ReadImg.o: ReadImg.cpp ReadImg.h ../Common/Message.h ../Common/GmshUI.h \
Scale.o: Scale.cpp ../Common/GmshUI.h Draw.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PView.h ../Post/PViewOptions.h \
../Post/ColorTable.h ../Post/PViewData.h ../Common/Context.h \
- ../Geo/CGNSOptions.h gl2ps.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h gl2ps.h
Graph2D.o: Graph2D.cpp ../Common/GmshUI.h Draw.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PView.h ../Post/PViewOptions.h \
../Post/ColorTable.h ../Post/PViewData.h gl2ps.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h
gl2ps.o: gl2ps.cpp gl2ps.h
gl2gif.o: gl2gif.cpp ../Common/MallocUtils.h gl2gif.h PixelBuffer.h \
../Common/GmshUI.h ../Common/Message.h Draw.h ../Geo/SBoundingBox3d.h \
diff --git a/Makefile b/Makefile
index 4863654022925ad0960505d50102d6ebac306930..1c64e4e8ab0f2a7a8beaffdca61615bf0d440823 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,7 @@ GMSH_API = Geo/GModel.h\
Geo/SPoint2.h Geo/SPoint3.h Geo/SVector3.h Geo/SBoundingBox3d.h\
Geo/Pair.h Geo/Range.h\
Post/PView.h Post/PViewData.h Post/PViewDataGModel.h\
+ Common/VertexArray.h\
Common/Gmsh.h Common/GmshDefines.h Common/GmshVersion.h Common/GmshMatrix.h
GMSH_EMBEDDED = ${GMSH_API} Geo/discrete*.cpp\
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 81f6914a6dbbb66b034b8710ebe044e48256d360..9c7b9bea5bc62b2ff53589bc2d85cda425d72350 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -74,24 +74,25 @@ depend:
# DO NOT DELETE THIS LINE
Generator.o: Generator.cpp ../Common/Message.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Common/OS.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/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/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 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 Field.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 \
- ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/ListUtils.h \
+ ../Mesh/PartitionOptions.h ../Common/OS.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/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/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 \
+ 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 ../Geo/Geo.h ../Common/GmshDefines.h \
+ ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
+ ../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h ../Common/ListUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
../Post/PView.h ../Geo/GeoInterpolation.h ../Geo/Geo.h ../Geo/GModel.h \
@@ -113,11 +114,11 @@ meshGEdge.o: meshGEdge.cpp meshGEdge.h ../Geo/GEdge.h ../Geo/GEntity.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
BackgroundMesh.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/Message.h ../Common/ListUtils.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.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/CGNSOptions.h ../Mesh/PartitionOptions.h ../Geo/GModel.h \
+ ../Geo/GVertex.h ../Geo/GEdge.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
meshGEdgeExtruded.o: meshGEdgeExtruded.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 \
@@ -144,13 +145,13 @@ meshGFace.o: meshGFace.cpp meshGFace.h meshGFaceBDS.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 \
- ../Common/Message.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
- BDS.h ../Post/PView.h qualityMeasures.h Field.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 \
- ../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \
- ../Common/ListUtils.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Common/OS.h
+ ../Mesh/PartitionOptions.h ../Common/Message.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h BDS.h ../Post/PView.h qualityMeasures.h \
+ Field.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 ../Common/ListUtils.h ../Common/TreeUtils.h \
+ ../Common/avl.h ../Common/ListUtils.h ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.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 \
@@ -162,7 +163,8 @@ meshGFaceTransfinite.o: meshGFaceTransfinite.cpp meshGFace.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/Context.h ../Geo/CGNSOptions.h \
- ../Common/Message.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h
+ ../Mesh/PartitionOptions.h ../Common/Message.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 \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -175,7 +177,7 @@ meshGFaceExtruded.o: meshGFaceExtruded.cpp ../Geo/GModel.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 \
../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Common/Message.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Common/Message.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 \
@@ -187,15 +189,16 @@ meshGFaceBDS.o: meshGFaceBDS.cpp meshGFace.h meshGFaceOptimize.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 ../Common/Context.h \
- ../Geo/CGNSOptions.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/Message.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h BDS.h ../Post/PView.h qualityMeasures.h \
- Field.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 ../Common/ListUtils.h ../Common/TreeUtils.h \
- ../Common/avl.h ../Common/ListUtils.h ../Geo/SPoint2.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Common/OS.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.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/Message.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
+ BDS.h ../Post/PView.h qualityMeasures.h Field.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 \
+ ../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \
+ ../Common/ListUtils.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Common/OS.h
meshGFaceDelaunayInsertion.o: meshGFaceDelaunayInsertion.cpp BDS.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -208,7 +211,7 @@ meshGFaceDelaunayInsertion.o: meshGFaceDelaunayInsertion.cpp BDS.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \
../Geo/MVertex.h ../Geo/SVector3.h meshGFaceOptimize.h meshGFace.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \
- ../Geo/CGNSOptions.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 \
@@ -252,7 +255,8 @@ meshGRegion.o: meshGRegion.cpp meshGRegion.h \
../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \
../Common/ListUtils.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
../Common/SmoothData.h ../Geo/GRegion.h BDS.h ../Post/PView.h \
- ../Common/Message.h ../Common/Context.h ../Geo/CGNSOptions.h
+ ../Common/Message.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h
meshGRegionDelaunayInsertion.o: meshGRegionDelaunayInsertion.cpp \
../Common/OS.h BackgroundMesh.h meshGRegion.h meshGRegionLocalMeshMod.h \
meshGRegionDelaunayInsertion.h ../Geo/MElement.h \
@@ -279,7 +283,7 @@ meshGRegionTransfinite.o: meshGRegionTransfinite.cpp meshGFace.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/Context.h ../Geo/CGNSOptions.h \
- ../Common/Message.h
+ ../Mesh/PartitionOptions.h ../Common/Message.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 \
@@ -292,7 +296,8 @@ meshGRegionExtruded.o: meshGRegionExtruded.cpp ../Geo/GModel.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 \
../Geo/ExtrudeParams.h ../Common/SmoothData.h meshGFace.h meshGRegion.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Common/Message.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Common/Message.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 \
@@ -319,14 +324,15 @@ DivideAndConquer.o: DivideAndConquer.cpp ../Common/Message.h \
../Common/MallocUtils.h
BackgroundMesh.o: BackgroundMesh.cpp ../Common/Message.h BackgroundMesh.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \
- ../Geo/CGNSOptions.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/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/CGNSOptions.h ../Mesh/PartitionOptions.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/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 Field.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 ../Geo/SBoundingBox3d.h \
@@ -382,4 +388,5 @@ HighOrder.o: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/MVertex.h ../Geo/SVector3.h meshGFaceDelaunayInsertion.h \
../Common/Message.h ../Common/OS.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Common/GmshMatrix.h ../Numeric/FunctionSpace.h
+ ../Mesh/PartitionOptions.h ../Common/GmshMatrix.h \
+ ../Numeric/FunctionSpace.h
diff --git a/Parser/Makefile b/Parser/Makefile
index 856675b4ad58ade318857b39e95958f07e76c9ee..0acfebc9557154d88943590198ead50b9ba31749 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -56,14 +56,14 @@ depend:
Gmsh.tab.o: Gmsh.tab.cpp ../Common/Message.h ../Common/MallocUtils.h \
../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \
../Common/ListUtils.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
- ../Common/Context.h ../Geo/CGNSOptions.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/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 \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.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/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/Geo.h ../Common/GmshDefines.h \
../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SBoundingBox3d.h \
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 6fe2167de15561d91092618e3a8240219fcf46c3..7e92811f564a71109b04d98ccbe9148f6456416d 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -77,7 +77,7 @@ PluginManager.o: PluginManager.cpp Plugin.h ../Common/Options.h \
Warp.h SphericalRaise.h Eigenvectors.h Eigenvalues.h Lambda2.h \
Evaluate.h ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h Probe.h FieldView.h GSHHS.h \
- ../Common/Context.h ../Geo/CGNSOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
Levelset.o: Levelset.cpp Levelset.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
@@ -89,18 +89,21 @@ CutPlane.o: CutPlane.cpp CutPlane.h Levelset.h Plugin.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h ../Common/GmshMatrix.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Common/GmshUI.h ../Graphics/Draw.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Common/GmshUI.h \
+ ../Graphics/Draw.h
CutSphere.o: CutSphere.cpp CutSphere.h Levelset.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h ../Common/GmshMatrix.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Common/GmshUI.h ../Graphics/Draw.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Common/GmshUI.h \
+ ../Graphics/Draw.h
CutMap.o: CutMap.cpp CutMap.h Levelset.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h
+ ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h
Smooth.o: Smooth.cpp Smooth.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
@@ -112,7 +115,8 @@ CutParametric.o: CutParametric.cpp ../Post/OctreePost.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h ../Common/GmshMatrix.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Common/GmshUI.h ../Graphics/Draw.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Common/GmshUI.h \
+ ../Graphics/Draw.h
Lambda2.o: Lambda2.cpp Lambda2.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
@@ -137,15 +141,15 @@ StreamLines.o: StreamLines.cpp StreamLines.h Plugin.h ../Common/Options.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h ../Common/GmshUI.h \
- ../Graphics/Draw.h
+ ../Mesh/PartitionOptions.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ ../Common/GmshUI.h ../Graphics/Draw.h
CutGrid.o: CutGrid.cpp ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h CutGrid.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Common/GmshUI.h ../Graphics/Draw.h
+ ../Mesh/PartitionOptions.h ../Common/GmshUI.h ../Graphics/Draw.h
Transform.o: Transform.cpp Transform.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
@@ -169,7 +173,8 @@ Triangulate.o: Triangulate.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/MVertex.h ../Geo/SPoint3.h Triangulate.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Post/PView.h \
../Post/PViewDataList.h ../Post/PViewData.h ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h
+ ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h
Warp.o: Warp.cpp Warp.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
../Common/Message.h ../Post/PView.h ../Geo/SPoint3.h \
../Post/PViewDataList.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
@@ -187,7 +192,8 @@ Skin.o: Skin.cpp Skin.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
../Post/PViewDataList.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Common/ListUtils.h ../Common/GmshMatrix.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
- ../Common/MallocUtils.h ../Common/Context.h ../Geo/CGNSOptions.h
+ ../Common/MallocUtils.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h
GSHHS.o: GSHHS.cpp GSHHS.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
@@ -287,10 +293,10 @@ Annotate.o: Annotate.cpp Annotate.h Plugin.h ../Common/Options.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Common/GmshUI.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \
- ../Fltk/Colorbar_Window.h ../Fltk/Popup_Button.h \
- ../Fltk/SpherePosition_Widget.h ../Mesh/Field.h ../Geo/Geo.h \
- ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
+ ../Mesh/PartitionOptions.h ../Common/GmshUI.h ../Fltk/GUI.h \
+ ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h \
+ ../Fltk/Popup_Button.h ../Fltk/SpherePosition_Widget.h ../Mesh/Field.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 \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/TreeUtils.h ../Common/avl.h \
@@ -306,8 +312,8 @@ Probe.o: Probe.cpp Probe.h Plugin.h ../Common/Options.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Post/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
- ../Common/GmshUI.h ../Graphics/Draw.h
+ ../Mesh/PartitionOptions.h ../Post/OctreePost.h ../Common/Octree.h \
+ ../Common/OctreeInternals.h ../Common/GmshUI.h ../Graphics/Draw.h
HarmonicToTime.o: HarmonicToTime.cpp HarmonicToTime.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
diff --git a/Post/Makefile b/Post/Makefile
index f645ecc77f241355b7df6278299324b10c4d319c..e3bee3550b8952b159a15ad8fafd42d269c81f52 100644
--- a/Post/Makefile
+++ b/Post/Makefile
@@ -52,9 +52,8 @@ depend:
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 ../Common/VertexArray.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Common/SmoothData.h adaptiveData.h ../Common/GmshMatrix.h \
- ../Common/Message.h
+ ../Geo/SPoint3.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 \
@@ -77,12 +76,12 @@ PViewDataList.o: PViewDataList.cpp PViewDataList.h PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/SmoothData.h ../Common/Message.h ../Common/Context.h \
- ../Geo/CGNSOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
PViewDataListIO.o: PViewDataListIO.cpp PViewDataList.h PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Message.h \
- ../Common/Context.h ../Geo/CGNSOptions.h adaptiveData.h \
- ../Common/GmshMatrix.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ adaptiveData.h ../Common/GmshMatrix.h
PViewDataGModel.o: PViewDataGModel.cpp PViewDataGModel.h PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -133,5 +132,5 @@ OctreePost.o: OctreePost.cpp ../Common/Octree.h \
../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h
diff --git a/utils/embed/GmshEmbedded.h b/utils/embed/GmshEmbedded.h
index 253f241b008b0caa43bd37ba79afb9963c5bf6b3..d72638b4b73c3c864e63abb4059d9eca0d8d960a 100644
--- a/utils/embed/GmshEmbedded.h
+++ b/utils/embed/GmshEmbedded.h
@@ -42,9 +42,4 @@ class smooth_normals{
int dummy;
};
-class VertexArray{
- public:
- int dummy;
-};
-
#endif