diff --git a/Common/Makefile b/Common/Makefile
index 7149c70085efe382880f18d3822de68a86e9b4de..8effc9fddd71cd9c00114089b8cfaff50852049e 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.166 2008-04-06 02:33:53 remacle Exp $
+# $Id: Makefile,v 1.167 2008-04-06 07:51:36 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -73,47 +73,52 @@ 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 \
- ../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h ../Mesh/Generator.h \
- Context.h Options.h ../Post/ColorTable.h ../Mesh/BackgroundMesh.h \
- ../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Options.h \
- ../Common/Message.h ../Post/PView.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PView.h ../Post/PViewData.h ../Post/PViewOptions.h \
+ ../Post/ColorTable.h ../Mesh/Generator.h Context.h Options.h \
+ ../Mesh/BackgroundMesh.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \
+ ../Common/Options.h ../Common/Message.h ../Post/PViewDataList.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Fltk/Solvers.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/Geo.h \
- ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
- ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Post/PView.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 ../DataStr/Tree.h ../DataStr/avl.h \
+ ../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h
CommandLine.o: CommandLine.cpp GmshUI.h GmshDefines.h GmshVersion.h \
Message.h ../Parser/OpenFile.h CommandLine.h Context.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/GPoint.h \
- ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/SVector3.h ../Geo/GFace.h \
- ../Geo/GEdgeLoop.h ../Geo/Pair.h ../Geo/GRegion.h ../Post/PView.h \
- ../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Parser/CreateFile.h OS.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/SBoundingBox3d.h ../Post/PView.h ../Post/PViewData.h \
+ ../Post/PViewOptions.h ../Post/ColorTable.h ../Parser/CreateFile.h OS.h
Gmsh.o: Gmsh.cpp ../Parser/Parser.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h Options.h ../Post/ColorTable.h CommandLine.h OS.h \
../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Options.h \
../Common/Message.h ../Post/PView.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Post/PViewDataList.h ../Post/AdaptiveViews.h \
- ../DataStr/List.h ../Common/GmshMatrix.h ../Common/GmshMatrix.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h
+ ../Post/ColorTable.h ../Post/PViewDataList.h ../Post/PViewData.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h
OS.o: OS.cpp Message.h
Visibility.o: Visibility.cpp Visibility.h GmshDefines.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/GVertex.h ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GModel.h \
- ../Geo/GFace.h ../Geo/GRegion.h ../Geo/MElement.h \
- ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h \
- ../Parser/Parser.h ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.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/GModel.h ../Geo/GVertex.h \
+ ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.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 ../Parser/Parser.h \
+ ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h
Trackball.o: Trackball.cpp Trackball.h
VertexArray.o: VertexArray.cpp VertexArray.h ../Geo/SVector3.h \
../Geo/SPoint3.h Context.h ../Numeric/Numeric.h \
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 03a0ae7a7c33d9b88144079e41e82c7fb2f813b5..09e92a7287c580c92b51730cf3aba735ec114f69 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.178 2008-04-06 02:33:53 remacle Exp $
+# $Id: Makefile,v 1.179 2008-04-06 07:51:36 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -73,184 +73,211 @@ Main.o: Main.cpp GUI.h Opengl_Window.h Colorbar_Window.h \
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/SBoundingBox3d.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h ../Common/Gmsh.h \
- ../Common/Message.h ../Mesh/Generator.h ../Parser/CreateFile.h \
- ../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Common/Context.h \
- ../Common/Options.h ../Post/ColorTable.h ../Parser/Parser.h \
- ../DataStr/List.h ../DataStr/Tree.h ../Parser/OpenFile.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Post/PView.h \
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ ../Common/Gmsh.h ../Common/Message.h ../Mesh/Generator.h \
+ ../Parser/CreateFile.h ../Graphics/Draw.h ../Common/Context.h \
+ ../Common/Options.h ../Parser/Parser.h ../Parser/OpenFile.h \
../Common/CommandLine.h Solvers.h ../Plugin/PluginManager.h \
- ../Plugin/Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Post/PView.h ../Post/PViewDataList.h ../Post/AdaptiveViews.h \
- ../DataStr/List.h ../Common/GmshMatrix.h ../Common/GmshMatrix.h \
- ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/GPoint.h \
- ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/GRegion.h \
- ../Mesh/BackgroundMesh.h ../Post/PView.h
+ ../Plugin/Plugin.h ../Post/PViewDataList.h ../Post/PViewData.h \
+ ../Post/AdaptiveViews.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/SBoundingBox3d.h \
+ ../Mesh/BackgroundMesh.h
Message.o: Message.cpp ../Common/Message.h ../Common/GmshUI.h \
../Common/Context.h ../Common/Options.h ../Post/ColorTable.h GUI.h \
- Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
+ Opengl_Window.h Colorbar_Window.h Popup_Button.h \
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/SBoundingBox3d.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h GUI_Extras.h ../Common/OS.h
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Post/PView.h \
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ GUI_Extras.h ../Common/OS.h
GUI.o: GUI.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \
../Common/Message.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/Context.h ../Common/Options.h ../Post/ColorTable.h \
../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h GUI.h \
- Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
+ Opengl_Window.h Colorbar_Window.h Popup_Button.h \
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/SVector3.h \
- ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../Geo/ExtrudeParams.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 ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
../Common/SmoothData.h ../Post/PView.h ../Post/PViewData.h \
- ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- Callbacks.h Win32Icon.h ../Parser/OpenFile.h ../Common/CommandLine.h \
- ../Mesh/Generator.h Solvers.h ../Plugin/PluginManager.h \
- ../Plugin/Plugin.h ../Common/Options.h ../Common/Message.h \
- ../Post/PView.h ../Post/PViewDataList.h ../Post/AdaptiveViews.h \
- ../DataStr/List.h ../Common/GmshMatrix.h ../Common/GmshMatrix.h \
- Shortcut_Window.h ../Post/PView.h ../Geo/GModel.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdge.h ../Geo/GFace.h \
- ../Geo/GEdgeLoop.h ../Geo/GRegion.h ../Geo/GeoStringInterface.h
+ ../Post/PViewOptions.h ../Post/ColorTable.h Callbacks.h Win32Icon.h \
+ ../Parser/OpenFile.h ../Common/CommandLine.h ../Mesh/Generator.h \
+ Solvers.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
+ ../Common/GmshMatrix.h Shortcut_Window.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/SBoundingBox3d.h \
+ ../Geo/GeoStringInterface.h
GUI_Extras.o: GUI_Extras.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \
../Parser/CreateFile.h ../Common/Options.h ../Post/ColorTable.h \
../Common/Context.h ../Graphics/Draw.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h GUI.h Opengl_Window.h Colorbar_Window.h \
- ../Post/ColorTable.h Popup_Button.h SpherePosition_Widget.h \
- ../Mesh/Field.h ../Geo/Geo.h ../Common/GmshDefines.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/SVector3.h ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
+ ../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
+ ../DataStr/avl.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Post/PView.h ../Post/PViewData.h \
../Post/PViewOptions.h ../Post/ColorTable.h Shortcut_Window.h \
File_Picker.h
GUI_Projection.o: GUI_Projection.cpp ../Geo/GModelIO_Fourier.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/SVector3.h ../Geo/GFace.h \
- ../Geo/GEdgeLoop.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/MElement.h \
- ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h \
- ../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Context.h ../Parser/OpenFile.h \
- ../Graphics/SelectBuffer.h ../Geo/GVertex.h ../Geo/GEdge.h \
- ../Geo/GFace.h ../Geo/GRegion.h GUI_Projection.h ../Common/GmshUI.h \
- ../Geo/GModel.h ../Geo/fourierProjectionFace.h GUI.h Opengl_Window.h \
- Colorbar_Window.h ../Post/ColorTable.h Popup_Button.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/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 ../Graphics/Draw.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Common/Context.h \
+ ../Parser/OpenFile.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 ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.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 ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Post/PView.h \
- ../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h Shortcut_Window.h GUI_Extras.h \
- ../Geo/fourierFace.h ../Geo/fourierEdge.h ../Geo/fourierVertex.h \
- ../Common/Message.h
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ Shortcut_Window.h GUI_Extras.h ../Geo/fourierFace.h ../Geo/GFace.h \
+ ../Geo/GModel.h ../Geo/Range.h ../Geo/fourierEdge.h ../Geo/GEdge.h \
+ ../Geo/GModel.h ../Geo/fourierVertex.h ../Geo/GModel.h ../Geo/GVertex.h \
+ ../Geo/MVertex.h ../Common/Message.h
GUI_Classifier.o: GUI_Classifier.cpp GUI_Classifier.h ../Common/GmshUI.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/SVector3.h ../Geo/GFace.h \
- ../Geo/GEdgeLoop.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/MElement.h \
- ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.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 ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.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/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 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 \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Post/PView.h \
- ../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h Shortcut_Window.h ../Graphics/Draw.h \
- ../Geo/SBoundingBox3d.h ../Common/Options.h ../Post/ColorTable.h \
- ../Common/Context.h ../Graphics/SelectBuffer.h ../Geo/GVertex.h \
- ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h GUI_Projection.h \
- ../Geo/fourierProjectionFace.h ../Geo/GModel.h GUI_Extras.h \
- ../Common/Message.h ../Mesh/meshGFaceDelaunayInsertion.h \
- ../Geo/MElement.h ../Mesh/meshGFaceOptimize.h ../Geo/MEdge.h \
- ../Mesh/meshGFaceDelaunayInsertion.h ../Geo/discreteEdge.h ../Geo/Geo.h \
- ../Geo/discreteFace.h
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ Shortcut_Window.h ../Graphics/Draw.h ../Common/Options.h \
+ ../Common/Context.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 \
+ ../Geo/discreteEdge.h ../Geo/GModel.h ../Geo/GEdge.h ../Geo/Geo.h \
+ ../Geo/discreteFace.h ../Geo/GModel.h ../Geo/GFace.h ../Geo/Geo.h
Callbacks.o: Callbacks.cpp ../Common/GmshUI.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/Tools.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.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/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/MElement.h ../Common/GmshDefines.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h \
- ../Geo/GeoStringInterface.h ../DataStr/List.h ../Geo/findLinks.h \
- ../Mesh/Generator.h ../Mesh/HighOrder.h ../Geo/GModel.h \
- ../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Graphics/SelectBuffer.h \
- ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h \
- ../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h ../Parser/CreateFile.h \
- ../Parser/OpenFile.h ../Common/CommandLine.h ../Common/Context.h \
- ../Common/Options.h ../Post/ColorTable.h GUI.h Opengl_Window.h \
- Colorbar_Window.h ../Post/ColorTable.h Popup_Button.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/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 \
+ ../Geo/GeoStringInterface.h ../Geo/findLinks.h ../Mesh/Generator.h \
+ ../Mesh/HighOrder.h ../Graphics/Draw.h ../Graphics/SelectBuffer.h \
+ ../Post/PView.h ../Post/PViewData.h ../Post/PViewOptions.h \
+ ../Post/ColorTable.h ../Parser/CreateFile.h ../Parser/OpenFile.h \
+ ../Common/CommandLine.h ../Common/Context.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 ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
- ../DataStr/Tree.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Post/PView.h GUI_Extras.h Callbacks.h ../Plugin/Plugin.h \
- ../Common/Options.h ../Common/Message.h ../Post/PView.h \
- ../Post/PViewDataList.h ../Post/AdaptiveViews.h ../DataStr/List.h \
- ../Common/GmshMatrix.h ../Common/GmshMatrix.h ../Plugin/PluginManager.h \
- ../Plugin/Plugin.h ../Common/Visibility.h ../Common/GmshDefines.h \
- ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h \
- ../Numeric/Numeric.h Solvers.h ../Common/OS.h ../Mesh/BackgroundMesh.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 ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h GUI_Extras.h Callbacks.h \
+ ../Plugin/Plugin.h ../Post/PViewDataList.h ../Post/PViewData.h \
+ ../Post/AdaptiveViews.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 \
../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Graphics/SelectBuffer.h ../Geo/GVertex.h ../Geo/GEntity.h \
- ../Geo/Range.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h \
- ../Geo/GEdge.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/GFace.h \
- ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/Pair.h ../Geo/GRegion.h \
- ../Common/StringUtils.h GUI.h Opengl_Window.h Colorbar_Window.h \
- ../Post/ColorTable.h Popup_Button.h SpherePosition_Widget.h \
- ../Mesh/Field.h ../Geo/Geo.h ../Common/GmshDefines.h \
- ../Geo/gmshSurface.h ../Numeric/Numeric.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Post/PView.h ../Post/PViewData.h \
- ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h ../Post/ColorTable.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 ../Common/StringUtils.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 \
+ ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Post/PView.h \
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
../Graphics/gl2ps.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 ../Graphics/Draw.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Graphics/SelectBuffer.h \
- ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.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/GVertex.h ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/Pair.h ../Geo/GRegion.h GUI.h Opengl_Window.h \
- Colorbar_Window.h ../Post/ColorTable.h Popup_Button.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 \
- ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Numeric/Numeric.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
+ ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
+ ../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SBoundingBox3d.h \
+ ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Post/PView.h \
- ../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h \
- ../Geo/MFace.h
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.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
Colorbar_Window.o: Colorbar_Window.cpp ../Common/GmshUI.h GUI.h \
Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
SpherePosition_Widget.h ../Mesh/Field.h ../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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h ../Common/Context.h
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Post/PView.h \
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ ../Common/Context.h
Solvers.o: Solvers.cpp ../Common/Message.h Solvers.h GmshServer.h \
../Parser/OpenFile.h ../Common/GmshUI.h GUI.h Opengl_Window.h \
Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
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/SBoundingBox3d.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PView.h \
- ../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Common/Context.h
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Post/PView.h \
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ ../Graphics/Draw.h ../Common/Context.h
diff --git a/Geo/Makefile b/Geo/Makefile
index d1894186283b734b492a093e3793a61be42b2b5a..0538e5372dc89752c493d4dc39a7d5da63d50b97 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.199 2008-04-06 02:33:53 remacle Exp $
+# $Id: Makefile,v 1.200 2008-04-06 07:51:36 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -75,7 +75,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 ../Common/Context.h
+ ../Common/Context.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
@@ -92,8 +92,7 @@ GFace.o: GFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.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 \
- ../Common/Context.h
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Common/Context.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 \
@@ -176,9 +175,8 @@ GModelIO_Geo.o: GModelIO_Geo.cpp GModel.h GVertex.h GEntity.h Range.h \
../Common/SmoothData.h ../Parser/OpenFile.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Common/Message.h gmshVertex.h \
MVertex.h gmshFace.h gmshEdge.h gmshRegion.h ../Parser/Parser.h \
- ../DataStr/List.h ../DataStr/Tree.h ../Mesh/Field.h ../Geo/Geo.h \
- ../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h
+ ../Mesh/Field.h ../Geo/Geo.h ../Post/PView.h ../Post/PViewData.h \
+ ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h ../Post/ColorTable.h
GModelIO_Mesh.o: GModelIO_Mesh.cpp GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h \
GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshDefines.h MElement.h \
@@ -214,22 +212,20 @@ Geo.o: Geo.cpp ../Common/Message.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../DataStr/Malloc.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h Geo.h \
../Common/GmshDefines.h gmshSurface.h Pair.h Range.h SPoint2.h \
- SPoint3.h SVector3.h SBoundingBox3d.h ../DataStr/List.h \
- ../DataStr/Tree.h ExtrudeParams.h ../Common/SmoothData.h GModel.h \
- GVertex.h GEntity.h GPoint.h GEdge.h GFace.h GEdgeLoop.h GRegion.h \
- GeoInterpolation.h ../Parser/Parser.h ../DataStr/List.h \
- ../DataStr/Tree.h ../Mesh/Field.h ../Geo/Geo.h ../Post/PView.h \
- ../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Common/Context.h
+ SPoint3.h SVector3.h SBoundingBox3d.h ExtrudeParams.h \
+ ../Common/SmoothData.h GModel.h GVertex.h GEntity.h GPoint.h GEdge.h \
+ GFace.h GEdgeLoop.h GRegion.h GeoInterpolation.h ../Parser/Parser.h \
+ ../Mesh/Field.h ../Geo/Geo.h ../Post/PView.h ../Post/PViewData.h \
+ ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ ../Common/Context.h
GeoStringInterface.o: GeoStringInterface.cpp ../Common/Message.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../DataStr/Malloc.h \
Geo.h ../Common/GmshDefines.h gmshSurface.h Pair.h Range.h SPoint2.h \
SPoint3.h SVector3.h SBoundingBox3d.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ExtrudeParams.h \
../Common/SmoothData.h GeoStringInterface.h ../Parser/Parser.h \
- ../DataStr/List.h ../DataStr/Tree.h ../Parser/OpenFile.h \
- ../Common/Context.h GModel.h GVertex.h GEntity.h GPoint.h GEdge.h \
- GFace.h GEdgeLoop.h GRegion.h
+ ../Parser/OpenFile.h ../Common/Context.h GModel.h GVertex.h GEntity.h \
+ GPoint.h GEdge.h GFace.h GEdgeLoop.h GRegion.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 \
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 7e53733da64cad21e31c3918aaba7a082aacf5cd..dccb816f468ba5fac64631766a1f82f04c4c4948 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.147 2008-04-06 02:33:53 remacle Exp $
+# $Id: Makefile,v 1.148 2008-04-06 07:51:37 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -74,41 +74,55 @@ Draw.o: Draw.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \
../Common/Message.h Draw.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/Context.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Post/PView.h ../Post/PViewData.h \
- ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h ../Post/ColorTable.h
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SBoundingBox3d.h \
+ ../Post/PView.h ../Post/PViewData.h ../Post/PViewOptions.h \
+ ../Post/ColorTable.h
Mesh.o: Mesh.cpp ../Common/Message.h ../Common/GmshUI.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/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/MElement.h ../Common/GmshDefines.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h Draw.h \
- ../Geo/SBoundingBox3d.h ../Common/Context.h ../Common/OS.h gl2ps.h \
- ../Common/VertexArray.h ../Geo/SVector3.h ../Common/Context.h \
- ../Common/SmoothData.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/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 ../Common/OS.h gl2ps.h ../Common/VertexArray.h \
+ ../Common/Context.h ../Common/SmoothData.h
Geom.o: Geom.cpp ../Common/GmshUI.h Draw.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Common/Context.h gl2ps.h ../Common/VertexArray.h \
- ../Geo/SVector3.h ../Common/Context.h ../Geo/GModel.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
- ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/SVector3.h ../Geo/GFace.h \
- ../Geo/GEdgeLoop.h ../Geo/Pair.h ../Geo/GRegion.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/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/PViewData.h ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Common/VertexArray.h ../Geo/SVector3.h \
- ../Common/Context.h ../Common/SmoothData.h ../Common/Context.h gl2ps.h
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Common/Context.h ../Common/SmoothData.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 \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/MElement.h ../Common/GmshDefines.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h Draw.h \
- ../Geo/SBoundingBox3d.h ../Common/Context.h SelectBuffer.h \
- ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h \
- ../Common/VertexArray.h ../Geo/SVector3.h ../Common/Context.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/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 SelectBuffer.h \
+ ../Common/VertexArray.h ../Common/Context.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 \
@@ -116,17 +130,15 @@ Entity.o: Entity.cpp ../Common/GmshUI.h ../Numeric/Numeric.h \
ReadImg.o: ReadImg.cpp ReadImg.h ../Common/Message.h ../Common/GmshUI.h \
../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Post/PViewDataList.h ../Post/AdaptiveViews.h ../DataStr/List.h \
- ../Common/GmshMatrix.h
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
+ ../DataStr/List.h ../Common/GmshMatrix.h
Scale.o: Scale.cpp ../Common/GmshUI.h Draw.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PView.h ../Post/PViewData.h \
- ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Common/Context.h gl2ps.h
+ ../Post/PViewOptions.h ../Post/ColorTable.h ../Common/Context.h gl2ps.h
Graph2D.o: Graph2D.cpp ../Common/GmshUI.h Draw.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PView.h ../Post/PViewData.h \
- ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- gl2ps.h ../Common/Context.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h
+ ../Post/PViewOptions.h ../Post/ColorTable.h gl2ps.h ../Common/Context.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h
gl2ps.o: gl2ps.cpp gl2ps.h
gl2gif.o: gl2gif.cpp gl2gif.h PixelBuffer.h ../Common/GmshUI.h \
../Common/Message.h ../DataStr/Malloc.h Draw.h ../Geo/SBoundingBox3d.h \
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 660344a8248ff01042411a879439e9988cb1c9f9..5f6f29a552edddc71e2c9a6ec38f5a4bde5106a4 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.212 2008-04-06 02:33:53 remacle Exp $
+# $Id: Makefile,v 1.213 2008-04-06 07:51:37 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -89,202 +89,293 @@ Generator.o: Generator.cpp ../Common/Message.h ../Numeric/Numeric.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Common/OS.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/MElement.h ../Common/GmshDefines.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h meshGEdge.h meshGFace.h \
- meshGFaceBDS.h meshGRegion.h BackgroundMesh.h BoundaryLayer.h \
- HighOrder.h
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/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 \
+ BoundaryLayer.h HighOrder.h
Field.o: Field.cpp ../Common/Context.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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h ../Geo/GeoInterpolation.h \
- ../Geo/Geo.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
- ../Geo/GPoint.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GEdgeLoop.h \
- ../Geo/GRegion.h ../Common/Message.h ../Post/OctreePost.h \
- ../Common/Octree.h ../Common/OctreeInternals.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Post/PView.h \
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ ../Geo/GeoInterpolation.h ../Geo/Geo.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/SBoundingBox3d.h \
+ ../Common/Message.h ../Post/OctreePost.h ../Common/Octree.h \
+ ../Common/OctreeInternals.h ../Post/PViewDataList.h ../Post/PViewData.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h
meshGEdge.o: meshGEdge.cpp meshGEdge.h ../Geo/GEdge.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
- ../Geo/GVertex.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
- ../Geo/MEdge.h ../Geo/MFace.h BackgroundMesh.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/Message.h ../DataStr/List.h \
- ../Common/Context.h ../Geo/GModel.h ../Geo/GEdge.h ../Geo/GFace.h \
- ../Geo/GEdgeLoop.h ../Geo/Pair.h ../Geo/GRegion.h
+ ../Geo/SPoint3.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \
+ ../Geo/SPoint2.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 \
+ BackgroundMesh.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
+ ../Common/Message.h ../DataStr/List.h ../Common/Context.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/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/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/MElement.h ../Common/GmshDefines.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Common/Message.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/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 \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Common/Message.h
meshGFace.o: meshGFace.cpp meshGFace.h meshGFaceBDS.h \
meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \
- ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/SVector3.h \
- ../Geo/MFace.h meshGFaceOptimize.h ../Geo/MEdge.h DivideAndConquer.h \
+ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h meshGFaceOptimize.h DivideAndConquer.h \
BackgroundMesh.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/GVertex.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
- ../Geo/Pair.h ../Geo/MVertex.h ../Common/Context.h ../Geo/GPoint.h \
- ../Common/Message.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
- BDS.h ../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
+ ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Common/Context.h ../Common/Message.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h BDS.h ../Post/PView.h ../Post/PViewData.h \
../Post/PViewOptions.h ../Post/ColorTable.h qualityMeasures.h Field.h \
- ../Geo/Geo.h ../Geo/gmshSurface.h ../Numeric/Numeric.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Common/OS.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 ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.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/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/Pair.h ../Geo/MVertex.h ../Geo/MElement.h \
- ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h \
- ../Common/Context.h ../Common/Message.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.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/MVertex.h ../Geo/SPoint3.h ../Geo/MElement.h \
+ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Common/Context.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/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/MElement.h ../Common/GmshDefines.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Common/Context.h ../Common/Message.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/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 \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Common/Context.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/SVector3.h ../Geo/MFace.h \
- ../Geo/MEdge.h meshGFaceDelaunayInsertion.h BackgroundMesh.h \
- ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/GVertex.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
- ../Geo/Pair.h ../Geo/MVertex.h ../Common/Context.h ../Geo/GPoint.h \
- ../Geo/GModel.h ../Geo/GFace.h ../Geo/GRegion.h ../Common/Message.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.h ../Post/PView.h \
- ../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h \
+ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ meshGFaceDelaunayInsertion.h BackgroundMesh.h ../Geo/GVertex.h \
+ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h \
+ ../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/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SBoundingBox3d.h \
+ ../Common/Message.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
+ BDS.h ../Post/PView.h ../Post/PViewData.h ../Post/PViewOptions.h \
../Post/ColorTable.h qualityMeasures.h Field.h ../Geo/Geo.h \
- ../Geo/gmshSurface.h ../Numeric/Numeric.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Common/OS.h
+ ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
+ ../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SBoundingBox3d.h \
+ ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.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/GPoint.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/GVertex.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Post/PView.h ../Post/PViewData.h \
- ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- BackgroundMesh.h meshGFaceDelaunayInsertion.h ../Geo/MElement.h \
- ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h \
- meshGFaceOptimize.h ../Geo/MEdge.h meshGFace.h ../Numeric/Numeric.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Post/PView.h ../Post/PViewData.h \
+ ../Post/PViewOptions.h ../Post/ColorTable.h BackgroundMesh.h \
+ meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \
+ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ meshGFaceOptimize.h meshGFace.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/Message.h ../Common/Context.h
meshGFaceOptimize.o: meshGFaceOptimize.cpp meshGFaceOptimize.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
- ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/SVector3.h ../Geo/MFace.h \
- ../Geo/MEdge.h meshGFaceDelaunayInsertion.h qualityMeasures.h \
- ../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SBoundingBox3d.h \
- ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GVertex.h \
- ../Geo/SPoint2.h ../Geo/Pair.h ../Geo/GEdge.h ../Geo/GVertex.h \
- ../Geo/MVertex.h BackgroundMesh.h
+ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ meshGFaceDelaunayInsertion.h qualityMeasures.h ../Geo/GFace.h \
+ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/Pair.h BackgroundMesh.h
meshGRegion.o: meshGRegion.cpp meshGRegion.h \
meshGRegionDelaunayInsertion.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
- ../Geo/MEdge.h ../Geo/SVector3.h ../Geo/MFace.h ../Numeric/Numeric.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h BackgroundMesh.h qualityMeasures.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h ../Geo/GRegion.h \
- ../Geo/GRegion.h ../Geo/GFace.h ../Geo/GEdge.h ../Geo/gmshRegion.h \
- ../Geo/Geo.h ../Geo/gmshSurface.h ../Numeric/Numeric.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h BDS.h ../Post/PView.h \
- ../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Common/Message.h ../Common/Context.h
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
+ ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SBoundingBox3d.h \
+ ../Geo/gmshRegion.h ../Geo/Geo.h ../Geo/gmshSurface.h ../Geo/Pair.h \
+ ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
+ ../Geo/SBoundingBox3d.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Geo/GRegion.h BDS.h ../Post/PView.h \
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ ../Common/Message.h ../Common/Context.h
meshGRegionDelaunayInsertion.o: meshGRegionDelaunayInsertion.cpp \
../Common/OS.h BackgroundMesh.h meshGRegion.h meshGRegionLocalMeshMod.h \
meshGRegionDelaunayInsertion.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
- ../Geo/MEdge.h ../Geo/SVector3.h ../Geo/MFace.h ../Numeric/Numeric.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h qualityMeasures.h ../Geo/GModel.h \
- ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h ../Geo/GRegion.h \
- ../Geo/GRegion.h ../Common/Message.h
+ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h \
+ ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/SBoundingBox3d.h ../Common/Message.h
meshGRegionTransfinite.o: meshGRegionTransfinite.cpp meshGFace.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/GVertex.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Geo/GRegion.h ../Geo/MVertex.h ../Geo/MElement.h \
- ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h \
- ../Common/Context.h ../Common/Message.h
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MElement.h \
+ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Common/Context.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/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/MElement.h ../Common/GmshDefines.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h meshGFace.h meshGRegion.h ../Common/Context.h \
- ../Common/Message.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/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 \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h meshGFace.h meshGRegion.h \
+ ../Common/Context.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/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/MElement.h ../Common/GmshDefines.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h ../Common/Message.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/SBoundingBox3d.h \
+ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
+ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h
meshGRegionLocalMeshMod.o: meshGRegionLocalMeshMod.cpp \
meshGRegionLocalMeshMod.h meshGRegionDelaunayInsertion.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
- ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/SVector3.h ../Geo/MFace.h \
+ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BackgroundMesh.h \
- qualityMeasures.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SBoundingBox3d.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Common/Message.h
+ qualityMeasures.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Common/Message.h
DivideAndConquer.o: DivideAndConquer.cpp ../Common/Message.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h DivideAndConquer.h \
../DataStr/Malloc.h
BackgroundMesh.o: BackgroundMesh.cpp ../Common/Message.h BackgroundMesh.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.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/GVertex.h ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/Pair.h ../Geo/GModel.h ../Geo/GFace.h \
- ../Geo/GRegion.h Field.h ../Geo/Geo.h ../Common/GmshDefines.h \
- ../Geo/gmshSurface.h ../Numeric/Numeric.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../Geo/ExtrudeParams.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/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 ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
../Common/SmoothData.h ../Post/PView.h ../Post/PViewData.h \
- ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h ../Post/ColorTable.h
+ ../Post/PViewOptions.h ../Post/ColorTable.h
qualityMeasures.o: qualityMeasures.cpp qualityMeasures.h BDS.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/GVertex.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Post/PView.h ../Post/PViewData.h \
- ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Geo/MVertex.h ../Geo/MElement.h ../Common/GmshDefines.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h ../Numeric/Numeric.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Post/PView.h ../Post/PViewData.h \
+ ../Post/PViewOptions.h ../Post/ColorTable.h ../Geo/MVertex.h \
+ ../Geo/SPoint3.h ../Geo/MElement.h ../Common/GmshDefines.h \
+ ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
BoundaryLayer.o: BoundaryLayer.cpp ../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/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/MElement.h ../Common/GmshDefines.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h BoundaryLayer.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/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 BoundaryLayer.h \
../Geo/ExtrudeParams.h ../Common/SmoothData.h meshGEdge.h meshGFace.h \
../Common/Message.h
BDS.o: BDS.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/GVertex.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Post/PView.h ../Post/PViewData.h \
- ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Common/Message.h meshGFaceDelaunayInsertion.h ../Geo/MElement.h \
- ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Post/PView.h ../Post/PViewData.h \
+ ../Post/PViewOptions.h ../Post/ColorTable.h ../Common/Message.h \
+ meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \
+ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
qualityMeasures.h
HighOrder.o: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h meshGFaceOptimize.h ../Geo/MElement.h \
- ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h \
- ../Geo/MEdge.h meshGFaceDelaunayInsertion.h ../Common/Message.h \
- ../Common/OS.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
- ../Common/Context.h ../Common/GmshMatrix.h ../Numeric/FunctionSpace.h \
- ../Common/GmshMatrix.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/SBoundingBox3d.h \
+ meshGFaceOptimize.h ../Geo/MElement.h ../Common/GmshDefines.h \
+ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ meshGFaceDelaunayInsertion.h ../Common/Message.h ../Common/OS.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \
+ ../Common/GmshMatrix.h ../Numeric/FunctionSpace.h
diff --git a/Parser/Makefile b/Parser/Makefile
index 50a231a43036b8ec37ff3b28e46b679084049a76..c8c30d69fb38e556c2472c0d8688b5e79a8a826f 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.147 2008-04-06 02:33:54 remacle Exp $
+# $Id: Makefile,v 1.148 2008-04-06 07:51:37 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -71,59 +71,67 @@ depend:
Gmsh.tab.o: Gmsh.tab.cpp ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
- ../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
- ../Common/GmshMatrix.h ../Parallel/ParUtil.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/GModel.h \
- ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/Geo.h ../Common/GmshDefines.h \
- ../Geo/gmshSurface.h ../Numeric/Numeric.h ../DataStr/List.h \
- ../DataStr/Tree.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Geo/GeoInterpolation.h ../Geo/Geo.h ../Mesh/Generator.h \
- ../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Post/PView.h \
- ../Post/PViewDataList.h ../Common/Options.h ../Common/Colors.h \
- ../Common/Options.h Parser.h ../DataStr/List.h ../DataStr/Tree.h \
- OpenFile.h ../Common/CommandLine.h FunctionManager.h \
- ../Post/ColorTable.h ../Common/OS.h CreateFile.h ../Geo/gmshSurface.h \
- ../Mesh/Field.h ../Geo/Geo.h ../Post/PView.h ../Mesh/BackgroundMesh.h
+ ../Post/ColorTable.h ../Post/PView.h ../Post/PViewData.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Post/PViewOptions.h \
+ ../Post/ColorTable.h ../Post/PViewDataList.h ../Post/PViewData.h \
+ ../Post/AdaptiveViews.h ../Common/GmshMatrix.h ../Parallel/ParUtil.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.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/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/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 ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Geo/GeoInterpolation.h ../Geo/Geo.h \
+ ../Mesh/Generator.h ../Graphics/Draw.h ../Common/Colors.h \
+ ../Common/Options.h Parser.h OpenFile.h ../Common/CommandLine.h \
+ FunctionManager.h ../Common/OS.h CreateFile.h ../Mesh/Field.h \
+ ../Mesh/BackgroundMesh.h
Gmsh.yy.o: Gmsh.yy.cpp ../Common/Message.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.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 \
- ../Numeric/Numeric.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- Gmsh.tab.hpp
+ ../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h Gmsh.tab.hpp
OpenFile.o: OpenFile.cpp ../Common/Message.h ../Geo/Geo.h \
../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
- ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/GPoint.h \
- ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/GRegion.h \
- ../Numeric/Numeric.h ../Common/Context.h Parser.h ../DataStr/List.h \
- ../DataStr/Tree.h OpenFile.h ../Common/CommandLine.h ../Post/PView.h \
- ../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.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/SBoundingBox3d.h \
+ ../Common/Context.h Parser.h OpenFile.h ../Common/CommandLine.h \
+ ../Post/PView.h ../Post/PViewData.h ../Post/PViewOptions.h \
../Post/ColorTable.h ../Graphics/ReadImg.h ../Common/OS.h \
- ../Mesh/HighOrder.h ../Geo/GModel.h ../Common/GmshUI.h \
- ../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Graphics/SelectBuffer.h \
- ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.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/Geo.h \
- ../Post/PView.h
+ ../Mesh/HighOrder.h ../Common/GmshUI.h ../Graphics/Draw.h \
+ ../Graphics/SelectBuffer.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \
+ ../Fltk/Colorbar_Window.h ../Fltk/Popup_Button.h \
+ ../Fltk/SpherePosition_Widget.h ../Mesh/Field.h
CreateFile.o: CreateFile.cpp ../Common/Message.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/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Common/GmshDefines.h OpenFile.h ../Common/Context.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/SBoundingBox3d.h \
+ ../Common/GmshDefines.h OpenFile.h ../Common/Context.h \
../Common/Options.h ../Post/ColorTable.h ../Common/GmshUI.h \
../Graphics/gl2ps.h ../Graphics/gl2gif.h ../Graphics/PixelBuffer.h \
- ../Common/GmshUI.h ../Common/Message.h ../DataStr/Malloc.h \
- ../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Graphics/gl2jpeg.h \
- ../Graphics/gl2png.h ../Graphics/gl2ppm.h ../Graphics/gl2yuv.h
+ ../DataStr/Malloc.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
FunctionManager.o: FunctionManager.cpp FunctionManager.h
diff --git a/Plugin/Eigenvalues.cpp b/Plugin/Eigenvalues.cpp
index f9c381bbce7d03e86e3958e7e92e9c4a3fc68a24..b3529ae35f5e462aedb7c44b9e01552a9f87049c 100644
--- a/Plugin/Eigenvalues.cpp
+++ b/Plugin/Eigenvalues.cpp
@@ -1,4 +1,4 @@
-// $Id: Eigenvalues.cpp,v 1.8 2008-04-05 17:49:23 geuzaine Exp $
+// $Id: Eigenvalues.cpp,v 1.9 2008-04-06 07:51:37 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -34,11 +34,6 @@ extern "C"
}
}
-GMSH_EigenvaluesPlugin::GMSH_EigenvaluesPlugin()
-{
- ;
-}
-
void GMSH_EigenvaluesPlugin::getName(char *name) const
{
strcpy(name, "Eigenvalues");
@@ -118,32 +113,24 @@ PView *GMSH_EigenvaluesPlugin::execute(PView *v)
List_T *outmax = incrementList(dmax, numEdges);
if(!outmin || !outmid || !outmax) continue;
int numNodes = data1->getNumNodes(0, ent, ele);
- double x[8], y[8], z[8];
+ double xyz[3][8];
for(int nod = 0; nod < numNodes; nod++)
- data1->getNode(0, ent, ele, nod, x[nod], y[nod], z[nod]);
- for(int nod = 0; nod < numNodes; nod++){
- List_Add(outmin, &x[nod]);
- List_Add(outmid, &x[nod]);
- List_Add(outmax, &x[nod]);
- }
- for(int nod = 0; nod < numNodes; nod++){
- List_Add(outmin, &y[nod]);
- List_Add(outmid, &y[nod]);
- List_Add(outmax, &y[nod]);
- }
- for(int nod = 0; nod < numNodes; nod++){
- List_Add(outmin, &z[nod]);
- List_Add(outmid, &z[nod]);
- List_Add(outmax, &z[nod]);
+ data1->getNode(0, ent, ele, nod, xyz[0][nod], xyz[1][nod], xyz[2][nod]);
+ for(int i = 0; i < 3; i++){
+ for(int nod = 0; nod < numNodes; nod++){
+ List_Add(outmin, &xyz[i][nod]);
+ List_Add(outmid, &xyz[i][nod]);
+ List_Add(outmax, &xyz[i][nod]);
+ }
}
for(int step = 0; step < data1->getNumTimeSteps(); step++){
for(int nod = 0; nod < numNodes; nod++){
- double val[9];
+ double val[9], w[3];
for(int comp = 0; comp < numComp; comp++)
data1->getValue(step, ent, ele, nod, comp, val[comp]);
- double w[3], A[3][3] = { {val[0], val[1], val[2]},
- {val[3], val[4], val[5]},
- {val[6], val[7], val[8]} };
+ double A[3][3] = {{val[0], val[1], val[2]},
+ {val[3], val[4], val[5]},
+ {val[6], val[7], val[8]}};
eigenvalue(A, w);
List_Add(outmin, &w[2]);
List_Add(outmid, &w[1]);
diff --git a/Plugin/Eigenvalues.h b/Plugin/Eigenvalues.h
index f761bce36e3097d4b576b0f4586d25b3f9b5a5e6..f424e0537769741d2ef0178bcf7ed87621aa69d4 100644
--- a/Plugin/Eigenvalues.h
+++ b/Plugin/Eigenvalues.h
@@ -30,7 +30,7 @@ extern "C"
class GMSH_EigenvaluesPlugin : public GMSH_Post_Plugin
{
public:
- GMSH_EigenvaluesPlugin();
+ GMSH_EigenvaluesPlugin(){}
void getName(char *name) const;
void getInfos(char *author, char *copyright, char *helpText) const;
void catchErrorMessage(char *errorMessage) const;
diff --git a/Plugin/Eigenvectors.cpp b/Plugin/Eigenvectors.cpp
index 41fe60be0bd5f3a9783c117fa26c48293fb56773..389a544abbe67410bc732d497f9b1de0814b8782 100644
--- a/Plugin/Eigenvectors.cpp
+++ b/Plugin/Eigenvectors.cpp
@@ -1,4 +1,4 @@
-// $Id: Eigenvectors.cpp,v 1.11 2008-03-20 11:44:13 geuzaine Exp $
+// $Id: Eigenvectors.cpp,v 1.12 2008-04-06 07:51:37 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -36,11 +36,6 @@ extern "C"
}
}
-GMSH_EigenvectorsPlugin::GMSH_EigenvectorsPlugin()
-{
- ;
-}
-
void GMSH_EigenvectorsPlugin::getName(char *name) const
{
strcpy(name, "Eigenvectors");
@@ -79,6 +74,21 @@ void GMSH_EigenvectorsPlugin::catchErrorMessage(char *errorMessage) const
strcpy(errorMessage, "Eigenvectors failed...");
}
+static List_T *incrementList(PViewDataList *data2, int numEdges)
+{
+ switch(numEdges){
+ case 0: data2->NbVP++; return data2->VP;
+ case 1: data2->NbVL++; return data2->VL;
+ case 3: data2->NbVT++; return data2->VT;
+ case 4: data2->NbVQ++; return data2->VQ;
+ case 6: data2->NbVS++; return data2->VS;
+ case 12: data2->NbVH++; return data2->VH;
+ case 9: data2->NbVI++; return data2->VI;
+ case 8: data2->NbVY++; return data2->VY;
+ default: return 0;
+ }
+}
+
static int nonzero(double v[3])
{
for(int i = 0; i < 3; i++)
@@ -86,52 +96,6 @@ static int nonzero(double v[3])
return 0;
}
-static void eigenvectors(List_T *inList, int inNb,
- int nbNod, int nbTime, int scale,
- List_T *minList, int *minNb,
- List_T *midList, int *midNb,
- List_T *maxList, int *maxNb)
-{
- if(!inNb) return;
-
- int nbcomplex = 0;
-
- int nb = List_Nbr(inList) / inNb;
- for(int i = 0; i < List_Nbr(inList); i += nb) {
- for(int j = 0; j < 3 * nbNod; j++){
- List_Add(minList, List_Pointer_Fast(inList, i + j));
- List_Add(midList, List_Pointer_Fast(inList, i + j));
- List_Add(maxList, List_Pointer_Fast(inList, i + j));
- }
- for(int j = 0; j < nbTime; j++){
- for(int k = 0; k < nbNod; k++){
- double *val = (double *)List_Pointer_Fast(inList, i + 3 * nbNod +
- nbNod * 9 * j + 9 * k);
- double wr[3], wi[3], B[9];
- if(!EigSolve3x3(val, wr, wi, B))
- Msg(GERROR, "Eigensolver failed to converge");
- nbcomplex += nonzero(wi);
- if(!scale)
- wr[0] = wr[1] = wr[2] = 1.;
- for(int l = 0; l < 3; l++){
- double res;
- // wrong if there are complex eigenvals (B contains both
- // real and imag parts: cf. explanation in EigSolve.cpp)
- res = wr[0] * B[l]; List_Add(minList, &res);
- res = wr[1] * B[3+l]; List_Add(midList, &res);
- res = wr[2] * B[6+l]; List_Add(maxList, &res);
- }
- }
- }
- (*minNb)++;
- (*midNb)++;
- (*maxNb)++;
- }
-
- if(nbcomplex)
- Msg(GERROR, "%d tensors have complex eigenvalues/eigenvectors", nbcomplex);
-}
-
PView *GMSH_EigenvectorsPlugin::execute(PView *v)
{
int scale = (int)EigenvectorsOptions_Number[0].def;
@@ -140,8 +104,11 @@ PView *GMSH_EigenvectorsPlugin::execute(PView *v)
PView *v1 = getView(iView, v);
if(!v1) return v;
- PViewDataList *data1 = getDataList(v1);
- if(!data1) return v;
+ PViewData *data1 = v1->getData();
+ if(data1->hasMultipleMeshes()){
+ Msg(GERROR, "Eigenvectors plugin cannot be run on multi-mesh views");
+ return v;
+ }
PView *min = new PView(true);
PView *mid = new PView(true);
@@ -151,27 +118,61 @@ PView *GMSH_EigenvectorsPlugin::execute(PView *v)
PViewDataList *dmid = getDataList(mid);
PViewDataList *dmax = getDataList(max);
- eigenvectors(data1->TP, data1->NbTP, 1, data1->getNumTimeSteps(), scale,
- dmin->VP, &dmin->NbVP, dmid->VP, &dmid->NbVP, dmax->VP, &dmax->NbVP);
- eigenvectors(data1->TL, data1->NbTL, 2, data1->getNumTimeSteps(), scale,
- dmin->VL, &dmin->NbVL, dmid->VL, &dmid->NbVL, dmax->VL, &dmax->NbVL);
- eigenvectors(data1->TT, data1->NbTT, 3, data1->getNumTimeSteps(), scale,
- dmin->VT, &dmin->NbVT, dmid->VT, &dmid->NbVT, dmax->VT, &dmax->NbVT);
- eigenvectors(data1->TQ, data1->NbTQ, 4, data1->getNumTimeSteps(), scale,
- dmin->VQ, &dmin->NbVQ, dmid->VQ, &dmid->NbVQ, dmax->VQ, &dmax->NbVQ);
- eigenvectors(data1->TS, data1->NbTS, 4, data1->getNumTimeSteps(), scale,
- dmin->VS, &dmin->NbVS, dmid->VS, &dmid->NbVS, dmax->VS, &dmax->NbVS);
- eigenvectors(data1->TH, data1->NbTH, 8, data1->getNumTimeSteps(), scale,
- dmin->VH, &dmin->NbVH, dmid->VH, &dmid->NbVH, dmax->VH, &dmax->NbVH);
- eigenvectors(data1->TI, data1->NbTI, 6, data1->getNumTimeSteps(), scale,
- dmin->VI, &dmin->NbVI, dmid->VI, &dmid->NbVI, dmax->VI, &dmax->NbVI);
- eigenvectors(data1->TY, data1->NbTY, 5, data1->getNumTimeSteps(), scale,
- dmin->VY, &dmin->NbVY, dmid->VY, &dmid->NbVY, dmax->VY, &dmax->NbVY);
-
- for(int i = 0; i < List_Nbr(data1->Time); i++){
- List_Add(dmin->Time, List_Pointer(data1->Time, i));
- List_Add(dmid->Time, List_Pointer(data1->Time, i));
- List_Add(dmax->Time, List_Pointer(data1->Time, i));
+ int nbcomplex = 0;
+
+ for(int ent = 0; ent < data1->getNumEntities(0); ent++){
+ for(int ele = 0; ele < data1->getNumElements(0, ent); ele++){
+ if(data1->skipElement(0, ent, ele)) continue;
+ int numComp = data1->getNumComponents(0, ent, ele);
+ if(numComp != 9) continue;
+ int numEdges = data1->getNumEdges(0, ent, ele);
+ List_T *outmin = incrementList(dmin, numEdges);
+ List_T *outmid = incrementList(dmid, numEdges);
+ List_T *outmax = incrementList(dmax, numEdges);
+ if(!outmin || !outmid || !outmax) continue;
+ int numNodes = data1->getNumNodes(0, ent, ele);
+ double xyz[3][8];
+ for(int nod = 0; nod < numNodes; nod++)
+ data1->getNode(0, ent, ele, nod, xyz[0][nod], xyz[1][nod], xyz[2][nod]);
+ for(int i = 0; i < 3; i++){
+ for(int nod = 0; nod < numNodes; nod++){
+ List_Add(outmin, &xyz[i][nod]);
+ List_Add(outmid, &xyz[i][nod]);
+ List_Add(outmax, &xyz[i][nod]);
+ }
+ }
+ for(int step = 0; step < data1->getNumTimeSteps(); step++){
+ for(int nod = 0; nod < numNodes; nod++){
+ double val[9];
+ for(int comp = 0; comp < numComp; comp++)
+ data1->getValue(step, ent, ele, nod, comp, val[comp]);
+ double wr[3], wi[3], B[9];
+ if(!EigSolve3x3(val, wr, wi, B))
+ Msg(GERROR, "Eigensolver failed to converge");
+ nbcomplex += nonzero(wi);
+ if(!scale) wr[0] = wr[1] = wr[2] = 1.;
+ for(int i = 0; i < 3; i++){
+ double res;
+ // wrong if there are complex eigenvals (B contains both
+ // real and imag parts: cf. explanation in EigSolve.cpp)
+ res = wr[0] * B[i]; List_Add(outmin, &res);
+ res = wr[1] * B[3 + i]; List_Add(outmid, &res);
+ res = wr[2] * B[6 + i]; List_Add(outmax, &res);
+ }
+ }
+ }
+ }
+ }
+
+ if(nbcomplex)
+ Msg(GERROR, "%d tensors have complex eigenvalues/eigenvectors",
+ nbcomplex);
+
+ for(int i = 0; i < data1->getNumTimeSteps(); i++){
+ double time = data1->getTime(i);
+ List_Add(dmin->Time, &time);
+ List_Add(dmid->Time, &time);
+ List_Add(dmax->Time, &time);
}
dmin->setName(data1->getName() + "_MinEigenvectors");
dmin->setFileName(data1->getName() + "_MinEigenvectors.pos");
diff --git a/Plugin/Eigenvectors.h b/Plugin/Eigenvectors.h
index a2d1fe3606163266e79c577831c5da9c312f5cca..34d8550471ef945acd4e4027de09d5966c9d79a7 100644
--- a/Plugin/Eigenvectors.h
+++ b/Plugin/Eigenvectors.h
@@ -30,12 +30,12 @@ extern "C"
class GMSH_EigenvectorsPlugin : public GMSH_Post_Plugin
{
public:
- GMSH_EigenvectorsPlugin();
+ GMSH_EigenvectorsPlugin(){}
void getName(char *name) const;
void getInfos(char *author, char *copyright, char *helpText) const;
void catchErrorMessage(char *errorMessage) const;
int getNbOptions() const;
- StringXNumber* getOption(int iopt);
+ StringXNumber *getOption(int iopt);
PView *execute(PView *);
};
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 845143dc5df42c181a03cadc5b16b5febfaf0ec6..d8a744838d97aec15325224873fe4c5bfa5c6d06 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.160 2008-04-06 02:33:54 remacle Exp $
+# $Id: Makefile,v 1.161 2008-04-06 07:51:37 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -76,279 +76,292 @@ depend:
Plugin.o: Plugin.cpp Plugin.h ../Common/Options.h ../Post/ColorTable.h \
../Common/Message.h ../Post/PView.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Post/PViewDataList.h ../Post/AdaptiveViews.h \
- ../DataStr/List.h ../Common/GmshMatrix.h ../Common/GmshMatrix.h
+ ../Post/ColorTable.h ../Post/PViewDataList.h ../Post/PViewData.h \
+ ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h
PluginManager.o: PluginManager.cpp Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h PluginManager.h CutMap.h Levelset.h CutGrid.h \
StreamLines.h CutPlane.h CutParametric.h CutSphere.h Skin.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h Extract.h \
- ExtractElements.h ExtractEdges.h HarmonicToTime.h ModulusPhase.h \
- Integrate.h Gradient.h Curl.h Divergence.h Annotate.h Remove.h \
- MakeSimplex.h Smooth.h Transform.h TransformLatLon.h Triangulate.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
+ ../DataStr/Tree.h ../DataStr/avl.h Extract.h ExtractElements.h \
+ ExtractEdges.h HarmonicToTime.h ModulusPhase.h Integrate.h Gradient.h \
+ Curl.h Divergence.h Annotate.h Remove.h MakeSimplex.h Smooth.h \
+ Transform.h TransformLatLon.h Triangulate.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
Levelset.o: Levelset.cpp Levelset.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
- ../Common/GmshMatrix.h MakeSimplex.h ../DataStr/List.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
+ ../Common/GmshMatrix.h MakeSimplex.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h
CutPlane.o: CutPlane.cpp CutPlane.h Levelset.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Post/PViewDataList.h ../Post/AdaptiveViews.h ../DataStr/List.h \
- ../Common/GmshMatrix.h ../Common/GmshMatrix.h ../DataStr/List.h \
- ../Common/Context.h ../Common/GmshUI.h ../Graphics/Draw.h \
- ../Geo/SBoundingBox3d.h
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
+ ../DataStr/List.h ../Common/GmshMatrix.h ../Common/Context.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 ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Post/PViewDataList.h ../Post/AdaptiveViews.h ../DataStr/List.h \
- ../Common/GmshMatrix.h ../Common/GmshMatrix.h ../DataStr/List.h \
- ../Common/Context.h ../Common/GmshUI.h ../Graphics/Draw.h \
- ../Geo/SBoundingBox3d.h
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
+ ../DataStr/List.h ../Common/GmshMatrix.h ../Common/Context.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 \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Common/Context.h
Smooth.o: Smooth.cpp Smooth.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h
CutParametric.o: CutParametric.cpp ../Post/OctreePost.h \
../Common/Octree.h ../Common/OctreeInternals.h CutParametric.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Post/PViewDataList.h ../Post/AdaptiveViews.h ../DataStr/List.h \
- ../Common/GmshMatrix.h ../Common/GmshMatrix.h ../Common/Context.h \
- ../Common/GmshUI.h ../Graphics/Draw.h ../Geo/SBoundingBox3d.h
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
+ ../DataStr/List.h ../Common/GmshMatrix.h ../Common/Context.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 \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Common/ShapeFunctions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Eigenvectors.o: Eigenvectors.cpp Eigenvectors.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Post/PViewDataList.h ../Post/AdaptiveViews.h ../DataStr/List.h \
- ../Common/GmshMatrix.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
+ ../DataStr/List.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/EigSolve.h
Eigenvalues.o: Eigenvalues.cpp Eigenvalues.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
StreamLines.o: StreamLines.cpp StreamLines.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h ../Common/Context.h ../Common/GmshUI.h \
- ../Graphics/Draw.h ../Geo/SBoundingBox3d.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 \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Common/Context.h ../Common/GmshUI.h \
- ../Graphics/Draw.h ../Geo/SBoundingBox3d.h
+ ../Graphics/Draw.h
Transform.o: Transform.cpp Transform.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h
TransformLatLon.o: TransformLatLon.cpp TransformLatLon.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Post/PViewDataList.h ../Post/AdaptiveViews.h ../DataStr/List.h \
- ../Common/GmshMatrix.h ../Common/GmshMatrix.h
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
+ ../DataStr/List.h ../Common/GmshMatrix.h
Triangulate.o: Triangulate.cpp ../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/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/discreteFace.h ../Geo/GModel.h ../Geo/Geo.h \
- ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Numeric/Numeric.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/SBoundingBox3d.h \
+ ../Geo/discreteFace.h ../Geo/GModel.h ../Geo/GFace.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 ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Mesh/DivideAndConquer.h ../Common/Message.h ../Geo/MVertex.h \
- Triangulate.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
- ../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../DataStr/avl.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Mesh/DivideAndConquer.h ../Common/Message.h \
+ ../Geo/MVertex.h ../Geo/SPoint3.h Triangulate.h Plugin.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Post/PView.h \
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
../Common/GmshMatrix.h ../Common/Context.h
Warp.o: Warp.cpp Warp.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
../Common/Message.h ../Post/PView.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Post/PViewDataList.h ../Post/AdaptiveViews.h \
- ../DataStr/List.h ../Common/GmshMatrix.h ../Common/GmshMatrix.h \
+ ../Post/ColorTable.h ../Post/PViewDataList.h ../Post/PViewData.h \
+ ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
../Common/SmoothData.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
SphericalRaise.o: SphericalRaise.cpp SphericalRaise.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Post/PViewDataList.h ../Post/AdaptiveViews.h ../DataStr/List.h \
- ../Common/GmshMatrix.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
+ ../DataStr/List.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Skin.o: Skin.cpp Skin.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
../Common/Message.h ../Post/PView.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Post/PViewDataList.h ../Post/AdaptiveViews.h \
- ../DataStr/List.h ../Common/GmshMatrix.h ../Common/GmshMatrix.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../DataStr/Malloc.h ../Common/Context.h
+ ../Post/ColorTable.h ../Post/PViewDataList.h ../Post/PViewData.h \
+ ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Malloc.h \
+ ../Common/Context.h
GSHHS.o: GSHHS.cpp GSHHS.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Mesh/Field.h ../Geo/Geo.h \
../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
- ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Post/PView.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
- ../Geo/GPoint.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GEdgeLoop.h \
- ../Geo/GRegion.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 ../DataStr/Tree.h ../DataStr/avl.h \
+ ../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.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/SBoundingBox3d.h
Extract.o: Extract.cpp Extract.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h
ExtractElements.o: ExtractElements.cpp ExtractElements.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Post/PViewDataList.h ../Post/AdaptiveViews.h ../DataStr/List.h \
- ../Common/GmshMatrix.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
+ ../DataStr/List.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
ExtractEdges.o: ExtractEdges.cpp ExtractEdges.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Post/PViewDataList.h ../Post/AdaptiveViews.h ../DataStr/List.h \
- ../Common/GmshMatrix.h ../Common/GmshMatrix.h ../Mesh/BDS.h \
- ../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SBoundingBox3d.h \
- ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GVertex.h \
- ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Post/PView.h
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
+ ../DataStr/List.h ../Common/GmshMatrix.h ../Mesh/BDS.h ../Geo/GFace.h \
+ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/GEntity.h \
+ ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/Pair.h
MakeSimplex.o: MakeSimplex.cpp MakeSimplex.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h
Evaluate.o: Evaluate.cpp Evaluate.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h
FieldView.o: FieldView.cpp FieldView.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Mesh/Field.h ../Geo/Geo.h \
../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
- ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Post/PView.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
- ../Geo/GPoint.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GEdgeLoop.h \
- ../Geo/GRegion.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 ../DataStr/Tree.h ../DataStr/avl.h \
+ ../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.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/SBoundingBox3d.h
Integrate.o: Integrate.cpp Integrate.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Common/ShapeFunctions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Gradient.o: Gradient.cpp Gradient.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Common/ShapeFunctions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Curl.o: Curl.cpp Curl.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
../Common/Message.h ../Post/PView.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Post/PViewDataList.h ../Post/AdaptiveViews.h \
- ../DataStr/List.h ../Common/GmshMatrix.h ../Common/GmshMatrix.h \
+ ../Post/ColorTable.h ../Post/PViewDataList.h ../Post/PViewData.h \
+ ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
../Common/ShapeFunctions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Divergence.o: Divergence.cpp Divergence.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Common/ShapeFunctions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Annotate.o: Annotate.cpp Annotate.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Common/Context.h ../Common/GmshUI.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/Geo.h \
- ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
- ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Post/PView.h ../Graphics/Draw.h ../Geo/SBoundingBox3d.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 ../DataStr/Tree.h ../DataStr/avl.h \
+ ../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
+ ../Graphics/Draw.h
Remove.o: Remove.cpp Remove.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h
Probe.o: Probe.cpp Probe.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Post/PViewData.h ../Post/AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Common/Context.h ../Post/OctreePost.h \
../Common/Octree.h ../Common/OctreeInternals.h ../Common/GmshUI.h \
- ../Graphics/Draw.h ../Geo/SBoundingBox3d.h
+ ../Graphics/Draw.h
HarmonicToTime.o: HarmonicToTime.cpp HarmonicToTime.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Post/PViewDataList.h ../Post/AdaptiveViews.h ../DataStr/List.h \
- ../Common/GmshMatrix.h ../Common/GmshMatrix.h
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
+ ../DataStr/List.h ../Common/GmshMatrix.h
ModulusPhase.o: ModulusPhase.cpp ModulusPhase.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
../Post/PView.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Post/PViewDataList.h ../Post/AdaptiveViews.h ../DataStr/List.h \
- ../Common/GmshMatrix.h ../Common/GmshMatrix.h
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
+ ../DataStr/List.h ../Common/GmshMatrix.h
diff --git a/Plugin/StreamLines.cpp b/Plugin/StreamLines.cpp
index b86fec33255e4d2cdec7e90007bf5fd23b7bebcf..6d679d7fe0d7c234270c84d18440f7351a55e8e0 100644
--- a/Plugin/StreamLines.cpp
+++ b/Plugin/StreamLines.cpp
@@ -1,4 +1,4 @@
-// $Id: StreamLines.cpp,v 1.34 2008-03-20 11:44:14 geuzaine Exp $
+// $Id: StreamLines.cpp,v 1.35 2008-04-06 07:51:37 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -58,11 +58,6 @@ extern "C"
}
}
-GMSH_StreamLinesPlugin::GMSH_StreamLinesPlugin()
-{
- ;
-}
-
void GMSH_StreamLinesPlugin::draw()
{
#if defined(HAVE_FLTK)
@@ -225,47 +220,51 @@ void GMSH_StreamLinesPlugin::getPoint(int iU, int iV, double *X)
double v = getNbV() > 1 ? (double)iV / (double)(getNbV() - 1.) : 0.;
X[0] = StreamLinesOptions_Number[0].def +
u * (StreamLinesOptions_Number[3].def-StreamLinesOptions_Number[0].def) +
- v * (StreamLinesOptions_Number[6].def-StreamLinesOptions_Number[0].def) ;
+ v * (StreamLinesOptions_Number[6].def-StreamLinesOptions_Number[0].def);
X[1] = StreamLinesOptions_Number[1].def +
u * (StreamLinesOptions_Number[4].def-StreamLinesOptions_Number[1].def) +
- v * (StreamLinesOptions_Number[7].def-StreamLinesOptions_Number[1].def) ;
+ v * (StreamLinesOptions_Number[7].def-StreamLinesOptions_Number[1].def);
X[2] = StreamLinesOptions_Number[2].def +
u * (StreamLinesOptions_Number[5].def-StreamLinesOptions_Number[2].def) +
- v * (StreamLinesOptions_Number[8].def-StreamLinesOptions_Number[2].def) ;
+ v * (StreamLinesOptions_Number[8].def-StreamLinesOptions_Number[2].def);
}
-PView *GMSH_StreamLinesPlugin::GenerateView(PView *v1, PView *v2)
+PView *GMSH_StreamLinesPlugin::execute(PView *v)
{
- const double b1=1./3., b2=2./3., b3=1./3., b4=1./6.;
- const double a1=0.5, a2=0.5, a3=1.0, a4=1.0;
- const double DT = StreamLinesOptions_Number[12].def;
- double XINIT[3], X[3], DX[3], X1[3], X2[3], X3[3], X4[3];
- double val[3], *val2 = 0;
-
- PViewDataList *data1 = getDataList(v1);
- if(!data1) return v1;
-
- PViewDataList *data2 = v2 ? getDataList(v2) : 0;
+ int maxIter = (int)StreamLinesOptions_Number[11].def;
+ double DT = StreamLinesOptions_Number[12].def;
+ int timeStep = (int)StreamLinesOptions_Number[13].def;
+ int dView = (int)StreamLinesOptions_Number[14].def;
+ int iView = (int)StreamLinesOptions_Number[15].def;
- PView *v = new PView(true);
+ PView *v1 = getView(iView, v);
+ if(!v1) return v;
+ PViewData *data1 = v1->getData();
- PViewDataList *data = getDataList(v);
- if(!data) return v1;
+ PView *v2 = (dView < 0) ? 0 : getView(dView, v);
+ PViewData *data2 = v2 ? v2->getData() : 0;
- int timestep = (int)StreamLinesOptions_Number[13].def;
- if(timestep > data1->getNumTimeSteps() - 1){
- Msg(GERROR, "Invalid time step (%d) in view: using step 0 instead", timestep);
- timestep = 0;
+ // sanity checks
+ if(timeStep > data1->getNumTimeSteps() - 1){
+ Msg(GERROR, "Invalid time step (%d) in view[%d]", v1->getIndex());
+ return v;
}
- OctreePost o(v1);
+ OctreePost o1(v1);
+ double *val2 = 0;
OctreePost *o2 = 0;
-
if(data2){
val2 = new double[data2->getNumTimeSteps()];
o2 = new OctreePost(v2);
}
+ PView *v3 = new PView(true);
+ PViewDataList *data3 = getDataList(v3);
+
+ const double b1 = 1. / 3., b2 = 2. / 3., b3 = 1. / 3., b4 = 1. / 6.;
+ const double a1 = 0.5, a2 = 0.5, a3 = 1., a4 = 1.;
+ double XINIT[3], X[3], DX[3], X1[3], X2[3], X3[3], X4[3];
+
for(int i = 0; i < getNbU(); ++i){
for(int j = 0; j < getNbV(); ++j){
getPoint(i, j, XINIT);
@@ -275,31 +274,30 @@ PView *GMSH_StreamLinesPlugin::GenerateView(PView *v1, PView *v2)
o2->searchScalar(X[0], X[1], X[2], val2, -1);
}
else{
- data->NbVP++;
- List_Add(data->VP, &X[0]);
- List_Add(data->VP, &X[1]);
- List_Add(data->VP, &X[2]);
+ data3->NbVP++;
+ List_Add(data3->VP, &X[0]);
+ List_Add(data3->VP, &X[1]);
+ List_Add(data3->VP, &X[2]);
}
int currentTimeStep = 0;
- for(int iter = 0; iter < (int)StreamLinesOptions_Number[11].def; iter++){
+ for(int iter = 0; iter < maxIter; iter++){
- double XPREV[3] = { X[0], X[1], X[2] };
+ double XPREV[3] = {X[0], X[1], X[2]};
- if(timestep < 0){
+ if(timeStep < 0){
double T0 = data1->getTime(0);
double currentT = T0 + DT * iter;
- List_Add(data->Time, ¤tT);
+ List_Add(data3->Time, ¤tT);
for(; currentTimeStep < data1->getNumTimeSteps() - 1 &&
currentT > 0.5 * (data1->getTime(currentTimeStep) +
data1->getTime(currentTimeStep + 1));
currentTimeStep++);
}
else{
- currentTimeStep = timestep;
+ currentTimeStep = timeStep;
}
- //Msg(DEBUG, "iter = %d, currentTimeStep = %d", iter, currentTimeStep);
// dX/dt = V
// X1 = X + a1 * DT * V(X)
@@ -307,43 +305,39 @@ PView *GMSH_StreamLinesPlugin::GenerateView(PView *v1, PView *v2)
// X3 = X + a3 * DT * V(X2)
// X4 = X + a4 * DT * V(X3)
// X = X + b1 X1 + b2 X2 + b3 X3 + b4 x4
-
- // o.searchVector(X[0], X[1], X[2], val, currentTimeStep, &sizeElem);
- // double normV = sqrt(val[0]*val[0]+val[1]*val[1]+val[2]*val[2]);
- // if (normV==0.0) normV = 1.0;
- // double DT = sizeElem / normV ; // CFL = 1 ==> secure
- o.searchVector(X[0], X[1], X[2], val, currentTimeStep);
+ double val[3];
+ o1.searchVector(X[0], X[1], X[2], val, currentTimeStep);
for(int k = 0; k < 3; k++) X1[k] = X[k] + DT * val[k] * a1;
- o.searchVector(X1[0], X1[1], X1[2], val, currentTimeStep);
+ o1.searchVector(X1[0], X1[1], X1[2], val, currentTimeStep);
for(int k = 0; k < 3; k++) X2[k] = X[k] + DT * val[k] * a2;
- o.searchVector(X2[0], X2[1], X2[2], val, currentTimeStep);
+ o1.searchVector(X2[0], X2[1], X2[2], val, currentTimeStep);
for(int k = 0; k < 3; k++) X3[k] = X[k] + DT * val[k] * a3;
- o.searchVector(X3[0], X3[1], X3[2], val, currentTimeStep);
+ o1.searchVector(X3[0], X3[1], X3[2], val, currentTimeStep);
for(int k = 0; k < 3; k++) X4[k] = X[k] + DT * val[k] * a4;
for(int k = 0; k < 3; k++)
- X[k] += (b1*(X1[k]-X[k]) + b2*(X2[k]-X[k]) +
- b3*(X3[k]-X[k]) + b4*(X4[k]-X[k])) ;
+ X[k] += (b1 * (X1[k] - X[k]) + b2 * (X2[k] - X[k]) +
+ b3 * (X3[k] - X[k]) + b4 * (X4[k] - X[k]));
for(int k = 0; k < 3; k++) DX[k] = X[k] - XINIT[k];
if(data2){
- data->NbSL++;
- List_Add(data->SL, &XPREV[0]);
- List_Add(data->SL, &X[0]);
- List_Add(data->SL, &XPREV[1]);
- List_Add(data->SL, &X[1]);
- List_Add(data->SL, &XPREV[2]);
- List_Add(data->SL, &X[2]);
+ data3->NbSL++;
+ List_Add(data3->SL, &XPREV[0]);
+ List_Add(data3->SL, &X[0]);
+ List_Add(data3->SL, &XPREV[1]);
+ List_Add(data3->SL, &X[1]);
+ List_Add(data3->SL, &XPREV[2]);
+ List_Add(data3->SL, &X[2]);
for(int k = 0; k < data2->getNumTimeSteps(); k++)
- List_Add(data->SL, &val2[k]);
+ List_Add(data3->SL, &val2[k]);
o2->searchScalar(X[0], X[1], X[2], val2, -1);
for(int k = 0; k < data2->getNumTimeSteps(); k++)
- List_Add(data->SL, &val2[k]);
+ List_Add(data3->SL, &val2[k]);
}
else{
- List_Add(data->VP, &DX[0]);
- List_Add(data->VP, &DX[1]);
- List_Add(data->VP, &DX[2]);
+ List_Add(data3->VP, &DX[0]);
+ List_Add(data3->VP, &DX[1]);
+ List_Add(data3->VP, &DX[2]);
}
}
}
@@ -354,25 +348,12 @@ PView *GMSH_StreamLinesPlugin::GenerateView(PView *v1, PView *v2)
delete o2;
}
else{
- v->getOptions()->VectorType = PViewOptions::Displacement;
+ v3->getOptions()->VectorType = PViewOptions::Displacement;
}
- data->setName(data1->getName() + "_StreamLines");
- data->setFileName(data1->getName() + "_StreamLines.pos");
- data->finalize();
-
- return v;
-}
-
-PView *GMSH_StreamLinesPlugin::execute(PView *v)
-{
- int dView = (int)StreamLinesOptions_Number[14].def;
- int iView = (int)StreamLinesOptions_Number[15].def;
-
- PView *v1 = getView(iView, v);
- if(!v1) return v;
-
- PView *v2 = (dView < 0) ? 0 : getView(dView, v);
+ data3->setName(data1->getName() + "_StreamLines");
+ data3->setFileName(data1->getName() + "_StreamLines.pos");
+ data3->finalize();
- return GenerateView(v1, v2);
+ return v3;
}
diff --git a/Plugin/StreamLines.h b/Plugin/StreamLines.h
index a484b2e7334a249b177bcf1608c66a82c9a30c30..191830ad55192e4efcd25dc4a4bb2400c3fa77a0 100644
--- a/Plugin/StreamLines.h
+++ b/Plugin/StreamLines.h
@@ -32,16 +32,13 @@ class GMSH_StreamLinesPlugin : public GMSH_Post_Plugin
static double callback(int num, int action, double value, double *opt,
double step, double min, double max);
public:
- GMSH_StreamLinesPlugin();
+ GMSH_StreamLinesPlugin(){}
void getName(char *name) const;
- void getInfos(char *author,
- char *copyright,
- char *help_text) const;
- void catchErrorMessage (char *errorMessage) const;
+ void getInfos(char *author, char *copyright, char *help_text) const;
+ void catchErrorMessage(char *errorMessage) const;
int getNbOptions() const;
StringXNumber *getOption(int iopt);
PView *execute(PView *);
- virtual PView *GenerateView(PView *v1, PView *v2);
static int getNbU();
static int getNbV();
diff --git a/Post/Makefile b/Post/Makefile
index 722f8af88b291b12649d7c12bd12657b8d1b433a..fe6c12b19b76fd5dfdcacf836ff284602f33b702 100644
--- a/Post/Makefile
+++ b/Post/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.39 2008-04-06 02:33:54 remacle Exp $
+# $Id: Makefile,v 1.40 2008-04-06 07:51:37 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -65,16 +65,19 @@ depend:
PView.o: PView.cpp PView.h PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h PViewOptions.h ColorTable.h PViewDataList.h \
AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
- ../Common/VertexArray.h ../Geo/SVector3.h ../Common/Context.h \
- ../Common/SmoothData.h ../Common/Message.h
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Common/Context.h ../Common/SmoothData.h ../Common/Message.h
PViewIO.o: PViewIO.cpp PView.h PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h PViewOptions.h ColorTable.h PViewDataList.h \
AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
PViewDataGModel.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
- ../Geo/Range.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h \
- ../Geo/GEdge.h ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h \
- ../Geo/Pair.h ../Geo/GRegion.h ../Common/StringUtils.h \
- ../Common/Message.h
+ ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SBoundingBox3d.h \
+ ../Common/StringUtils.h ../Common/Message.h
PViewData.o: PViewData.cpp PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/Message.h
@@ -94,20 +97,30 @@ PViewDataGModel.o: PViewDataGModel.cpp PViewDataGModel.h PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h PViewDataList.h \
AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/MElement.h ../Common/GmshDefines.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h ../Numeric/Numeric.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SBoundingBox3d.h \
+ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
+ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/Message.h
PViewDataGModelIO.o: PViewDataGModelIO.cpp ../Common/Message.h \
PViewDataGModel.h PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
PViewDataList.h AdaptiveViews.h ../DataStr/List.h \
../Common/GmshMatrix.h ../Geo/GModel.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
- ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/SVector3.h ../Geo/GFace.h \
- ../Geo/GEdgeLoop.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/MVertex.h \
+ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
+ ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \
+ ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/SBoundingBox3d.h ../Geo/MVertex.h ../Geo/SPoint3.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
- ../Geo/MEdge.h ../Geo/MFace.h ../Numeric/Numeric.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/StringUtils.h
PViewOptions.o: PViewOptions.cpp PViewOptions.h ColorTable.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/Message.h
@@ -116,17 +129,21 @@ AdaptiveViews.o: AdaptiveViews.cpp AdaptiveViews.h ../DataStr/List.h \
../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h
+ ../Post/PViewData.h ../Post/AdaptiveViews.h
OctreePost.o: OctreePost.cpp ../Common/Octree.h \
../Common/OctreeInternals.h OctreePost.h ../DataStr/List.h PView.h \
PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h PViewOptions.h \
ColorTable.h PViewDataList.h AdaptiveViews.h ../Common/GmshMatrix.h \
PViewDataGModel.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
- ../Geo/Range.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h \
- ../Geo/GEdge.h ../Geo/SVector3.h ../Geo/GFace.h ../Geo/GEdgeLoop.h \
- ../Geo/Pair.h ../Geo/GRegion.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/Message.h \
- ../Common/ShapeFunctions.h ../Numeric/Numeric.h ../Geo/MElement.h \
- ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MFace.h
+ ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SBoundingBox3d.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Message.h \
+ ../Common/ShapeFunctions.h ../Geo/MElement.h ../Common/GmshDefines.h \
+ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h
ColorTable.o: ColorTable.cpp ../Common/Message.h ColorTable.h \
../Common/Context.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h
diff --git a/Post/PViewDataGModelIO.cpp b/Post/PViewDataGModelIO.cpp
index 6082f8fb0726c201f407b0325a8eb2c2545be1ea..8be3af98dfa6339e08b22cff9fcbda810e7a4429 100644
--- a/Post/PViewDataGModelIO.cpp
+++ b/Post/PViewDataGModelIO.cpp
@@ -1,4 +1,4 @@
-// $Id: PViewDataGModelIO.cpp,v 1.38 2008-04-05 09:21:37 geuzaine Exp $
+// $Id: PViewDataGModelIO.cpp,v 1.39 2008-04-06 07:51:37 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -127,9 +127,9 @@ bool PViewDataGModel::writeMSH(std::string fileName, bool binary)
if(_steps[step]->getData(i)) numNodes++;
if(numNodes){
fprintf(fp, "$NodeData\n");
- fprintf(fp, "\"%s\"\n", getName().c_str());
- fprintf(fp, "%d %.16g 0 0 %d %d\n", step, _steps[step]->getTime(),
- numComp, numNodes);
+ fprintf(fp, "1\n\"%s\"\n", getName().c_str());
+ fprintf(fp, "1\n%.16g\n", _steps[step]->getTime());
+ fprintf(fp, "3\n%d\n%d\n%d\n", step, numComp, numNodes);
for(int i = 0; i < _steps[step]->getNumData(); i++){
if(_steps[step]->getData(i)){
MVertex *v = _steps[step]->getModel()->getMeshVertexByTag(i);
diff --git a/Post/PViewDataListIO.cpp b/Post/PViewDataListIO.cpp
index 9094400fa9e74bd06567b0e0e58dda194a61ffbe..40d7f35d4215f009866f93613f4d62f5e10dc9b8 100644
--- a/Post/PViewDataListIO.cpp
+++ b/Post/PViewDataListIO.cpp
@@ -1,4 +1,4 @@
-// $Id: PViewDataListIO.cpp,v 1.18 2008-03-29 10:19:43 geuzaine Exp $
+// $Id: PViewDataListIO.cpp,v 1.19 2008-04-06 07:51:37 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -590,8 +590,9 @@ bool PViewDataList::writeMSH(std::string fileName, bool binary)
for(int ts = 0; ts < NbTimeStep; ts++){
double time = getTime(ts);
fprintf(fp, "$NodeData\n");
- fprintf(fp, "\"%s\"\n", getName().c_str());
- fprintf(fp, "%d %.16g 0 0 %d %d\n", ts, time, numComp, numNodes);
+ fprintf(fp, "1\n\"%s\"\n", getName().c_str());
+ fprintf(fp, "1\n%.16g\n", time);
+ fprintf(fp, "3\n%d\n%d\n%d\n", ts, numComp, numNodes);
for(std::set<pVertex, pVertexLessThan>::iterator it = nodes.begin();
it != nodes.end(); ++it){
fprintf(fp, "%d", it->Num);
diff --git a/Post/PViewIO.cpp b/Post/PViewIO.cpp
index de18c1810b94ecdc80a6b63076b99fc26bd58f70..cbe29ce1b09562f63e35b9171d937e247432cf23 100644
--- a/Post/PViewIO.cpp
+++ b/Post/PViewIO.cpp
@@ -1,4 +1,4 @@
-// $Id: PViewIO.cpp,v 1.4 2008-04-03 07:48:54 geuzaine Exp $
+// $Id: PViewIO.cpp,v 1.5 2008-04-06 07:51:37 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -157,16 +157,49 @@ bool PView::readMSH(std::string fileName, int fileIndex)
type = PViewDataGModel::ElementData;
else
type = PViewDataGModel::ElementNodeData;
- // read data info
+ int numTags;
+ // string tags
+ std::string viewName, interpolName;
if(!fgets(str, sizeof(str), fp)) return false;
- std::string name = extractDoubleQuotedString(str, sizeof(str));
- int timeStep, partition, interpolationScheme, numComp, numEnt;
- double time;
+ if(sscanf(str, "%d", &numTags) != 1) return false;
+ for(int i = 0; i < numTags; i++){
+ if(!fgets(str, sizeof(str), fp)) return false;
+ if(i == 0)
+ viewName = extractDoubleQuotedString(str, sizeof(str));
+ else if(i == 1)
+ interpolName = extractDoubleQuotedString(str, sizeof(str));
+ }
+ // double tags
+ double time = 0.;
if(!fgets(str, sizeof(str), fp)) return false;
- if(sscanf(str, "%d %lf %d %d %d %d", &timeStep, &time, &partition,
- &interpolationScheme, &numComp, &numEnt) != 6) return false;
+ if(sscanf(str, "%d", &numTags) != 1) return false;
+ for(int i = 0; i < numTags; i++){
+ if(!fgets(str, sizeof(str), fp)) return false;
+ if(i == 0){
+ if(sscanf(str, "%lf", &time) != 1) return false;
+ }
+ }
+ // integer tags
+ int timeStep = 0, numComp = 0, numEnt = 0, partition = 0;
+ if(!fgets(str, sizeof(str), fp)) return false;
+ if(sscanf(str, "%d", &numTags) != 1) return false;
+ for(int i = 0; i < numTags; i++){
+ if(!fgets(str, sizeof(str), fp)) return false;
+ if(i == 0){
+ if(sscanf(str, "%d", &timeStep) != 1) return false;
+ }
+ else if(i == 1){
+ if(sscanf(str, "%d", &numComp) != 1) return false;
+ }
+ else if(i == 2){
+ if(sscanf(str, "%d", &numEnt) != 1) return false;
+ }
+ else if(i == 3){
+ if(sscanf(str, "%d", &partition) != 1) return false;
+ }
+ }
// either get existing viewData, or create new one
- PView *p = getViewByName(name, timeStep, partition);
+ PView *p = getViewByName(viewName, timeStep, partition);
PViewDataGModel *d = 0;
if(p) d = dynamic_cast<PViewDataGModel*>(p->getData());
bool create = d ? false : true;
@@ -178,7 +211,7 @@ bool PView::readMSH(std::string fileName, int fileIndex)
return false;
}
else{
- d->setName(name);
+ d->setName(viewName);
d->setFileName(fileName);
d->setFileIndex(index);
if(create) new PView(d);
diff --git a/contrib/NativeFileChooser/Makefile b/contrib/NativeFileChooser/Makefile
index 82253d6fb9cc05844d8513e4eb61313b0fd1c30b..22afa16b863297ae4c86305b8f7bf2e443cce62d 100644
--- a/contrib/NativeFileChooser/Makefile
+++ b/contrib/NativeFileChooser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 2008-04-06 02:33:54 remacle Exp $
+# $Id: Makefile,v 1.10 2008-04-06 07:51:38 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -52,5 +52,5 @@ depend:
# DO NOT DELETE THIS LINE
Fl_Native_File_Chooser.o: Fl_Native_File_Chooser.cxx \
- Fl_Native_File_Chooser_FLTK.cxx FL/Fl_Native_File_Chooser.H \
- FL/Fl_Native_File_Chooser_FLTK.H common.cxx
+ Fl_Native_File_Chooser_MAC.cxx common.cxx FL/Fl_Native_File_Chooser.H \
+ FL/Fl_Native_File_Chooser_MAC.H
diff --git a/contrib/Netgen/Makefile b/contrib/Netgen/Makefile
index 029f52449eccc6993b5ad7f9bbe5431ef058123a..abc63406c7d033fa9ac10a9698fabedd769f6b67 100644
--- a/contrib/Netgen/Makefile
+++ b/contrib/Netgen/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.35 2008-04-06 02:33:54 remacle Exp $
+# $Id: Makefile,v 1.36 2008-04-06 07:51:38 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -344,9 +344,10 @@ meshtool.o: libsrc/meshing/meshtool.cpp libsrc/include/mystdlib.h \
libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
libsrc/meshing/specials.hpp libsrc/include/csg.hpp \
- libsrc/include/../csg/csg.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/../csg/surface.hpp \
- libsrc/include/../csg/solid.hpp libsrc/include/../csg/identify.hpp \
+ libsrc/include/../csg/csg.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/meshing.hpp libsrc/include/../meshing/meshing.hpp \
+ libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+ libsrc/include/../csg/identify.hpp \
libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
@@ -357,7 +358,7 @@ meshtool.o: libsrc/meshing/meshtool.cpp libsrc/include/mystdlib.h \
libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
libsrc/include/geometry2d.hpp libsrc/include/../geom2d/geometry2d.hpp \
- libsrc/include/../geom2d/spline2d.hpp \
+ libsrc/include/../gprim/gprim.hpp libsrc/include/../geom2d/spline2d.hpp \
libsrc/include/../geom2d/splinegeometry2.hpp \
libsrc/include/../geom2d/geom2dmesh.hpp
refine.o: libsrc/meshing/refine.cpp libsrc/include/mystdlib.h \
@@ -485,7 +486,7 @@ improve3.o: libsrc/meshing/improve3.cpp libsrc/include/mystdlib.h \
libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
- libsrc/meshing/specials.hpp
+ libsrc/meshing/specials.hpp libsrc/include/../opti/opti.hpp
smoothing3.o: libsrc/meshing/smoothing3.cpp libsrc/include/mystdlib.h \
libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
@@ -527,7 +528,7 @@ smoothing3.o: libsrc/meshing/smoothing3.cpp libsrc/include/mystdlib.h \
libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
- libsrc/meshing/specials.hpp
+ libsrc/meshing/specials.hpp libsrc/include/../opti/opti.hpp
adfront3.o: libsrc/meshing/adfront3.cpp libsrc/include/mystdlib.h \
libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
@@ -741,7 +742,7 @@ improve2.o: libsrc/meshing/improve2.cpp libsrc/include/mystdlib.h \
libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
- libsrc/meshing/specials.hpp
+ libsrc/meshing/specials.hpp libsrc/include/../opti/opti.hpp
smoothing2.o: libsrc/meshing/smoothing2.cpp libsrc/include/mystdlib.h \
libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
@@ -783,7 +784,7 @@ smoothing2.o: libsrc/meshing/smoothing2.cpp libsrc/include/mystdlib.h \
libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
- libsrc/meshing/specials.hpp
+ libsrc/meshing/specials.hpp libsrc/include/../opti/opti.hpp
adfront2.o: libsrc/meshing/adfront2.cpp libsrc/include/mystdlib.h \
libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
@@ -1331,7 +1332,7 @@ improve2gen.o: libsrc/meshing/improve2gen.cpp libsrc/include/mystdlib.h \
libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
- libsrc/meshing/specials.hpp
+ libsrc/meshing/specials.hpp libsrc/include/../opti/opti.hpp
delaunay.o: libsrc/meshing/delaunay.cpp libsrc/include/mystdlib.h \
libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
@@ -1753,7 +1754,8 @@ nglib.o: libsrc/interface/nglib.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -1791,12 +1793,13 @@ nglib.o: libsrc/interface/nglib.cpp libsrc/include/mystdlib.h \
libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
libsrc/include/stlgeom.hpp libsrc/include/../stlgeom/stlgeom.hpp \
+ libsrc/include/../gprim/gprim.hpp \
libsrc/include/../stlgeom/stltopology.hpp \
libsrc/include/../stlgeom/stltool.hpp \
libsrc/include/../stlgeom/stlline.hpp \
libsrc/include/../stlgeom/meshstlsurface.hpp \
libsrc/include/geometry2d.hpp libsrc/include/../geom2d/geometry2d.hpp \
- libsrc/include/../geom2d/spline2d.hpp \
+ libsrc/include/../gprim/gprim.hpp libsrc/include/../geom2d/spline2d.hpp \
libsrc/include/../geom2d/splinegeometry2.hpp \
libsrc/include/../geom2d/geom2dmesh.hpp libsrc/interface/nglib.h
geomtest3d.o: libsrc/gprim/geomtest3d.cpp libsrc/include/mystdlib.h \
@@ -2028,7 +2031,8 @@ algprim.o: libsrc/csg/algprim.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -2095,7 +2099,8 @@ brick.o: libsrc/csg/brick.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -2158,8 +2163,9 @@ manifold.o: libsrc/csg/manifold.cpp libsrc/include/csg.hpp \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/linalg.hpp \
- libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+ libsrc/include/../linalg/vector.hpp \
libsrc/include/../linalg/densemat.hpp \
libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
@@ -2224,8 +2230,9 @@ bspline2d.o: libsrc/csg/bspline2d.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/linalg.hpp \
- libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+ libsrc/include/../linalg/vector.hpp \
libsrc/include/../linalg/densemat.hpp \
libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
@@ -2290,8 +2297,9 @@ meshsurf.o: libsrc/csg/meshsurf.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/linalg.hpp \
- libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+ libsrc/include/../linalg/vector.hpp \
libsrc/include/../linalg/densemat.hpp \
libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
@@ -2359,7 +2367,8 @@ csgeom.o: libsrc/csg/csgeom.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -2426,7 +2435,8 @@ polyhedra.o: libsrc/csg/polyhedra.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -2489,8 +2499,9 @@ curve2d.o: libsrc/csg/curve2d.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/linalg.hpp \
- libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+ libsrc/include/../linalg/vector.hpp \
libsrc/include/../linalg/densemat.hpp \
libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
@@ -2558,7 +2569,8 @@ singularref.o: libsrc/csg/singularref.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -2649,8 +2661,9 @@ edgeflw.o: libsrc/csg/edgeflw.cpp libsrc/include/mystdlib.h \
libsrc/include/../meshing/hprefinement.hpp \
libsrc/include/../meshing/boundarylayer.hpp \
libsrc/include/../meshing/specials.hpp libsrc/include/csg.hpp \
- libsrc/include/../csg/csg.hpp libsrc/include/../csg/surface.hpp \
- libsrc/include/../csg/solid.hpp libsrc/include/../csg/identify.hpp \
+ libsrc/include/../csg/csg.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+ libsrc/include/../csg/identify.hpp \
libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
@@ -2690,7 +2703,8 @@ solid.o: libsrc/csg/solid.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -2754,8 +2768,9 @@ explicitcurve2d.o: libsrc/csg/explicitcurve2d.cpp \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/linalg.hpp \
- libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+ libsrc/include/../linalg/vector.hpp \
libsrc/include/../linalg/densemat.hpp \
libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
@@ -2848,8 +2863,9 @@ specpoin.o: libsrc/csg/specpoin.cpp libsrc/include/mystdlib.h \
libsrc/include/../meshing/hprefinement.hpp \
libsrc/include/../meshing/boundarylayer.hpp \
libsrc/include/../meshing/specials.hpp libsrc/include/csg.hpp \
- libsrc/include/../csg/csg.hpp libsrc/include/../csg/surface.hpp \
- libsrc/include/../csg/solid.hpp libsrc/include/../csg/identify.hpp \
+ libsrc/include/../csg/csg.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+ libsrc/include/../csg/identify.hpp \
libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
@@ -2889,7 +2905,8 @@ gencyl.o: libsrc/csg/gencyl.cpp libsrc/include/linalg.hpp \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -2956,7 +2973,8 @@ revolution.o: libsrc/csg/revolution.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -3022,7 +3040,8 @@ genmesh.o: libsrc/csg/genmesh.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -3088,7 +3107,8 @@ spline3d.o: libsrc/csg/spline3d.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -3151,8 +3171,9 @@ surface.o: libsrc/csg/surface.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/linalg.hpp \
- libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+ libsrc/include/../linalg/vector.hpp \
libsrc/include/../linalg/densemat.hpp \
libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
@@ -3190,7 +3211,8 @@ surface.o: libsrc/csg/surface.cpp libsrc/include/mystdlib.h \
libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
libsrc/include/../csg/extrusion.hpp \
libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
- libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+ libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
+ libsrc/include/../linalg/linalg.hpp
identify.o: libsrc/csg/identify.cpp libsrc/include/mystdlib.h \
libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
@@ -3220,7 +3242,8 @@ identify.o: libsrc/csg/identify.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -3286,7 +3309,8 @@ triapprox.o: libsrc/csg/triapprox.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -3349,8 +3373,9 @@ geom2dmesh.o: libsrc/geom2d/geom2dmesh.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/linalg.hpp \
- libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+ libsrc/include/../linalg/vector.hpp \
libsrc/include/../linalg/densemat.hpp \
libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
@@ -3390,7 +3415,7 @@ geom2dmesh.o: libsrc/geom2d/geom2dmesh.cpp libsrc/include/mystdlib.h \
libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
libsrc/include/geometry2d.hpp libsrc/include/../geom2d/geometry2d.hpp \
- libsrc/include/../geom2d/spline2d.hpp \
+ libsrc/include/../gprim/gprim.hpp libsrc/include/../geom2d/spline2d.hpp \
libsrc/include/../geom2d/splinegeometry2.hpp \
libsrc/include/../geom2d/geom2dmesh.hpp
spline2d.o: libsrc/geom2d/spline2d.cpp libsrc/include/mystdlib.h \
@@ -3419,8 +3444,9 @@ spline2d.o: libsrc/geom2d/spline2d.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/linalg.hpp \
- libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+ libsrc/include/../linalg/vector.hpp \
libsrc/include/../linalg/densemat.hpp \
libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
@@ -3459,7 +3485,7 @@ spline2d.o: libsrc/geom2d/spline2d.cpp libsrc/include/mystdlib.h \
libsrc/include/../csg/extrusion.hpp \
libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
- libsrc/geom2d/spline2d.hpp
+ libsrc/include/../linalg/linalg.hpp libsrc/geom2d/spline2d.hpp
splinegeometry2.o: libsrc/geom2d/splinegeometry2.cpp \
libsrc/include/mystdlib.h libsrc/include/csg.hpp \
libsrc/include/../csg/csg.hpp libsrc/include/myadt.hpp \
@@ -3487,8 +3513,9 @@ splinegeometry2.o: libsrc/geom2d/splinegeometry2.cpp \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/linalg.hpp \
- libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+ libsrc/include/../linalg/vector.hpp \
libsrc/include/../linalg/densemat.hpp \
libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
@@ -3527,7 +3554,8 @@ splinegeometry2.o: libsrc/geom2d/splinegeometry2.cpp \
libsrc/include/../csg/extrusion.hpp \
libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
- libsrc/geom2d/spline2d.hpp libsrc/geom2d/splinegeometry2.hpp
+ libsrc/include/../linalg/linalg.hpp libsrc/geom2d/spline2d.hpp \
+ libsrc/geom2d/splinegeometry2.hpp
genmesh2d.o: libsrc/geom2d/genmesh2d.cpp libsrc/include/mystdlib.h \
libsrc/include/csg.hpp libsrc/include/../csg/csg.hpp \
libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
@@ -3554,8 +3582,9 @@ genmesh2d.o: libsrc/geom2d/genmesh2d.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/linalg.hpp \
- libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+ libsrc/include/../linalg/vector.hpp \
libsrc/include/../linalg/densemat.hpp \
libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
@@ -3595,7 +3624,7 @@ genmesh2d.o: libsrc/geom2d/genmesh2d.cpp libsrc/include/mystdlib.h \
libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
libsrc/include/geometry2d.hpp libsrc/include/../geom2d/geometry2d.hpp \
- libsrc/include/../geom2d/spline2d.hpp \
+ libsrc/include/../gprim/gprim.hpp libsrc/include/../geom2d/spline2d.hpp \
libsrc/include/../geom2d/splinegeometry2.hpp \
libsrc/include/../geom2d/geom2dmesh.hpp
meshstlsurface.o: libsrc/stlgeom/meshstlsurface.cpp \
@@ -3627,7 +3656,8 @@ meshstlsurface.o: libsrc/stlgeom/meshstlsurface.cpp \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -3653,8 +3683,9 @@ meshstlsurface.o: libsrc/stlgeom/meshstlsurface.cpp \
libsrc/include/../meshing/hprefinement.hpp \
libsrc/include/../meshing/boundarylayer.hpp \
libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
- libsrc/stlgeom/stltopology.hpp libsrc/stlgeom/stltool.hpp \
- libsrc/stlgeom/stlline.hpp libsrc/stlgeom/meshstlsurface.hpp
+ libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
+ libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
+ libsrc/stlgeom/meshstlsurface.hpp
stlline.o: libsrc/stlgeom/stlline.cpp libsrc/include/mystdlib.h \
libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
@@ -3683,7 +3714,8 @@ stlline.o: libsrc/stlgeom/stlline.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -3709,8 +3741,9 @@ stlline.o: libsrc/stlgeom/stlline.cpp libsrc/include/mystdlib.h \
libsrc/include/../meshing/hprefinement.hpp \
libsrc/include/../meshing/boundarylayer.hpp \
libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
- libsrc/stlgeom/stltopology.hpp libsrc/stlgeom/stltool.hpp \
- libsrc/stlgeom/stlline.hpp libsrc/stlgeom/meshstlsurface.hpp
+ libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
+ libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
+ libsrc/stlgeom/meshstlsurface.hpp
stltopology.o: libsrc/stlgeom/stltopology.cpp libsrc/include/mystdlib.h \
libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
@@ -3739,7 +3772,8 @@ stltopology.o: libsrc/stlgeom/stltopology.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -3765,8 +3799,9 @@ stltopology.o: libsrc/stlgeom/stltopology.cpp libsrc/include/mystdlib.h \
libsrc/include/../meshing/hprefinement.hpp \
libsrc/include/../meshing/boundarylayer.hpp \
libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
- libsrc/stlgeom/stltopology.hpp libsrc/stlgeom/stltool.hpp \
- libsrc/stlgeom/stlline.hpp libsrc/stlgeom/meshstlsurface.hpp
+ libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
+ libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
+ libsrc/stlgeom/meshstlsurface.hpp
stltool.o: libsrc/stlgeom/stltool.cpp libsrc/include/mystdlib.h \
libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
@@ -3795,7 +3830,8 @@ stltool.o: libsrc/stlgeom/stltool.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -3821,8 +3857,9 @@ stltool.o: libsrc/stlgeom/stltool.cpp libsrc/include/mystdlib.h \
libsrc/include/../meshing/hprefinement.hpp \
libsrc/include/../meshing/boundarylayer.hpp \
libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
- libsrc/stlgeom/stltopology.hpp libsrc/stlgeom/stltool.hpp \
- libsrc/stlgeom/stlline.hpp libsrc/stlgeom/meshstlsurface.hpp
+ libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
+ libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
+ libsrc/stlgeom/meshstlsurface.hpp
stlgeom.o: libsrc/stlgeom/stlgeom.cpp libsrc/include/mystdlib.h \
libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
@@ -3851,7 +3888,8 @@ stlgeom.o: libsrc/stlgeom/stlgeom.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -3877,8 +3915,9 @@ stlgeom.o: libsrc/stlgeom/stlgeom.cpp libsrc/include/mystdlib.h \
libsrc/include/../meshing/hprefinement.hpp \
libsrc/include/../meshing/boundarylayer.hpp \
libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
- libsrc/stlgeom/stltopology.hpp libsrc/stlgeom/stltool.hpp \
- libsrc/stlgeom/stlline.hpp libsrc/stlgeom/meshstlsurface.hpp
+ libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
+ libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
+ libsrc/stlgeom/meshstlsurface.hpp
stlgeomchart.o: libsrc/stlgeom/stlgeomchart.cpp libsrc/include/mystdlib.h \
libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
@@ -3907,7 +3946,8 @@ stlgeomchart.o: libsrc/stlgeom/stlgeomchart.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -3933,8 +3973,9 @@ stlgeomchart.o: libsrc/stlgeom/stlgeomchart.cpp libsrc/include/mystdlib.h \
libsrc/include/../meshing/hprefinement.hpp \
libsrc/include/../meshing/boundarylayer.hpp \
libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
- libsrc/stlgeom/stltopology.hpp libsrc/stlgeom/stltool.hpp \
- libsrc/stlgeom/stlline.hpp libsrc/stlgeom/meshstlsurface.hpp
+ libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
+ libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
+ libsrc/stlgeom/meshstlsurface.hpp
stlgeommesh.o: libsrc/stlgeom/stlgeommesh.cpp libsrc/include/mystdlib.h \
libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
@@ -3963,7 +4004,8 @@ stlgeommesh.o: libsrc/stlgeom/stlgeommesh.cpp libsrc/include/mystdlib.h \
libsrc/include/../gprim/geomtest3d.hpp \
libsrc/include/../gprim/transform3d.hpp \
libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
- libsrc/include/../meshing/meshing.hpp libsrc/include/opti.hpp \
+ libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+ libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
libsrc/include/../opti/opti.hpp \
libsrc/include/../meshing/msghandler.hpp \
libsrc/include/../meshing/meshtype.hpp \
@@ -3989,8 +4031,9 @@ stlgeommesh.o: libsrc/stlgeom/stlgeommesh.cpp libsrc/include/mystdlib.h \
libsrc/include/../meshing/hprefinement.hpp \
libsrc/include/../meshing/boundarylayer.hpp \
libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
- libsrc/stlgeom/stltopology.hpp libsrc/stlgeom/stltool.hpp \
- libsrc/stlgeom/stlline.hpp libsrc/stlgeom/meshstlsurface.hpp
+ libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
+ libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
+ libsrc/stlgeom/meshstlsurface.hpp
moveablemem.o: libsrc/general/moveablemem.cpp libsrc/include/myadt.hpp \
libsrc/include/../general/myadt.hpp libsrc/include/mystdlib.h \
libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 039073d149594e0747c882d0ecfb0034294a3e4c..7343d49250b6199973f974839fdfdcce1aa3434a 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
-@c $Id: gmsh.texi,v 1.242 2008-04-05 09:21:37 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.243 2008-04-06 07:51:38 geuzaine Exp $
@c
@c Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
@c
@@ -3009,18 +3009,41 @@ $PhysicalNames
@dots{}
$EndPhysicalNames
$NodeData
-"@var{view-name}"
-@var{step} @var{time} @var{partition} @var{interpolation-id} @var{number-of-components} @var{number-of-nodes}
+@var{number-of-string-tags}
+"@var{string-tag}"
+@dots{}
+@var{number-of-real-tags}
+@var{real-tag}
+@dots{}
+@var{number-of-integer-tags}
+@var{integer-tag}
+@dots{}
@var{node-number} @var{value} @dots{}
@dots{}
$EndNodeData
$ElementData
-@var{step} @var{time} @var{partition} @var{interpolation-id} @var{number-of-components} @var{number-of-elements}
+@var{number-of-string-tags}
+"@var{string-tag}"
+@dots{}
+@var{number-of-real-tags}
+@var{real-tag}
+@dots{}
+@var{number-of-integer-tags}
+@var{integer-tag}
+@dots{}
@var{elm-number} @var{value} @dots{}
@dots{}
$EndElementData
$ElementNodeData
-@var{step} @var{time} @var{partition} @var{interpolation-id} @var{number-of-components} @var{number-of-elements}
+@var{number-of-string-tags}
+"@var{string-tag}"
+@dots{}
+@var{number-of-real-tags}
+@var{real-tag}
+@dots{}
+@var{number-of-integer-tags}
+@var{integer-tag}
+@dots{}
@var{elm-number} @var{number-of-nodes-per-element} @var{value} @dots{}
@dots{}
$ElementEndNodeData
@@ -3138,31 +3161,20 @@ any), followed by the nodes associated with the volume (if any). The
ordering of these additional nodes follows the ordering of the edges and
quadrangular faces given in @ref{Node ordering}.
-@item @var{view-name}
-gives the name of the post-processing dataset
-
-@item @var{step}
-is an integer giving an index for the view (e.g. a time step number)
-
-@item @var{time}
-is a real number associating some floating point to the step value
-
-@item @var{partition}
-is an integer giving a partition index for the view data. If another
-view is loaded with the same name, but a different partition index, then
-their contents will be merged.
+@item @var{number-of-string-tags}
+gives the number of string tags that follow. The first @var{string-tag}
+is always interpreted as the name of the post-processing dataset; the
+second as the name of the interpolation scheme.
-@item @var{interpolation-id}
-index of an interpolation scheme used to interpret the view values
+@item @var{number-of-real-tags}
+gives the number of real number tags that follow.
-@item @var{number-of-components}
-gives the number of components of the data in the view
-
-@item @var{number-of-nodes}
-gives the number of nodes in a node-based view
-
-@item @var{number-of-elements}
-gives the number of elements in an element-based view
+@item @var{number-of-integer-tags}
+gives the number of integer tags that follow. The first
+@var{integer-tag} is always interpreted as a time step number; the
+second as the number of components of the data in the view; the third as
+the number of entities (nodes or elements) in the view; the fourth as
+the partition index for the view data.
@item @var{number-of-nodes-per-elements}
gives the number of node values for an element in an element-based view