diff --git a/Common/Makefile b/Common/Makefile index 84e555f176bf0fbdcd7c60c1cf920a30a71bf89f..3780e4562c8766879b7411f60484c4eef4eeb8f8 100644 --- a/Common/Makefile +++ b/Common/Makefile @@ -107,7 +107,7 @@ Gmsh.o: Gmsh.cpp GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \ ../Post/PView.h Context.h ../Geo/CGNSOptions.h \ ../Mesh/PartitionOptions.h ../Mesh/Partition.h GmshDaemon.h \ ../Plugin/PluginManager.h -GmshDaemon.o: GmshDaemon.cpp Message.h GmshSocket.h +GmshDaemon.o: GmshDaemon.cpp Message.h OS.h GmshSocket.h OS.o: OS.cpp Message.h OpenFile.o: OpenFile.cpp Message.h ../Geo/Geo.h ../Common/GmshDefines.h \ ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \ @@ -165,7 +165,8 @@ Visibility.o: Visibility.cpp Visibility.h GmshDefines.h ../Geo/GVertex.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Parser/Parser.h + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + ../Parser/Parser.h Trackball.o: Trackball.cpp Trackball.h VertexArray.o: VertexArray.cpp VertexArray.h ../Geo/SVector3.h \ ../Geo/SPoint3.h Context.h ../Geo/CGNSOptions.h \ diff --git a/Fltk/Makefile b/Fltk/Makefile index 2305528037a2414a2cc9c19462f17e91ee039cb6..db8ac0b7859e618824cbed8aa72e9f5636bb02fc 100644 --- a/Fltk/Makefile +++ b/Fltk/Makefile @@ -114,12 +114,12 @@ GUI_Projection.o: GUI_Projection.cpp ../Geo/GModelIO_Fourier.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Graphics/Draw.h ../Common/Options.h \ - ../Post/ColorTable.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/PartitionOptions.h ../Common/StringUtils.h \ - ../Graphics/SelectBuffer.h GUI_Projection.h ../Common/GmshUI.h \ - ../Geo/fourierProjectionFace.h ../Geo/GModel.h ../Geo/Range.h GUI.h \ - Opengl_Window.h Colorbar_Window.h Popup_Button.h \ + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + ../Graphics/Draw.h ../Common/Options.h ../Post/ColorTable.h \ + ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ + ../Common/StringUtils.h ../Graphics/SelectBuffer.h GUI_Projection.h \ + ../Common/GmshUI.h ../Geo/fourierProjectionFace.h ../Geo/GModel.h \ + ../Geo/Range.h GUI.h Opengl_Window.h Colorbar_Window.h Popup_Button.h \ SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \ Shortcut_Window.h GUI_Extras.h ../Geo/fourierFace.h ../Geo/GFace.h \ ../Geo/GModel.h ../Geo/Range.h ../Geo/fourierEdge.h ../Geo/GEdge.h \ @@ -136,11 +136,12 @@ GUI_Classifier.o: GUI_Classifier.cpp GUI_Classifier.h ../Common/GmshUI.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h GUI.h Opengl_Window.h Colorbar_Window.h \ - ../Post/ColorTable.h Popup_Button.h SpherePosition_Widget.h \ - ../Mesh/Field.h ../Post/PView.h Shortcut_Window.h ../Numeric/Numeric.h \ - ../Numeric/NumericEmbedded.h ../Graphics/Draw.h ../Common/Options.h \ - ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + GUI.h Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h \ + Popup_Button.h SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \ + Shortcut_Window.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \ + ../Graphics/Draw.h ../Common/Options.h ../Common/Context.h \ + ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ ../Graphics/SelectBuffer.h GUI_Projection.h \ ../Geo/fourierProjectionFace.h ../Geo/GModel.h ../Geo/Range.h \ GUI_Extras.h ../Mesh/meshGFaceDelaunayInsertion.h \ @@ -159,6 +160,7 @@ Callbacks.o: Callbacks.cpp ../Common/GmshUI.h ../Common/Message.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ ../Geo/GeoStringInterface.h ../Geo/findLinks.h ../Mesh/Generator.h \ ../Mesh/HighOrder.h ../Graphics/Draw.h ../Graphics/SelectBuffer.h \ ../Post/PView.h ../Post/PViewOptions.h ../Post/ColorTable.h \ @@ -167,9 +169,8 @@ Callbacks.o: Callbacks.cpp ../Common/GmshUI.h ../Common/Message.h \ ../Mesh/PartitionOptions.h ../Common/Options.h GUI.h Opengl_Window.h \ Colorbar_Window.h Popup_Button.h SpherePosition_Widget.h \ ../Mesh/Field.h GUI_Extras.h Callbacks.h ../Plugin/Plugin.h \ - ../Post/PViewDataList.h ../Post/PViewData.h ../Common/GmshMatrix.h \ - ../Plugin/PluginManager.h ../Common/Visibility.h \ - ../Common/GmshDefines.h ../Numeric/Numeric.h \ + ../Post/PViewDataList.h ../Post/PViewData.h ../Plugin/PluginManager.h \ + ../Common/Visibility.h ../Common/GmshDefines.h ../Numeric/Numeric.h \ ../Numeric/NumericEmbedded.h Solvers.h ../Common/OS.h \ ../Mesh/BackgroundMesh.h Opengl.o: Opengl.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \ @@ -200,7 +201,7 @@ Opengl_Window.o: Opengl_Window.cpp ../Common/GmshUI.h \ SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \ ../Geo/MElement.h ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \ - ../Geo/SVector3.h + ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h Colorbar_Window.o: Colorbar_Window.cpp ../Common/GmshUI.h GUI.h \ Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \ SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \ diff --git a/Geo/Makefile b/Geo/Makefile index 667e10851086f76b2360ebb05b1f1357664ae0ab..b09968effaaaa1acc0db2d04b820e56b13d8ffcc 100644 --- a/Geo/Makefile +++ b/Geo/Makefile @@ -70,17 +70,20 @@ depend: GEntity.o: GEntity.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \ - MVertex.h MEdge.h MFace.h ../Common/Message.h ../Common/VertexArray.h \ - ../Geo/SVector3.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/PartitionOptions.h + MVertex.h MEdge.h MFace.h ../Common/Message.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + ../Common/VertexArray.h ../Geo/SVector3.h ../Common/Context.h \ + ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h GVertex.o: GVertex.cpp GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GFace.h GEdgeLoop.h GEdge.h \ SVector3.h Pair.h MElement.h ../Common/GmshDefines.h MVertex.h MEdge.h \ - MFace.h ../Common/Message.h + MFace.h ../Common/Message.h ../Numeric/FunctionSpace.h \ + ../Common/GmshMatrix.h GEdge.o: GEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \ MVertex.h MEdge.h MFace.h ../Common/Message.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ ../Numeric/GaussLegendre1D.h GEdgeLoop.o: GEdgeLoop.cpp GEdgeLoop.h GEdge.h GEntity.h Range.h \ SPoint3.h SBoundingBox3d.h GVertex.h GPoint.h SPoint2.h SVector3.h \ @@ -88,14 +91,16 @@ GEdgeLoop.o: GEdgeLoop.cpp GEdgeLoop.h GEdge.h GEntity.h Range.h \ GFace.o: GFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \ - MVertex.h MEdge.h MFace.h ../Common/Message.h ../Common/VertexArray.h \ - ../Geo/SVector3.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \ - ../Numeric/GaussLegendre1D.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/PartitionOptions.h + MVertex.h MEdge.h MFace.h ../Common/Message.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + ../Common/VertexArray.h ../Geo/SVector3.h ../Numeric/Numeric.h \ + ../Numeric/NumericEmbedded.h ../Numeric/GaussLegendre1D.h \ + ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h GRegion.o: GRegion.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \ - MVertex.h MEdge.h MFace.h ../Common/Message.h + MVertex.h MEdge.h MFace.h ../Common/Message.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h gmshVertex.o: gmshVertex.cpp GFace.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h SPoint2.h \ SVector3.h Pair.h gmshVertex.h Geo.h ../Common/GmshDefines.h \ @@ -103,7 +108,7 @@ gmshVertex.o: gmshVertex.cpp GFace.h GEntity.h Range.h SPoint3.h \ ../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \ ../Common/ListUtils.h ExtrudeParams.h ../Common/SmoothData.h \ GeoInterpolation.h ../Common/Message.h MVertex.h MElement.h MEdge.h \ - MFace.h + MFace.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h gmshEdge.o: gmshEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h gmshEdge.h Geo.h ../Common/GmshDefines.h \ @@ -133,7 +138,8 @@ gmshSurface.o: gmshSurface.cpp gmshSurface.h Pair.h Range.h SPoint2.h \ OCCVertex.o: OCCVertex.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h MVertex.h MElement.h \ - ../Common/GmshDefines.h MEdge.h MFace.h ../Common/Message.h OCCVertex.h \ + ../Common/GmshDefines.h MEdge.h MFace.h ../Common/Message.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h OCCVertex.h \ OCCIncludes.h OCCEdge.h OCCFace.h OCCEdge.o: OCCEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ @@ -186,7 +192,8 @@ fourierProjectionFace.o: fourierProjectionFace.cpp \ GModel.o: GModel.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \ - MVertex.h MEdge.h MFace.h ../Common/Message.h discreteRegion.h \ + MVertex.h MEdge.h MFace.h ../Common/Message.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h discreteRegion.h \ discreteFace.h discreteEdge.h discreteVertex.h gmshSurface.h \ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Octree.h \ ../Common/OctreeInternals.h ../Common/SmoothData.h ../Mesh/Field.h \ @@ -204,7 +211,8 @@ GModelIO_Geo.o: GModelIO_Geo.cpp GModel.h GVertex.h GEntity.h Range.h \ GModelIO_Mesh.o: GModelIO_Mesh.cpp GModel.h GVertex.h GEntity.h Range.h \ SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h \ GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshDefines.h MElement.h \ - MVertex.h MEdge.h MFace.h ../Common/Message.h discreteRegion.h \ + MVertex.h MEdge.h MFace.h ../Common/Message.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h discreteRegion.h \ discreteFace.h ../Common/StringUtils.h GModelIO_OCC.o: GModelIO_OCC.cpp GModelIO_OCC.h GModel.h GVertex.h \ GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \ @@ -212,7 +220,7 @@ GModelIO_OCC.o: GModelIO_OCC.cpp GModelIO_OCC.h GModel.h GVertex.h \ ../Common/Message.h ../Common/Context.h ../Geo/CGNSOptions.h \ ../Mesh/PartitionOptions.h OCCVertex.h OCCEdge.h OCCFace.h OCCRegion.h \ MElement.h ../Common/GmshDefines.h MVertex.h MEdge.h MFace.h \ - ../Common/OpenFile.h + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Common/OpenFile.h GModelIO_Fourier.o: GModelIO_Fourier.cpp GModel.h GVertex.h GEntity.h \ Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \ SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/Message.h \ @@ -265,27 +273,32 @@ MVertex.o: MVertex.cpp MVertex.h SPoint3.h GEdge.h GEntity.h Range.h \ GEdgeLoop.h Pair.h ../Common/Message.h ../Common/StringUtils.h GaussQuadratureTri.o: GaussQuadratureTri.cpp MElement.h \ ../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \ - ../Common/Message.h GaussLegendreSimplex.h + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + GaussLegendreSimplex.h GaussQuadratureQuad.o: GaussQuadratureQuad.cpp MElement.h \ ../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \ - ../Common/Message.h GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h GaussQuadratureTet.o: GaussQuadratureTet.cpp MElement.h \ ../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \ - ../Common/Message.h GaussLegendreSimplex.h + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + GaussLegendreSimplex.h GaussQuadratureHex.o: GaussQuadratureHex.cpp MElement.h \ ../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \ - ../Common/Message.h GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h GaussLegendreSimplex.o: GaussLegendreSimplex.cpp MElement.h \ ../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \ - ../Common/Message.h GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h MFace.o: MFace.cpp MFace.h MVertex.h SPoint3.h SVector3.h \ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h MElement.o: MElement.cpp MElement.h ../Common/GmshDefines.h MVertex.h \ - SPoint3.h MEdge.h SVector3.h MFace.h ../Common/Message.h GEntity.h \ - Range.h SBoundingBox3d.h GFace.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h \ - SPoint2.h Pair.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ - ../Common/StringUtils.h ../Numeric/Numeric.h \ + SPoint3.h MEdge.h SVector3.h MFace.h ../Common/Message.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h GEntity.h Range.h \ + SBoundingBox3d.h GFace.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h \ + SPoint2.h Pair.h ../Common/StringUtils.h ../Numeric/Numeric.h \ ../Numeric/NumericEmbedded.h ../Numeric/GaussLegendre1D.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ ../Mesh/qualityMeasures.h ../Mesh/meshGFaceDelaunayInsertion.h \ diff --git a/Graphics/Makefile b/Graphics/Makefile index 413f850ee34e569f352a6df4dcd663c3c832b56f..0664926a2667e8cbfdaf8481c5d645362e29a64e 100644 --- a/Graphics/Makefile +++ b/Graphics/Makefile @@ -80,10 +80,10 @@ Mesh.o: Mesh.cpp ../Common/Message.h ../Common/GmshUI.h ../Geo/GModel.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - Draw.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/PartitionOptions.h ../Common/OS.h gl2ps.h \ - ../Common/VertexArray.h ../Common/SmoothData.h ../Post/PView.h \ - ../Post/PViewData.h + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h Draw.h \ + ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ + ../Common/OS.h gl2ps.h ../Common/VertexArray.h ../Common/SmoothData.h \ + ../Post/PView.h ../Post/PViewData.h Geom.o: Geom.cpp ../Common/GmshUI.h Draw.h ../Geo/SBoundingBox3d.h \ ../Geo/SPoint3.h ../Common/Context.h ../Geo/CGNSOptions.h \ ../Mesh/PartitionOptions.h gl2ps.h ../Common/VertexArray.h \ @@ -113,7 +113,8 @@ SelectBuffer.o: SelectBuffer.cpp ../Common/Message.h ../Common/GmshUI.h \ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h Draw.h \ + ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h Draw.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ SelectBuffer.h ../Common/VertexArray.h Iso.o: Iso.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h diff --git a/Mesh/Makefile b/Mesh/Makefile index af73417385bc1dd697c36c30a69109f56b079b4c..26cc27a68acbe568efdda79846d1d1010b0bea7b 100644 --- a/Mesh/Makefile +++ b/Mesh/Makefile @@ -86,7 +86,8 @@ Generator.o: Generator.cpp ../Common/Message.h ../Numeric/Numeric.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - meshGEdge.h meshGFace.h meshGFaceBDS.h meshGRegion.h BackgroundMesh.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h meshGEdge.h \ + meshGFace.h meshGFaceBDS.h meshGRegion.h BackgroundMesh.h \ BoundaryLayers.h HighOrder.h ../Post/PView.h ../Post/PViewData.h Field.o: Field.cpp ../Common/Context.h ../Geo/CGNSOptions.h \ ../Mesh/PartitionOptions.h Field.h ../Post/PView.h ../Geo/SPoint3.h \ @@ -118,7 +119,8 @@ meshGEdge.o: meshGEdge.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/SBoundingBox3d.h meshGEdge.h ../Geo/MElement.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \ - ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h BackgroundMesh.h \ + ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h BackgroundMesh.h \ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h meshGEdgeExtruded.o: meshGEdgeExtruded.cpp ../Geo/GModel.h \ @@ -132,24 +134,26 @@ meshGEdgeExtruded.o: meshGEdgeExtruded.cpp ../Geo/GModel.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + ../Geo/ExtrudeParams.h ../Common/SmoothData.h meshGFace.o: meshGFace.cpp meshGFace.h meshGFaceBDS.h \ meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h \ - ../Geo/SVector3.h ../Common/Message.h meshGFaceQuadrilateralize.h \ - meshGFaceOptimize.h DivideAndConquer.h BackgroundMesh.h \ - ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ - ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ - ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h \ - ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \ - ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GModel.h \ - ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h \ - ../Geo/GEntity.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \ - ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ - ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.h ../Post/PView.h \ - qualityMeasures.h Field.h ../Common/OS.h + ../Geo/SVector3.h ../Common/Message.h ../Numeric/FunctionSpace.h \ + ../Common/GmshMatrix.h meshGFaceQuadrilateralize.h meshGFaceOptimize.h \ + DivideAndConquer.h BackgroundMesh.h ../Geo/GVertex.h ../Geo/GEntity.h \ + ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \ + ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \ + ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \ + ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \ + ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \ + ../Geo/Pair.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h \ + ../Geo/GFace.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ + ../Geo/SBoundingBox3d.h ../Common/Context.h ../Geo/CGNSOptions.h \ + ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \ + ../Numeric/NumericEmbedded.h BDS.h ../Post/PView.h qualityMeasures.h \ + Field.h ../Common/OS.h meshGFaceTransfinite.o: meshGFaceTransfinite.cpp meshGFace.h \ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -160,8 +164,9 @@ meshGFaceTransfinite.o: meshGFaceTransfinite.cpp meshGFace.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MElement.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \ - ../Geo/SVector3.h ../Common/Message.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \ + ../Geo/SVector3.h ../Common/Message.h ../Numeric/FunctionSpace.h \ + ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \ + ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \ ../Numeric/NumericEmbedded.h meshGFaceExtruded.o: meshGFaceExtruded.cpp ../Geo/GModel.h \ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ @@ -174,14 +179,16 @@ meshGFaceExtruded.o: meshGFaceExtruded.cpp ../Geo/GModel.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \ - ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Common/Context.h \ + ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h meshGFaceBDS.o: meshGFaceBDS.cpp meshGFace.h meshGFaceOptimize.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h meshGFaceDelaunayInsertion.h BackgroundMesh.h \ - ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + meshGFaceDelaunayInsertion.h BackgroundMesh.h ../Geo/GVertex.h \ + ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../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 \ @@ -202,15 +209,17 @@ meshGFaceDelaunayInsertion.o: meshGFaceDelaunayInsertion.cpp BDS.h \ BackgroundMesh.h meshGFaceDelaunayInsertion.h ../Geo/MElement.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \ - ../Geo/MVertex.h ../Geo/SVector3.h meshGFaceOptimize.h meshGFace.h \ + ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/FunctionSpace.h \ + ../Common/GmshMatrix.h meshGFaceOptimize.h meshGFace.h \ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h meshGFaceOptimize.o: meshGFaceOptimize.cpp meshGFaceOptimize.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h meshGFaceDelaunayInsertion.h qualityMeasures.h \ - ../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + meshGFaceDelaunayInsertion.h qualityMeasures.h ../Geo/GFace.h \ + ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../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 \ @@ -222,26 +231,27 @@ meshGFaceQuadrilateralize.o: meshGFaceQuadrilateralize.cpp \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - meshGFaceOptimize.h meshGFaceBDS.h BDS.h ../Geo/GFace.h \ - ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ - ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ - ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \ - ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h ../Geo/SVector3.h \ - ../Geo/Pair.h ../Post/PView.h + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h meshGFaceOptimize.h \ + meshGFaceBDS.h BDS.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h \ + ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ + ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h \ + ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h \ + ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h \ + ../Geo/SVector3.h ../Geo/Pair.h ../Post/PView.h meshGRegion.o: meshGRegion.cpp meshGRegion.h \ meshGRegionDelaunayInsertion.h ../Geo/MElement.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \ - ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BackgroundMesh.h \ - qualityMeasures.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \ - ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \ - ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \ - ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \ - ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \ - ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \ - ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \ + ../Numeric/NumericEmbedded.h BackgroundMesh.h qualityMeasures.h \ + ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ + ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ + ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \ + ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \ + ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \ + ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ + ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ ../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 \ @@ -255,15 +265,15 @@ meshGRegionDelaunayInsertion.o: meshGRegionDelaunayInsertion.cpp \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \ - ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h qualityMeasures.h \ - ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ - ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ - ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \ - ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \ - ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \ - ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ - ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \ + ../Numeric/NumericEmbedded.h qualityMeasures.h ../Geo/GModel.h \ + ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ + ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ + ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ + ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h \ + ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \ + ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h \ + ../Geo/GEntity.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h meshGRegionTransfinite.o: meshGRegionTransfinite.cpp meshGFace.h \ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -274,8 +284,9 @@ meshGRegionTransfinite.o: meshGRegionTransfinite.cpp meshGFace.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MElement.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \ - ../Geo/SVector3.h ../Common/Message.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h + ../Geo/SVector3.h ../Common/Message.h ../Numeric/FunctionSpace.h \ + ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \ + ../Mesh/PartitionOptions.h meshGRegionExtruded.o: meshGRegionExtruded.cpp ../Geo/GModel.h \ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -287,9 +298,9 @@ meshGRegionExtruded.o: meshGRegionExtruded.cpp ../Geo/GModel.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \ - meshGFace.h meshGRegion.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/PartitionOptions.h + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + ../Geo/ExtrudeParams.h ../Common/SmoothData.h meshGFace.h meshGRegion.h \ + ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h meshGRegionCarveHole.o: meshGRegionCarveHole.cpp ../Geo/GModel.h \ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -301,16 +312,17 @@ meshGRegionCarveHole.o: meshGRegionCarveHole.cpp ../Geo/GModel.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h meshGRegionLocalMeshMod.o: meshGRegionLocalMeshMod.cpp \ meshGRegionLocalMeshMod.h meshGRegionDelaunayInsertion.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \ - BackgroundMesh.h qualityMeasures.h ../Geo/GEntity.h ../Geo/Range.h \ - ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ - ../Geo/GRegion.h ../Geo/GEntity.h + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BackgroundMesh.h \ + qualityMeasures.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ + ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GRegion.h \ + ../Geo/GEntity.h DivideAndConquer.o: DivideAndConquer.cpp ../Common/Message.h \ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h DivideAndConquer.h \ ../Common/MallocUtils.h @@ -336,8 +348,8 @@ qualityMeasures.o: qualityMeasures.cpp qualityMeasures.h BDS.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MElement.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \ - ../Geo/SVector3.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \ - ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h + ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BoundaryLayers.o: BoundaryLayers.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -349,8 +361,9 @@ BoundaryLayers.o: BoundaryLayers.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Common/Message.h BoundaryLayers.h ../Geo/ExtrudeParams.h \ - ../Common/SmoothData.h meshGEdge.h meshGFace.h + ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ + BoundaryLayers.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \ + meshGEdge.h meshGFace.h BDS.o: BDS.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.h \ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -361,7 +374,7 @@ BDS.o: BDS.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.h \ meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - qualityMeasures.h + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h qualityMeasures.h HighOrder.o: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -374,10 +387,10 @@ HighOrder.o: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \ meshGFaceDelaunayInsertion.h ../Common/OS.h ../Numeric/Numeric.h \ ../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/PartitionOptions.h ../Common/GmshMatrix.h \ - ../Numeric/FunctionSpace.h + ../Mesh/PartitionOptions.h Partition.o: Partition.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -390,4 +403,4 @@ Partition.o: Partition.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \ - PartitionOptions.h + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h PartitionOptions.h diff --git a/Post/Makefile b/Post/Makefile index 4f258269eda258d404ebc94cbd5e3e5ded2628fb..15291678defe1847bb17d80687bd1de84a49e4f0 100644 --- a/Post/Makefile +++ b/Post/Makefile @@ -101,7 +101,8 @@ PViewDataGModel.o: PViewDataGModel.cpp PViewDataGModel.h PViewData.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \ - ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \ + ../Numeric/NumericEmbedded.h PViewDataGModelIO.o: PViewDataGModelIO.cpp ../Common/Message.h \ PViewDataGModel.h PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ @@ -114,7 +115,8 @@ PViewDataGModelIO.o: PViewDataGModelIO.cpp ../Common/Message.h \ ../Geo/SBoundingBox3d.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \ - ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \ + ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/FunctionSpace.h \ + ../Common/GmshMatrix.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 @@ -137,7 +139,8 @@ OctreePost.o: OctreePost.cpp ../Common/Octree.h \ ../Numeric/NumericEmbedded.h ../Common/Message.h shapeFunctions.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h + ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ + ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ColorTable.o: ColorTable.cpp ../Common/Message.h ColorTable.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h diff --git a/doc/VERSIONS.txt b/doc/VERSIONS.txt index afbf08d701ce110bddf1c12b721aa88712fc5eda..06f8f35e971418d85eb5d00e8be55b1bb4d87971 100644 --- a/doc/VERSIONS.txt +++ b/doc/VERSIONS.txt @@ -1,6 +1,6 @@ -$Id: VERSIONS.txt,v 1.11 2008-10-25 08:31:30 geuzaine Exp $ +$Id: VERSIONS.txt,v 1.12 2008-10-25 13:17:32 geuzaine Exp $ -2.2.5 (XXX): Gmsh now requires FLTK 1.1.7 or above; various +2.2.5 (Oct 25, 2008): Gmsh now requires FLTK 1.1.7 or above; various small improvements (STL and VTK mesh IO, Netgen upgrade, Visual C++ support, Fields) and bug fixes (pyramid interpolation, Chaco crashes). diff --git a/doc/gmsh.html b/doc/gmsh.html index 3b01d5f4310cef322bedb2ff5be4f72433beccf5..660dfc394b942a3a16705fcd73583688b8626629 100644 --- a/doc/gmsh.html +++ b/doc/gmsh.html @@ -25,7 +25,7 @@ generator with built-in pre- and post-processing facilities</h1> <p> <h3 align="center">Christophe Geuzaine and Jean-Fran�ois Remacle</h3> <p> -<h3 align=center>Version 2.2.5, XXX 2008</h3> +<h3 align=center>Version 2.2.5, October 25 2008</h3> <p> <center> <a href="#Description">Description</a> | diff --git a/utils/solvers/c++/GmshSocket.h b/utils/solvers/c++/GmshSocket.h index 6bfa40a1d3d71b498b49f214e0cd67a7dfaaa50a..5b13db0ee4d05e8c25b8f8dbc5e02ad61bebb939 100644 --- a/utils/solvers/c++/GmshSocket.h +++ b/utils/solvers/c++/GmshSocket.h @@ -65,7 +65,7 @@ class GmshSocket{ int sofar = 0; int remaining = bytes; do { - ssize_t len = send(_sock, buf + sofar, remaining, 0); + int len = send(_sock, buf + sofar, remaining, 0); sofar += len; remaining -= len; } while(remaining > 0);