diff --git a/Common/Makefile b/Common/Makefile
index 9409f140c13da94a467b0e8ac01d14cacc4ad2a3..ca10ea7bafc2df0fdfa16614a2de6fd67802840f 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -77,11 +77,12 @@ Options.o: Options.cpp GmshUI.h GmshDefines.h ../Geo/GModel.h \
DefaultOptions.h ../Mesh/Field.h ../Post/PView.h \
../Mesh/BackgroundMesh.h ../Post/PViewOptions.h ../Post/ColorTable.h \
../Post/PViewData.h ../Post/adaptiveData.h ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \
- ../Common/Options.h ../Common/GmshMessage.h ../Post/PViewDataList.h \
- ../Post/PViewData.h ../Fltk/Solvers.h ../Fltk/GUI.h \
- ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h ../Common/GmshUI.h \
- ../Fltk/Popup_Button.h ../Fltk/SpherePosition_Widget.h
+ ../Numeric/GmshMatrix.h ../Common/GmshMessage.h \
+ ../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Options.h \
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Fltk/Solvers.h \
+ ../Fltk/GUI.h ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h \
+ ../Common/GmshUI.h ../Fltk/Popup_Button.h \
+ ../Fltk/SpherePosition_Widget.h
CommandLine.o: CommandLine.cpp GmshUI.h GmshDefines.h GmshVersion.h \
GmshMessage.h OpenFile.h CommandLine.h Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h Options.h ../Post/ColorTable.h \
@@ -166,7 +167,7 @@ Visibility.o: 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 \
- ../Common/GmshMatrix.h ../Parser/Parser.h
+ ../Numeric/GmshMatrix.h ../Parser/Parser.h
Trackball.o: Trackball.cpp Trackball.h
VertexArray.o: VertexArray.cpp VertexArray.h ../Geo/SVector3.h \
../Geo/SPoint3.h Context.h ../Geo/CGNSOptions.h \
diff --git a/Fltk/Makefile b/Fltk/Makefile
index fb7456437b01c936f2afe7b20f93d61c82d62537..6ff88bd71141ceb82a1251d03b001f63e15f0f1a 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -80,7 +80,7 @@ GUI.o: GUI.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \
Win32Icon.h ../Common/OpenFile.h ../Common/CommandLine.h \
../Mesh/Generator.h Solvers.h ../Plugin/PluginManager.h \
../Plugin/Plugin.h ../Post/PViewDataList.h ../Post/PViewData.h \
- ../Common/ListUtils.h ../Common/GmshMatrix.h Shortcut_Window.h \
+ ../Common/ListUtils.h ../Numeric/GmshMatrix.h Shortcut_Window.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
@@ -116,7 +116,7 @@ GUI_Projection.o: GUI_Projection.cpp ../Geo/GModelIO_Fourier.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 \
- ../Common/GmshMatrix.h ../Graphics/Draw.h ../Common/Options.h \
+ ../Numeric/GmshMatrix.h ../Graphics/Draw.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Common/StringUtils.h \
../Graphics/SelectBuffer.h GUI_Projection.h ../Common/GmshUI.h \
@@ -139,7 +139,7 @@ GUI_Classifier.o: GUI_Classifier.cpp GUI_Classifier.h ../Common/GmshUI.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 \
- ../Common/GmshMatrix.h GUI.h Opengl_Window.h Colorbar_Window.h \
+ ../Numeric/GmshMatrix.h GUI.h Opengl_Window.h Colorbar_Window.h \
../Post/ColorTable.h Popup_Button.h SpherePosition_Widget.h \
../Mesh/Field.h ../Post/PView.h Shortcut_Window.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Graphics/Draw.h ../Common/Options.h \
@@ -162,7 +162,7 @@ Callbacks.o: Callbacks.cpp ../Common/GmshUI.h ../Common/GmshMessage.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 ../Common/GmshMatrix.h \
+ ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
../Geo/GeoStringInterface.h ../Geo/findLinks.h ../Mesh/Generator.h \
../Mesh/HighOrder.h ../Graphics/Draw.h ../Graphics/SelectBuffer.h \
../Post/PView.h ../Post/PViewOptions.h ../Post/ColorTable.h \
@@ -204,7 +204,7 @@ Opengl_Window.o: Opengl_Window.cpp ../Common/GmshUI.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 \
- ../Common/GmshMatrix.h
+ ../Numeric/GmshMatrix.h
Colorbar_Window.o: Colorbar_Window.cpp ../Common/GmshUI.h GUI.h \
Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \
diff --git a/Geo/Makefile b/Geo/Makefile
index 137ca3ecbdffb54d18a37ba02d8a75f371aee851..73e0b1b3b21ffeb242225b8bfa44adac3f7153c1 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -71,19 +71,19 @@ GEntity.o: GEntity.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
../Common/VertexArray.h ../Geo/SVector3.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
GVertex.o: GVertex.cpp GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GFace.h GEdgeLoop.h GEdge.h \
SVector3.h Pair.h MElement.h ../Common/GmshDefines.h MVertex.h MEdge.h \
MFace.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
- ../Common/GmshMatrix.h
+ ../Numeric/GmshMatrix.h
GEdge.o: GEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
../Numeric/GaussLegendre1D.h
GEdgeLoop.o: GEdgeLoop.cpp GEdgeLoop.h GEdge.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GVertex.h GPoint.h SPoint2.h SVector3.h \
@@ -92,7 +92,7 @@ GFace.o: GFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
../Common/VertexArray.h ../Geo/SVector3.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/GaussLegendre1D.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
@@ -100,14 +100,15 @@ GFaceCompound.o: GFaceCompound.cpp GFaceCompound.h GFace.h GEntity.h \
Range.h SPoint3.h SBoundingBox3d.h GPoint.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 ../Common/GmshMatrix.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 ../Geo/SVector3.h \
- ../Numeric/FunctionSpace.h ../Numeric/Numeric.h \
+ ../Numeric/gmshTermOfFormulation.h ../Numeric/GmshMatrix.h \
+ ../Common/GmshMessage.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 \
+ ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
+ ../Numeric/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/Octree.h \
../Common/OctreeInternals.h ../Numeric/gmshLinearSystemGmm.h \
../Numeric/gmshLinearSystem.h
@@ -115,7 +116,7 @@ GRegion.o: GRegion.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h
gmshVertex.o: gmshVertex.cpp GFace.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h SPoint2.h \
SVector3.h Pair.h gmshVertex.h Geo.h ../Common/GmshDefines.h \
@@ -123,7 +124,7 @@ gmshVertex.o: gmshVertex.cpp GFace.h GEntity.h Range.h SPoint3.h \
../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \
../Common/ListUtils.h ExtrudeParams.h ../Common/SmoothData.h \
GeoInterpolation.h ../Common/GmshMessage.h MVertex.h MElement.h MEdge.h \
- MFace.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h
+ MFace.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h
gmshEdge.o: gmshEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h GFaceCompound.h gmshEdge.h Geo.h \
@@ -155,7 +156,7 @@ OCCVertex.o: OCCVertex.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MVertex.h MElement.h \
../Common/GmshDefines.h MEdge.h MFace.h ../Common/GmshMessage.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h OCCVertex.h \
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h OCCVertex.h \
OCCIncludes.h OCCEdge.h OCCFace.h
OCCEdge.o: OCCEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
@@ -209,7 +210,7 @@ GModel.o: GModel.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h discreteRegion.h \
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h discreteRegion.h \
discreteFace.h discreteEdge.h discreteVertex.h gmshSurface.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Octree.h \
../Common/OctreeInternals.h ../Common/SmoothData.h ../Mesh/Field.h \
@@ -228,7 +229,7 @@ GModelIO_Mesh.o: GModelIO_Mesh.cpp GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h \
GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshDefines.h MElement.h \
MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h discreteRegion.h \
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h discreteRegion.h \
discreteFace.h ../Common/StringUtils.h
GModelIO_OCC.o: GModelIO_OCC.cpp GModelIO_OCC.h GModel.h GVertex.h \
GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \
@@ -236,7 +237,7 @@ GModelIO_OCC.o: GModelIO_OCC.cpp GModelIO_OCC.h GModel.h GVertex.h \
../Common/GmshMessage.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h OCCVertex.h OCCEdge.h OCCFace.h OCCRegion.h \
MElement.h ../Common/GmshDefines.h MVertex.h MEdge.h MFace.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Common/OpenFile.h
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Common/OpenFile.h
GModelIO_Fourier.o: GModelIO_Fourier.cpp GModel.h GVertex.h GEntity.h \
Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \
SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshMessage.h \
@@ -292,32 +293,32 @@ MVertex.o: MVertex.cpp MVertex.h SPoint2.h SPoint3.h GVertex.h GEntity.h \
GaussQuadratureTri.o: GaussQuadratureTri.cpp MElement.h \
../Common/GmshDefines.h MVertex.h SPoint2.h SPoint3.h MEdge.h \
SVector3.h MFace.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
- ../Common/GmshMatrix.h GaussLegendreSimplex.h
+ ../Numeric/GmshMatrix.h GaussLegendreSimplex.h
GaussQuadratureQuad.o: GaussQuadratureQuad.cpp MElement.h \
../Common/GmshDefines.h MVertex.h SPoint2.h SPoint3.h MEdge.h \
SVector3.h MFace.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
- ../Common/GmshMatrix.h GaussLegendreSimplex.h \
+ ../Numeric/GmshMatrix.h GaussLegendreSimplex.h \
../Numeric/GaussLegendre1D.h
GaussQuadratureTet.o: GaussQuadratureTet.cpp MElement.h \
../Common/GmshDefines.h MVertex.h SPoint2.h SPoint3.h MEdge.h \
SVector3.h MFace.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
- ../Common/GmshMatrix.h GaussLegendreSimplex.h
+ ../Numeric/GmshMatrix.h GaussLegendreSimplex.h
GaussQuadratureHex.o: GaussQuadratureHex.cpp MElement.h \
../Common/GmshDefines.h MVertex.h SPoint2.h SPoint3.h MEdge.h \
SVector3.h MFace.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
- ../Common/GmshMatrix.h GaussLegendreSimplex.h \
+ ../Numeric/GmshMatrix.h GaussLegendreSimplex.h \
../Numeric/GaussLegendre1D.h
GaussLegendreSimplex.o: GaussLegendreSimplex.cpp MElement.h \
../Common/GmshDefines.h MVertex.h SPoint2.h SPoint3.h MEdge.h \
SVector3.h MFace.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
- ../Common/GmshMatrix.h GaussLegendreSimplex.h \
+ ../Numeric/GmshMatrix.h GaussLegendreSimplex.h \
../Numeric/GaussLegendre1D.h
MFace.o: MFace.cpp MFace.h MVertex.h SPoint2.h SPoint3.h SVector3.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
MElement.o: MElement.cpp MElement.h ../Common/GmshDefines.h MVertex.h \
SPoint2.h SPoint3.h MEdge.h SVector3.h MFace.h ../Common/GmshMessage.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h GEntity.h Range.h \
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.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 \
diff --git a/Graphics/Makefile b/Graphics/Makefile
index c41eb1c9889387aa9e1cc39549bc63518209c103..c65e8f57911d53ee56b721ba53477a6c4c51c1d9 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -81,7 +81,7 @@ Mesh.o: Mesh.cpp ../Common/GmshMessage.h ../Common/GmshUI.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 ../Common/GmshMatrix.h \
+ ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
Draw.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Common/OS.h gl2ps.h \
../Common/VertexArray.h ../Common/SmoothData.h ../Post/PView.h \
@@ -116,7 +116,7 @@ SelectBuffer.o: SelectBuffer.cpp ../Common/GmshMessage.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 ../Common/GmshMatrix.h Draw.h \
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h Draw.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
SelectBuffer.h ../Common/VertexArray.h
Iso.o: Iso.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h
diff --git a/Makefile b/Makefile
index 92c4be960cadbd3bb650e9e1326d5a51677dc2ce..a452e27c27cf18d2b206cebdddb3cde710df6e4c 100644
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,10 @@ 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\
+ Geo/Pair.h Geo/Range.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 Common/GmshMatrix.h
+ Common/Gmsh.h Common/GmshDefines.h Common/GmshVersion.h
GMSH_EMBEDDED = ${GMSH_API} Geo/discrete*.cpp\
Geo/GModel.cpp Geo/GModelIO_Mesh.cpp\
diff --git a/Mesh/BDS.cpp b/Mesh/BDS.cpp
index 197c36d95da0c902e8707e6235ff46959bcfe5e2..1c8507f66758185bd04054cf409357ccbd4f3c09 100644
--- a/Mesh/BDS.cpp
+++ b/Mesh/BDS.cpp
@@ -1294,7 +1294,6 @@ double smooth_obj(double U, double V, void *data)
void optimize_vertex_position(GFace *GF, BDS_Point *data, double su, double sv)
{
-#ifdef HAVE_GSL
if(data->g && data->g->classif_degree <= 1) return;
smoothVertexData vd;
vd.p = data;
@@ -1324,7 +1323,6 @@ void optimize_vertex_position(GFace *GF, BDS_Point *data, double su, double sv)
data->X = gp.x();
data->Y = gp.y();
data->Z = gp.z();
-#endif
}
bool BDS_Mesh::smooth_point_centroid(BDS_Point *p, GFace *gf, bool test_quality)
diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp
index 686b9e7befb09d3fabe9c1337a464c70fa0b02ec..89d4061535a0d325ff52df59df7a88e53bddbcc3 100644
--- a/Mesh/HighOrder.cpp
+++ b/Mesh/HighOrder.cpp
@@ -1003,11 +1003,6 @@ void SetOrderN(GModel *m, int order, bool linear, bool incomplete)
// edges (creating 8-node quads, 20-node hexas, etc., instead of
// 9-node quads, 27-node hexas, etc.)
-#if !defined(HAVE_GSL)
- Msg::Error("High order mesh generation requires the GSL");
- return;
-#endif
-
int nPts = order - 1;
Msg::StatusBar(1, true, "Meshing order %d...", order);
diff --git a/Mesh/Makefile b/Mesh/Makefile
index d58491614b160afe566ee452e9191d2074b15a69..4ef7f40816e337b30fb064ebf6ce647a6cabed83 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -89,7 +89,7 @@ Generator.o: Generator.cpp ../Common/GmshMessage.h ../Numeric/Numeric.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 ../Common/GmshMatrix.h \
+ ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
meshGEdge.h meshGFace.h meshGFaceBDS.h meshGRegion.h BackgroundMesh.h \
BoundaryLayers.h HighOrder.h ../Post/PView.h ../Post/PViewData.h
Field.o: Field.cpp ../Common/Context.h ../Geo/CGNSOptions.h \
@@ -124,12 +124,13 @@ gmshSmoothHighOrder.o: 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 \
- ../Common/GmshMatrix.h meshGFaceDelaunayInsertion.h \
+ ../Numeric/GmshMatrix.h meshGFaceDelaunayInsertion.h \
gmshSmoothHighOrder.h ../Numeric/gmshAssembler.h \
../Numeric/gmshLinearSystem.h ../Numeric/gmshLaplace.h \
../Numeric/gmshTermOfFormulation.h ../Common/Gmsh.h \
- ../Common/GmshMessage.h ../Numeric/gmshElasticity.h \
- ../Numeric/gmshTermOfFormulation.h ../Numeric/gmshLinearSystemGmm.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/PartitionOptions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
@@ -146,7 +147,7 @@ meshGEdge.o: 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 \
- ../Common/GmshMatrix.h BackgroundMesh.h ../Numeric/Numeric.h \
+ ../Numeric/GmshMatrix.h BackgroundMesh.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
meshGEdgeExtruded.o: meshGEdgeExtruded.cpp ../Geo/GModel.h \
@@ -161,13 +162,13 @@ meshGEdgeExtruded.o: 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 \
- ../Common/GmshMatrix.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h
+ ../Numeric/GmshMatrix.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h
meshGFace.o: meshGFace.cpp meshGFace.h meshGFaceBDS.h \
meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/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 ../Common/GmshMatrix.h \
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
meshGFaceQuadrilateralize.h meshGFaceOptimize.h DivideAndConquer.h \
BackgroundMesh.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
@@ -192,7 +193,7 @@ meshGFaceTransfinite.o: 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 \
- ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Numeric/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
meshGFaceExtruded.o: meshGFaceExtruded.cpp ../Geo/GModel.h \
@@ -207,14 +208,14 @@ meshGFaceExtruded.o: 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 \
- ../Common/GmshMatrix.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
+ ../Numeric/GmshMatrix.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
meshGFaceBDS.o: meshGFaceBDS.cpp meshGFace.h meshGFaceOptimize.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
../Geo/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 \
- ../Common/GmshMatrix.h meshGFaceDelaunayInsertion.h BackgroundMesh.h \
+ ../Numeric/GmshMatrix.h meshGFaceDelaunayInsertion.h BackgroundMesh.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
@@ -237,7 +238,7 @@ meshGFaceDelaunayInsertion.o: meshGFaceDelaunayInsertion.cpp BDS.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 ../Common/GmshMatrix.h meshGFaceOptimize.h \
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h meshGFaceOptimize.h \
meshGFace.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
meshGFaceOptimize.o: meshGFaceOptimize.cpp meshGFaceOptimize.h \
@@ -245,7 +246,7 @@ meshGFaceOptimize.o: meshGFaceOptimize.cpp 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 \
- ../Common/GmshMatrix.h meshGFaceDelaunayInsertion.h qualityMeasures.h \
+ ../Numeric/GmshMatrix.h meshGFaceDelaunayInsertion.h qualityMeasures.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
@@ -259,7 +260,7 @@ meshGFaceQuadrilateralize.o: meshGFaceQuadrilateralize.cpp \
../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 \
- ../Common/GmshMatrix.h meshGFaceOptimize.h meshGFaceBDS.h BDS.h \
+ ../Numeric/GmshMatrix.h meshGFaceOptimize.h meshGFaceBDS.h BDS.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
@@ -272,7 +273,7 @@ meshGRegion.o: meshGRegion.cpp meshGRegion.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 \
- ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Numeric/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h BackgroundMesh.h qualityMeasures.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
@@ -295,7 +296,7 @@ meshGRegionDelaunayInsertion.o: meshGRegionDelaunayInsertion.cpp \
../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 \
- ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Numeric/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h qualityMeasures.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -315,7 +316,7 @@ meshGRegionTransfinite.o: 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 \
- ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Numeric/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
meshGRegionExtruded.o: meshGRegionExtruded.cpp ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -329,7 +330,7 @@ meshGRegionExtruded.o: 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 \
- ../Common/GmshMatrix.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
+ ../Numeric/GmshMatrix.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
meshGFace.h meshGRegion.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
meshGRegionCarveHole.o: meshGRegionCarveHole.cpp ../Geo/GModel.h \
@@ -344,14 +345,14 @@ meshGRegionCarveHole.o: 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 \
- ../Common/GmshMatrix.h
+ ../Numeric/GmshMatrix.h
meshGRegionLocalMeshMod.o: meshGRegionLocalMeshMod.cpp \
meshGRegionLocalMeshMod.h meshGRegionDelaunayInsertion.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 \
- ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Numeric/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h BackgroundMesh.h qualityMeasures.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GRegion.h \
@@ -381,7 +382,7 @@ qualityMeasures.o: qualityMeasures.cpp qualityMeasures.h BDS.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/MFace.h ../Geo/MVertex.h \
- ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
+ ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h
BoundaryLayers.o: BoundaryLayers.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -395,7 +396,7 @@ BoundaryLayers.o: 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 \
- ../Common/GmshMatrix.h BoundaryLayers.h ../Geo/ExtrudeParams.h \
+ ../Numeric/GmshMatrix.h BoundaryLayers.h ../Geo/ExtrudeParams.h \
../Common/SmoothData.h meshGEdge.h meshGFace.h
BDS.o: BDS.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -407,7 +408,7 @@ BDS.o: BDS.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.h \
meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/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 ../Common/GmshMatrix.h \
+ ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
qualityMeasures.h
HighOrder.o: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -422,7 +423,7 @@ HighOrder.o: 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 \
- ../Common/GmshMatrix.h ../Common/OS.h ../Numeric/Numeric.h \
+ ../Numeric/GmshMatrix.h ../Common/OS.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
Partition.o: Partition.cpp ../Geo/GModel.h ../Geo/GVertex.h \
@@ -438,7 +439,7 @@ Partition.o: 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 \
- ../Common/GmshMatrix.h PartitionOptions.h
+ ../Numeric/GmshMatrix.h PartitionOptions.h
Refine.o: 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 \
@@ -452,4 +453,4 @@ Refine.o: 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 \
- ../Common/GmshMatrix.h ../Common/OS.h
+ ../Numeric/GmshMatrix.h ../Common/OS.h
diff --git a/Common/GmshMatrix.h b/Numeric/GmshMatrix.h
similarity index 95%
rename from Common/GmshMatrix.h
rename to Numeric/GmshMatrix.h
index de2d1e0a8acd2c0c70a1c8d8b6946f94a752267c..d8a67ed2c8e4be7499a8f4de9c7e41f9a991d1f2 100644
--- a/Common/GmshMatrix.h
+++ b/Numeric/GmshMatrix.h
@@ -6,6 +6,8 @@
#ifndef _GMSH_MATRIX_H_
#define _GMSH_MATRIX_H_
+#include "GmshMessage.h"
+
template <class SCALAR>
class Gmsh_Vector
{
@@ -94,7 +96,7 @@ class Gmsh_Matrix
inline void blas_dgemm(const Gmsh_Matrix<SCALAR> & x, const Gmsh_Matrix<SCALAR> & b,
const double c_a = 1.0, const double c_b = 1.0)
{
- // FIXME: not implemented
+ Msg::Fatal("Gmsh_Matrix::blas_dgemm is not implemented");
}
inline void set_all(const double &m)
{
@@ -102,27 +104,27 @@ class Gmsh_Matrix
}
inline void lu_solve(const Gmsh_Vector<SCALAR> &rhs, Gmsh_Vector<SCALAR> &result)
{
- // FIXME: not implemented
+ Msg::Fatal("Gmsh_Matrix::lu_solve is not implemented");
result.scale(0);
}
Gmsh_Matrix cofactor(int i, int j) const
{
- // FIXME: not implemented
+ Msg::Fatal("Gmsh_Matrix::cofactor is not implemented");
Gmsh_Matrix cof(size1() - 1, size2() - 1);
return cof;
}
inline void invert()
{
- // FIXME: not implemented
+ Msg::Fatal("Gmsh_Matrix::invert is not implemented");
}
double determinant() const
{
- // FIXME: not implemented
+ Msg::Fatal("Gmsh_Matrix::determinant is not implemented");
return 0.;
}
inline Gmsh_Matrix touchSubmatrix(int i0, int ni, int j0, int nj)
{
- // FIXME: not implemented
+ Msg::Fatal("Gmsh_Matrix::touchSubmatrix is not implemented");
Gmsh_Matrix subm(ni, nj);
return subm;
}
diff --git a/Numeric/Makefile b/Numeric/Makefile
index bf6789622b9d682a2f8e5994984a43d509a1ba12..ee9b54b9f3d097818d476b0ecceebb2c91f8a005 100644
--- a/Numeric/Makefile
+++ b/Numeric/Makefile
@@ -68,26 +68,28 @@ gmshTermOfFormulation.o: gmshTermOfFormulation.cpp ../Common/Gmsh.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 ../Common/GmshMatrix.h \
- gmshTermOfFormulation.h gmshFunction.h gmshLinearSystem.h \
+ ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
+ GmshMatrix.h gmshTermOfFormulation.h gmshFunction.h gmshLinearSystem.h \
gmshAssembler.h
gmshLaplace.o: gmshLaplace.cpp gmshLaplace.h gmshTermOfFormulation.h \
- ../Common/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 \
+ ../Numeric/GmshMatrix.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 ../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
+ ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
+ GmshMatrix.h
gmshElasticity.o: gmshElasticity.cpp gmshElasticity.h \
- gmshTermOfFormulation.h ../Common/GmshMatrix.h ../Common/Gmsh.h \
- ../Common/GmshMessage.h ../Geo/GModel.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ gmshTermOfFormulation.h ../Numeric/GmshMatrix.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 ../Geo/GVertex.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
@@ -97,10 +99,11 @@ gmshElasticity.o: gmshElasticity.cpp gmshElasticity.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
+ ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
+ GmshMatrix.h
EigSolve.o: EigSolve.cpp
-FunctionSpace.o: FunctionSpace.cpp FunctionSpace.h ../Common/GmshMatrix.h \
- ../Common/GmshDefines.h ../Common/GmshMessage.h
+FunctionSpace.o: FunctionSpace.cpp FunctionSpace.h GmshMatrix.h \
+ ../Common/GmshMessage.h ../Common/GmshDefines.h
gmsh_predicates.o: gmsh_predicates.cpp
gsl_newt.o: gsl_newt.cpp ../Common/GmshMessage.h Numeric.h \
NumericEmbedded.h
diff --git a/Plugin/Makefile b/Plugin/Makefile
index b7721bda26215deb3a71772ee9f0694a0d2f3c3d..feefea5bb024d60ee8a73029bec36a5500794436 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -63,12 +63,12 @@ depend:
Plugin.o: 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 ../Common/ListUtils.h ../Common/GmshMatrix.h
+ ../Geo/SPoint3.h ../Common/ListUtils.h ../Numeric/GmshMatrix.h
PluginManager.o: PluginManager.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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h PluginManager.h CutMap.h Levelset.h CutGrid.h \
+ ../Numeric/GmshMatrix.h PluginManager.h CutMap.h Levelset.h CutGrid.h \
StreamLines.h CutPlane.h CutParametric.h CutSphere.h Skin.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h Extract.h \
ExtractElements.h ExtractEdges.h HarmonicToTime.h ModulusPhase.h \
@@ -82,64 +82,64 @@ Levelset.o: 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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h MakeSimplex.h ../Numeric/Numeric.h \
+ ../Numeric/GmshMatrix.h MakeSimplex.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Post/adaptiveData.h
CutPlane.o: CutPlane.cpp CutPlane.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 \
- ../Common/ListUtils.h ../Common/GmshMatrix.h ../Common/Context.h \
+ ../Common/ListUtils.h ../Numeric/GmshMatrix.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Common/GmshUI.h \
../Graphics/Draw.h
CutSphere.o: CutSphere.cpp CutSphere.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 \
- ../Common/ListUtils.h ../Common/GmshMatrix.h ../Common/Context.h \
+ ../Common/ListUtils.h ../Numeric/GmshMatrix.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Common/GmshUI.h \
../Graphics/Draw.h
CutMap.o: 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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Numeric/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
Smooth.o: 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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h
+ ../Numeric/GmshMatrix.h
CutParametric.o: CutParametric.cpp ../Post/OctreePost.h \
../Common/Octree.h ../Common/OctreeInternals.h CutParametric.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Common/ListUtils.h ../Common/GmshMatrix.h ../Common/Context.h \
+ ../Common/ListUtils.h ../Numeric/GmshMatrix.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Common/GmshUI.h \
../Graphics/Draw.h
Lambda2.o: 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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Numeric/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Eigenvectors.o: 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 \
- ../Common/ListUtils.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Common/ListUtils.h ../Numeric/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/EigSolve.h
Eigenvalues.o: Eigenvalues.cpp Eigenvalues.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Numeric/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
StreamLines.o: StreamLines.cpp StreamLines.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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Post/OctreePost.h ../Common/Octree.h \
+ ../Numeric/GmshMatrix.h ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Post/PViewOptions.h ../Post/ColorTable.h \
../Common/GmshUI.h ../Graphics/Draw.h
@@ -148,18 +148,18 @@ CutGrid.o: CutGrid.cpp ../Post/OctreePost.h ../Common/Octree.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/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Numeric/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Common/GmshUI.h ../Graphics/Draw.h
Transform.o: 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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h
+ ../Numeric/GmshMatrix.h
LongitudeLatitude.o: 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 \
- ../Common/ListUtils.h ../Common/GmshMatrix.h
+ ../Common/ListUtils.h ../Numeric/GmshMatrix.h
Triangulate.o: Triangulate.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -173,24 +173,24 @@ Triangulate.o: 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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Numeric/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
Warp.o: 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 ../Common/ListUtils.h ../Common/GmshMatrix.h \
+ ../Geo/SPoint3.h ../Common/ListUtils.h ../Numeric/GmshMatrix.h \
../Common/SmoothData.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
SphericalRaise.o: SphericalRaise.cpp SphericalRaise.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Common/ListUtils.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Common/ListUtils.h ../Numeric/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Skin.o: 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 ../Common/ListUtils.h ../Common/GmshMatrix.h \
+ ../Geo/SPoint3.h ../Common/ListUtils.h ../Numeric/GmshMatrix.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
../Common/MallocUtils.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
@@ -198,8 +198,8 @@ GSHHS.o: GSHHS.cpp GSHHS.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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Mesh/Field.h ../Geo/GModel.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Numeric/GmshMatrix.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 ../Geo/SVector3.h ../Geo/SPoint3.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \
@@ -210,18 +210,18 @@ Extract.o: Extract.cpp Extract.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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h
+ ../Numeric/GmshMatrix.h
ExtractElements.o: 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 \
- ../Common/ListUtils.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Common/ListUtils.h ../Numeric/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
ExtractEdges.o: 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 \
- ../Common/ListUtils.h ../Common/GmshMatrix.h ../Mesh/BDS.h \
+ ../Common/ListUtils.h ../Numeric/GmshMatrix.h ../Mesh/BDS.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/GEntity.h \
@@ -232,19 +232,19 @@ MakeSimplex.o: 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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h
+ ../Numeric/GmshMatrix.h
Evaluate.o: Evaluate.cpp Evaluate.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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Post/OctreePost.h ../Common/Octree.h \
+ ../Numeric/GmshMatrix.h ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h
FieldView.o: FieldView.cpp FieldView.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Mesh/Field.h ../Geo/GModel.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Numeric/GmshMatrix.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 ../Geo/SVector3.h ../Geo/SPoint3.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \
@@ -255,32 +255,32 @@ Integrate.o: 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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Post/shapeFunctions.h ../Numeric/Numeric.h \
+ ../Numeric/GmshMatrix.h ../Post/shapeFunctions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Post/PViewOptions.h \
../Post/ColorTable.h
Gradient.o: 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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Post/shapeFunctions.h ../Numeric/Numeric.h \
+ ../Numeric/GmshMatrix.h ../Post/shapeFunctions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Curl.o: 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 ../Common/ListUtils.h ../Common/GmshMatrix.h \
+ ../Geo/SPoint3.h ../Common/ListUtils.h ../Numeric/GmshMatrix.h \
../Post/shapeFunctions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Divergence.o: 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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Post/shapeFunctions.h ../Numeric/Numeric.h \
+ ../Numeric/GmshMatrix.h ../Post/shapeFunctions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Annotate.o: Annotate.cpp Annotate.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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Numeric/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Common/GmshUI.h ../Fltk/GUI.h \
../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h \
../Fltk/Popup_Button.h ../Fltk/SpherePosition_Widget.h ../Mesh/Field.h \
@@ -289,21 +289,21 @@ Remove.o: 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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h
+ ../Numeric/GmshMatrix.h
Probe.o: Probe.cpp Probe.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 ../Common/ListUtils.h \
- ../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Numeric/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h ../Common/GmshUI.h ../Graphics/Draw.h
HarmonicToTime.o: 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 \
- ../Common/ListUtils.h ../Common/GmshMatrix.h
+ ../Common/ListUtils.h ../Numeric/GmshMatrix.h
ModulusPhase.o: 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 \
- ../Common/ListUtils.h ../Common/GmshMatrix.h
+ ../Common/ListUtils.h ../Numeric/GmshMatrix.h
diff --git a/Post/Makefile b/Post/Makefile
index d9f9eab52f87f6ae1198cd595ea875c314cdae4c..2d6148d13f86d858045d4580b4e781477052c65c 100644
--- a/Post/Makefile
+++ b/Post/Makefile
@@ -60,7 +60,7 @@ PView.o: PView.cpp PView.h ../Geo/SPoint3.h PViewDataList.h PViewData.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/GmshMatrix.h ../Common/GmshMessage.h
+ ../Numeric/GmshMatrix.h ../Common/GmshMessage.h
PViewIO.o: PViewIO.cpp PView.h ../Geo/SPoint3.h PViewDataList.h \
PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h PViewDataGModel.h ../Geo/GModel.h \
@@ -74,8 +74,8 @@ PViewIO.o: PViewIO.cpp PView.h ../Geo/SPoint3.h PViewDataList.h \
../Common/GmshMessage.h
PViewData.o: PViewData.cpp PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Common/ListUtils.h adaptiveData.h \
- ../Common/GmshMatrix.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/GmshMessage.h
+ ../Numeric/GmshMatrix.h ../Common/GmshMessage.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h
PViewDataIO.o: PViewDataIO.cpp ../Common/GmshMessage.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h
@@ -88,7 +88,7 @@ PViewDataListIO.o: PViewDataListIO.cpp PViewDataList.h PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/GmshMessage.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h adaptiveData.h ../Common/GmshMatrix.h
+ ../Mesh/PartitionOptions.h adaptiveData.h ../Numeric/GmshMatrix.h
PViewDataGModel.o: PViewDataGModel.cpp PViewDataGModel.h PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -102,7 +102,7 @@ PViewDataGModel.o: PViewDataGModel.cpp PViewDataGModel.h PViewData.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 \
- ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Numeric/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
PViewDataGModelIO.o: PViewDataGModelIO.cpp ../Common/GmshMessage.h \
PViewDataGModel.h PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
@@ -117,7 +117,7 @@ PViewDataGModelIO.o: PViewDataGModelIO.cpp ../Common/GmshMessage.h \
../Geo/SPoint3.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/StringUtils.h
PViewOptions.o: PViewOptions.cpp PViewOptions.h ColorTable.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshMessage.h
@@ -125,7 +125,7 @@ adaptiveData.o: adaptiveData.cpp ../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/GmshMatrix.h adaptiveData.h
+ ../Numeric/GmshMatrix.h adaptiveData.h
OctreePost.o: 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 \
@@ -141,7 +141,7 @@ OctreePost.o: OctreePost.cpp ../Common/Octree.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 ../Common/GmshMatrix.h
+ ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h
ColorTable.o: ColorTable.cpp ../Common/GmshMessage.h ColorTable.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h