From 6b28c99d4c01a6c1504358e4088f877bfe7603fe Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Sun, 8 Feb 2009 13:15:42 +0000 Subject: [PATCH] fix template specialization when !blas and !lapack --- Common/Makefile | 41 ++++---- Fltk/Makefile | 31 +++--- Geo/Makefile | 86 +++++++++------- Graphics/Makefile | 52 +++++----- Mesh/Makefile | 225 +++++++++++++++++++++-------------------- Numeric/GmshMatrix.cpp | 55 ---------- Numeric/GmshMatrix.h | 64 ++++++++++-- Numeric/Makefile | 40 ++++---- Parser/Makefile | 8 +- Plugin/Makefile | 84 ++++++++------- Post/Makefile | 102 ++++++++++--------- configure | 12 +-- configure.in | 13 +-- 13 files changed, 421 insertions(+), 392 deletions(-) diff --git a/Common/Makefile b/Common/Makefile index 8d29caa19a..76d0e6f312 100644 --- a/Common/Makefile +++ b/Common/Makefile @@ -90,9 +90,9 @@ Options${OBJEXT}: Options.cpp GmshConfig.h GmshDefines.h ../Geo/GModel.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 \ - ../Common/GmshMessage.h ../Post/PViewDataList.h ../Post/PViewData.h \ + ../Post/PViewData.h ../Numeric/GmshMatrix.h ../Common/GmshMessage.h \ + ../Post/adaptiveData.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \ + ../Common/Options.h ../Post/PViewDataList.h ../Post/PViewData.h \ ../Common/ListUtils.h ../Fltk/GUI.h ../Fltk/Solvers.h \ ../Fltk/menuWindow.h ../Fltk/popupButton.h ../Fltk/graphicWindow.h \ ../Fltk/openglWindow.h ../Graphics/drawContext.h ../Fltk/optionWindow.h \ @@ -115,21 +115,22 @@ OpenFile${OBJEXT}: OpenFile.cpp GmshConfig.h GmshMessage.h ../Geo/Geo.h \ ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \ ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h \ - ../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.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/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 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 + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.h \ + ../Common/GmshMessage.h ../Common/ListUtils.h ../Common/TreeUtils.h \ + ../Common/avl.h ../Common/ListUtils.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/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 \ + 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 \ @@ -150,9 +151,9 @@ CreateFile${OBJEXT}: CreateFile.cpp GmshConfig.h GmshMessage.h ../Geo/GModel.h \ VertexArray${OBJEXT}: VertexArray.cpp VertexArray.h ../Geo/SVector3.h \ ../Geo/SPoint3.h Context.h ../Geo/CGNSOptions.h \ ../Mesh/meshPartitionOptions.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/GmshMessage.h SmoothData${OBJEXT}: SmoothData.cpp SmoothData.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/GmshMessage.h Octree${OBJEXT}: Octree.cpp Octree.h OctreeInternals.h OctreeInternals${OBJEXT}: OctreeInternals.cpp GmshMessage.h OctreeInternals.h StringUtils${OBJEXT}: StringUtils.cpp StringUtils.h GmshMessage.h diff --git a/Fltk/Makefile b/Fltk/Makefile index 268fe2b0ef..92efaa7c77 100644 --- a/Fltk/Makefile +++ b/Fltk/Makefile @@ -110,9 +110,9 @@ graphicWindow${OBJEXT}: graphicWindow.cpp GUI.h graphicWindow.h openglWindow.h \ ../Graphics/drawContext.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ paletteWindow.h mainWindow.h menuWindow.h popupButton.h messageWindow.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 + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/GmshMessage.h \ + ../Common/OS.h ../Common/Options.h ../Post/ColorTable.h \ + ../Common/Context.h ../Geo/CGNSOptions.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 \ @@ -197,8 +197,8 @@ pluginWindow${OBJEXT}: pluginWindow.cpp GUI.h Draw.h pluginWindow.h \ ../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Options.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 + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/ListUtils.h \ + ../Common/Context.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 \ @@ -212,9 +212,9 @@ statisticsWindow${OBJEXT}: statisticsWindow.cpp GUI.h Draw.h statisticsWindow.h ../Geo/SPoint3.h ../Geo/MEdge.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 ../Post/PView.h \ - ../Mesh/Generator.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h \ + ../Post/PView.h ../Mesh/Generator.h ../Common/Context.h \ + ../Geo/CGNSOptions.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 \ @@ -333,13 +333,14 @@ classificationEditor${OBJEXT}: classificationEditor.cpp GUI.h \ ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.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 ../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 ../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 + ../Numeric/GmshMatrix.h ../Common/GmshConfig.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 \ + ../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 c1d846252b..ffdc7096fe 100644 --- a/Geo/Makefile +++ b/Geo/Makefile @@ -66,14 +66,15 @@ GEntity${OBJEXT}: 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/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 + ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \ + ../Common/GmshConfig.h ../Numeric/Gauss.h ../Common/VertexArray.h \ + ../Geo/SVector3.h ../Common/Context.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 \ MFace.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \ - ../Numeric/GmshMatrix.h ../Numeric/Gauss.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h GEdge${OBJEXT}: GEdge.cpp ../Common/GmshConfig.h ../Common/GmshDefines.h \ ../Common/GmshMessage.h GModel.h GVertex.h GEntity.h Range.h SPoint3.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ @@ -97,9 +98,10 @@ GFaceCompound${OBJEXT}: GFaceCompound.cpp ../Common/GmshConfig.h GFaceCompound.h GEdgeLoop.h GEdge.h GVertex.h SPoint2.h SVector3.h Pair.h \ ../Numeric/gmshAssembler.h ../Numeric/gmshLinearSystem.h \ ../Numeric/gmshLaplace.h ../Numeric/gmshTermOfFormulation.h \ - ../Numeric/GmshMatrix.h ../Numeric/gmshFunction.h ../Common/Gmsh.h \ - ../Common/GmshMessage.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h \ - ../Geo/GFace.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ + ../Numeric/GmshMatrix.h ../Common/GmshMessage.h \ + ../Numeric/gmshFunction.h ../Common/Gmsh.h ../Common/GmshMessage.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 ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \ @@ -113,39 +115,41 @@ GRegion${OBJEXT}: 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/GmshMessage.h \ - ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h + ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \ + ../Common/GmshConfig.h ../Numeric/Gauss.h gmshVertex${OBJEXT}: 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 \ gmshSurface.h ../Numeric/Numeric.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 MVertex.h MElement.h MEdge.h \ - MFace.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \ - ../Numeric/Gauss.h + ../Common/GmshConfig.h ../Common/GmshMessage.h ../Common/ListUtils.h \ + ../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \ + ExtrudeParams.h ../Common/SmoothData.h GeoInterpolation.h MVertex.h \ + MElement.h MEdge.h MFace.h ../Numeric/FunctionSpace.h \ + ../Numeric/GmshMatrix.h ../Numeric/Gauss.h gmshEdge${OBJEXT}: 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 GFaceCompound.h gmshEdge.h Geo.h \ ../Common/GmshDefines.h gmshSurface.h ../Numeric/Numeric.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 + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/GmshMessage.h \ + ../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \ + ../Common/ListUtils.h ExtrudeParams.h ../Common/SmoothData.h \ + GeoInterpolation.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 \ gmshSurface.h ../Numeric/Numeric.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/GmshMessage.h ../Common/ListUtils.h \ + ../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \ + ExtrudeParams.h ../Common/SmoothData.h GeoInterpolation.h \ + ../Common/Context.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 \ ../Common/GmshDefines.h gmshSurface.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h ../Common/ListUtils.h ../Common/TreeUtils.h \ - ../Common/avl.h ../Common/ListUtils.h ExtrudeParams.h \ - ../Common/SmoothData.h ../Common/GmshMessage.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/GmshMessage.h \ + ../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \ + ../Common/ListUtils.h ExtrudeParams.h ../Common/SmoothData.h gmshSurface${OBJEXT}: gmshSurface.cpp ../Common/GmshConfig.h \ ../Common/GmshMessage.h gmshSurface.h Pair.h Range.h SPoint2.h \ SPoint3.h SVector3.h SBoundingBox3d.h ../Numeric/Numeric.h \ @@ -193,8 +197,9 @@ discreteRegion${OBJEXT}: discreteRegion.cpp ../Common/GmshConfig.h \ SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \ GEdgeLoop.h Pair.h GRegion.h Geo.h ../Common/GmshDefines.h \ gmshSurface.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \ - ../Common/ListUtils.h ExtrudeParams.h ../Common/SmoothData.h + ../Common/GmshMessage.h ../Common/ListUtils.h ../Common/TreeUtils.h \ + ../Common/avl.h ../Common/ListUtils.h ExtrudeParams.h \ + ../Common/SmoothData.h fourierEdge${OBJEXT}: fourierEdge.cpp ../Common/GmshConfig.h fourierEdge.h \ GEdge.h GEntity.h Range.h SPoint3.h SBoundingBox3d.h GVertex.h GPoint.h \ SPoint2.h SVector3.h GModel.h GFace.h GEdgeLoop.h Pair.h GRegion.h \ @@ -233,8 +238,9 @@ GModelIO_Mesh${OBJEXT}: 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/GmshMessage.h \ - ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \ - discreteRegion.h discreteFace.h ../Common/StringUtils.h + ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \ + ../Common/GmshConfig.h ../Numeric/Gauss.h discreteRegion.h \ + discreteFace.h ../Common/StringUtils.h GModelIO_OCC${OBJEXT}: GModelIO_OCC.cpp ../Common/GmshConfig.h \ ../Common/GmshMessage.h GModelIO_OCC.h GModel.h GVertex.h GEntity.h \ Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \ @@ -260,18 +266,18 @@ GModelIO_MED${OBJEXT}: GModelIO_MED.cpp ../Common/GmshConfig.h \ ExtrudeParams${OBJEXT}: ExtrudeParams.cpp ../Common/GmshMessage.h Geo.h \ ../Common/GmshDefines.h gmshSurface.h Pair.h Range.h SPoint2.h \ SPoint3.h SVector3.h SBoundingBox3d.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h ../Common/ListUtils.h ../Common/TreeUtils.h \ - ../Common/avl.h ../Common/ListUtils.h ExtrudeParams.h \ - ../Common/SmoothData.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/ListUtils.h \ + ../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \ + ExtrudeParams.h ../Common/SmoothData.h Geo${OBJEXT}: Geo.cpp ../Common/GmshMessage.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h ../Common/MallocUtils.h Geo.h \ - ../Common/GmshDefines.h gmshSurface.h Pair.h Range.h SPoint2.h \ + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/MallocUtils.h \ + Geo.h ../Common/GmshDefines.h gmshSurface.h Pair.h Range.h SPoint2.h \ SPoint3.h SVector3.h SBoundingBox3d.h ../Common/ListUtils.h \ ../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \ ExtrudeParams.h ../Common/SmoothData.h GModel.h GVertex.h GEntity.h \ GPoint.h GEdge.h GFace.h GEdgeLoop.h GRegion.h GeoInterpolation.h \ - ../Mesh/Field.h ../Common/GmshConfig.h ../Post/PView.h ../Geo/SPoint3.h \ - ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h + ../Mesh/Field.h ../Post/PView.h ../Geo/SPoint3.h ../Common/Context.h \ + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h GeoStringInterface${OBJEXT}: GeoStringInterface.cpp ../Common/GmshConfig.h \ ../Common/GmshMessage.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ ../Common/StringUtils.h Geo.h ../Common/GmshDefines.h gmshSurface.h \ @@ -285,9 +291,10 @@ GeoStringInterface${OBJEXT}: GeoStringInterface.cpp ../Common/GmshConfig.h \ GeoInterpolation${OBJEXT}: GeoInterpolation.cpp ../Common/GmshMessage.h Geo.h \ ../Common/GmshDefines.h gmshSurface.h Pair.h Range.h SPoint2.h \ SPoint3.h SVector3.h SBoundingBox3d.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h ../Common/ListUtils.h ../Common/TreeUtils.h \ - ../Common/avl.h ../Common/ListUtils.h ExtrudeParams.h \ - ../Common/SmoothData.h GeoInterpolation.h GeoStringInterface.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/ListUtils.h \ + ../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \ + ExtrudeParams.h ../Common/SmoothData.h GeoInterpolation.h \ + GeoStringInterface.h findLinks${OBJEXT}: findLinks.cpp ../Common/GmshMessage.h GModel.h GVertex.h \ GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \ SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/TreeUtils.h \ @@ -298,7 +305,8 @@ MVertex${OBJEXT}: MVertex.cpp MVertex.h SPoint2.h SPoint3.h GVertex.h GEntity.h ../Common/StringUtils.h MFace${OBJEXT}: MFace.cpp ../Common/GmshConfig.h MFace.h MVertex.h SPoint2.h \ SPoint3.h SVector3.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ - ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h + ../Common/GmshMessage.h ../Common/Context.h ../Geo/CGNSOptions.h \ + ../Mesh/meshPartitionOptions.h MElement${OBJEXT}: MElement.cpp ../Common/GmshConfig.h ../Common/GmshMessage.h \ MElement.h ../Common/GmshDefines.h MVertex.h SPoint2.h SPoint3.h \ MEdge.h SVector3.h MFace.h ../Numeric/FunctionSpace.h \ diff --git a/Graphics/Makefile b/Graphics/Makefile index 12d6fc5851..b9ba433e4f 100644 --- a/Graphics/Makefile +++ b/Graphics/Makefile @@ -59,23 +59,25 @@ depend: # DO NOT DELETE THIS LINE Trackball${OBJEXT}: Trackball.cpp Trackball.h -Iso${OBJEXT}: Iso.cpp ../Numeric/Numeric.h ../Numeric/GmshMatrix.h +Iso${OBJEXT}: Iso.cpp ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ + ../Common/GmshConfig.h ../Common/GmshMessage.h ReadImg${OBJEXT}: ReadImg.cpp ReadImg.h ../Common/GmshMessage.h ../Post/PView.h \ ../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h + ../Common/GmshConfig.h ../Common/ListUtils.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 \ - ../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 ../Common/GmshConfig.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 \ @@ -88,10 +90,11 @@ drawMesh${OBJEXT}: drawMesh.cpp drawContext.h ../Geo/SBoundingBox3d.h \ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Geo/MVertex.h \ ../Geo/SPoint2.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 ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \ - ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Common/OS.h gl2ps.h ../Common/GmshConfig.h ../Common/VertexArray.h \ - ../Common/SmoothData.h ../Post/PView.h ../Post/PViewData.h + ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \ + ../Common/GmshConfig.h ../Numeric/Gauss.h ../Common/Context.h \ + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h ../Common/OS.h \ + gl2ps.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 gl2ps.h ../Common/GmshConfig.h \ @@ -120,23 +123,24 @@ drawAxes${OBJEXT}: drawAxes.cpp drawContext.h ../Geo/SBoundingBox3d.h \ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../Common/Context.h ../Geo/CGNSOptions.h \ ../Mesh/meshPartitionOptions.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h gl2ps.h ../Common/GmshConfig.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/GmshMessage.h \ + gl2ps.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 \ - gl2ps.h ../Common/GmshConfig.h + ../Common/GmshConfig.h ../Common/GmshMessage.h ../Common/Context.h \ + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h gl2ps.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 \ - gl2ps.h ../Common/GmshConfig.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h + ../Common/GmshConfig.h ../Common/GmshMessage.h gl2ps.h \ + ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h 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 \ - gl2ps.h ../Common/GmshConfig.h + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.h \ + ../Common/GmshMessage.h ../Common/StringUtils.h ../Common/Context.h \ + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h gl2ps.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 bc87220603..369729d83f 100644 --- a/Mesh/Makefile +++ b/Mesh/Makefile @@ -99,17 +99,17 @@ Field${OBJEXT}: Field.cpp ../Common/GmshConfig.h \ ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \ ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h \ - ../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.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/SPoint3.h ../Geo/SBoundingBox3d.h \ - ../Common/GmshMessage.h ../Post/OctreePost.h ../Common/Octree.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/GmshMessage.h \ + ../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \ + ../Common/ListUtils.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/SPoint3.h \ + ../Geo/SBoundingBox3d.h ../Post/OctreePost.h ../Common/Octree.h \ ../Common/OctreeInternals.h ../Post/PViewDataList.h ../Post/PViewData.h \ ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h gmshSmoothHighOrder${OBJEXT}: gmshSmoothHighOrder.cpp HighOrder.h \ @@ -125,14 +125,14 @@ gmshSmoothHighOrder${OBJEXT}: gmshSmoothHighOrder.cpp HighOrder.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \ - ../Numeric/GmshMatrix.h ../Numeric/Gauss.h meshGFaceDelaunayInsertion.h \ - gmshSmoothHighOrder.h ../Numeric/gmshAssembler.h \ - ../Numeric/gmshLinearSystem.h ../Numeric/gmshLaplace.h \ - ../Numeric/gmshTermOfFormulation.h ../Numeric/GmshMatrix.h \ - ../Numeric/gmshFunction.h ../Common/Gmsh.h ../Common/GmshMessage.h \ - ../Numeric/GmshMatrix.h ../Numeric/gmshElasticity.h \ - ../Numeric/gmshTermOfFormulation.h ../Numeric/GmshMatrix.h \ - ../Numeric/gmshLinearSystemGmm.h ../Common/GmshConfig.h \ + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h \ + meshGFaceDelaunayInsertion.h gmshSmoothHighOrder.h \ + ../Numeric/gmshAssembler.h ../Numeric/gmshLinearSystem.h \ + ../Numeric/gmshLaplace.h ../Numeric/gmshTermOfFormulation.h \ + ../Numeric/GmshMatrix.h ../Numeric/gmshFunction.h ../Common/Gmsh.h \ + ../Common/GmshMessage.h ../Numeric/GmshMatrix.h \ + ../Numeric/gmshElasticity.h ../Numeric/gmshTermOfFormulation.h \ + ../Numeric/GmshMatrix.h ../Numeric/gmshLinearSystemGmm.h \ ../Numeric/gmshLinearSystem.h ../Common/Context.h ../Geo/CGNSOptions.h \ ../Mesh/meshPartitionOptions.h ../Numeric/Numeric.h \ ../Numeric/GmshMatrix.h @@ -149,9 +149,9 @@ meshGEdge${OBJEXT}: meshGEdge.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/SPoint3.h ../Geo/MEdge.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 BackgroundMesh.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h \ + BackgroundMesh.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ + ../Common/Context.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 \ @@ -164,27 +164,27 @@ meshGEdgeExtruded${OBJEXT}: meshGEdgeExtruded.cpp ../Geo/GModel.h \ ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.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 ../Geo/ExtrudeParams.h \ - ../Common/SmoothData.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h \ + ../Geo/ExtrudeParams.h ../Common/SmoothData.h meshGFace${OBJEXT}: meshGFace.cpp meshGFace.h meshGFaceBDS.h \ meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/SPoint2.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/GmshMessage.h \ - ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.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/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 + ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \ + ../Common/GmshConfig.h ../Numeric/Gauss.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/meshPartitionOptions.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h BDS.h qualityMeasures.h \ + Field.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 \ @@ -196,8 +196,8 @@ meshGFaceTransfinite${OBJEXT}: meshGFaceTransfinite.cpp meshGFace.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \ - ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h \ + ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.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 \ @@ -211,57 +211,58 @@ meshGFaceExtruded${OBJEXT}: meshGFaceExtruded.cpp ../Geo/GModel.h \ ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.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 ../Geo/ExtrudeParams.h \ - ../Common/SmoothData.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h \ + ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Common/Context.h \ + ../Geo/CGNSOptions.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 \ ../Geo/SPoint2.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/FunctionSpace.h ../Numeric/GmshMatrix.h \ - ../Numeric/Gauss.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/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 + ../Common/GmshConfig.h ../Numeric/Gauss.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/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 ../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 \ ../Geo/MVertex.h ../Geo/SPoint2.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/FunctionSpace.h \ - ../Numeric/GmshMatrix.h ../Numeric/Gauss.h meshGFaceOptimize.h \ - meshGFace.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 ../Numeric/Numeric.h \ + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h \ + meshGFaceOptimize.h meshGFace.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 ../Numeric/Numeric.h \ ../Numeric/GmshMatrix.h meshGFaceOptimize${OBJEXT}: meshGFaceOptimize.cpp meshGFaceOptimize.h \ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \ ../Geo/SPoint2.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/GmshMessage.h ../Numeric/FunctionSpace.h \ - ../Numeric/GmshMatrix.h ../Numeric/Gauss.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 Generator.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.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 Generator.h meshGFaceQuadrilateralize${OBJEXT}: meshGFaceQuadrilateralize.cpp \ meshGFaceQuadrilateralize.h ../Common/GmshMessage.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Geo/GFace.h \ - ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.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 \ @@ -300,16 +301,16 @@ meshGRegionDelaunayInsertion${OBJEXT}: meshGRegionDelaunayInsertion.cpp \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint2.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/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.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 ../Numeric/GmshMatrix.h \ + ../Common/GmshConfig.h ../Numeric/Gauss.h ../Numeric/Numeric.h \ + ../Numeric/GmshMatrix.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${OBJEXT}: 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 \ @@ -321,8 +322,8 @@ meshGRegionTransfinite${OBJEXT}: meshGRegionTransfinite.cpp meshGFace.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \ - ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h \ + ../Common/Context.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 \ @@ -335,9 +336,9 @@ meshGRegionExtruded${OBJEXT}: meshGRegionExtruded.cpp ../Geo/GModel.h \ ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.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 ../Geo/ExtrudeParams.h \ - ../Common/SmoothData.h meshGFace.h meshGRegion.h ../Common/Context.h \ - ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h \ + ../Geo/ExtrudeParams.h ../Common/SmoothData.h meshGFace.h meshGRegion.h \ + ../Common/Context.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 \ @@ -358,33 +359,35 @@ meshGRegionLocalMeshMod${OBJEXT}: meshGRegionLocalMeshMod.cpp \ ../Geo/SPoint2.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/GmshMessage.h ../Numeric/FunctionSpace.h \ - ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h BackgroundMesh.h qualityMeasures.h \ - ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.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${OBJEXT}: DivideAndConquer.cpp ../Common/GmshMessage.h \ ../Numeric/GmshPredicates.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h DivideAndConquer.h ../Common/MallocUtils.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h DivideAndConquer.h \ + ../Common/MallocUtils.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 \ - ../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 + ../Common/GmshConfig.h ../Common/Context.h ../Geo/CGNSOptions.h \ + ../Mesh/meshPartitionOptions.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 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 \ ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \ ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \ - ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h + ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \ + ../Common/GmshConfig.h ../Numeric/Gauss.h ../Numeric/Numeric.h \ + ../Numeric/GmshMatrix.h BoundaryLayers${OBJEXT}: 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 \ @@ -397,11 +400,12 @@ BoundaryLayers${OBJEXT}: BoundaryLayers.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.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 BoundaryLayers.h \ - ../Geo/ExtrudeParams.h ../Common/SmoothData.h meshGEdge.h meshGFace.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h \ + BoundaryLayers.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \ + meshGEdge.h meshGFace.h BDS${OBJEXT}: BDS.cpp ../Common/GmshMessage.h ../Numeric/GmshPredicates.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h BDS.h ../Geo/GFace.h \ - ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.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 \ @@ -425,9 +429,9 @@ HighOrder${OBJEXT}: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \ gmshSmoothHighOrder.h ../Geo/MElement.h ../Common/GmshDefines.h \ ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.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 + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h \ + ../Common/OS.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ + ../Common/Context.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 \ @@ -455,4 +459,5 @@ meshRefine${OBJEXT}: meshRefine.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \ - ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/OS.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Numeric/Gauss.h \ + ../Common/OS.h diff --git a/Numeric/GmshMatrix.cpp b/Numeric/GmshMatrix.cpp index 0923e0ef85..1bdd680f1b 100644 --- a/Numeric/GmshMatrix.cpp +++ b/Numeric/GmshMatrix.cpp @@ -91,38 +91,6 @@ void gmshMatrix<std::complex<double> >::mult(const gmshVector<std::complex<doubl &beta, y._data, &INCY); } -#else - -template<class scalar> -void gmshMatrix<scalar>::mult(const gmshMatrix<scalar> &b, gmshMatrix<scalar> &c) -{ - c.scale(0.); - for(int i = 0; i < _r; i++) - for(int j = 0; j < b.size2(); j++) - for(int k = 0; k < _c; k++) - c._data[i + _r * j] += (*this)(i, k) * b(k, j); -} - -template<class scalar> -void gmshMatrix<scalar>::gemm(gmshMatrix<scalar> &a, gmshMatrix<scalar> &b, - scalar alpha, scalar beta) -{ - gmshMatrix<scalar> temp(a.size1(), b.size2()); - a.mult(b, temp); - temp.scale(alpha); - scale(beta); - add(temp); -} - -template<class scalar> -void gmshMatrix<scalar>::mult(const gmshVector<scalar> &x, gmshVector<scalar> &y) -{ - y.scale(0.); - for(int i = 0; i < _r; i++) - for(int j = 0; j < _c; j++) - y._data[i] += (*this)(i, j) * x(j); -} - #endif #if defined(HAVE_LAPACK) @@ -179,27 +147,4 @@ bool gmshMatrix<double>::svd(gmshMatrix<double> &V, gmshVector<double> &S) return false; } -#else - -template<class scalar> -bool gmshMatrix<scalar>::lu_solve(const gmshVector<scalar> &rhs, gmshVector<scalar> &result) -{ - Msg::Error("LU factorization requires LAPACK"); - return false; -} - -template<class scalar> -scalar gmshMatrix<scalar>::determinant() const -{ - Msg::Error("Determinant computation requires LAPACK"); - return 0.; -} - -template<class scalar> -bool gmshMatrix<scalar>::svd(gmshMatrix<scalar> &V, gmshVector<scalar> &S) -{ - Msg::Error("Singular value decomposition requires LAPACK"); - return false; -} - #endif diff --git a/Numeric/GmshMatrix.h b/Numeric/GmshMatrix.h index 1c2ec429e8..e78be16628 100644 --- a/Numeric/GmshMatrix.h +++ b/Numeric/GmshMatrix.h @@ -7,6 +7,8 @@ #define _GMSH_MATRIX_H_ #include <math.h> +#include "GmshConfig.h" +#include "GmshMessage.h" template <class scalar> class gmshMatrix; @@ -103,9 +105,29 @@ class gmshMatrix for(int j = j0, destj = destj0; j < j0 + nj; j++, destj++) (*this)(desti, destj) = a(i, j); } - void mult(const gmshMatrix<scalar> &b, gmshMatrix<scalar> &c); + void mult(const gmshMatrix<scalar> &b, gmshMatrix<scalar> &c) +#if !defined(HAVE_BLAS) + { + c.scale(0.); + for(int i = 0; i < _r; i++) + for(int j = 0; j < b.size2(); j++) + for(int k = 0; k < _c; k++) + c._data[i + _r * j] += (*this)(i, k) * b(k, j); + } +#endif + ; void gemm(gmshMatrix<scalar> &a, gmshMatrix<scalar> &b, - scalar alpha=1., scalar beta=1.); + scalar alpha=1., scalar beta=1.) +#if !defined(HAVE_BLAS) + { + gmshMatrix<scalar> temp(a.size1(), b.size2()); + a.mult(b, temp); + temp.scale(alpha); + scale(beta); + add(temp); + } +#endif + ; inline void set_all(const scalar &m) { for(int i = 0; i < _r * _c; i++) _data[i] = m; @@ -127,7 +149,16 @@ class gmshMatrix for(int j = 0; j < size2(); j++) (*this)(i, j) += m(i, j); } - void mult(const gmshVector<scalar> &x, gmshVector<scalar> &y); + void mult(const gmshVector<scalar> &x, gmshVector<scalar> &y) +#if !defined(HAVE_BLAS) + { + y.scale(0.); + for(int i = 0; i < _r; i++) + for(int j = 0; j < _c; j++) + y._data[i] += (*this)(i, j) * x(j); + } +#endif + ; inline gmshMatrix<scalar> transpose() { gmshMatrix<scalar> T(size2(), size1()); @@ -136,7 +167,14 @@ class gmshMatrix T(j, i) = (*this)(i, j); return T; } - bool lu_solve(const gmshVector<scalar> &rhs, gmshVector<scalar> &result); + bool lu_solve(const gmshVector<scalar> &rhs, gmshVector<scalar> &result) +#if !defined(HAVE_LAPACK) + { + Msg::Error("LU factorization requires LAPACK"); + return false; + } +#endif + ; gmshMatrix<scalar> cofactor(int i, int j) const { int ni = size1(); @@ -150,8 +188,22 @@ class gmshMatrix } return cof; } - scalar determinant() const; - bool svd(gmshMatrix<scalar> &V, gmshVector<scalar> &S); + scalar determinant() const +#if !defined(HAVE_LAPACK) + { + Msg::Error("Determinant computation requires LAPACK"); + return 0.; + } +#endif + ; + bool svd(gmshMatrix<scalar> &V, gmshVector<scalar> &S) +#if !defined(HAVE_LAPACK) + { + Msg::Error("Singular value decomposition requires LAPACK"); + return false; + } +#endif + ; }; #endif diff --git a/Numeric/Makefile b/Numeric/Makefile index 3b9904b08f..caef387d32 100644 --- a/Numeric/Makefile +++ b/Numeric/Makefile @@ -72,10 +72,27 @@ gmshTermOfFormulation${OBJEXT}: gmshTermOfFormulation.cpp ../Common/Gmsh.h \ ../Geo/MVertex.h ../Geo/SPoint2.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 ../Numeric/GmshMatrix.h \ - ../Numeric/Gauss.h GmshMatrix.h gmshTermOfFormulation.h gmshFunction.h \ - gmshLinearSystem.h gmshAssembler.h + ../Common/GmshConfig.h ../Numeric/Gauss.h GmshMatrix.h \ + gmshTermOfFormulation.h gmshFunction.h gmshAssembler.h \ + gmshLinearSystem.h gmshLaplace${OBJEXT}: gmshLaplace.cpp gmshLaplace.h gmshTermOfFormulation.h \ - GmshMatrix.h gmshFunction.h ../Common/Gmsh.h ../Common/GmshMessage.h \ + GmshMatrix.h ../Common/GmshConfig.h ../Common/GmshMessage.h \ + gmshFunction.h ../Common/Gmsh.h ../Common/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 \ + ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ + ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \ + ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \ + ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ + ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ + ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ + ../Geo/MVertex.h ../Geo/SPoint2.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 ../Numeric/GmshMatrix.h \ + ../Numeric/Gauss.h Numeric.h +gmshElasticity${OBJEXT}: gmshElasticity.cpp gmshElasticity.h \ + gmshTermOfFormulation.h GmshMatrix.h ../Common/GmshConfig.h \ + ../Common/GmshMessage.h ../Common/Gmsh.h ../Common/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 ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \ @@ -88,24 +105,9 @@ gmshLaplace${OBJEXT}: gmshLaplace.cpp gmshLaplace.h gmshTermOfFormulation.h \ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \ ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \ ../Numeric/Gauss.h Numeric.h -gmshElasticity${OBJEXT}: gmshElasticity.cpp gmshElasticity.h \ - gmshTermOfFormulation.h GmshMatrix.h ../Common/Gmsh.h \ - ../Common/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 \ - ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \ - ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \ - ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \ - ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ - ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \ - ../Geo/MVertex.h ../Geo/SPoint2.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 ../Numeric/GmshMatrix.h \ - ../Numeric/Gauss.h Numeric.h EigSolve${OBJEXT}: EigSolve.cpp FunctionSpace${OBJEXT}: FunctionSpace.cpp FunctionSpace.h GmshMatrix.h \ - ../Common/GmshDefines.h ../Common/GmshMessage.h + ../Common/GmshConfig.h ../Common/GmshMessage.h ../Common/GmshDefines.h GaussQuadratureLin${OBJEXT}: GaussQuadratureLin.cpp Gauss.h GaussLegendre1D.h GaussQuadratureTri${OBJEXT}: GaussQuadratureTri.cpp Gauss.h GaussLegendre1D.h GaussQuadratureQuad${OBJEXT}: GaussQuadratureQuad.cpp Gauss.h GaussLegendre1D.h diff --git a/Parser/Makefile b/Parser/Makefile index 26557d7a89..446dfe2d54 100644 --- a/Parser/Makefile +++ b/Parser/Makefile @@ -80,8 +80,8 @@ Gmsh.yy${OBJEXT}: Gmsh.yy.cpp ../Common/GmshMessage.h ../Geo/Geo.h \ ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \ ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h \ - ../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \ - ../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \ - Gmsh.tab.hpp + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.h \ + ../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \ + ../Common/ListUtils.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \ + ../Common/SmoothData.h Gmsh.tab.hpp FunctionManager${OBJEXT}: FunctionManager.cpp FunctionManager.h diff --git a/Plugin/Makefile b/Plugin/Makefile index 262044fe23..0cd3036a2d 100644 --- a/Plugin/Makefile +++ b/Plugin/Makefile @@ -62,7 +62,8 @@ depend: Plugin${OBJEXT}: Plugin.cpp 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 \ - ../Geo/SPoint3.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h + ../Geo/SPoint3.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.h \ + ../Common/ListUtils.h PluginManager${OBJEXT}: PluginManager.cpp ../Common/GmshConfig.h Plugin.h \ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \ ../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \ @@ -82,8 +83,8 @@ Levelset${OBJEXT}: Levelset.cpp Levelset.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 ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h MakeSimplex.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h ../Post/adaptiveData.h + ../Common/GmshConfig.h ../Common/ListUtils.h MakeSimplex.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Post/adaptiveData.h CutPlane${OBJEXT}: CutPlane.cpp ../Common/GmshConfig.h CutPlane.h Levelset.h \ Plugin.h ../Common/Options.h ../Post/ColorTable.h \ ../Common/GmshMessage.h ../Post/PView.h ../Geo/SPoint3.h \ @@ -102,13 +103,13 @@ CutMap${OBJEXT}: CutMap.cpp CutMap.h Levelset.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 ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h + ../Common/GmshConfig.h ../Common/ListUtils.h ../Common/Context.h \ + ../Geo/CGNSOptions.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 \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h + ../Common/GmshConfig.h ../Common/ListUtils.h CutParametric${OBJEXT}: CutParametric.cpp ../Common/GmshConfig.h \ ../Post/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \ CutParametric.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \ @@ -121,18 +122,20 @@ Lambda2${OBJEXT}: Lambda2.cpp Lambda2.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 ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h + ../Common/GmshConfig.h ../Common/ListUtils.h ../Numeric/Numeric.h \ + ../Numeric/GmshMatrix.h Eigenvectors${OBJEXT}: Eigenvectors.cpp Eigenvectors.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 ../Geo/SPoint3.h \ - ../Numeric/GmshMatrix.h ../Common/ListUtils.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h ../Numeric/EigSolve.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/ListUtils.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Numeric/EigSolve.h Eigenvalues${OBJEXT}: Eigenvalues.cpp Eigenvalues.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 ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h + ../Common/GmshConfig.h ../Common/ListUtils.h ../Numeric/Numeric.h \ + ../Numeric/GmshMatrix.h StreamLines${OBJEXT}: StreamLines.cpp ../Common/GmshConfig.h StreamLines.h \ Plugin.h ../Common/Options.h ../Post/ColorTable.h \ ../Common/GmshMessage.h ../Post/PView.h ../Geo/SPoint3.h \ @@ -154,12 +157,13 @@ Transform${OBJEXT}: Transform.cpp Transform.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 ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h + ../Common/GmshConfig.h ../Common/ListUtils.h LongitudeLatitude${OBJEXT}: LongitudeLatitude.cpp LongitudeLatitude.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 ../Geo/SPoint3.h \ - ../Numeric/GmshMatrix.h ../Common/ListUtils.h ../Common/OpenFile.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/ListUtils.h \ + ../Common/OpenFile.h Triangulate${OBJEXT}: Triangulate.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 \ @@ -173,26 +177,27 @@ Triangulate${OBJEXT}: Triangulate.cpp ../Geo/GModel.h ../Geo/GVertex.h \ ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h Triangulate.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 ../Common/ListUtils.h ../Common/Context.h \ + ../Geo/CGNSOptions.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 \ - ../Geo/SPoint3.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h \ - ../Common/SmoothData.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h + ../Geo/SPoint3.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.h \ + ../Common/ListUtils.h ../Common/SmoothData.h ../Numeric/Numeric.h \ + ../Numeric/GmshMatrix.h SphericalRaise${OBJEXT}: SphericalRaise.cpp SphericalRaise.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 ../Geo/SPoint3.h \ - ../Numeric/GmshMatrix.h ../Common/ListUtils.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/ListUtils.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h Skin${OBJEXT}: Skin.cpp Skin.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 \ - ../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 + ../Geo/SPoint3.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.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 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 \ @@ -214,18 +219,19 @@ ExtractElements${OBJEXT}: ExtractElements.cpp ExtractElements.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 ../Geo/SPoint3.h \ - ../Numeric/GmshMatrix.h ../Common/ListUtils.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/ListUtils.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ExtractEdges${OBJEXT}: ExtractEdges.cpp ExtractEdges.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 ../Geo/SPoint3.h \ - ../Numeric/GmshMatrix.h ../Common/ListUtils.h ../Mesh/BDS.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/ListUtils.h \ + ../Mesh/BDS.h MakeSimplex${OBJEXT}: MakeSimplex.cpp MakeSimplex.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 ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h + ../Common/GmshConfig.h ../Common/ListUtils.h Evaluate${OBJEXT}: Evaluate.cpp ../Common/GmshConfig.h Evaluate.h Plugin.h \ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \ ../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \ @@ -236,7 +242,7 @@ FieldView${OBJEXT}: FieldView.cpp FieldView.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 ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h ../Mesh/Field.h ../Common/GmshConfig.h \ + ../Common/GmshConfig.h ../Common/ListUtils.h ../Mesh/Field.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 \ @@ -249,25 +255,27 @@ Integrate${OBJEXT}: Integrate.cpp Integrate.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 ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h ../Post/shapeFunctions.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h ../Post/PViewOptions.h ../Post/ColorTable.h + ../Common/GmshConfig.h ../Common/ListUtils.h ../Post/shapeFunctions.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Post/PViewOptions.h \ + ../Post/ColorTable.h Gradient${OBJEXT}: Gradient.cpp Gradient.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 ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h ../Post/shapeFunctions.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h + ../Common/GmshConfig.h ../Common/ListUtils.h ../Post/shapeFunctions.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h Curl${OBJEXT}: Curl.cpp Curl.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 \ - ../Geo/SPoint3.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h \ - ../Post/shapeFunctions.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h + ../Geo/SPoint3.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.h \ + ../Common/ListUtils.h ../Post/shapeFunctions.h ../Numeric/Numeric.h \ + ../Numeric/GmshMatrix.h Divergence${OBJEXT}: Divergence.cpp Divergence.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 ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h ../Post/shapeFunctions.h ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h + ../Common/GmshConfig.h ../Common/ListUtils.h ../Post/shapeFunctions.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h Annotate${OBJEXT}: Annotate.cpp ../Common/GmshConfig.h Annotate.h Plugin.h \ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \ ../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \ @@ -279,7 +287,7 @@ Remove${OBJEXT}: Remove.cpp Remove.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 ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h + ../Common/GmshConfig.h ../Common/ListUtils.h Probe${OBJEXT}: Probe.cpp ../Common/GmshConfig.h Probe.h Plugin.h \ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \ ../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \ @@ -292,9 +300,9 @@ HarmonicToTime${OBJEXT}: HarmonicToTime.cpp HarmonicToTime.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 ../Geo/SPoint3.h \ - ../Numeric/GmshMatrix.h ../Common/ListUtils.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/ListUtils.h ModulusPhase${OBJEXT}: ModulusPhase.cpp ModulusPhase.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 ../Geo/SPoint3.h \ - ../Numeric/GmshMatrix.h ../Common/ListUtils.h + ../Numeric/GmshMatrix.h ../Common/GmshConfig.h ../Common/ListUtils.h diff --git a/Post/Makefile b/Post/Makefile index 34581aae3d..c214d07f3f 100644 --- a/Post/Makefile +++ b/Post/Makefile @@ -51,16 +51,16 @@ depend: # DO NOT DELETE THIS LINE PView${OBJEXT}: PView.cpp PView.h ../Geo/SPoint3.h PViewDataList.h PViewData.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ - ../Common/ListUtils.h PViewDataGModel.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 PViewOptions.h ColorTable.h \ - ../Common/VertexArray.h ../Common/SmoothData.h adaptiveData.h \ - ../Common/GmshMessage.h + ../Common/GmshConfig.h ../Common/GmshMessage.h ../Common/ListUtils.h \ + PViewDataGModel.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 PViewOptions.h ColorTable.h \ + ../Common/VertexArray.h ../Common/SmoothData.h adaptiveData.h PViewIO${OBJEXT}: PViewIO.cpp ../Common/GmshConfig.h ../Common/GmshMessage.h \ PView.h ../Geo/SPoint3.h PViewDataList.h PViewData.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ @@ -73,37 +73,37 @@ PViewIO${OBJEXT}: PViewIO.cpp ../Common/GmshConfig.h ../Common/GmshMessage.h \ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Common/StringUtils.h PViewData${OBJEXT}: PViewData.cpp PViewData.h ../Geo/SBoundingBox3d.h \ - ../Geo/SPoint3.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h \ - adaptiveData.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ - ../Common/GmshMessage.h + ../Geo/SPoint3.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.h \ + ../Common/GmshMessage.h ../Common/ListUtils.h adaptiveData.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h PViewDataIO${OBJEXT}: PViewDataIO.cpp ../Common/GmshMessage.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h PViewData.h \ - ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.h \ + PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h 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 ../Common/GmshMessage.h ../Common/ListUtils.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/SmoothData.h \ + ../Common/Context.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 adaptiveData.h + ../Common/GmshConfig.h ../Common/GmshMessage.h ../Common/ListUtils.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/Context.h \ + ../Geo/CGNSOptions.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 \ - ../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 ../Geo/MElement.h ../Common/GmshDefines.h \ - ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.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 ../Numeric/Numeric.h \ - ../Numeric/GmshMatrix.h + ../Common/GmshConfig.h ../Common/GmshMessage.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 ../Geo/MElement.h \ + ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint2.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 ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \ + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h PViewDataGModelIO${OBJEXT}: PViewDataGModelIO.cpp ../Common/GmshConfig.h \ ../Common/GmshMessage.h PViewDataGModel.h PViewData.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \ @@ -124,29 +124,31 @@ PViewOptions${OBJEXT}: PViewOptions.cpp ../Common/GmshConfig.h \ ../Common/GmshMessage.h PViewOptions.h ColorTable.h \ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h adaptiveData${OBJEXT}: adaptiveData.cpp adaptiveData.h ../Numeric/GmshMatrix.h \ - ../Plugin/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 \ - ../Geo/SPoint3.h ../Common/ListUtils.h ../Common/OS.h + ../Common/GmshConfig.h ../Common/GmshMessage.h ../Plugin/Plugin.h \ + ../Common/Options.h ../Post/ColorTable.h ../Post/PView.h \ + ../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \ + ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \ + ../Common/OS.h shapeFunctions${OBJEXT}: shapeFunctions.cpp shapeFunctions.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/GmshMessage.h + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.h \ + ../Common/GmshMessage.h OctreePost${OBJEXT}: OctreePost.cpp ../Common/Octree.h \ ../Common/OctreeInternals.h OctreePost.h ../Common/ListUtils.h PView.h \ ../Geo/SPoint3.h PViewDataList.h PViewData.h ../Geo/SBoundingBox3d.h \ - ../Geo/SPoint3.h ../Numeric/GmshMatrix.h PViewDataGModel.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 ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ - ../Common/GmshMessage.h shapeFunctions.h ../Geo/MElement.h \ + ../Geo/SPoint3.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.h \ + ../Common/GmshMessage.h PViewDataGModel.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 ../Numeric/Numeric.h \ + ../Numeric/GmshMatrix.h shapeFunctions.h ../Geo/MElement.h \ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint2.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 ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ColorTable${OBJEXT}: ColorTable.cpp ../Common/GmshMessage.h ColorTable.h \ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h + ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.h diff --git a/configure b/configure index aea571b55f..a30a64c6fe 100755 --- a/configure +++ b/configure @@ -5594,7 +5594,6 @@ case "${F77}" in F77LIB="" ;; esac -LDFLAGS="${LDFLAGS} ${F77LIB}" if test "x${BLAS_LAPACK_PREFIX}" != "x"; then LDFLAGS="${LDFLAGS} -L${BLAS_LAPACK_PREFIX} -L${BLAS_LAPACK_PREFIX}/lib" fi @@ -5604,7 +5603,7 @@ if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-latlas $LIBS" +LIBS="-latlas ${F77LIB} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5666,7 +5665,7 @@ if test "${ac_cv_lib_f77blas_dgemm_+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lf77blas -latlas $LIBS" +LIBS="-lf77blas -latlas ${F77LIB} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5722,7 +5721,8 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_f77blas_dgemm_" >&5 echo "${ECHO_T}$ac_cv_lib_f77blas_dgemm_" >&6; } if test $ac_cv_lib_f77blas_dgemm_ = yes; then - BLAS="yes" BLAS_LIBS="${BLAS_LIBS} -lf77blas -latlas" + BLAS="yes" BLAS_LIBS="${BLAS_LIBS} + -lf77blas -latlas" fi fi @@ -5734,7 +5734,7 @@ if test "${ac_cv_lib_blas_dgemm_+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lblas $LIBS" +LIBS="-lblas ${F77LIB} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5806,7 +5806,7 @@ if test "${ac_cv_lib_lapack_dbdsqr_+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-llapack ${BLAS_LIBS} $LIBS" +LIBS="-llapack ${BLAS_LIBS} ${F77LIB} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF diff --git a/configure.in b/configure.in index 97bb7b4670..27be9a48fa 100644 --- a/configure.in +++ b/configure.in @@ -720,21 +720,22 @@ case "${F77}" in F77LIB="" ;; esac -LDFLAGS="${LDFLAGS} ${F77LIB}" if test "x${BLAS_LAPACK_PREFIX}" != "x"; then LDFLAGS="${LDFLAGS} -L${BLAS_LAPACK_PREFIX} -L${BLAS_LAPACK_PREFIX}/lib" fi AC_CHECK_LIB(atlas,ATL_xerbla, - AC_CHECK_LIB(f77blas,dgemm_, - [BLAS="yes" BLAS_LIBS="${BLAS_LIBS} -lf77blas -latlas"],[],-latlas)) + AC_CHECK_LIB(f77blas,dgemm_,[BLAS="yes" BLAS_LIBS="${BLAS_LIBS} + -lf77blas -latlas"],[],[-latlas ${F77LIB}]), + [],${F77LIB}) if test "x${BLAS}" != "xyes"; then - AC_CHECK_LIB(blas,dgemm_,[BLAS="yes" BLAS_LIBS="${BLAS_LIBS} -lblas"]) + AC_CHECK_LIB(blas,dgemm_,[BLAS="yes" BLAS_LIBS="${BLAS_LIBS} -lblas"], + [],${F77LIB}) fi if test "x${BLAS}" = "xyes"; then AC_DEFINE(HAVE_BLAS) BO="${BO} Blas" - AC_CHECK_LIB(lapack,dbdsqr_, - [LAPACK="yes" BLAS_LIBS="-llapack ${BLAS_LIBS}"],[],${BLAS_LIBS}) + AC_CHECK_LIB(lapack,dbdsqr_,[LAPACK="yes" BLAS_LIBS="-llapack ${BLAS_LIBS}"], + [],[${BLAS_LIBS} ${F77LIB}]) if test "x${LAPACK}" = "xyes"; then AC_DEFINE(HAVE_LAPACK) BO="${BO} Lapack" -- GitLab