diff --git a/Common/Makefile b/Common/Makefile
index 979bdcdc8666c2ce4a88f311e8eb581521fb214d..d9a89bfaed29b101feeea432e7e3964cfeccfb7d 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -158,8 +158,7 @@ Visibility${OBJEXT}: Visibility.cpp Visibility.h GmshDefines.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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Parser/Parser.h
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Parser/Parser.h
VertexArray${OBJEXT}: VertexArray.cpp VertexArray.h ../Geo/SVector3.h \
../Geo/SPoint3.h Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Numeric/Numeric.h \
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 2c7ecdc56c2fd30d44f308523da9b75404d884a9..fd033bd0db6625ae50e14cfed1ca5de74bd6992e 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -100,11 +100,11 @@ GUI${OBJEXT}: GUI.cpp GUI.h graphicWindow.h openglWindow.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/NumericEmbedded.h ../Post/PView.h \
- Solvers.h ../Mesh/Field.h ../Plugin/Plugin.h ../Common/Options.h \
- ../Post/PViewDataList.h ../Post/PViewData.h ../Common/ListUtils.h \
- ../Plugin/PluginManager.h ../Common/OpenFile.h Win32Icon.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Post/PView.h Solvers.h ../Mesh/Field.h ../Plugin/Plugin.h \
+ ../Common/Options.h ../Post/PViewDataList.h ../Post/PViewData.h \
+ ../Common/ListUtils.h ../Plugin/PluginManager.h ../Common/OpenFile.h \
+ Win32Icon.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h
graphicWindow${OBJEXT}: graphicWindow.cpp GUI.h graphicWindow.h openglWindow.h \
../Graphics/drawContext.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
shortcutWindow.h menuWindow.h popupButton.h messageWindow.h \
@@ -126,7 +126,7 @@ openglWindow${OBJEXT}: openglWindow.cpp openglWindow.h ../Graphics/drawContext.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/NumericEmbedded.h Draw.h GUI.h \
+ Draw.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h GUI.h \
../Common/VertexArray.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
menuWindow${OBJEXT}: menuWindow.cpp GUI.h Draw.h menuWindow.h popupButton.h \
@@ -149,14 +149,14 @@ menuWindow${OBJEXT}: menuWindow.cpp GUI.h Draw.h menuWindow.h popupButton.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/NumericEmbedded.h ../Common/Options.h Solvers.h \
- ../Common/CommandLine.h ../Mesh/Generator.h ../Mesh/HighOrder.h \
- ../Post/PView.h ../Post/PViewData.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Mesh/Field.h ../Common/OS.h \
- ../Common/StringUtils.h ../Common/OpenFile.h ../Common/CreateFile.h \
- ../Geo/findLinks.h ../Common/ListUtils.h ../Geo/GeoStringInterface.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/Options.h \
+ Solvers.h ../Common/CommandLine.h ../Mesh/Generator.h \
+ ../Mesh/HighOrder.h ../Post/PView.h ../Post/PViewData.h \
+ ../Post/PViewOptions.h ../Post/ColorTable.h ../Mesh/Field.h \
+ ../Common/OS.h ../Common/StringUtils.h ../Common/OpenFile.h \
+ ../Common/CreateFile.h ../Geo/findLinks.h ../Common/ListUtils.h \
+ ../Geo/GeoStringInterface.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h
optionWindow${OBJEXT}: optionWindow.cpp GUI.h optionWindow.h \
spherePositionWidget.h colorbarWindow.h ../Post/ColorTable.h \
shortcutWindow.h menuWindow.h popupButton.h extraDialogs.h Draw.h \
@@ -172,10 +172,9 @@ optionWindow${OBJEXT}: optionWindow.cpp GUI.h optionWindow.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/NumericEmbedded.h \
- ../Post/PView.h ../Post/PViewData.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Common/OS.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Numeric/Gauss.h ../Post/PView.h ../Post/PViewData.h \
+ ../Post/PViewOptions.h ../Post/ColorTable.h ../Common/OS.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
colorbarWindow${OBJEXT}: colorbarWindow.cpp colorbarWindow.h \
../Post/ColorTable.h Draw.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
@@ -212,9 +211,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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Post/PView.h ../Mesh/Generator.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Post/PView.h \
+ ../Mesh/Generator.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h
visibilityWindow${OBJEXT}: visibilityWindow.cpp GUI.h Draw.h visibilityWindow.h \
shortcutWindow.h contextWindow.h ../Common/GmshDefines.h \
../Common/GmshMessage.h ../Geo/GModel.h ../Geo/GVertex.h \
@@ -229,7 +228,6 @@ visibilityWindow${OBJEXT}: visibilityWindow.cpp GUI.h Draw.h visibilityWindow.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/NumericEmbedded.h \
../Common/Visibility.h ../Common/GmshDefines.h \
../Geo/GeoStringInterface.h ../Common/ListUtils.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Context.h ../Geo/CGNSOptions.h \
@@ -306,8 +304,7 @@ projectionEditor${OBJEXT}: projectionEditor.cpp GUI.h projectionEditor.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/NumericEmbedded.h Draw.h ../Common/Options.h \
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h Draw.h ../Common/Options.h \
../Common/StringUtils.h ../Geo/fourierFace.h ../Geo/GFace.h \
../Geo/GModel.h ../Geo/Range.h ../Geo/fourierEdge.h ../Geo/GEdge.h \
../Geo/GModel.h ../Geo/fourierVertex.h ../Geo/GModel.h ../Geo/GVertex.h \
@@ -326,8 +323,8 @@ 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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Post/ColorTable.h Draw.h \
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Post/ColorTable.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h Draw.h \
../Common/Options.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Mesh/meshGFaceDelaunayInsertion.h \
../Mesh/meshGFaceOptimize.h ../Mesh/meshGFaceDelaunayInsertion.h \
diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp
index 30a475342c6c904f971bc94160fc55f4f1798417..ecad47c36390385b2ba6e25f73c92df61963678c 100644
--- a/Geo/MElement.cpp
+++ b/Geo/MElement.cpp
@@ -15,7 +15,6 @@
#include "GmshEmbedded.h"
#else
#include "Numeric.h"
-#include "Gauss.h"
#include "GaussLegendre1D.h"
#include "Context.h"
#include "qualityMeasures.h"
diff --git a/Geo/Makefile b/Geo/Makefile
index 59ec9bf588b42312bafd45677688c444a3a9a6e8..fe2672b8bc14c7e74332cacd5854634bca54f460 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -67,21 +67,18 @@ GEntity${OBJEXT}: GEntity.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/VertexArray.h ../Geo/SVector3.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.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/Numeric.h \
- ../Numeric/NumericEmbedded.h
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h
GEdge${OBJEXT}: GEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/GaussLegendre1D.h
GEdgeLoop${OBJEXT}: GEdgeLoop.cpp GEdgeLoop.h GEdge.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GVertex.h GPoint.h SPoint2.h SVector3.h \
@@ -91,8 +88,8 @@ GFace${OBJEXT}: GFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
- ../Common/VertexArray.h ../Geo/SVector3.h ../Numeric/GaussLegendre1D.h \
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h ../Numeric/GaussLegendre1D.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
GFaceCompound${OBJEXT}: GFaceCompound.cpp GFaceCompound.h GFace.h GEntity.h \
Range.h SPoint3.h SBoundingBox3d.h GPoint.h GEdgeLoop.h GEdge.h \
@@ -106,17 +103,16 @@ GFaceCompound${OBJEXT}: GFaceCompound.cpp GFaceCompound.h GFace.h GEntity.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/NumericEmbedded.h \
- ../Numeric/GmshMatrix.h ../Common/Octree.h ../Common/OctreeInternals.h \
- ../Numeric/gmshLinearSystemGmm.h ../Numeric/gmshLinearSystem.h \
- ../Numeric/gmshLinearSystemFull.h ../Numeric/gmshLinearSystem.h \
- ../Numeric/GmshMatrix.h
+ ../Numeric/Gauss.h ../Numeric/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h ../Common/Octree.h \
+ ../Common/OctreeInternals.h ../Numeric/gmshLinearSystemGmm.h \
+ ../Numeric/gmshLinearSystem.h ../Numeric/gmshLinearSystemFull.h \
+ ../Numeric/gmshLinearSystem.h ../Numeric/GmshMatrix.h
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/Numeric.h ../Numeric/NumericEmbedded.h
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.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 \
@@ -125,7 +121,7 @@ gmshVertex${OBJEXT}: gmshVertex.cpp GFace.h GEntity.h Range.h SPoint3.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 ../Numeric/Numeric.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 \
@@ -158,8 +154,7 @@ OCCVertex${OBJEXT}: OCCVertex.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h
GEdgeLoop.h Pair.h GRegion.h MVertex.h MElement.h \
../Common/GmshDefines.h MEdge.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h OCCVertex.h \
- OCCIncludes.h OCCEdge.h OCCFace.h
+ OCCVertex.h OCCIncludes.h OCCEdge.h OCCFace.h
OCCEdge${OBJEXT}: OCCEdge.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/GmshMessage.h OCCEdge.h \
@@ -213,8 +208,8 @@ GModel${OBJEXT}: GModel.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h discreteRegion.h \
- discreteFace.h discreteEdge.h discreteVertex.h gmshSurface.h \
+ discreteRegion.h discreteFace.h discreteEdge.h discreteVertex.h \
+ gmshSurface.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/Octree.h ../Common/OctreeInternals.h ../Common/SmoothData.h \
../Mesh/Field.h ../Post/PView.h ../Geo/SPoint3.h ../Mesh/Generator.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
@@ -232,8 +227,7 @@ GModelIO_Mesh${OBJEXT}: GModelIO_Mesh.cpp GModel.h GVertex.h GEntity.h Range.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 \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h discreteRegion.h \
- discreteFace.h ../Common/StringUtils.h
+ discreteRegion.h discreteFace.h ../Common/StringUtils.h
GModelIO_OCC${OBJEXT}: GModelIO_OCC.cpp GModelIO_OCC.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 OCCIncludes.h \
@@ -241,7 +235,7 @@ GModelIO_OCC${OBJEXT}: GModelIO_OCC.cpp GModelIO_OCC.h GModel.h GVertex.h \
../Mesh/PartitionOptions.h OCCVertex.h OCCEdge.h OCCFace.h OCCRegion.h \
MElement.h ../Common/GmshDefines.h MVertex.h MEdge.h MFace.h \
../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/OpenFile.h
+ ../Common/OpenFile.h
GModelIO_Fourier${OBJEXT}: GModelIO_Fourier.cpp GModel.h GVertex.h GEntity.h \
Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \
SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshMessage.h \
@@ -300,9 +294,9 @@ MFace${OBJEXT}: MFace.cpp MFace.h MVertex.h SPoint2.h SPoint3.h SVector3.h \
MElement${OBJEXT}: MElement.cpp MElement.h ../Common/GmshDefines.h MVertex.h \
SPoint2.h SPoint3.h MEdge.h SVector3.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h GEntity.h Range.h \
- SBoundingBox3d.h GFace.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h Pair.h \
- ../Common/StringUtils.h ../Numeric/GaussLegendre1D.h \
+ GEntity.h Range.h SBoundingBox3d.h GFace.h GPoint.h GEdgeLoop.h GEdge.h \
+ GVertex.h Pair.h ../Common/StringUtils.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h ../Numeric/GaussLegendre1D.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
../Mesh/qualityMeasures.h ../Mesh/meshGFaceDelaunayInsertion.h \
../Geo/MElement.h ../Mesh/meshGRegionDelaunayInsertion.h \
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 31e0120a8bc2ecf6f09b9915e72f945779dbdd08..40cfcf3b075e81ec0455aed95aa6a1f39d05478b 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -89,10 +89,9 @@ drawMesh${OBJEXT}: drawMesh.cpp drawContext.h ../Geo/SBoundingBox3d.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/NumericEmbedded.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Common/OS.h gl2ps.h \
- ../Common/VertexArray.h ../Common/SmoothData.h ../Post/PView.h \
- ../Post/PViewData.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Common/OS.h gl2ps.h ../Common/VertexArray.h ../Common/SmoothData.h \
+ ../Post/PView.h ../Post/PViewData.h
drawGeom${OBJEXT}: drawGeom.cpp drawContext.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h gl2ps.h ../Common/VertexArray.h \
diff --git a/Makefile b/Makefile
index 129e260f34a033ff7481c5cc1b6090986e3b3501..0c7631e5ca0e00d7edee4553864109a6cf979f88 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,8 @@ GMSH_API = Geo/GModel.h Geo/GEntity.h Geo/GPoint.h\
Geo/MVertex.h Geo/MEdge.h Geo/MFace.h Geo/MElement.h\
Geo/discreteVertex.h Geo/discreteEdge.h Geo/discreteFace.h Geo/discreteRegion.h\
Geo/SPoint2.h Geo/SPoint3.h Geo/SVector3.h Geo/SBoundingBox3d.h\
- Geo/Pair.h Geo/Range.h Numeric/FunctionSpace.h Numeric/GmshMatrix.h\
+ Geo/Pair.h Geo/Range.h\
+ Numeric/Gauss.h Numeric/FunctionSpace.h Numeric/GmshMatrix.h\
Post/PView.h Post/PViewData.h Plugin/PluginManager.h\
Common/VertexArray.h Common/GmshMessage.h\
Common/Gmsh.h Common/GmshDefines.h Common/GmshVersion.h
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 8efc7b2f0fbd590cd9d8bcd9e32b111f6878822a..e4caab0b73d0f9009863ec15423b924021b7ee04 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -90,9 +90,9 @@ Generator${OBJEXT}: Generator.cpp ../Common/GmshMessage.h ../Numeric/Numeric.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 meshGEdge.h meshGFace.h \
- meshGFaceBDS.h meshGRegion.h BackgroundMesh.h BoundaryLayers.h \
- HighOrder.h Generator.h ../Post/PView.h ../Post/PViewData.h
+ ../Numeric/Gauss.h meshGEdge.h meshGFace.h meshGFaceBDS.h meshGRegion.h \
+ BackgroundMesh.h BoundaryLayers.h HighOrder.h Generator.h \
+ ../Post/PView.h ../Post/PViewData.h
Field${OBJEXT}: Field.cpp ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h Field.h ../Post/PView.h ../Geo/SPoint3.h \
../Geo/GeoInterpolation.h ../Geo/Geo.h ../Common/GmshDefines.h \
@@ -126,8 +126,7 @@ 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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h meshGFaceDelaunayInsertion.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 \
@@ -135,7 +134,8 @@ gmshSmoothHighOrder${OBJEXT}: gmshSmoothHighOrder.cpp HighOrder.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/PartitionOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h
meshGEdge${OBJEXT}: meshGEdge.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 \
@@ -149,8 +149,8 @@ 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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h BackgroundMesh.h ../Common/Context.h \
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h BackgroundMesh.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
meshGEdgeExtruded${OBJEXT}: meshGEdgeExtruded.cpp ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -164,8 +164,7 @@ 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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Geo/ExtrudeParams.h \
+ ../Numeric/GmshMatrix.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 \
@@ -173,7 +172,6 @@ meshGFace${OBJEXT}: meshGFace.cpp meshGFace.h meshGFaceBDS.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/NumericEmbedded.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 \
@@ -184,7 +182,8 @@ 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/PartitionOptions.h BDS.h qualityMeasures.h Field.h \
+ ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.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 \
@@ -197,9 +196,9 @@ 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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/Context.h \
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.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 \
@@ -212,8 +211,7 @@ 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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Geo/ExtrudeParams.h \
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Geo/ExtrudeParams.h \
../Common/SmoothData.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
meshGFaceBDS${OBJEXT}: meshGFaceBDS.cpp meshGFace.h meshGFaceOptimize.h \
@@ -221,8 +219,7 @@ meshGFaceBDS${OBJEXT}: meshGFaceBDS.cpp meshGFace.h meshGFaceOptimize.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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h meshGFaceDelaunayInsertion.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 \
@@ -232,29 +229,29 @@ meshGFaceBDS${OBJEXT}: meshGFaceBDS.cpp meshGFace.h meshGFaceOptimize.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.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 BDS.h qualityMeasures.h Field.h ../Post/PView.h \
- ../Common/OS.h
+ ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h BDS.h qualityMeasures.h Field.h \
+ ../Post/PView.h ../Common/OS.h
meshGFaceDelaunayInsertion${OBJEXT}: meshGFaceDelaunayInsertion.cpp \
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 \
../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
- ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.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/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/NumericEmbedded.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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h meshGFaceDelaunayInsertion.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 \
@@ -274,7 +271,7 @@ meshGFaceQuadrilateralize${OBJEXT}: meshGFaceQuadrilateralize.cpp \
../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 meshGFaceOptimize.h meshGFaceBDS.h BDS.h
+ meshGFaceOptimize.h meshGFaceBDS.h BDS.h
meshGRegion${OBJEXT}: meshGRegion.cpp meshGRegion.h \
meshGRegionDelaunayInsertion.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint2.h \
@@ -324,9 +321,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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/Context.h \
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.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 +335,7 @@ 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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Geo/ExtrudeParams.h \
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Geo/ExtrudeParams.h \
../Common/SmoothData.h meshGFace.h meshGRegion.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
meshGRegionCarveHole${OBJEXT}: meshGRegionCarveHole.cpp ../Geo/GModel.h \
@@ -355,8 +350,7 @@ meshGRegionCarveHole${OBJEXT}: meshGRegionCarveHole.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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h
meshGRegionLocalMeshMod${OBJEXT}: meshGRegionLocalMeshMod.cpp \
meshGRegionLocalMeshMod.h meshGRegionDelaunayInsertion.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
@@ -402,9 +396,8 @@ 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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h BoundaryLayers.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h meshGEdge.h meshGFace.h
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h BoundaryLayers.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h meshGEdge.h meshGFace.h
BDS${OBJEXT}: BDS.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.h \
../Common/GmshMessage.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
@@ -416,7 +409,7 @@ BDS${OBJEXT}: BDS.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.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 qualityMeasures.h
+ ../Numeric/Gauss.h qualityMeasures.h
HighOrder${OBJEXT}: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -430,8 +423,8 @@ 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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/OS.h ../Common/Context.h \
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/OS.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
Partition${OBJEXT}: Partition.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -446,8 +439,7 @@ Partition${OBJEXT}: Partition.cpp ../Geo/GModel.h ../Geo/GVertex.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/NumericEmbedded.h PartitionOptions.h
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h PartitionOptions.h
Refine${OBJEXT}: Refine.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -461,5 +453,4 @@ Refine${OBJEXT}: Refine.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 ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/OS.h
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/OS.h
diff --git a/Numeric/Gauss.h b/Numeric/Gauss.h
index c8258e26ef22fbf6e8c5beff5a80370470171e58..6e30077da154601bc4895ccff4e36a46a61fa7cf 100644
--- a/Numeric/Gauss.h
+++ b/Numeric/Gauss.h
@@ -6,7 +6,10 @@
#ifndef _GAUSS_H_
#define _GAUSS_H_
-#include "Numeric.h"
+struct IntPt{
+ double pt[3];
+ double weight;
+};
int GaussLegendreTri(int n1, int n2, IntPt *pts);
int GaussLegendreTet(int n1, int n2, int n3, IntPt *pts);
diff --git a/Numeric/Makefile b/Numeric/Makefile
index b0eea45326720ffddec77ba21747f80ce30f9d34..1040b376b39c6df69eb366cc20e3c85b5bb3e034 100644
--- a/Numeric/Makefile
+++ b/Numeric/Makefile
@@ -71,9 +71,8 @@ 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 ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
- GmshMatrix.h gmshTermOfFormulation.h gmshFunction.h gmshLinearSystem.h \
- gmshAssembler.h
+ ../Numeric/Gauss.h GmshMatrix.h gmshTermOfFormulation.h gmshFunction.h \
+ gmshLinearSystem.h gmshAssembler.h
gmshLaplace${OBJEXT}: gmshLaplace.cpp gmshLaplace.h gmshTermOfFormulation.h \
GmshMatrix.h ../Common/GmshMessage.h gmshFunction.h ../Common/Gmsh.h \
../Common/GmshMessage.h ../Geo/GModel.h ../Geo/GVertex.h \
@@ -88,8 +87,7 @@ gmshLaplace${OBJEXT}: gmshLaplace.cpp gmshLaplace.h gmshTermOfFormulation.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/NumericEmbedded.h \
- Numeric.h
+ ../Numeric/Gauss.h Numeric.h NumericEmbedded.h
gmshElasticity${OBJEXT}: gmshElasticity.cpp gmshElasticity.h \
gmshTermOfFormulation.h GmshMatrix.h ../Common/GmshMessage.h \
../Common/Gmsh.h ../Common/GmshMessage.h ../Geo/GModel.h \
@@ -104,19 +102,14 @@ gmshElasticity${OBJEXT}: gmshElasticity.cpp gmshElasticity.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/NumericEmbedded.h \
- Numeric.h
+ ../Numeric/Gauss.h Numeric.h NumericEmbedded.h
EigSolve${OBJEXT}: EigSolve.cpp
FunctionSpace${OBJEXT}: FunctionSpace.cpp FunctionSpace.h GmshMatrix.h \
../Common/GmshMessage.h ../Common/GmshDefines.h
-GaussQuadratureTri${OBJEXT}: GaussQuadratureTri.cpp Gauss.h Numeric.h \
- NumericEmbedded.h GaussLegendre1D.h
-GaussQuadratureQuad${OBJEXT}: GaussQuadratureQuad.cpp Gauss.h Numeric.h \
- NumericEmbedded.h GaussLegendre1D.h
-GaussQuadratureTet${OBJEXT}: GaussQuadratureTet.cpp Gauss.h Numeric.h \
- NumericEmbedded.h GaussLegendre1D.h
-GaussQuadratureHex${OBJEXT}: GaussQuadratureHex.cpp Gauss.h Numeric.h \
- NumericEmbedded.h GaussLegendre1D.h
-GaussLegendreSimplex${OBJEXT}: GaussLegendreSimplex.cpp Gauss.h Numeric.h \
- NumericEmbedded.h GaussLegendre1D.h
+GaussQuadratureTri${OBJEXT}: GaussQuadratureTri.cpp Gauss.h GaussLegendre1D.h
+GaussQuadratureQuad${OBJEXT}: GaussQuadratureQuad.cpp Gauss.h GaussLegendre1D.h
+GaussQuadratureTet${OBJEXT}: GaussQuadratureTet.cpp Gauss.h GaussLegendre1D.h
+GaussQuadratureHex${OBJEXT}: GaussQuadratureHex.cpp Gauss.h GaussLegendre1D.h
+GaussLegendreSimplex${OBJEXT}: GaussLegendreSimplex.cpp Gauss.h \
+ GaussLegendre1D.h
GmshPredicates${OBJEXT}: GmshPredicates.cpp
diff --git a/Numeric/NumericEmbedded.h b/Numeric/NumericEmbedded.h
index 12563191213b35cdadd7164147c1fe51b1391966..ceba0e734ba6f32e3a494f9e511613aa0d64b2d3 100644
--- a/Numeric/NumericEmbedded.h
+++ b/Numeric/NumericEmbedded.h
@@ -11,11 +11,6 @@
#define myhypot(a,b) (sqrt((a)*(a)+(b)*(b)))
#define sign(x) (((x)>=0)?1:-1)
-struct IntPt{
- double pt[3];
- double weight;
-};
-
double myatan2(double a, double b);
double myasin(double a);
double myacos(double a);
diff --git a/Post/Makefile b/Post/Makefile
index 8f1f9363a886599b1398e78feeba5b375baf87db..6ebb0b725b75f35be094ae288ed4d7a27aa62dbc 100644
--- a/Post/Makefile
+++ b/Post/Makefile
@@ -143,8 +143,7 @@ OctreePost${OBJEXT}: OctreePost.cpp ../Common/Octree.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/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h
ColorTable${OBJEXT}: ColorTable.cpp ../Common/GmshMessage.h ColorTable.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h