From 758ef7249dcd34ab042d715bef9fe11cbb5cfc6d Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 8 Jan 2009 11:04:31 +0000
Subject: [PATCH] rename Partion* -> meshPartition* to avoid name mangling
problems with Metis
---
Common/Context.h | 4 +-
Common/DefaultOptions.h | 4 +-
Common/Gmsh.cpp | 2 +-
Common/Makefile | 16 +++---
Fltk/Makefile | 50 +++++++++----------
Fltk/partitionDialog.cpp | 2 +-
Geo/Makefile | 32 ++++++------
Graphics/Makefile | 19 +++----
Mesh/Makefile | 37 +++++++-------
Mesh/{Partition.cpp => meshPartition.cpp} | 10 ++--
Mesh/{Partition.h => meshPartition.h} | 6 +--
...titionObjects.h => meshPartitionObjects.h} | 5 +-
...titionOptions.h => meshPartitionOptions.h} | 9 ++--
Parser/Makefile | 2 +-
Plugin/Makefile | 22 ++++----
Post/Makefile | 6 +--
16 files changed, 115 insertions(+), 111 deletions(-)
rename Mesh/{Partition.cpp => meshPartition.cpp} (98%)
rename Mesh/{Partition.h => meshPartition.h} (79%)
rename Mesh/{PartitionObjects.h => meshPartitionObjects.h} (98%)
rename Mesh/{PartitionOptions.h => meshPartitionOptions.h} (96%)
diff --git a/Common/Context.h b/Common/Context.h
index a14ed6b68b..09b62c8314 100644
--- a/Common/Context.h
+++ b/Common/Context.h
@@ -10,7 +10,7 @@
#include <string>
#include "CGNSOptions.h"
-#include "PartitionOptions.h"
+#include "meshPartitionOptions.h"
// The interface-independent context.
@@ -166,7 +166,7 @@ class Context_T {
double angle_smooth_normals;
double allow_swap_edge_angle;
int zone_definition;
- PartitionOptions partition_options;
+ meshPartitionOptions partition_options;
CGNSOptions cgns_options;
int clip; // status of clip planes (bit array)
} mesh;
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index a403e9fe63..2fbc2ecae2 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -848,9 +848,9 @@ StringXNumber GeometryOptions_Number[] = {
{ F|O, "NumSubEdges" , opt_geometry_num_sub_edges , 20. ,
"Number of edge subdivisions between control points when displaying curves" },
- { F|O, "OCCFixSmallEdges" , opt_geometry_occ_fix_small_edges , 1. ,
+ { F|O, "OCCFixSmallEdges" , opt_geometry_occ_fix_small_edges , 0. ,
"Fix small edges in STEP, IGES and BRep models" },
- { F|O, "OCCFixSmallFaces" , opt_geometry_occ_fix_small_faces , 1. ,
+ { F|O, "OCCFixSmallFaces" , opt_geometry_occ_fix_small_faces , 0. ,
"Fix small faces in STEP, IGES and BRep models" },
{ F|O, "OCCSewFaces" , opt_geometry_occ_sew_faces , 0. ,
"Sew faces in STEP, IGES and BRep models" },
diff --git a/Common/Gmsh.cpp b/Common/Gmsh.cpp
index 85988d59fe..2d3a20f3c5 100644
--- a/Common/Gmsh.cpp
+++ b/Common/Gmsh.cpp
@@ -17,7 +17,7 @@
#include "Generator.h"
#include "Field.h"
#include "Context.h"
-#include "Partition.h"
+#include "meshPartition.h"
#include "GmshDaemon.h"
#if !defined(HAVE_NO_POST)
diff --git a/Common/Makefile b/Common/Makefile
index d90ce861a2..efaf189d6c 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -69,12 +69,12 @@ Gmsh${OBJEXT}: Gmsh.cpp GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \
../Numeric/NumericEmbedded.h ../Numeric/GmshMatrix.h \
../Common/GmshMessage.h ../Mesh/Generator.h ../Mesh/Field.h \
../Post/PView.h Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h ../Mesh/Partition.h GmshDaemon.h \
+ ../Mesh/meshPartitionOptions.h ../Mesh/meshPartition.h GmshDaemon.h \
../Plugin/PluginManager.h
GmshMessage${OBJEXT}: GmshMessage.cpp GmshMessage.h Gmsh.h Options.h \
../Post/ColorTable.h Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h OS.h ../Fltk/GUI.h ../Fltk/messageWindow.h \
- ../Fltk/extraDialogs.h
+ ../Mesh/meshPartitionOptions.h OS.h ../Fltk/GUI.h \
+ ../Fltk/messageWindow.h ../Fltk/extraDialogs.h
GmshDaemon${OBJEXT}: GmshDaemon.cpp GmshMessage.h OS.h GmshSocket.h
Options${OBJEXT}: Options.cpp GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -86,7 +86,7 @@ Options${OBJEXT}: Options.cpp GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h GmshMessage.h ../Fltk/Draw.h \
../Mesh/Generator.h Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h Options.h ../Post/ColorTable.h \
+ ../Mesh/meshPartitionOptions.h Options.h ../Post/ColorTable.h \
DefaultOptions.h ../Mesh/Field.h ../Post/PView.h \
../Mesh/BackgroundMesh.h ../Post/PViewOptions.h ../Post/ColorTable.h \
../Post/PViewData.h ../Numeric/GmshMatrix.h ../Common/GmshMessage.h \
@@ -100,7 +100,7 @@ Options${OBJEXT}: Options.cpp GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \
../Fltk/contextWindow.h ../Fltk/clippingWindow.h
CommandLine${OBJEXT}: CommandLine.cpp GmshDefines.h GmshVersion.h GmshMessage.h \
OpenFile.h CommandLine.h Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h Options.h ../Post/ColorTable.h \
+ ../Mesh/meshPartitionOptions.h Options.h ../Post/ColorTable.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
@@ -125,7 +125,7 @@ OpenFile${OBJEXT}: OpenFile.cpp GmshMessage.h ../Geo/Geo.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 Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h OpenFile.h \
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h OpenFile.h \
CommandLine.h ../Graphics/ReadImg.h OS.h StringUtils.h \
../Parser/Parser.h ../Post/PView.h ../Post/PViewData.h ../Fltk/GUI.h \
../Fltk/Draw.h
@@ -138,7 +138,7 @@ CreateFile${OBJEXT}: CreateFile.cpp GmshMessage.h ../Geo/GModel.h \
../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h GmshDefines.h StringUtils.h Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h Options.h \
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h Options.h \
../Post/ColorTable.h ../Graphics/gl2ps.h ../Graphics/gl2gif.h \
../Graphics/PixelBuffer.h ../Common/GmshMessage.h ../Fltk/Draw.h \
../Common/MallocUtils.h ../Graphics/gl2jpeg.h ../Graphics/PixelBuffer.h \
@@ -147,7 +147,7 @@ CreateFile${OBJEXT}: CreateFile.cpp GmshMessage.h ../Geo/GModel.h \
../Graphics/PixelBuffer.h
VertexArray${OBJEXT}: VertexArray.cpp VertexArray.h ../Geo/SVector3.h \
../Geo/SPoint3.h Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \
+ ../Mesh/meshPartitionOptions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/GmshMatrix.h \
../Common/GmshMessage.h
SmoothData${OBJEXT}: SmoothData.cpp SmoothData.h ../Numeric/Numeric.h \
diff --git a/Fltk/Makefile b/Fltk/Makefile
index c45b946da5..1432303ab0 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -71,7 +71,7 @@ depend:
# DO NOT DELETE THIS LINE
Main${OBJEXT}: Main.cpp GUI.h menuWindow.h popupButton.h ../Common/Gmsh.h \
../Common/GmshMessage.h Draw.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h ../Common/Options.h ../Post/ColorTable.h \
+ ../Mesh/meshPartitionOptions.h ../Common/Options.h ../Post/ColorTable.h \
../Parser/Parser.h ../Common/OpenFile.h ../Common/CommandLine.h \
Solvers.h ../Plugin/PluginManager.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -105,14 +105,14 @@ GUI${OBJEXT}: GUI.cpp GUI.h graphicWindow.h openglWindow.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
+ ../Mesh/meshPartitionOptions.h
graphicWindow${OBJEXT}: graphicWindow.cpp GUI.h graphicWindow.h openglWindow.h \
../Graphics/drawContext.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
paletteWindow.h mainWindow.h menuWindow.h popupButton.h messageWindow.h \
manipWindow.h extraDialogs.h Draw.h ../Post/PView.h ../Post/PViewData.h \
../Numeric/GmshMatrix.h ../Common/GmshMessage.h ../Common/OS.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
openglWindow${OBJEXT}: openglWindow.cpp openglWindow.h ../Graphics/drawContext.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h graphicWindow.h manipWindow.h \
contextWindow.h ../Common/GmshDefines.h ../Common/GmshMessage.h \
@@ -129,7 +129,7 @@ openglWindow${OBJEXT}: openglWindow.cpp openglWindow.h ../Graphics/drawContext.h
../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
Draw.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/GmshMatrix.h GUI.h ../Common/VertexArray.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
menuWindow${OBJEXT}: menuWindow.cpp GUI.h Draw.h menuWindow.h popupButton.h \
mainWindow.h graphicWindow.h openglWindow.h ../Graphics/drawContext.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h optionWindow.h \
@@ -156,7 +156,7 @@ menuWindow${OBJEXT}: menuWindow.cpp GUI.h Draw.h menuWindow.h popupButton.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
+ ../Mesh/meshPartitionOptions.h
optionWindow${OBJEXT}: optionWindow.cpp GUI.h optionWindow.h \
spherePositionWidget.h colorbarWindow.h ../Post/ColorTable.h \
paletteWindow.h menuWindow.h popupButton.h extraDialogs.h Draw.h \
@@ -174,10 +174,10 @@ optionWindow${OBJEXT}: optionWindow.cpp GUI.h optionWindow.h \
../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.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
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
colorbarWindow${OBJEXT}: colorbarWindow.cpp colorbarWindow.h \
../Post/ColorTable.h Draw.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Mesh/meshPartitionOptions.h
fieldWindow${OBJEXT}: fieldWindow.cpp GUI.h Draw.h fieldWindow.h paletteWindow.h \
fileDialogs.h ../Common/GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -190,14 +190,14 @@ fieldWindow${OBJEXT}: fieldWindow.cpp GUI.h Draw.h fieldWindow.h paletteWindow.h
../Geo/SBoundingBox3d.h ../Post/PView.h ../Common/GmshMessage.h \
../Mesh/Field.h ../Geo/GeoStringInterface.h ../Common/ListUtils.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
pluginWindow${OBJEXT}: pluginWindow.cpp GUI.h Draw.h pluginWindow.h \
paletteWindow.h ../Post/PView.h ../Geo/SPoint3.h \
../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Numeric/GmshMatrix.h ../Common/ListUtils.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
statisticsWindow${OBJEXT}: statisticsWindow.cpp GUI.h Draw.h statisticsWindow.h \
paletteWindow.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
@@ -213,7 +213,7 @@ statisticsWindow${OBJEXT}: statisticsWindow.cpp GUI.h Draw.h statisticsWindow.h
../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Post/PView.h \
../Mesh/Generator.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Mesh/meshPartitionOptions.h
visibilityWindow${OBJEXT}: visibilityWindow.cpp GUI.h Draw.h visibilityWindow.h \
paletteWindow.h contextWindow.h ../Common/GmshDefines.h \
../Common/GmshMessage.h ../Geo/GModel.h ../Geo/GVertex.h \
@@ -230,20 +230,20 @@ visibilityWindow${OBJEXT}: visibilityWindow.cpp GUI.h Draw.h visibilityWindow.h
../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
../Geo/GeoStringInterface.h ../Common/ListUtils.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h ../Parser/Parser.h
+ ../Mesh/meshPartitionOptions.h ../Parser/Parser.h
clippingWindow${OBJEXT}: clippingWindow.cpp GUI.h Draw.h clippingWindow.h \
paletteWindow.h ../Common/GmshDefines.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
messageWindow${OBJEXT}: messageWindow.cpp GUI.h messageWindow.h paletteWindow.h \
fileDialogs.h ../Common/GmshMessage.h ../Common/OS.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
manipWindow${OBJEXT}: manipWindow.cpp GUI.h Draw.h manipWindow.h paletteWindow.h \
graphicWindow.h openglWindow.h ../Graphics/drawContext.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Mesh/meshPartitionOptions.h
contextWindow${OBJEXT}: contextWindow.cpp GUI.h Draw.h contextWindow.h \
paletteWindow.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
@@ -254,7 +254,7 @@ contextWindow${OBJEXT}: contextWindow.cpp GUI.h Draw.h contextWindow.h \
../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GeoStringInterface.h \
../Common/ListUtils.h ../Common/OpenFile.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
solverWindow${OBJEXT}: solverWindow.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -268,10 +268,10 @@ solverWindow${OBJEXT}: solverWindow.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Post/ColorTable.h messageWindow.h fileDialogs.h \
../Common/GmshMessage.h Solvers.h ../Common/StringUtils.h \
../Common/Options.h ../Common/OS.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
aboutWindow${OBJEXT}: aboutWindow.cpp GUI.h aboutWindow.h paletteWindow.h \
../Common/CommandLine.h ../Common/StringUtils.h ../Common/OS.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
fileDialogs${OBJEXT}: fileDialogs.cpp GUI.h ../Common/GmshDefines.h \
../Common/CreateFile.h ../Common/Options.h ../Post/ColorTable.h Draw.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
@@ -282,7 +282,7 @@ fileDialogs${OBJEXT}: fileDialogs.cpp GUI.h ../Common/GmshDefines.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \
../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h fileChooser.h
+ ../Mesh/meshPartitionOptions.h fileChooser.h
extraDialogs${OBJEXT}: extraDialogs.cpp GUI.h paletteWindow.h \
../Common/GmshDefines.h ../Common/OpenFile.h ../Common/CreateFile.h \
../Common/Options.h ../Post/ColorTable.h Draw.h ../Geo/GModel.h \
@@ -294,7 +294,7 @@ extraDialogs${OBJEXT}: extraDialogs.cpp GUI.h paletteWindow.h \
../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Mesh/meshPartitionOptions.h
projectionEditor${OBJEXT}: projectionEditor.cpp GUI.h projectionEditor.h \
../Geo/fourierProjectionFace.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -315,7 +315,7 @@ projectionEditor${OBJEXT}: projectionEditor.cpp GUI.h projectionEditor.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 \
../Geo/MVertex.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Mesh/meshPartitionOptions.h
classificationEditor${OBJEXT}: classificationEditor.cpp GUI.h \
classificationEditor.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -332,7 +332,7 @@ classificationEditor${OBJEXT}: classificationEditor.cpp GUI.h \
../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Post/ColorTable.h \
paletteWindow.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/GmshMatrix.h Draw.h ../Common/Options.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
../Mesh/meshGFaceDelaunayInsertion.h ../Mesh/meshGFaceOptimize.h \
../Mesh/meshGFaceDelaunayInsertion.h ../Geo/discreteEdge.h \
../Geo/GModel.h ../Geo/GEdge.h ../Geo/discreteFace.h ../Geo/GModel.h \
@@ -347,16 +347,16 @@ partitionDialog${OBJEXT}: partitionDialog.cpp GUI.h paletteWindow.h \
../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h Draw.h ../Common/Options.h ../Post/ColorTable.h \
- ../Mesh/Partition.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Mesh/meshPartition.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/meshPartitionOptions.h
Draw${OBJEXT}: Draw.cpp GUI.h graphicWindow.h openglWindow.h \
../Graphics/drawContext.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
optionWindow.h spherePositionWidget.h colorbarWindow.h \
../Post/ColorTable.h ../Common/GmshDefines.h ../Common/GmshMessage.h \
Draw.h ../Common/StringUtils.h ../Graphics/gl2ps.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
Solvers${OBJEXT}: Solvers.cpp GUI.h solverWindow.h menuWindow.h popupButton.h \
../Common/GmshMessage.h ../Common/StringUtils.h Solvers.h \
../Common/GmshSocket.h ../Common/OpenFile.h ../Post/PView.h \
../Geo/SPoint3.h Draw.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h ../Common/OS.h
+ ../Mesh/meshPartitionOptions.h ../Common/OS.h
diff --git a/Fltk/partitionDialog.cpp b/Fltk/partitionDialog.cpp
index 488585afe4..3cf3b2cc60 100644
--- a/Fltk/partitionDialog.cpp
+++ b/Fltk/partitionDialog.cpp
@@ -25,7 +25,7 @@
#include "GModel.h"
#include "Draw.h"
#include "Options.h"
-#include "Partition.h"
+#include "meshPartition.h"
#include "Context.h"
extern Context_T CTX;
diff --git a/Geo/Makefile b/Geo/Makefile
index 77ea183111..78461edd09 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -68,7 +68,7 @@ GEntity${OBJEXT}: GEntity.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
../Common/VertexArray.h ../Geo/SVector3.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
GVertex${OBJEXT}: GVertex.cpp GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GFace.h GEdgeLoop.h GEdge.h \
SVector3.h Pair.h MElement.h ../Common/GmshDefines.h MVertex.h MEdge.h \
@@ -91,7 +91,7 @@ GFace${OBJEXT}: GFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
../Common/VertexArray.h ../Geo/SVector3.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/GmshMatrix.h \
../Numeric/GaussLegendre1D.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Mesh/meshPartitionOptions.h
GFaceCompound${OBJEXT}: 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 \
@@ -131,7 +131,7 @@ gmshEdge${OBJEXT}: gmshEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
../Common/GmshMessage.h ../Common/ListUtils.h ../Common/TreeUtils.h \
../Common/avl.h ../Common/ListUtils.h ExtrudeParams.h \
../Common/SmoothData.h GeoInterpolation.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
gmshFace${OBJEXT}: gmshFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h gmshFace.h Geo.h ../Common/GmshDefines.h \
@@ -139,7 +139,7 @@ gmshFace${OBJEXT}: gmshFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
../Numeric/GmshMatrix.h ../Common/GmshMessage.h ../Common/ListUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
ExtrudeParams.h ../Common/SmoothData.h GeoInterpolation.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
gmshRegion${OBJEXT}: gmshRegion.cpp GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h \
GFace.h GEdgeLoop.h Pair.h GRegion.h gmshRegion.h Geo.h \
@@ -162,14 +162,14 @@ 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 \
OCCVertex.h OCCIncludes.h OCCFace.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
OCCFace${OBJEXT}: OCCFace.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 OCCVertex.h OCCIncludes.h OCCEdge.h \
OCCFace.h ../Common/GmshMessage.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/GmshMatrix.h \
../Common/VertexArray.h ../Geo/SVector3.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
OCCRegion${OBJEXT}: OCCRegion.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 OCCVertex.h OCCIncludes.h OCCEdge.h \
@@ -199,7 +199,7 @@ discreteRegion${OBJEXT}: discreteRegion.cpp discreteRegion.h GModel.h GVertex.h
fourierEdge${OBJEXT}: fourierEdge.cpp fourierEdge.h GEdge.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GVertex.h GPoint.h SPoint2.h SVector3.h \
GModel.h GFace.h GEdgeLoop.h Pair.h GRegion.h fourierVertex.h MVertex.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
fourierFace${OBJEXT}: fourierFace.cpp fourierVertex.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 MVertex.h fourierFace.h \
@@ -218,7 +218,7 @@ GModel${OBJEXT}: GModel.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
../Numeric/GmshMatrix.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
+ ../Mesh/meshPartitionOptions.h
GModelIO_Geo${OBJEXT}: GModelIO_Geo.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 Geo.h ../Common/GmshDefines.h \
@@ -238,10 +238,10 @@ 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 \
../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 ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
- ../Common/OpenFile.h
+ ../Mesh/meshPartitionOptions.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 ../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 \
@@ -268,7 +268,7 @@ Geo${OBJEXT}: Geo.cpp ../Common/GmshMessage.h ../Numeric/Numeric.h \
../Common/ListUtils.h ExtrudeParams.h ../Common/SmoothData.h GModel.h \
GVertex.h GEntity.h GPoint.h GEdge.h GFace.h GEdgeLoop.h GRegion.h \
GeoInterpolation.h ../Mesh/Field.h ../Post/PView.h ../Geo/SPoint3.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
GeoStringInterface${OBJEXT}: GeoStringInterface.cpp ../Common/GmshMessage.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/GmshMatrix.h ../Common/StringUtils.h Geo.h \
@@ -277,7 +277,7 @@ GeoStringInterface${OBJEXT}: GeoStringInterface.cpp ../Common/GmshMessage.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
ExtrudeParams.h ../Common/SmoothData.h GeoStringInterface.h \
../Common/OpenFile.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h GModel.h GVertex.h GEntity.h GPoint.h \
+ ../Mesh/meshPartitionOptions.h GModel.h GVertex.h GEntity.h GPoint.h \
GEdge.h GFace.h GEdgeLoop.h GRegion.h ../Parser/Parser.h
GeoInterpolation${OBJEXT}: GeoInterpolation.cpp ../Common/GmshMessage.h Geo.h \
../Common/GmshDefines.h gmshSurface.h Pair.h Range.h SPoint2.h \
@@ -297,7 +297,7 @@ MVertex${OBJEXT}: MVertex.cpp MVertex.h SPoint2.h SPoint3.h GVertex.h GEntity.h
MFace${OBJEXT}: MFace.cpp MFace.h MVertex.h SPoint2.h SPoint3.h SVector3.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/GmshMatrix.h ../Common/GmshMessage.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.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 \
@@ -305,7 +305,7 @@ MElement${OBJEXT}: MElement.cpp MElement.h ../Common/GmshDefines.h MVertex.h \
GVertex.h Pair.h ../Common/StringUtils.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/GmshMatrix.h \
../Numeric/GaussLegendre1D.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h ../Mesh/qualityMeasures.h \
+ ../Mesh/meshPartitionOptions.h ../Mesh/qualityMeasures.h \
../Mesh/meshGFaceDelaunayInsertion.h ../Geo/MElement.h \
../Mesh/meshGRegionDelaunayInsertion.h ../Mesh/BackgroundMesh.h \
../Mesh/qualityMeasures.h
diff --git a/Graphics/Makefile b/Graphics/Makefile
index ab2422eb2d..30b7694b7f 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -67,7 +67,7 @@ ReadImg${OBJEXT}: ReadImg.cpp ReadImg.h ../Common/GmshMessage.h ../Post/PView.h
../Common/ListUtils.h
drawContext${OBJEXT}: drawContext.cpp ../Common/GmshMessage.h drawContext.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h Trackball.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/GmshMatrix.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -91,12 +91,12 @@ 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 \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
../Common/OS.h gl2ps.h ../Common/VertexArray.h ../Common/SmoothData.h \
../Post/PView.h ../Post/PViewData.h
drawGeom${OBJEXT}: drawGeom.cpp drawContext.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h gl2ps.h ../Common/VertexArray.h \
+ ../Mesh/meshPartitionOptions.h gl2ps.h ../Common/VertexArray.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
@@ -111,7 +111,7 @@ drawPost${OBJEXT}: drawPost.cpp drawContext.h ../Geo/SBoundingBox3d.h \
../Post/PView.h ../Post/PViewOptions.h ../Post/ColorTable.h \
../Post/PViewData.h ../Common/VertexArray.h ../Geo/SVector3.h \
../Geo/SPoint3.h ../Common/SmoothData.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h gl2ps.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h gl2ps.h
drawAxes${OBJEXT}: drawAxes.cpp drawContext.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
@@ -121,25 +121,26 @@ drawAxes${OBJEXT}: drawAxes.cpp drawContext.h ../Geo/SBoundingBox3d.h \
../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \
+ ../Mesh/meshPartitionOptions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/GmshMatrix.h \
../Common/GmshMessage.h gl2ps.h
drawScales${OBJEXT}: drawScales.cpp drawContext.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PView.h ../Post/PViewOptions.h \
../Post/ColorTable.h ../Post/PViewData.h ../Numeric/GmshMatrix.h \
../Common/GmshMessage.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h gl2ps.h
+ ../Mesh/meshPartitionOptions.h gl2ps.h
drawGraph2d${OBJEXT}: drawGraph2d.cpp drawContext.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Post/PView.h ../Post/PViewOptions.h \
../Post/ColorTable.h ../Post/PViewData.h ../Numeric/GmshMatrix.h \
../Common/GmshMessage.h gl2ps.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Numeric/GmshMatrix.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
+ ../Numeric/GmshMatrix.h
drawGlyph${OBJEXT}: drawGlyph.cpp drawContext.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Fltk/Draw.h ../Common/GmshDefines.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/GmshMatrix.h ../Common/GmshMessage.h ../Common/StringUtils.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
gl2ps.h
gl2ps${OBJEXT}: gl2ps.cpp gl2ps.h
gl2gif${OBJEXT}: gl2gif.cpp ../Common/MallocUtils.h gl2gif.h PixelBuffer.h \
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 6e8963da99..c0fdff8516 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -43,7 +43,7 @@ SRC = Generator.cpp \
BoundaryLayers.cpp \
BDS.cpp \
HighOrder.cpp \
- Partition.cpp \
+ meshPartition.cpp \
meshRefine.cpp
OBJ = ${SRC:.cpp=${OBJEXT}}
@@ -78,7 +78,7 @@ depend:
# DO NOT DELETE THIS LINE
Generator${OBJEXT}: Generator.cpp ../Common/GmshMessage.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/GmshMatrix.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
../Common/OS.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 \
@@ -95,7 +95,7 @@ Generator${OBJEXT}: Generator.cpp ../Common/GmshMessage.h ../Numeric/Numeric.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 \
+ ../Mesh/meshPartitionOptions.h Field.h ../Post/PView.h ../Geo/SPoint3.h \
../Geo/GeoInterpolation.h ../Geo/Geo.h ../Common/GmshDefines.h \
../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SPoint3.h \
@@ -134,7 +134,7 @@ 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/meshPartitionOptions.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/GmshMatrix.h
meshGEdge${OBJEXT}: meshGEdge.cpp ../Geo/GModel.h ../Geo/GVertex.h \
@@ -153,7 +153,7 @@ meshGEdge${OBJEXT}: meshGEdge.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Numeric/GmshMatrix.h ../Numeric/Gauss.h BackgroundMesh.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Mesh/meshPartitionOptions.h
meshGEdgeExtruded${OBJEXT}: meshGEdgeExtruded.cpp ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -184,7 +184,7 @@ 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 ../Numeric/Numeric.h \
+ ../Mesh/meshPartitionOptions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/GmshMatrix.h BDS.h \
qualityMeasures.h Field.h ../Post/PView.h ../Common/OS.h HighOrder.h
meshGFaceTransfinite${OBJEXT}: meshGFaceTransfinite.cpp meshGFace.h \
@@ -199,8 +199,9 @@ meshGFaceTransfinite${OBJEXT}: meshGFaceTransfinite.cpp meshGFace.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Numeric/GmshMatrix.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
+ ../Numeric/GmshMatrix.h
meshGFaceExtruded${OBJEXT}: meshGFaceExtruded.cpp ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -215,7 +216,7 @@ meshGFaceExtruded${OBJEXT}: meshGFaceExtruded.cpp ../Geo/GModel.h \
../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Geo/ExtrudeParams.h \
../Common/SmoothData.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Mesh/meshPartitionOptions.h
meshGFaceBDS${OBJEXT}: 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 \
@@ -228,7 +229,7 @@ meshGFaceBDS${OBJEXT}: meshGFaceBDS.cpp meshGFace.h meshGFaceOptimize.h \
../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
@@ -295,7 +296,7 @@ meshGRegion${OBJEXT}: meshGRegion.cpp meshGRegion.h \
../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \
../Common/ListUtils.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
../Common/SmoothData.h ../Geo/GRegion.h BDS.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
meshGRegionDelaunayInsertion${OBJEXT}: meshGRegionDelaunayInsertion.cpp \
../Common/OS.h BackgroundMesh.h meshGRegion.h meshGRegionLocalMeshMod.h \
meshGRegionDelaunayInsertion.h ../Geo/MElement.h \
@@ -325,7 +326,7 @@ meshGRegionTransfinite${OBJEXT}: meshGRegionTransfinite.cpp meshGFace.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
meshGRegionExtruded${OBJEXT}: meshGRegionExtruded.cpp ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -340,7 +341,7 @@ meshGRegionExtruded${OBJEXT}: meshGRegionExtruded.cpp ../Geo/GModel.h \
../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Geo/ExtrudeParams.h \
../Common/SmoothData.h meshGFace.h meshGRegion.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
meshGRegionCarveHole${OBJEXT}: meshGRegionCarveHole.cpp ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -371,7 +372,7 @@ DivideAndConquer${OBJEXT}: DivideAndConquer.cpp ../Common/GmshMessage.h \
BackgroundMesh${OBJEXT}: BackgroundMesh.cpp ../Common/GmshMessage.h \
BackgroundMesh.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h ../Geo/GVertex.h ../Geo/GEntity.h \
+ ../Mesh/meshPartitionOptions.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
@@ -431,8 +432,8 @@ HighOrder${OBJEXT}: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \
../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/OS.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
-Partition${OBJEXT}: Partition.cpp ../Geo/GModel.h ../Geo/GVertex.h \
+ ../Mesh/meshPartitionOptions.h
+meshPartition${OBJEXT}: meshPartition.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 \
../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
@@ -440,12 +441,12 @@ Partition${OBJEXT}: Partition.cpp ../Geo/GModel.h ../Geo/GVertex.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 Partition.h PartitionObjects.h \
+ ../Geo/SBoundingBox3d.h meshPartition.h meshPartitionObjects.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
- ../Numeric/GmshMatrix.h ../Numeric/Gauss.h PartitionOptions.h
+ ../Numeric/GmshMatrix.h ../Numeric/Gauss.h meshPartitionOptions.h
meshRefine${OBJEXT}: meshRefine.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 \
diff --git a/Mesh/Partition.cpp b/Mesh/meshPartition.cpp
similarity index 98%
rename from Mesh/Partition.cpp
rename to Mesh/meshPartition.cpp
index 15830d52ba..74b672c922 100644
--- a/Mesh/Partition.cpp
+++ b/Mesh/meshPartition.cpp
@@ -8,9 +8,9 @@
#if defined(HAVE_CHACO) || defined(HAVE_METIS)
#include "GModel.h"
-#include "Partition.h"
-#include "PartitionObjects.h"
-#include "PartitionOptions.h"
+#include "meshPartition.h"
+#include "meshPartitionObjects.h"
+#include "meshPartitionOptions.h"
//--Prototype for Chaco interface
@@ -84,7 +84,7 @@ void MakeGraphDIM(const EntIter begin, const EntIter end,
*
******************************************************************************/
-int PartitionMesh(GModel *const model, PartitionOptions &options)
+int PartitionMesh(GModel *const model, meshPartitionOptions &options)
{
Graph graph;
@@ -139,7 +139,7 @@ int PartitionMesh(GModel *const model, PartitionOptions &options)
*
******************************************************************************/
-int PartitionGraph(Graph &graph, PartitionOptions &options)
+int PartitionGraph(Graph &graph, meshPartitionOptions &options)
{
int ier = 0;
diff --git a/Mesh/Partition.h b/Mesh/meshPartition.h
similarity index 79%
rename from Mesh/Partition.h
rename to Mesh/meshPartition.h
index 974704a120..2c81367f46 100644
--- a/Mesh/Partition.h
+++ b/Mesh/meshPartition.h
@@ -8,7 +8,7 @@
#include <vector>
-struct PartitionOptions;
+struct meshPartitionOptions;
struct BoElemGr;
class GModel;
class Graph;
@@ -23,7 +23,7 @@ typedef std::vector<BoElemGr> BoElemGrVec;
int MakeGraph(GModel *const model, Graph &graph,
BoElemGrVec *const boElemGrVec = 0);
-int PartitionGraph(Graph &graph, PartitionOptions &options);
-int PartitionMesh(GModel *const model, PartitionOptions &options);
+int PartitionGraph(Graph &graph, meshPartitionOptions &options);
+int PartitionMesh(GModel *const model, meshPartitionOptions &options);
#endif
diff --git a/Mesh/PartitionObjects.h b/Mesh/meshPartitionObjects.h
similarity index 98%
rename from Mesh/PartitionObjects.h
rename to Mesh/meshPartitionObjects.h
index 6f74e7393d..96680252d5 100644
--- a/Mesh/PartitionObjects.h
+++ b/Mesh/meshPartitionObjects.h
@@ -2,8 +2,9 @@
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
-#ifndef _PARTITIONOBJECT_H_
-#define _PARTITIONOBJECT_H_
+
+#ifndef _MESH_PARTITION_OBJECTS_H_
+#define _MESH_PARTITION_OBJECTS_H_
#include <map>
#include <vector>
diff --git a/Mesh/PartitionOptions.h b/Mesh/meshPartitionOptions.h
similarity index 96%
rename from Mesh/PartitionOptions.h
rename to Mesh/meshPartitionOptions.h
index d02d0d6da0..53be3dc783 100644
--- a/Mesh/PartitionOptions.h
+++ b/Mesh/meshPartitionOptions.h
@@ -2,10 +2,11 @@
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
-#ifndef _PARTITIONOPTIONS_H_
-#define _PARTITIONOPTIONS_H_
-struct PartitionOptions
+#ifndef _MESH_PARTITION_OPTIONS_H_
+#define _MESH_PARTITION_OPTIONS_H_
+
+struct meshPartitionOptions
{
//--General
@@ -65,7 +66,7 @@ struct PartitionOptions
//--Constructor
- PartitionOptions()
+ meshPartitionOptions()
:
goal(0)
{ }
diff --git a/Parser/Makefile b/Parser/Makefile
index 247dd581e9..95db30118d 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -57,7 +57,7 @@ Gmsh.tab${OBJEXT}: Gmsh.tab.cpp ../Common/GmshMessage.h ../Numeric/GmshMatrix.h
../Common/MallocUtils.h ../Common/ListUtils.h ../Common/TreeUtils.h \
../Common/avl.h ../Common/ListUtils.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/GmshMatrix.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.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 \
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 515a6cf560..80bc5ddbd7 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -77,7 +77,7 @@ PluginManager${OBJEXT}: PluginManager.cpp Plugin.h ../Common/Options.h \
Warp.h SphericalRaise.h Eigenvectors.h Eigenvalues.h Lambda2.h \
Evaluate.h ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h Probe.h FieldView.h GSHHS.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
Levelset${OBJEXT}: Levelset.cpp Levelset.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
@@ -90,19 +90,19 @@ CutPlane${OBJEXT}: CutPlane.cpp ../Graphics/drawContext.h \
Levelset.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
../Common/GmshMessage.h ../Post/PView.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
CutSphere${OBJEXT}: CutSphere.cpp ../Graphics/drawContext.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Fltk/Draw.h CutSphere.h \
Levelset.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
../Common/GmshMessage.h ../Post/PView.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
CutMap${OBJEXT}: CutMap.cpp CutMap.h Levelset.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \
../Common/ListUtils.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Mesh/meshPartitionOptions.h
Smooth${OBJEXT}: Smooth.cpp Smooth.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
@@ -114,7 +114,7 @@ CutParametric${OBJEXT}: CutParametric.cpp ../Graphics/drawContext.h \
CutParametric.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
../Common/GmshMessage.h ../Post/PView.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
Lambda2${OBJEXT}: Lambda2.cpp Lambda2.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
@@ -140,7 +140,7 @@ StreamLines${OBJEXT}: StreamLines.cpp ../Graphics/drawContext.h \
../Common/GmshMessage.h ../Post/PView.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h \
../Post/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
../Post/PViewOptions.h ../Post/ColorTable.h
CutGrid${OBJEXT}: CutGrid.cpp ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h CutGrid.h Plugin.h ../Common/Options.h \
@@ -148,7 +148,7 @@ CutGrid${OBJEXT}: CutGrid.cpp ../Post/OctreePost.h ../Common/Octree.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \
../Common/ListUtils.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h ../Graphics/drawContext.h ../Fltk/Draw.h
+ ../Mesh/meshPartitionOptions.h ../Graphics/drawContext.h ../Fltk/Draw.h
Transform${OBJEXT}: Transform.cpp Transform.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
@@ -173,7 +173,7 @@ Triangulate${OBJEXT}: Triangulate.cpp ../Geo/GModel.h ../Geo/GVertex.h \
Plugin.h ../Common/Options.h ../Post/ColorTable.h ../Post/PView.h \
../Post/PViewDataList.h ../Post/PViewData.h ../Numeric/GmshMatrix.h \
../Common/ListUtils.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Mesh/meshPartitionOptions.h
Warp${OBJEXT}: Warp.cpp Warp.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
../Common/GmshMessage.h ../Post/PView.h ../Geo/SPoint3.h \
../Post/PViewDataList.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
@@ -192,7 +192,7 @@ Skin${OBJEXT}: Skin.cpp Skin.h Plugin.h ../Common/Options.h ../Post/ColorTable.h
../Geo/SPoint3.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
../Common/MallocUtils.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Mesh/meshPartitionOptions.h
GSHHS${OBJEXT}: 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 \
@@ -274,7 +274,7 @@ Annotate${OBJEXT}: Annotate.cpp ../Graphics/drawContext.h \
Annotate.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
../Common/GmshMessage.h ../Post/PView.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Numeric/GmshMatrix.h ../Common/ListUtils.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
Remove${OBJEXT}: Remove.cpp Remove.h Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
@@ -285,7 +285,7 @@ Probe${OBJEXT}: Probe.cpp ../Graphics/drawContext.h ../Geo/SBoundingBox3d.h \
../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Post/PViewDataList.h ../Post/PViewData.h ../Numeric/GmshMatrix.h \
../Common/ListUtils.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h ../Post/OctreePost.h ../Common/Octree.h \
+ ../Mesh/meshPartitionOptions.h ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h
HarmonicToTime${OBJEXT}: HarmonicToTime.cpp HarmonicToTime.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \
diff --git a/Post/Makefile b/Post/Makefile
index 9d976cc095..2849abb753 100644
--- a/Post/Makefile
+++ b/Post/Makefile
@@ -85,12 +85,12 @@ PViewDataList${OBJEXT}: PViewDataList.cpp PViewDataList.h PViewData.h \
../Common/GmshMessage.h ../Common/ListUtils.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/GmshMatrix.h \
../Common/SmoothData.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ ../Mesh/meshPartitionOptions.h
PViewDataListIO${OBJEXT}: PViewDataListIO.cpp PViewDataList.h PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \
../Common/GmshMessage.h ../Common/ListUtils.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/GmshMatrix.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
adaptiveData.h
PViewDataGModel${OBJEXT}: PViewDataGModel.cpp PViewDataGModel.h PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/GmshMatrix.h \
@@ -149,6 +149,6 @@ OctreePost${OBJEXT}: OctreePost.cpp ../Common/Octree.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h
ColorTable${OBJEXT}: ColorTable.cpp ../Common/GmshMessage.h ColorTable.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/GmshMatrix.h
--
GitLab