diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp index ae500eaeef99efa956b90d1d7442a84155de7352..a14bc5ae40ba35f4546b1e81b8c9f8ae9840f5fc 100644 --- a/Common/CommandLine.cpp +++ b/Common/CommandLine.cpp @@ -508,7 +508,7 @@ void Get_Options(int argc, char *argv[]) #endif fprintf(stderr, "License : %s\n", GMSH_SHORT_LICENSE); fprintf(stderr, "Build OS : %s\n", GMSH_OS); - fprintf(stderr, "Build options : %s\n", GMSH_CONFIG_OPTIONS); + fprintf(stderr, "Build options :%s\n", GMSH_CONFIG_OPTIONS); fprintf(stderr, "Build date : %s\n", GMSH_DATE); fprintf(stderr, "Build host : %s\n", GMSH_HOST); fprintf(stderr, "Packager : %s\n", GMSH_PACKAGER); diff --git a/Common/Makefile b/Common/Makefile index 3ed92c7e78d7298a4c55ec4073b2e539cc8fcf59..8d29caa19a505af5dc45742d747d2c479add7d47 100644 --- a/Common/Makefile +++ b/Common/Makefile @@ -72,11 +72,11 @@ Gmsh${OBJEXT}: Gmsh.cpp GmshConfig.h GmshDefines.h ../Numeric/GmshPredicates.h \ ../Mesh/meshPartition.h GmshDaemon.h ../Plugin/PluginManager.h GmshMessage${OBJEXT}: GmshMessage.cpp GmshConfig.h GmshMessage.h Gmsh.h \ Options.h ../Post/ColorTable.h Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h OS.h \ - ../Fltk/GUI.h ../Fltk/messageWindow.h ../Fltk/extraDialogs.h + ../Mesh/meshPartitionOptions.h OS.h ../Fltk/GUI.h \ + ../Fltk/messageWindow.h ../Fltk/extraDialogs.h GmshDaemon${OBJEXT}: GmshDaemon.cpp GmshMessage.h OS.h GmshSocket.h GmshConfig.h Context${OBJEXT}: Context.cpp GmshConfig.h Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h + ../Mesh/meshPartitionOptions.h Options${OBJEXT}: Options.cpp GmshConfig.h GmshDefines.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 \ @@ -87,8 +87,8 @@ Options${OBJEXT}: Options.cpp GmshConfig.h GmshDefines.h ../Geo/GModel.h \ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h GmshMessage.h ../Fltk/Draw.h \ ../Mesh/Generator.h Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h Options.h \ - ../Post/ColorTable.h DefaultOptions.h ../Mesh/Field.h ../Post/PView.h \ + ../Mesh/meshPartitionOptions.h Options.h ../Post/ColorTable.h \ + DefaultOptions.h ../Mesh/Field.h ../Common/GmshConfig.h ../Post/PView.h \ ../Mesh/BackgroundMesh.h ../Post/PViewOptions.h ../Post/ColorTable.h \ ../Post/PViewData.h ../Numeric/GmshMatrix.h ../Post/adaptiveData.h \ ../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Options.h \ @@ -101,16 +101,15 @@ Options${OBJEXT}: Options.cpp GmshConfig.h GmshDefines.h ../Geo/GModel.h \ ../Fltk/contextWindow.h ../Fltk/clippingWindow.h CommandLine${OBJEXT}: CommandLine.cpp GmshConfig.h GmshDefines.h GmshVersion.h \ GmshMessage.h OpenFile.h CommandLine.h Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h Options.h \ - ../Post/ColorTable.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \ - ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \ - ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \ - ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \ - ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \ - ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \ - ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \ - ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h CreateFile.h OS.h \ - ../Post/PView.h + ../Mesh/meshPartitionOptions.h Options.h ../Post/ColorTable.h \ + ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ + ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ + ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \ + ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \ + ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \ + ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \ + ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ + ../Geo/SBoundingBox3d.h CreateFile.h OS.h ../Post/PView.h OS${OBJEXT}: OS.cpp GmshMessage.h OpenFile${OBJEXT}: OpenFile.cpp GmshConfig.h GmshMessage.h ../Geo/Geo.h \ ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \ @@ -128,10 +127,9 @@ OpenFile${OBJEXT}: OpenFile.cpp GmshConfig.h GmshMessage.h ../Geo/Geo.h \ ../Geo/GEntity.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \ ../Mesh/HighOrder.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SPoint2.h \ ../Geo/SPoint3.h ../Geo/SVector3.h Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h OpenFile.h \ - CommandLine.h ../Graphics/ReadImg.h OS.h StringUtils.h \ - ../Parser/Parser.h ../Post/PView.h ../Post/PViewData.h ../Fltk/GUI.h \ - ../Fltk/Draw.h + ../Mesh/meshPartitionOptions.h OpenFile.h CommandLine.h \ + ../Graphics/ReadImg.h OS.h StringUtils.h ../Parser/Parser.h \ + ../Post/PView.h ../Post/PViewData.h ../Fltk/GUI.h ../Fltk/Draw.h CreateFile${OBJEXT}: CreateFile.cpp GmshConfig.h GmshMessage.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 \ @@ -141,18 +139,18 @@ CreateFile${OBJEXT}: CreateFile.cpp GmshConfig.h GmshMessage.h ../Geo/GModel.h \ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h GmshDefines.h StringUtils.h Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h Options.h ../Post/ColorTable.h \ - ../Graphics/gl2ps.h ../Graphics/gl2gif.h ../Graphics/PixelBuffer.h \ - ../Common/GmshMessage.h ../Fltk/Draw.h ../Common/MallocUtils.h \ - ../Graphics/gl2jpeg.h ../Graphics/PixelBuffer.h ../Graphics/gl2png.h \ + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h Options.h \ + ../Post/ColorTable.h ../Graphics/gl2ps.h ../Common/GmshConfig.h \ + ../Graphics/gl2gif.h ../Graphics/PixelBuffer.h ../Common/GmshMessage.h \ + ../Fltk/Draw.h ../Common/MallocUtils.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 VertexArray${OBJEXT}: VertexArray.cpp VertexArray.h ../Geo/SVector3.h \ ../Geo/SPoint3.h Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h + ../Mesh/meshPartitionOptions.h ../Numeric/Numeric.h \ + ../Numeric/GmshMatrix.h SmoothData${OBJEXT}: SmoothData.cpp SmoothData.h ../Numeric/Numeric.h \ ../Numeric/GmshMatrix.h Octree${OBJEXT}: Octree.cpp Octree.h OctreeInternals.h diff --git a/Fltk/Makefile b/Fltk/Makefile index 12896e07d5a64c020af1116455d7425f4afc5c45..268fe2b0efe1f8f20a5d35b5e2ee8c5e5f100844 100644 --- a/Fltk/Makefile +++ b/Fltk/Makefile @@ -71,10 +71,9 @@ depend: # DO NOT DELETE THIS LINE Main${OBJEXT}: Main.cpp GUI.h menuWindow.h popupButton.h ../Common/Gmsh.h \ ../Common/GmshMessage.h Draw.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h \ - ../Common/Options.h ../Post/ColorTable.h ../Parser/Parser.h \ - ../Common/OpenFile.h ../Common/CommandLine.h Solvers.h \ - ../Plugin/PluginManager.h ../Geo/GModel.h ../Geo/GVertex.h \ + ../Mesh/meshPartitionOptions.h ../Common/Options.h ../Post/ColorTable.h \ + ../Parser/Parser.h ../Common/OpenFile.h ../Common/CommandLine.h \ + Solvers.h ../Plugin/PluginManager.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 \ @@ -82,8 +81,8 @@ Main${OBJEXT}: Main.cpp GUI.h menuWindow.h popupButton.h ../Common/Gmsh.h \ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h ../Mesh/Field.h ../Post/PView.h \ - ../Mesh/BackgroundMesh.h + ../Geo/SBoundingBox3d.h ../Mesh/Field.h ../Common/GmshConfig.h \ + ../Post/PView.h ../Mesh/BackgroundMesh.h GUI${OBJEXT}: GUI.cpp GUI.h graphicWindow.h openglWindow.h \ ../Graphics/drawContext.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ menuWindow.h popupButton.h optionWindow.h spherePositionWidget.h \ @@ -113,7 +112,7 @@ graphicWindow${OBJEXT}: graphicWindow.cpp GUI.h graphicWindow.h openglWindow.h \ manipWindow.h extraDialogs.h Draw.h ../Post/PView.h ../Post/PViewData.h \ ../Numeric/GmshMatrix.h ../Common/OS.h ../Common/Options.h \ ../Post/ColorTable.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h + ../Mesh/meshPartitionOptions.h openglWindow${OBJEXT}: openglWindow.cpp openglWindow.h ../Graphics/drawContext.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h graphicWindow.h manipWindow.h \ contextWindow.h visibilityWindow.h ../Common/GmshConfig.h \ @@ -179,7 +178,7 @@ optionWindow${OBJEXT}: optionWindow.cpp ../Common/GmshConfig.h \ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h colorbarWindow${OBJEXT}: colorbarWindow.cpp colorbarWindow.h \ ../Post/ColorTable.h Draw.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h + ../Mesh/meshPartitionOptions.h fieldWindow${OBJEXT}: fieldWindow.cpp GUI.h Draw.h fieldWindow.h paletteWindow.h \ fileDialogs.h ../Common/GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ @@ -199,8 +198,7 @@ pluginWindow${OBJEXT}: pluginWindow.cpp GUI.h Draw.h pluginWindow.h \ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PViewDataList.h \ ../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ ../Numeric/GmshMatrix.h ../Common/ListUtils.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h statisticsWindow${OBJEXT}: statisticsWindow.cpp GUI.h Draw.h statisticsWindow.h \ paletteWindow.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \ ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \ @@ -216,7 +214,7 @@ statisticsWindow${OBJEXT}: statisticsWindow.cpp GUI.h Draw.h statisticsWindow.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Post/PView.h \ ../Mesh/Generator.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h + ../Mesh/meshPartitionOptions.h visibilityWindow${OBJEXT}: visibilityWindow.cpp ../Common/GmshConfig.h GUI.h \ Draw.h visibilityWindow.h paletteWindow.h contextWindow.h \ graphicWindow.h openglWindow.h ../Graphics/drawContext.h \ @@ -240,17 +238,15 @@ clippingWindow${OBJEXT}: clippingWindow.cpp GUI.h Draw.h clippingWindow.h \ paletteWindow.h ../Common/GmshDefines.h ../Post/PView.h \ ../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h messageWindow${OBJEXT}: messageWindow.cpp GUI.h messageWindow.h paletteWindow.h \ fileDialogs.h ../Common/GmshMessage.h ../Common/OS.h \ - ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h manipWindow${OBJEXT}: manipWindow.cpp GUI.h Draw.h manipWindow.h paletteWindow.h \ graphicWindow.h openglWindow.h ../Graphics/drawContext.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/Options.h \ ../Post/ColorTable.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h + ../Mesh/meshPartitionOptions.h contextWindow${OBJEXT}: contextWindow.cpp GUI.h Draw.h contextWindow.h \ paletteWindow.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \ ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \ @@ -261,8 +257,7 @@ contextWindow${OBJEXT}: contextWindow.cpp GUI.h Draw.h contextWindow.h \ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GeoStringInterface.h \ ../Common/ListUtils.h ../Common/OpenFile.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h solverWindow${OBJEXT}: solverWindow.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 \ @@ -276,12 +271,10 @@ solverWindow${OBJEXT}: solverWindow.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Post/ColorTable.h messageWindow.h fileDialogs.h \ ../Common/GmshMessage.h Solvers.h ../Common/StringUtils.h \ ../Common/Options.h ../Common/OS.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h aboutWindow${OBJEXT}: aboutWindow.cpp GUI.h aboutWindow.h paletteWindow.h \ ../Common/CommandLine.h ../Common/StringUtils.h ../Common/OS.h \ - ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h fileDialogs${OBJEXT}: fileDialogs.cpp ../Common/GmshConfig.h \ ../Common/GmshMessage.h ../Common/GmshDefines.h GUI.h \ ../Common/CreateFile.h ../Common/Options.h ../Post/ColorTable.h Draw.h \ @@ -305,7 +298,7 @@ extraDialogs${OBJEXT}: extraDialogs.cpp GUI.h paletteWindow.h \ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h + ../Mesh/meshPartitionOptions.h projectionEditor${OBJEXT}: projectionEditor.cpp ../Common/GmshConfig.h GUI.h \ projectionEditor.h ../Geo/fourierProjectionFace.h ../Geo/GModel.h \ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ @@ -343,11 +336,10 @@ classificationEditor${OBJEXT}: classificationEditor.cpp GUI.h \ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Post/ColorTable.h \ paletteWindow.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h Draw.h \ ../Common/Options.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h \ - ../Mesh/meshGFaceDelaunayInsertion.h ../Mesh/meshGFaceOptimize.h \ - ../Mesh/meshGFaceDelaunayInsertion.h ../Geo/discreteEdge.h \ - ../Geo/GModel.h ../Geo/GEdge.h ../Geo/discreteFace.h ../Geo/GModel.h \ - ../Geo/GFace.h + ../Mesh/meshPartitionOptions.h ../Mesh/meshGFaceDelaunayInsertion.h \ + ../Mesh/meshGFaceOptimize.h ../Mesh/meshGFaceDelaunayInsertion.h \ + ../Geo/discreteEdge.h ../Geo/GModel.h ../Geo/GEdge.h \ + ../Geo/discreteFace.h ../Geo/GModel.h ../Geo/GFace.h partitionDialog${OBJEXT}: partitionDialog.cpp ../Common/GmshConfig.h \ ../Common/GmshDefines.h ../Common/GmshMessage.h GUI.h paletteWindow.h \ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ diff --git a/Geo/Makefile b/Geo/Makefile index 4ba63ee9993a4ae77440336e1258e129c887dd96..c1d846252bc579b51713d45239c07c38ac6ed259 100644 --- a/Geo/Makefile +++ b/Geo/Makefile @@ -68,8 +68,7 @@ GEntity${OBJEXT}: GEntity.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \ ../Common/VertexArray.h ../Geo/SVector3.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h GVertex${OBJEXT}: 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 \ @@ -131,8 +130,7 @@ gmshEdge${OBJEXT}: gmshEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ ../Numeric/GmshMatrix.h ../Common/ListUtils.h ../Common/TreeUtils.h \ ../Common/avl.h ../Common/ListUtils.h ExtrudeParams.h \ ../Common/SmoothData.h GeoInterpolation.h ../Common/GmshMessage.h \ - ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h gmshFace${OBJEXT}: gmshFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h gmshFace.h Geo.h ../Common/GmshDefines.h \ @@ -140,8 +138,7 @@ gmshFace${OBJEXT}: gmshFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ ../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \ ../Common/ListUtils.h ExtrudeParams.h ../Common/SmoothData.h \ GeoInterpolation.h ../Common/GmshMessage.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h gmshRegion${OBJEXT}: gmshRegion.cpp GModel.h GVertex.h GEntity.h Range.h \ SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h \ GFace.h GEdgeLoop.h Pair.h GRegion.h gmshRegion.h Geo.h \ diff --git a/Graphics/Makefile b/Graphics/Makefile index 3e9de40a2c79d91f2235eded1c635f5bac75a6e8..12d6fc585198fdbc9a4b0f32749feb9c62b33872 100644 --- a/Graphics/Makefile +++ b/Graphics/Makefile @@ -67,16 +67,15 @@ ReadImg${OBJEXT}: ReadImg.cpp ReadImg.h ../Common/GmshMessage.h ../Post/PView.h drawContext${OBJEXT}: drawContext.cpp ../Common/GmshMessage.h drawContext.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h Trackball.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ - ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ - ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \ - ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ - ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \ - ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \ - ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ - ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h ../Post/PView.h ../Post/PViewOptions.h \ - ../Post/ColorTable.h + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Geo/GModel.h \ + ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ + ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \ + ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \ + ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \ + ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \ + ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \ + ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Post/PView.h \ + ../Post/PViewOptions.h ../Post/ColorTable.h drawMesh${OBJEXT}: drawMesh.cpp drawContext.h ../Geo/SBoundingBox3d.h \ ../Geo/SPoint3.h ../Common/GmshMessage.h ../Common/GmshDefines.h \ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ @@ -91,11 +90,11 @@ drawMesh${OBJEXT}: drawMesh.cpp drawContext.h ../Geo/SBoundingBox3d.h \ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h ../Common/OS.h gl2ps.h ../Common/VertexArray.h \ + ../Common/OS.h gl2ps.h ../Common/GmshConfig.h ../Common/VertexArray.h \ ../Common/SmoothData.h ../Post/PView.h ../Post/PViewData.h drawGeom${OBJEXT}: drawGeom.cpp drawContext.h ../Geo/SBoundingBox3d.h \ ../Geo/SPoint3.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h gl2ps.h \ + ../Mesh/meshPartitionOptions.h gl2ps.h ../Common/GmshConfig.h \ ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \ @@ -120,13 +119,13 @@ drawAxes${OBJEXT}: drawAxes.cpp drawContext.h ../Geo/SBoundingBox3d.h \ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h gl2ps.h + ../Mesh/meshPartitionOptions.h ../Numeric/Numeric.h \ + ../Numeric/GmshMatrix.h gl2ps.h ../Common/GmshConfig.h drawScales${OBJEXT}: drawScales.cpp drawContext.h ../Geo/SBoundingBox3d.h \ ../Geo/SPoint3.h ../Post/PView.h ../Post/PViewOptions.h \ ../Post/ColorTable.h ../Post/PViewData.h ../Numeric/GmshMatrix.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h gl2ps.h + gl2ps.h ../Common/GmshConfig.h drawGraph2d${OBJEXT}: drawGraph2d.cpp drawContext.h ../Geo/SBoundingBox3d.h \ ../Geo/SPoint3.h ../Post/PView.h ../Post/PViewOptions.h \ ../Post/ColorTable.h ../Post/PViewData.h ../Numeric/GmshMatrix.h \ @@ -137,7 +136,7 @@ drawGlyph${OBJEXT}: drawGlyph.cpp drawContext.h ../Geo/SBoundingBox3d.h \ ../Geo/SPoint3.h ../Fltk/Draw.h ../Common/GmshDefines.h \ ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/StringUtils.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h gl2ps.h + gl2ps.h ../Common/GmshConfig.h gl2ps${OBJEXT}: gl2ps.cpp gl2ps.h ../Common/GmshConfig.h gl2gif${OBJEXT}: gl2gif.cpp ../Common/MallocUtils.h gl2gif.h PixelBuffer.h \ ../Common/GmshConfig.h ../Common/GmshMessage.h ../Fltk/Draw.h diff --git a/Mesh/Makefile b/Mesh/Makefile index e1dffcd73845db92489fb354a09fdfd5992098e4..bc872206032657bb87906b1bf46ff8b5b23099a4 100644 --- a/Mesh/Makefile +++ b/Mesh/Makefile @@ -151,8 +151,7 @@ meshGEdge${OBJEXT}: meshGEdge.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h BackgroundMesh.h \ ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h meshGEdgeExtruded${OBJEXT}: meshGEdgeExtruded.cpp ../Geo/GModel.h \ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -183,9 +182,9 @@ meshGFace${OBJEXT}: meshGFace.cpp meshGFace.h meshGFaceBDS.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/meshPartitionOptions.h ../Common/GmshConfig.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h BDS.h qualityMeasures.h \ - Field.h ../Post/PView.h ../Common/OS.h HighOrder.h + ../Mesh/meshPartitionOptions.h ../Numeric/Numeric.h \ + ../Numeric/GmshMatrix.h BDS.h qualityMeasures.h Field.h \ + ../Common/GmshConfig.h ../Post/PView.h ../Common/OS.h HighOrder.h meshGFaceTransfinite${OBJEXT}: 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 \ @@ -199,7 +198,7 @@ meshGFaceTransfinite${OBJEXT}: meshGFaceTransfinite.cpp meshGFace.h \ ../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/Context.h \ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h meshGFaceExtruded${OBJEXT}: meshGFaceExtruded.cpp ../Geo/GModel.h \ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ @@ -214,7 +213,7 @@ meshGFaceExtruded${OBJEXT}: meshGFaceExtruded.cpp ../Geo/GModel.h \ ../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Geo/ExtrudeParams.h \ ../Common/SmoothData.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h + ../Mesh/meshPartitionOptions.h meshGFaceBDS${OBJEXT}: meshGFaceBDS.cpp ../Common/GmshMessage.h \ ../Numeric/GmshPredicates.h meshGFace.h meshGFaceOptimize.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ @@ -228,11 +227,11 @@ meshGFaceBDS${OBJEXT}: meshGFaceBDS.cpp ../Common/GmshMessage.h \ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h \ ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.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 ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ - BDS.h qualityMeasures.h Field.h ../Post/PView.h ../Common/OS.h + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.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 \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h BDS.h qualityMeasures.h \ + Field.h ../Common/GmshConfig.h ../Post/PView.h ../Common/OS.h meshGFaceDelaunayInsertion${OBJEXT}: meshGFaceDelaunayInsertion.cpp \ ../Common/GmshMessage.h ../Numeric/GmshPredicates.h BackgroundMesh.h \ meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \ @@ -323,8 +322,7 @@ meshGRegionTransfinite${OBJEXT}: meshGRegionTransfinite.cpp meshGFace.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h meshGRegionExtruded${OBJEXT}: 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 \ @@ -339,8 +337,7 @@ meshGRegionExtruded${OBJEXT}: meshGRegionExtruded.cpp ../Geo/GModel.h \ ../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Geo/ExtrudeParams.h \ ../Common/SmoothData.h meshGFace.h meshGRegion.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h meshGRegionCarveHole${OBJEXT}: meshGRegionCarveHole.cpp ../Common/GmshConfig.h \ ../Common/GmshMessage.h ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ @@ -372,15 +369,15 @@ DivideAndConquer${OBJEXT}: DivideAndConquer.cpp ../Common/GmshMessage.h \ BackgroundMesh${OBJEXT}: BackgroundMesh.cpp ../Common/GmshMessage.h \ BackgroundMesh.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ - ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ - ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \ - ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \ - ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \ - ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \ - ../Geo/Pair.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h \ - ../Geo/GFace.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h Field.h ../Post/PView.h + ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ + ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \ + ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ + ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \ + ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \ + ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ + ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h \ + ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ + ../Geo/SBoundingBox3d.h Field.h ../Common/GmshConfig.h ../Post/PView.h qualityMeasures${OBJEXT}: qualityMeasures.cpp qualityMeasures.h BDS.h \ ../Common/GmshMessage.h ../Geo/MVertex.h ../Geo/SPoint2.h \ ../Geo/SPoint3.h ../Geo/MElement.h ../Common/GmshDefines.h \ @@ -430,8 +427,7 @@ HighOrder${OBJEXT}: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/MFace.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/OS.h \ ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h meshPartition${OBJEXT}: meshPartition.cpp ../Common/GmshConfig.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 \ diff --git a/Mesh/meshPartitionOptions.h b/Mesh/meshPartitionOptions.h index a3916e492d031a55a3aba401731bddf93d923a91..03d9be42c00bad1aa1824d9709c47c53f7a4f42e 100644 --- a/Mesh/meshPartitionOptions.h +++ b/Mesh/meshPartitionOptions.h @@ -6,8 +6,6 @@ #ifndef _MESH_PARTITION_OPTIONS_H_ #define _MESH_PARTITION_OPTIONS_H_ -#include "GmshConfig.h" - struct meshPartitionOptions { @@ -77,11 +75,7 @@ struct meshPartitionOptions void setDefaults() { -#if defined(HAVE_CHACO) - partitioner = 1; -#else partitioner = 2; -#endif num_partitions = 4; global_method = 1; architecture = 1; diff --git a/Plugin/Makefile b/Plugin/Makefile index e7307dd050c8b570d1620405fb31a7079f894d11..262044fe238b7731f1c128abcdbe636bf4ef6c00 100644 --- a/Plugin/Makefile +++ b/Plugin/Makefile @@ -103,7 +103,7 @@ CutMap${OBJEXT}: CutMap.cpp CutMap.h Levelset.h Plugin.h ../Common/Options.h \ ../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ ../Common/ListUtils.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h + ../Mesh/meshPartitionOptions.h Smooth${OBJEXT}: Smooth.cpp Smooth.h Plugin.h ../Common/Options.h \ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \ ../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \ @@ -174,7 +174,7 @@ Triangulate${OBJEXT}: Triangulate.cpp ../Geo/GModel.h ../Geo/GVertex.h \ Plugin.h ../Common/Options.h ../Post/ColorTable.h ../Post/PView.h \ ../Post/PViewDataList.h ../Post/PViewData.h ../Numeric/GmshMatrix.h \ ../Common/ListUtils.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h + ../Mesh/meshPartitionOptions.h Warp${OBJEXT}: Warp.cpp Warp.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \ ../Common/GmshMessage.h ../Post/PView.h ../Geo/SPoint3.h \ ../Post/PViewDataList.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \ @@ -192,7 +192,7 @@ Skin${OBJEXT}: Skin.cpp Skin.h Plugin.h ../Common/Options.h ../Post/ColorTable.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h \ ../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \ ../Common/MallocUtils.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h + ../Mesh/meshPartitionOptions.h GSHHS${OBJEXT}: GSHHS.cpp ../Mesh/Field.h ../Common/GmshConfig.h ../Post/PView.h \ ../Geo/SPoint3.h ../Geo/SPoint2.h GSHHS.h Plugin.h ../Common/Options.h \ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PViewDataList.h \ diff --git a/Post/Makefile b/Post/Makefile index d663a8ef71b9808689555455ed5f0b77eebd8022..34581aae3d05c019038ce9322edd437df975a141 100644 --- a/Post/Makefile +++ b/Post/Makefile @@ -83,13 +83,12 @@ PViewDataList${OBJEXT}: PViewDataList.cpp PViewDataList.h PViewData.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ ../Common/ListUtils.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ ../Common/SmoothData.h ../Common/GmshMessage.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h PViewDataListIO${OBJEXT}: PViewDataListIO.cpp PViewDataList.h PViewData.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ ../Common/ListUtils.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ ../Common/GmshMessage.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/GmshConfig.h adaptiveData.h + ../Mesh/meshPartitionOptions.h adaptiveData.h PViewDataGModel${OBJEXT}: PViewDataGModel.cpp PViewDataGModel.h PViewData.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ @@ -150,4 +149,4 @@ OctreePost${OBJEXT}: OctreePost.cpp ../Common/Octree.h \ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ColorTable${OBJEXT}: ColorTable.cpp ../Common/GmshMessage.h ColorTable.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/GmshConfig.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h