diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index 91c4e6662ecea19bfe3e860689a3a8b3d331dd4f..58fe37f4ab563922f4ce2906097f1873166fa114 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -1,4 +1,4 @@
-// $Id: CommandLine.cpp,v 1.74 2006-08-10 15:55:23 geuzaine Exp $
+// $Id: CommandLine.cpp,v 1.75 2006-08-12 16:44:31 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -21,13 +21,13 @@
#include "Gmsh.h"
#include "GmshUI.h"
+#include "GmshDefines.h"
#include "GmshVersion.h"
#include "CommandLine.h"
#include "Numeric.h"
#include "Context.h"
#include "Options.h"
#include "Geo.h"
-#include "Mesh.h"
#include "Views.h"
#include "OpenFile.h"
#include "CreateFile.h"
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index df731b674060a18482338179ebf3baa32758d8d4..0a4741e5aa4b0576c9ce3ef27fa5ceb93d7b2fdb 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -20,9 +20,9 @@
//
// Please report all bugs and problems to <gmsh@geuz.org>.
+#include "GmshDefines.h"
#include "Options.h"
#include "Context.h"
-#include "Mesh.h"
#include "Views.h"
// PLEASE RESPECT THE ALPHABETICAL ORDER WHEN
diff --git a/Common/GmshDefines.h b/Common/GmshDefines.h
index 94fcd10821486e01ec479874ee39f7baad955741..84d756dd1c49275510bcc177ba6ba3e8b23df016 100644
--- a/Common/GmshDefines.h
+++ b/Common/GmshDefines.h
@@ -50,7 +50,7 @@
#define PYR2 14
#define PNT 15
-// Geometrical entities
+// Geometric entities
#define ENT_NONE 0
#define ENT_POINT 1
#define ENT_LINE 2
@@ -61,6 +61,15 @@
#define PHYSICAL 2
#define PARTITION 3
+// Mesh algorithms
+#define QUALITY_EDGES_BASED 1
+#define QUALITY_SIMPLEX_BASED 2
+#define DELAUNAY_ISO 1
+#define DELAUNAY_ANISO 2
+#define DELAUNAY_TRIANGLE 3
+#define FRONTAL_NETGEN 4
+#define DELAUNAY_TETGEN 5
+
#define CONV_VALUE 0.8
#define NOTTOLINK 1
@@ -82,6 +91,4 @@
#define LIBRE 2
#define ELLIPTIC 3
-#define NB_HISTOGRAM 100
-
#endif
diff --git a/Common/Makefile b/Common/Makefile
index 2985bdafdd8aa809a5e3d75ff4131bc77c63058b..c1ab647728cf819b09d193d14e08be8290ea718a 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.100 2006-08-12 16:16:27 geuzaine Exp $
+# $Id: Makefile,v 1.101 2006-08-12 16:44:31 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -68,15 +68,8 @@ depend:
Context.o: Context.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Context.h \
- DefaultOptions.h Options.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- Views.h ColorTable.h VertexArray.h SmoothNormals.h GmshMatrix.h \
- AdaptiveViews.h Trackball.h
+ DefaultOptions.h GmshDefines.h Options.h Views.h ColorTable.h \
+ VertexArray.h SmoothNormals.h GmshMatrix.h AdaptiveViews.h Trackball.h
# 1 "/Users/geuzaine/.gmsh/Common//"
AdaptiveViews.o: AdaptiveViews.cpp AdaptiveViews.h ../DataStr/List.h \
GmshMatrix.h ../Plugin/Plugin.h ../Common/Options.h ../Common/Message.h \
@@ -113,35 +106,29 @@ Options.o: Options.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
Context.h Options.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \
../Common/Options.h ../Common/Message.h ../Fltk/Solvers.h ../Fltk/GUI.h \
- ../Fltk/Opengl_Window.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+ ../Fltk/Opengl_Window.h ../Mesh/Mesh.h ../Common/GmshDefines.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
../Fltk/Colorbar_Window.h ../Common/GmshUI.h ../Fltk/Popup_Button.h
# 1 "/Users/geuzaine/.gmsh/Common//"
CommandLine.o: CommandLine.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../DataStr/List.h ../DataStr/Tree.h GmshUI.h GmshVersion.h \
- CommandLine.h ../Numeric/Numeric.h Context.h Options.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- Views.h ColorTable.h VertexArray.h SmoothNormals.h GmshMatrix.h \
- AdaptiveViews.h ../Parser/OpenFile.h ../Graphics/CreateFile.h \
- ../Parser/Parser.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
- ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h ../Geo/MVertex.h ../Geo/MVertex.h ../Geo/GPoint.h \
- ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
- ../Geo/SBoundingBox3d.h OS.h
+ ../DataStr/List.h ../DataStr/Tree.h GmshUI.h GmshDefines.h \
+ GmshVersion.h CommandLine.h ../Numeric/Numeric.h Context.h Options.h \
+ ../Geo/Geo.h Views.h ColorTable.h VertexArray.h SmoothNormals.h \
+ GmshMatrix.h AdaptiveViews.h ../Parser/OpenFile.h \
+ ../Graphics/CreateFile.h ../Parser/Parser.h ../Geo/GModel.h \
+ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/MVertex.h \
+ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/GPoint.h ../Geo/GEdge.h \
+ ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SBoundingBox3d.h OS.h
# 1 "/Users/geuzaine/.gmsh/Common//"
OS.o: OS.cpp Message.h
# 1 "/Users/geuzaine/.gmsh/Common//"
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 1c585ed76425ce5feb9b89736224dd7f0cbe43ef..3fb979417b523ede168ac7d6451b34d51f1b0ce4 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.96 2006-08-12 16:16:28 geuzaine Exp $
+# $Id: Makefile,v 1.97 2006-08-12 16:44:31 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -65,20 +65,19 @@ depend:
# DO NOT DELETE THIS LINE
# 1 "/Users/geuzaine/.gmsh/Fltk//"
-Main.o: Main.cpp GUI.h Opengl_Window.h ../Mesh/Mesh.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
- ../Common/GmshDefines.h ../Mesh/Metric.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Colorbar_Window.h \
- ../Common/GmshUI.h ../Common/ColorTable.h Popup_Button.h \
- ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
+Main.o: Main.cpp GUI.h Opengl_Window.h ../Mesh/Mesh.h \
+ ../Common/GmshDefines.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+ Colorbar_Window.h ../Common/GmshUI.h ../Common/ColorTable.h \
+ Popup_Button.h ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h ../Geo/Geo.h \
../Graphics/CreateFile.h ../Graphics/Draw.h ../Common/Views.h \
../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+ ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshMatrix.h \
../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
../Common/Options.h ../Parser/Parser.h ../Parser/OpenFile.h \
../Common/CommandLine.h Solvers.h ../Plugin/PluginManager.h \
@@ -96,12 +95,11 @@ Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Common/GmshUI.h ../Common/Context.h ../Common/Options.h GUI.h \
- Opengl_Window.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
- ../Common/GmshDefines.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ Opengl_Window.h ../Mesh/Mesh.h ../Common/GmshDefines.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Colorbar_Window.h \
../Common/ColorTable.h Popup_Button.h GUI_Extras.h ../Common/OS.h
# 1 "/Users/geuzaine/.gmsh/Fltk//"
@@ -112,11 +110,11 @@ GUI.o: GUI.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
../Common/VertexArray.h ../Common/SmoothNormals.h \
../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
- GUI.h Opengl_Window.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
- ../Common/GmshDefines.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ GUI.h Opengl_Window.h ../Mesh/Mesh.h ../Common/GmshDefines.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Colorbar_Window.h \
Popup_Button.h Callbacks.h Bitmaps.h Win32Icon.h ../Parser/OpenFile.h \
../Common/CommandLine.h Solvers.h ../Plugin/PluginManager.h \
@@ -125,32 +123,30 @@ GUI.o: GUI.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
GUI_Extras.o: GUI_Extras.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Common/GmshUI.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
- ../Common/GmshDefines.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Common/GmshUI.h ../Mesh/Mesh.h ../Common/GmshDefines.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h File_Picker.h \
Shortcut_Window.h ../Graphics/CreateFile.h ../Common/Options.h \
../Common/Context.h ../Graphics/Draw.h ../Common/Views.h \
../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+ ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshMatrix.h \
../Common/AdaptiveViews.h ../Common/GmshMatrix.h
# 1 "/Users/geuzaine/.gmsh/Fltk//"
Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Common/GmshUI.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
+ ../Common/GmshDefines.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
../Mesh/Matrix.h ../Geo/ExtrudeParams.h ../Geo/ExtractContour.h \
../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h \
+ ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
../Graphics/CreateFile.h ../Parser/OpenFile.h ../Common/CommandLine.h \
../Common/Context.h ../Common/Options.h GUI.h Opengl_Window.h \
@@ -176,12 +172,13 @@ Opengl.o: Opengl.cpp ../Common/Gmsh.h ../Common/Message.h \
../Common/ColorTable.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Common/GmshMatrix.h \
../Common/AdaptiveViews.h ../Common/GmshMatrix.h GUI.h Opengl_Window.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/GmshDefines.h \
- ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
- ../Mesh/Matrix.h Colorbar_Window.h Popup_Button.h ../Graphics/gl2ps.h
+ ../Mesh/Mesh.h ../Common/GmshDefines.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Colorbar_Window.h \
+ Popup_Button.h ../Graphics/gl2ps.h
# 1 "/Users/geuzaine/.gmsh/Fltk//"
Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -191,25 +188,25 @@ Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h ../Common/Message.h \
../Common/ColorTable.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Common/GmshMatrix.h \
../Common/AdaptiveViews.h ../Common/GmshMatrix.h GUI.h Opengl_Window.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/GmshDefines.h \
- ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
- ../Mesh/Matrix.h Colorbar_Window.h Popup_Button.h
+ ../Mesh/Mesh.h ../Common/GmshDefines.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Colorbar_Window.h \
+ Popup_Button.h
# 1 "/Users/geuzaine/.gmsh/Fltk//"
Colorbar_Window.o: Colorbar_Window.cpp ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
../DataStr/Tree.h ../Common/GmshUI.h GUI.h Opengl_Window.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
- ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
- ../Mesh/Matrix.h Colorbar_Window.h ../Common/ColorTable.h \
- Popup_Button.h ../Common/Context.h
+ ../Mesh/Mesh.h ../Common/GmshDefines.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Colorbar_Window.h \
+ ../Common/ColorTable.h Popup_Button.h ../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Fltk//"
Popup_Button.o: Popup_Button.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -220,14 +217,13 @@ Solvers.o: Solvers.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
Solvers.h GmshServer.h ../Parser/OpenFile.h ../Common/GmshUI.h GUI.h \
- Opengl_Window.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
- ../Common/GmshDefines.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ Opengl_Window.h ../Mesh/Mesh.h ../Common/GmshDefines.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Colorbar_Window.h \
../Common/ColorTable.h Popup_Button.h ../Graphics/Draw.h \
../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+ ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshMatrix.h \
../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h
diff --git a/Geo/Makefile b/Geo/Makefile
index 8ca22b93cd788da98ee0a1e5352a51b6eb8e2fde..b85cab8d7060418f94237072bad8c557c774ab47 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.85 2006-08-12 16:16:29 geuzaine Exp $
+# $Id: Makefile,v 1.86 2006-08-12 16:44:31 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -81,12 +81,12 @@ depend:
CAD.o: CAD.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+ ../Mesh/Mesh.h ../Common/GmshDefines.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h CAD.h ExtrudeParams.h \
../Common/Context.h
@@ -94,38 +94,36 @@ CAD.o: CAD.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
ExtrudeParams.o: ExtrudeParams.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- Geo.h CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
- ../Common/GmshDefines.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ Geo.h CAD.h ../Mesh/Mesh.h ../Common/GmshDefines.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ExtrudeParams.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
Geo.o: Geo.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Geo.h CAD.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ExtrudeParams.h ../Parser/Parser.h ../Common/Context.h gmshModel.h \
- GModel.h GVertex.h GEntity.h Range.h SPoint3.h SBoundingBox3d.h \
- MVertex.h GPoint.h GEdge.h SVector3.h SPoint2.h MElement.h GFace.h \
- Pair.h GRegion.h
+ ../Mesh/Mesh.h ../Common/GmshDefines.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ExtrudeParams.h \
+ ../Parser/Parser.h ../Common/Context.h gmshModel.h GModel.h GVertex.h \
+ GEntity.h Range.h SPoint3.h SBoundingBox3d.h MVertex.h GPoint.h GEdge.h \
+ SVector3.h SPoint2.h MElement.h GFace.h Pair.h GRegion.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
GeoUtils.o: GeoUtils.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- Geo.h CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
- ../Common/GmshDefines.h ../Mesh/Metric.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ExtrudeParams.h
+ Geo.h CAD.h ../Mesh/Mesh.h ../Common/GmshDefines.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ExtrudeParams.h \
+ ../Numeric/Numeric.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
GVertex.o: GVertex.cpp GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h MVertex.h ../Common/GmshDefines.h GPoint.h
@@ -155,12 +153,12 @@ GModelIO.o: GModelIO.cpp ../Common/Message.h ../Common/GmshDefines.h \
../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Mesh/Metric.h \
+ ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
gmshModel.h GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h MVertex.h GPoint.h GEdge.h SVector3.h SPoint2.h \
- MElement.h GFace.h Pair.h GRegion.h gmshFace.h gmshVertex.h gmshEdge.h
+ MElement.h ../Numeric/Numeric.h GFace.h Pair.h GRegion.h gmshFace.h \
+ gmshVertex.h gmshEdge.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
MVertex.o: MVertex.cpp MVertex.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
@@ -175,11 +173,10 @@ gmshModel.o: gmshModel.cpp gmshModel.h GModel.h GVertex.h GEntity.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- Geo.h ../Parser/OpenFile.h ../DataStr/Tools.h ../DataStr/List.h \
- ../DataStr/Tree.h ../Common/Message.h gmshVertex.h gmshFace.h \
- gmshEdge.h gmshRegion.h
+ ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+ ../Mesh/Matrix.h Geo.h ../Parser/OpenFile.h ../DataStr/Tools.h \
+ ../DataStr/List.h ../DataStr/Tree.h ../Common/Message.h gmshVertex.h \
+ gmshFace.h gmshEdge.h gmshRegion.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
gmshEdge.o: gmshEdge.cpp gmshModel.h GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h MVertex.h ../Common/GmshDefines.h GPoint.h \
@@ -189,8 +186,7 @@ gmshEdge.o: gmshEdge.cpp gmshModel.h GModel.h GVertex.h GEntity.h Range.h \
../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h CAD.h \
ExtrudeParams.h Geo.h ../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
@@ -204,8 +200,7 @@ gmshFace.o: gmshFace.cpp gmshModel.h GModel.h GVertex.h GEntity.h Range.h \
../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h gmshFace.h \
../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h CAD.h \
ExtrudeParams.h Geo.h ../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
@@ -219,8 +214,7 @@ gmshRegion.o: gmshRegion.cpp gmshModel.h GModel.h GVertex.h GEntity.h \
../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h gmshFace.h \
gmshRegion.h ../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
CAD.h ExtrudeParams.h Geo.h ../Mesh/Create.h ../Mesh/Vertex.h \
@@ -233,21 +227,20 @@ SBoundingBox3d.o: SBoundingBox3d.cpp SBoundingBox3d.h SPoint3.h
ExtractContour.o: ExtractContour.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- Geo.h GeoUtils.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
- ../Common/GmshDefines.h ../Mesh/Metric.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h CAD.h ExtrudeParams.h
+ Geo.h GeoUtils.h ../Mesh/Mesh.h ../Common/GmshDefines.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h CAD.h ExtrudeParams.h \
+ ../Numeric/Numeric.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
Print_Geo.o: Print_Geo.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
- ../Common/GmshDefines.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ Geo.h ../Mesh/Mesh.h ../Common/GmshDefines.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h CAD.h ExtrudeParams.h
diff --git a/Graphics/Makefile b/Graphics/Makefile
index f535878d52edce9145bdc79655cb9e030ff45fd2..348939c14e79d995a4ff19a293f4ee09997ac5c3 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.91 2006-08-12 16:16:30 geuzaine Exp $
+# $Id: Makefile,v 1.92 2006-08-12 16:44:31 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -77,11 +77,10 @@ Draw.o: Draw.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
../Geo/ExtrudeParams.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h \
+ ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
../Common/Context.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
diff --git a/Mesh/Create.cpp b/Mesh/Create.cpp
index a8b124913898e2076dea0ab191d98da681716da0..2a626470f49257a22b5275ec072aa471de62c60c 100644
--- a/Mesh/Create.cpp
+++ b/Mesh/Create.cpp
@@ -1,4 +1,4 @@
-// $Id: Create.cpp,v 1.83 2006-08-12 16:16:30 geuzaine Exp $
+// $Id: Create.cpp,v 1.84 2006-08-12 16:44:31 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -525,7 +525,6 @@ Curve *Create_Curve(int Num, int Typ, int Order, List_T * Liste,
Curve *pC = (Curve *) Malloc(sizeof(Curve));
// pC->bds = 0;
- pC->LinVertexArray = NULL;
pC->Color.type = 0;
pC->Visible = 1;
pC->cp = NULL;
@@ -632,8 +631,6 @@ void Free_Curve(void *a, void *b)
{
Curve *pC = *(Curve **) a;
if(pC) {
- if(pC->LinVertexArray)
- delete pC->LinVertexArray;
List_Delete(pC->Vertices);
Tree_Action(pC->Simplexes, Free_Simplex);
Tree_Delete(pC->Simplexes);
@@ -675,8 +672,6 @@ Surface *Create_Surface(int Num, int Typ)
pS->Generatrices = NULL;
pS->Edges = NULL;
pS->Extrude = NULL;
- pS->TriVertexArray = NULL;
- pS->QuadVertexArray = NULL;
return (pS);
}
@@ -701,10 +696,6 @@ void Free_Surface(void *a, void *b)
Tree_Action(pS->Edges, Free_Edge);
Tree_Delete(pS->Edges);
}
- if(pS->TriVertexArray)
- delete pS->TriVertexArray;
- if(pS->QuadVertexArray)
- delete pS->QuadVertexArray;
Free(pS);
pS = NULL;
}
@@ -737,8 +728,6 @@ Volume *Create_Volume(int Num, int Typ)
pV->Lin_Surf = Tree_Create(sizeof(Simplex *), compareSimplex);
pV->Simp_Surf = Tree_Create(sizeof(Simplex *), compareSimplex);
pV->Quad_Surf = Tree_Create(sizeof(Simplex *), compareQuadrangle);
- pV->TriVertexArray = NULL;
- pV->QuadVertexArray = NULL;
return pV;
}
@@ -774,10 +763,6 @@ void Free_Volume_But_Not_Elements(void *a, void *b)
Tree_Delete(pV->Pyramids);
Tree_Delete(pV->Edges);
Tree_Delete(pV->Faces);
- if(pV->TriVertexArray)
- delete pV->TriVertexArray;
- if(pV->QuadVertexArray)
- delete pV->QuadVertexArray;
Free(pV);
pV = NULL;
}
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index ec971fbf7319e85a64499fc78b8bb48d1cca543c..ff8f86a6ed41e9340f78ac5378f4831392e6a2e8 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -1,4 +1,4 @@
-// $Id: Generator.cpp,v 1.91 2006-08-11 18:48:39 geuzaine Exp $
+// $Id: Generator.cpp,v 1.92 2006-08-12 16:44:31 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -446,9 +446,6 @@ void Init_Mesh()
if(THEM->Metric)
delete THEM->Metric;
- if(THEM->normals)
- delete THEM->normals;
-
THEM->Vertices = Tree_Create(sizeof(Vertex *), compareVertex);
THEM->Simplexes = Tree_Create(sizeof(Simplex *), compareSimplex);
THEM->Points = Tree_Create(sizeof(Vertex *), compareVertex);
@@ -460,17 +457,8 @@ void Init_Mesh()
THEM->PhysicalGroups = List_Create(5, 5, sizeof(PhysicalGroup *));
THEM->Partitions = List_Create(5, 5, sizeof(MeshPartition *));
THEM->Metric = new GMSHMetric;
- THEM->normals = new smooth_normals(CTX.mesh.angle_smooth_normals);
-
THEM->status = 0;
- for(int i = 0; i < 3; i++){
- THEM->timing[i] = 0.0;
- THEM->quality_gamma[i] = 0.0;
- THEM->quality_eta[i] = 0.0;
- THEM->quality_rho[i] = 0.0;
- }
-
CTX.mesh.bgmesh_type = WITHPOINTS;
CTX.mesh.changed = 1;
}
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 67a2003bf14c39f6c239aeff438d08f9672ec890..faf674ab4483ac89b51d7957eb48092cd91e3ec0 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.116 2006-08-12 16:16:30 geuzaine Exp $
+# $Id: Makefile,v 1.117 2006-08-12 16:44:31 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -111,240 +111,215 @@ depend:
1D_Mesh.o: 1D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h \
- Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
- Utils.h ../Common/Context.h Interpolation.h
+ ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h ../Common/GmshDefines.h \
+ Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
+ Metric.h Matrix.h Utils.h ../Common/Context.h Interpolation.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_Mesh.o: 2D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ../Geo/ExtrudeParams.h Mesh.h Utils.h Vertex.h Create.h 2D_Mesh.h \
- ../Common/Context.h Interpolation.h
+ ../Common/GmshDefines.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+ ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+ ../Mesh/Matrix.h ../Geo/ExtrudeParams.h Mesh.h Utils.h Vertex.h \
+ Create.h 2D_Mesh.h ../Common/Context.h Interpolation.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_Transfinite.o: 2D_Transfinite.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
- Metric.h Matrix.h Interpolation.h
+ ../Geo/Geo.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
+ ../Numeric/Numeric.h Interpolation.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_Elliptic.o: 2D_Elliptic.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ../Geo/ExtrudeParams.h Mesh.h
+ ../Common/GmshDefines.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+ ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+ ../Mesh/Matrix.h ../Geo/ExtrudeParams.h Mesh.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_BGMesh.o: 2D_BGMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
+ ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
2D_Mesh.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_Recombine.o: 2D_Recombine.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h \
- Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
- Interpolation.h Utils.h 2D_Mesh.h Create.h ../Common/Context.h
+ ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h ../Common/GmshDefines.h \
+ Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
+ Metric.h Matrix.h Interpolation.h Utils.h 2D_Mesh.h Create.h \
+ ../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_InitMesh.o: 2D_InitMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
+ ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
2D_Mesh.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_Bowyer.o: 2D_Bowyer.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
+ ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
2D_Mesh.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_Bricks.o: 2D_Bricks.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
+ ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
2D_Mesh.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_DivAndConq.o: 2D_DivAndConq.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
+ ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
2D_Mesh.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_Util.o: 2D_Util.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
+ ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
2D_Mesh.h ../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_Links.o: 2D_Links.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
+ ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
2D_Mesh.h ../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_Tree.o: 2D_Tree.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
- Metric.h Matrix.h 2D_Mesh.h
+ Mesh.h ../Common/GmshDefines.h Vertex.h Element.h Simplex.h Face.h \
+ Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h 2D_Mesh.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_Cylindrical.o: 2D_Cylindrical.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
+ ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_Parametric.o: 2D_Parametric.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ../Geo/ExtrudeParams.h Interpolation.h Vertex.h Mesh.h 2D_Mesh.h \
- Create.h ../Common/Context.h
+ ../Common/GmshDefines.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+ ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+ ../Mesh/Matrix.h ../Geo/ExtrudeParams.h Interpolation.h Vertex.h Mesh.h \
+ 2D_Mesh.h Create.h ../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_Mesh_Aniso.o: 2D_Mesh_Aniso.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ../Geo/ExtrudeParams.h Mesh.h Interpolation.h Vertex.h Create.h \
- ../Common/Context.h
+ ../Common/GmshDefines.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+ ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+ ../Mesh/Matrix.h ../Geo/ExtrudeParams.h Mesh.h Interpolation.h Vertex.h \
+ Create.h ../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
2D_Mesh_Triangle.o: 2D_Mesh_Triangle.cpp ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
- ../DataStr/Tree.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
- Metric.h Matrix.h ../Common/Context.h
+ ../DataStr/Tree.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
+ ../Numeric/Numeric.h ../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
3D_Mesh.o: 3D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h \
- Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
- 3D_Mesh.h Create.h ../Common/Context.h
+ ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h ../Common/GmshDefines.h \
+ Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
+ Metric.h Matrix.h 3D_Mesh.h Create.h ../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
3D_Transfinite.o: 3D_Transfinite.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
- Metric.h Matrix.h Interpolation.h Create.h
+ Mesh.h ../Common/GmshDefines.h Vertex.h Element.h Simplex.h Face.h \
+ Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h Interpolation.h \
+ Create.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
3D_BGMesh.o: 3D_BGMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
- Metric.h Matrix.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h \
- ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
- ../Common/Context.h ../Common/OctreePost.h ../Common/Octree.h \
- ../Common/OctreeInternals.h
+ Mesh.h ../Common/GmshDefines.h Vertex.h Element.h Simplex.h Face.h \
+ Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h ../Common/Views.h \
+ ../Common/ColorTable.h ../Common/VertexArray.h \
+ ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshMatrix.h \
+ ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
+ ../Common/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
3D_Extrude.o: 3D_Extrude.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ../Geo/ExtrudeParams.h Mesh.h ../Common/Context.h Create.h Vertex.h
+ ../Common/GmshDefines.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+ ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+ ../Mesh/Matrix.h ../Geo/ExtrudeParams.h Mesh.h ../Common/Context.h \
+ Create.h Vertex.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
3D_Extrude_Old.o: 3D_Extrude_Old.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ../Geo/ExtrudeParams.h Mesh.h ../Common/Context.h Create.h Vertex.h
+ ../Common/GmshDefines.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+ ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+ ../Mesh/Matrix.h ../Geo/ExtrudeParams.h Mesh.h ../Common/Context.h \
+ Create.h Vertex.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
3D_Coherence.o: 3D_Coherence.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h \
- Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
- 3D_Mesh.h Create.h
+ ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h ../Common/GmshDefines.h \
+ Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
+ Metric.h Matrix.h 3D_Mesh.h Create.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
3D_Divide.o: 3D_Divide.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h
+ ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
3D_Mesh_Netgen.o: 3D_Mesh_Netgen.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
- Metric.h Matrix.h Create.h ../Common/Context.h ../Common/OS.h
+ ../Geo/Geo.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
+ Create.h ../Numeric/Numeric.h ../Common/Context.h ../Common/OS.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
3D_Mesh_Tetgen.o: 3D_Mesh_Tetgen.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
- Metric.h Matrix.h Create.h ../Common/Context.h
+ Mesh.h ../Common/GmshDefines.h Vertex.h Element.h Simplex.h Face.h \
+ Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h Create.h \
+ ../Numeric/Numeric.h ../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
BDS.o: BDS.cpp ../Numeric/Numeric.h ../Common/GmshMatrix.h BDS.h \
../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
@@ -356,22 +331,20 @@ Create.o: Create.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ../Geo/ExtrudeParams.h Mesh.h Utils.h Vertex.h ../Common/Context.h \
- Create.h
+ ../Common/GmshDefines.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+ ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+ ../Mesh/Matrix.h ../Geo/ExtrudeParams.h Mesh.h Utils.h Vertex.h \
+ ../Common/Context.h Create.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
Generator.o: Generator.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
- BDS.h ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
+ ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h BDS.h \
+ ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
../Common/SmoothNormals.h ../Common/GmshMatrix.h \
../Common/AdaptiveViews.h ../Common/GmshMatrix.h Create.h \
../Common/Context.h ../Parser/OpenFile.h PartitionMesh.h ../Common/OS.h \
@@ -388,48 +361,45 @@ Generator.o: Generator.cpp ../Common/Gmsh.h ../Common/Message.h \
DiscreteSurface.o: DiscreteSurface.cpp ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
- ../DataStr/Tree.h ../Numeric/Numeric.h Mesh.h Vertex.h Element.h \
- Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Geo/ExtrudeParams.h \
- ../Geo/Geo.h Create.h Interpolation.h ../Common/Context.h BDS.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h PartitionMesh.h \
- ../Common/OS.h
+ ../DataStr/Tree.h ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h \
+ Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
+ Metric.h Matrix.h ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
+ ../Geo/ExtrudeParams.h ../Geo/Geo.h Create.h Interpolation.h \
+ ../Common/Context.h BDS.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/VertexArray.h ../Common/SmoothNormals.h \
+ ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+ PartitionMesh.h ../Common/OS.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
SwapEdge.o: SwapEdge.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
+ ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
SwapPatterns.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
Utils.o: Utils.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ../Geo/ExtrudeParams.h Mesh.h Interpolation.h Vertex.h \
+ ../Common/GmshDefines.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+ ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+ ../Mesh/Matrix.h ../Geo/ExtrudeParams.h Mesh.h Interpolation.h Vertex.h \
../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
Metric.o: Metric.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ../Geo/ExtrudeParams.h Mesh.h Matrix.h Interpolation.h Vertex.h
+ ../Common/GmshDefines.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+ ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+ ../Mesh/Matrix.h ../Geo/ExtrudeParams.h Mesh.h Matrix.h Interpolation.h \
+ Vertex.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
meshGEdge.o: meshGEdge.cpp meshGEdge.h ../Geo/GEdge.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
@@ -440,57 +410,52 @@ meshGEdge.o: meshGEdge.cpp meshGEdge.h ../Geo/GEdge.h ../Geo/GEntity.h \
../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h Utils.h Vertex.h Mesh.h Element.h \
- Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h Metric.h Matrix.h ../Common/Context.h
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
+ ../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
meshGFace.o: meshGFace.cpp meshGFace.h ../Geo/SPoint2.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/MVertex.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/GPoint.h 2D_Mesh.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h Mesh.h Vertex.h \
- Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
- Metric.h Matrix.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h \
+ Matrix.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
- ../Geo/MElement.h ../Geo/MVertex.h ../Geo/GFace.h ../Geo/GPoint.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Common/Context.h Utils.h ../Common/Message.h BDS.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
- ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+ ../Geo/MElement.h ../Geo/MVertex.h ../Numeric/Numeric.h ../Geo/GFace.h \
+ ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Common/Context.h Utils.h \
+ ../Common/Message.h BDS.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/VertexArray.h ../Common/SmoothNormals.h \
+ ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
Nurbs.o: Nurbs.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- Nurbs.h Vertex.h Mesh.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
- Metric.h Matrix.h ../Geo/Geo.h ../Geo/GeoUtils.h ../Mesh/Mesh.h \
- Create.h ../Geo/CAD.h ../Mesh/Vertex.h ../Geo/ExtrudeParams.h
+ Nurbs.h Vertex.h Mesh.h ../Common/GmshDefines.h Element.h Simplex.h \
+ Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h ../Geo/Geo.h \
+ ../Geo/GeoUtils.h ../Mesh/Mesh.h Create.h ../Geo/CAD.h ../Mesh/Vertex.h \
+ ../Geo/ExtrudeParams.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
Interpolation.o: Interpolation.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h ../Geo/Geo.h Nurbs.h Vertex.h Mesh.h Element.h \
- Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Geo/ExtrudeParams.h \
- Utils.h Interpolation.h
+ ../Numeric/Numeric.h ../Geo/Geo.h Nurbs.h Vertex.h Mesh.h \
+ ../Common/GmshDefines.h Element.h Simplex.h Face.h Edge.h \
+ ../Geo/ExtrudeParams.h Metric.h Matrix.h ../Geo/CAD.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Geo/ExtrudeParams.h Utils.h Interpolation.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
SecondOrder.o: SecondOrder.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
- Metric.h Matrix.h Utils.h Interpolation.h ../Common/OS.h
+ ../Geo/Geo.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
+ Utils.h Interpolation.h ../Numeric/Numeric.h ../Common/OS.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
PartitionMesh.o: PartitionMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
+ ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Geo/ExtrudeParams.h \
../Geo/Geo.h Create.h Interpolation.h ../Common/Context.h BDS.h \
../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
@@ -501,52 +466,43 @@ PartitionMesh.o: PartitionMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
Smoothing.o: Smoothing.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h
+ ../Numeric/Numeric.h Mesh.h ../Common/GmshDefines.h Vertex.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
CrossData.o: CrossData.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
- Metric.h Matrix.h
+ Mesh.h ../Common/GmshDefines.h Vertex.h Element.h Simplex.h Face.h \
+ Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
Vertex.o: Vertex.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h Vertex.h Mesh.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
+ ../Numeric/Numeric.h Vertex.h Mesh.h ../Common/GmshDefines.h Element.h \
+ Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h \
../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
Edge.o: Edge.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Mesh.h \
- Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h \
- ../Common/GmshDefines.h Metric.h Matrix.h
+ ../Common/GmshDefines.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+ ../Geo/ExtrudeParams.h Metric.h Matrix.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
Face.o: Face.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Mesh.h \
- Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
- ../Common/VertexArray.h ../Common/SmoothNormals.h \
- ../Common/GmshDefines.h Metric.h Matrix.h
+ ../Common/GmshDefines.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+ ../Geo/ExtrudeParams.h Metric.h Matrix.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
Element.o: Element.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
- Metric.h Matrix.h
+ Mesh.h ../Common/GmshDefines.h Vertex.h Element.h Simplex.h Face.h \
+ Edge.h ../Geo/ExtrudeParams.h Metric.h Matrix.h ../Numeric/Numeric.h
# 1 "/Users/geuzaine/.gmsh/Mesh//"
Simplex.o: Simplex.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
- ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h \
- Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h Metric.h Matrix.h \
- ../Common/Context.h
+ ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h ../Common/GmshDefines.h \
+ Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
+ Metric.h Matrix.h ../Common/Context.h
diff --git a/Mesh/Mesh.h b/Mesh/Mesh.h
index 8d42d8e4636e2e55f04d68dc06cf48df3577536c..43ce9af1c79535ebe75e0576e4c3e0435cf4c1d0 100644
--- a/Mesh/Mesh.h
+++ b/Mesh/Mesh.h
@@ -20,6 +20,7 @@
//
// Please report all bugs and problems to <gmsh@geuz.org>.
+#include "GmshDefines.h"
#include "List.h"
#include "Tree.h"
#include "Vertex.h"
@@ -27,9 +28,6 @@
#include "Simplex.h"
#include "Edge.h"
#include "ExtrudeParams.h"
-#include "VertexArray.h"
-#include "SmoothNormals.h"
-#include "GmshDefines.h"
class BDS_Mesh;
@@ -180,8 +178,6 @@ struct _Surf{
CylParam Cyl;
ExtrudeParams *Extrude;
DrawingColor Color;
- VertexArray *TriVertexArray;
- VertexArray *QuadVertexArray;
};
typedef struct _Surf Surface;
@@ -237,8 +233,6 @@ typedef struct {
Tree_T *Prisms;
Tree_T *Pyramids;
DrawingColor Color;
- VertexArray *TriVertexArray;
- VertexArray *QuadVertexArray;
}Volume;
typedef struct {
@@ -294,7 +288,6 @@ typedef struct{
CircParam Circle;
char functu[256], functv[256], functw[256];
DrawingColor Color;
- VertexArray *LinVertexArray;
}Curve;
typedef struct{
@@ -309,14 +302,6 @@ typedef struct{
#include "Metric.h"
-#define QUALITY_EDGES_BASED 1
-#define QUALITY_SIMPLEX_BASED 2
-#define DELAUNAY_ISO 1
-#define DELAUNAY_ANISO 2
-#define DELAUNAY_TRIANGLE 3
-#define FRONTAL_NETGEN 4
-#define DELAUNAY_TETGEN 5
-
struct _Mesh{
char name[256];
int status; // current state of the mesh
@@ -330,12 +315,6 @@ struct _Mesh{
Tree_T *EdgeLoops;
List_T *PhysicalGroups;
List_T *Partitions;
- smooth_normals *normals; // container for smooth normals
- double timing[3]; // timing for 1d, 2d and 3d mesh
- double quality_gamma[3]; // mesh quality statistics
- double quality_eta[3]; // mesh quality statistics
- double quality_rho[3]; // mesh quality statistics
- int Histogram[3][NB_HISTOGRAM]; // quality histograms
GMSHMetric *Metric;
BDS_Mesh *bds;
BDS_Mesh *bds_mesh;
diff --git a/Parser/Makefile b/Parser/Makefile
index e38977c2475a6a9a2ecf61658959a8d9904a97d3..ab287f2dfb066b0ccecf43b69da8034b5101d4c1 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.93 2006-08-12 16:16:36 geuzaine Exp $
+# $Id: Makefile,v 1.94 2006-08-12 16:44:31 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -84,28 +84,28 @@ Gmsh.tab.o: Gmsh.tab.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
../DataStr/Tree.h ../Common/Context.h ../Geo/Geo.h ../Geo/GeoUtils.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/GmshDefines.h \
- ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
- ../Mesh/Matrix.h ../Mesh/Nurbs.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
- ../Geo/CAD.h ../Geo/ExtrudeParams.h ../Graphics/Draw.h ../Mesh/Create.h \
- ../Mesh/Vertex.h ../Mesh/Mesh.h ../Common/Colors.h ../Common/Options.h \
- Parser.h OpenFile.h ../Common/CommandLine.h FunctionManager.h \
- ../Common/OS.h ../Graphics/CreateFile.h
+ ../Mesh/Mesh.h ../Common/GmshDefines.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ../Mesh/Nurbs.h \
+ ../Mesh/Vertex.h ../Mesh/Mesh.h ../Geo/CAD.h ../Geo/ExtrudeParams.h \
+ ../Graphics/Draw.h ../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
+ ../Common/Colors.h ../Common/Options.h Parser.h OpenFile.h \
+ ../Common/CommandLine.h FunctionManager.h ../Common/OS.h \
+ ../Graphics/CreateFile.h
# 1 "/Users/geuzaine/.gmsh/Parser//"
Gmsh.yy.o: Gmsh.yy.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ../Geo/ExtrudeParams.h Gmsh.tab.hpp
+ ../Common/GmshDefines.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+ ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+ ../Mesh/Matrix.h ../Geo/ExtrudeParams.h Gmsh.tab.hpp
# 1 "/Users/geuzaine/.gmsh/Parser//"
OpenFile.o: OpenFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 8fd973d0e7414fd49fc1241ec03c2d61214843fd..f441c0d0e8c4935217601da4113cf9c1cd7c30d7 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.103 2006-08-04 14:28:03 geuzaine Exp $
+# $Id: Makefile,v 1.104 2006-08-12 16:44:31 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -80,13 +80,13 @@ Plugin.o: Plugin.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
Extract.h ExtractElements.h ExtractEdges.h HarmonicToTime.h \
ModulusPhase.h Integrate.h Gradient.h Curl.h Divergence.h Annotate.h \
Remove.h DecomposeInSimplex.h Smooth.h Transform.h Triangulate.h Warp.h \
- StructuralSolver.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
- ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ../Common/GmshUI.h Eigenvectors.h Eigenvalues.h Lambda2.h Evaluate.h \
+ StructuralSolver.h ../Geo/Geo.h ../Mesh/Mesh.h ../Common/GmshDefines.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+ ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ../Common/GmshUI.h \
+ Eigenvectors.h Eigenvalues.h Lambda2.h Evaluate.h \
../Common/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
Probe.h ../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Plugin//"
@@ -181,13 +181,13 @@ Triangulate.o: Triangulate.cpp ../Common/Gmsh.h ../Common/Message.h \
../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
Triangulate.h ../Common/Context.h ../Geo/Geo.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/GmshDefines.h ../Mesh/Metric.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
- ../Mesh/Utils.h ../Mesh/Vertex.h ../Mesh/Mesh.h ../Mesh/Create.h \
- ../Mesh/Vertex.h ../Mesh/Mesh.h
+ ../Common/GmshDefines.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+ ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+ ../Mesh/Matrix.h ../Mesh/Utils.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
+ ../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h
# 1 "/Users/geuzaine/.gmsh/Plugin//"
Warp.o: Warp.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
@@ -196,16 +196,15 @@ Warp.o: Warp.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
Warp.h ../Common/Context.h
# 1 "/Users/geuzaine/.gmsh/Plugin//"
StructuralSolver.o: StructuralSolver.cpp StructuralSolver.h ../Geo/Geo.h \
- ../DataStr/List.h ../Mesh/Mesh.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
- ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshDefines.h \
+ ../DataStr/List.h ../Mesh/Mesh.h ../Common/GmshDefines.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
../Mesh/Matrix.h Plugin.h ../Common/Options.h ../Common/Message.h \
../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
- ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+ ../Common/SmoothNormals.h ../Numeric/Numeric.h ../Common/GmshMatrix.h \
../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/GmshUI.h \
../Common/Context.h ../DataStr/Tools.h ../DataStr/List.h \
../DataStr/Tree.h ../Graphics/Draw.h ../Mesh/Utils.h ../Mesh/Vertex.h \
@@ -283,11 +282,11 @@ Annotate.o: Annotate.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
../Common/VertexArray.h ../Common/SmoothNormals.h ../Numeric/Numeric.h \
../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
Annotate.h ../Common/Context.h ../Common/GmshUI.h ../Fltk/GUI.h \
- ../Fltk/Opengl_Window.h ../Mesh/Mesh.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
- ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/GmshDefines.h \
+ ../Fltk/Opengl_Window.h ../Mesh/Mesh.h ../Common/GmshDefines.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+ ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
../Mesh/Matrix.h ../Fltk/Colorbar_Window.h ../Fltk/Popup_Button.h \
../Graphics/Draw.h