From c735a5e6b55043eea472cbae1e72bf5d6c5790db Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 11 Jun 2015 18:34:42 +0300 Subject: [PATCH] Align include directives in MEDPartitioner package --- src/MEDPartitioner/MEDPARTITIONER_ConnectZone.cxx | 2 ++ src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx | 8 ++++++-- src/MEDPartitioner/MEDPARTITIONER_Graph.cxx | 12 ++++++++++++ src/MEDPartitioner/MEDPARTITIONER_Graph.hxx | 5 ++--- src/MEDPartitioner/MEDPARTITIONER_JointFinder.hxx | 4 +++- src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx | 2 ++ src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx | 9 +++------ src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx | 1 + src/MEDPartitioner/MEDPARTITIONER_MeshCollection.hxx | 2 -- .../MEDPARTITIONER_MeshCollectionDriver.cxx | 2 ++ .../MEDPARTITIONER_MeshCollectionDriver.hxx | 6 +++++- .../MEDPARTITIONER_MeshCollectionMedAsciiDriver.hxx | 3 ++- .../MEDPARTITIONER_MeshCollectionMedXmlDriver.hxx | 3 ++- src/MEDPartitioner/MEDPARTITIONER_MetisGraph.cxx | 1 + src/MEDPartitioner/MEDPARTITIONER_MetisGraph.hxx | 1 + src/MEDPartitioner/MEDPARTITIONER_ParMetisGraph.cxx | 5 +++-- src/MEDPartitioner/MEDPARTITIONER_ParMetisGraph.hxx | 3 ++- .../MEDPARTITIONER_ParaDomainSelector.cxx | 1 + .../MEDPARTITIONER_ParallelTopology.cxx | 2 ++ .../MEDPARTITIONER_ParallelTopology.hxx | 4 +--- src/MEDPartitioner/MEDPARTITIONER_ScotchGraph.cxx | 2 ++ src/MEDPartitioner/MEDPARTITIONER_ScotchGraph.hxx | 1 + src/MEDPartitioner/MEDPARTITIONER_UserGraph.cxx | 2 ++ src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx | 2 -- 24 files changed, 58 insertions(+), 25 deletions(-) diff --git a/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.cxx b/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.cxx index 78fd1a0f4..402d66249 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.cxx @@ -19,6 +19,8 @@ #include "MEDPARTITIONER_ConnectZone.hxx" +#include "MEDCouplingSkyLineArray.hxx" + #include using namespace ParaMEDMEM; diff --git a/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx b/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx index 8c1626dfd..9572db1c8 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx @@ -21,8 +21,12 @@ #define __MEDPARTITIONER_CONNECTZONE_HXX__ #include "MEDPARTITIONER.hxx" -#include "MEDCouplingUMesh.hxx" -#include "MEDCouplingSkyLineArray.hxx" + +namespace ParaMEDMEM +{ + class MEDCouplingUMesh; + class MEDCouplingSkyLineArray; +} #include #include diff --git a/src/MEDPartitioner/MEDPARTITIONER_Graph.cxx b/src/MEDPartitioner/MEDPARTITIONER_Graph.cxx index 62a273a6a..1904ae4f5 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_Graph.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_Graph.cxx @@ -19,6 +19,8 @@ #include "MEDPARTITIONER_Graph.hxx" +#include "MEDCouplingSkyLineArray.hxx" + #include MEDPARTITIONER::Graph::Graph(ParaMEDMEM::MEDCouplingSkyLineArray *array, int *edgeweight):_graph(array),_partition(0),_edge_weight(edgeweight),_cell_weight(0) @@ -42,3 +44,13 @@ int MEDPARTITIONER::Graph::nbDomains() const } return domains.size(); } + +const int *MEDPARTITIONER::Graph::getPart() const +{ + return _partition->getValue(); +} + +int MEDPARTITIONER::Graph::nbVertices() const +{ + return _graph->getNumberOf(); +} diff --git a/src/MEDPartitioner/MEDPARTITIONER_Graph.hxx b/src/MEDPartitioner/MEDPARTITIONER_Graph.hxx index 33ea67601..12227bdb0 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_Graph.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_Graph.hxx @@ -21,7 +21,6 @@ #define __MEDPARTITIONER_GRAPH_HXX__ #include "MEDPARTITIONER.hxx" -#include "MEDCouplingSkyLineArray.hxx" #include @@ -50,10 +49,10 @@ namespace MEDPARTITIONER virtual void partGraph(int ndomain, const std::string& options_string="", ParaDomainSelector *sel=0) = 0; //returns the partitioning - const int *getPart() const { return _partition->getValue(); } + const int *getPart() const; //returns the number of graph vertices (which can correspond to the cells in the mesh!) - int nbVertices() const { return _graph->getNumberOf(); } + int nbVertices() const; // returns nb of domains in _partition int nbDomains() const; diff --git a/src/MEDPartitioner/MEDPARTITIONER_JointFinder.hxx b/src/MEDPartitioner/MEDPARTITIONER_JointFinder.hxx index 9cd52efba..4fcc9ace6 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_JointFinder.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_JointFinder.hxx @@ -20,6 +20,8 @@ #ifndef __MEDPARTITIONER_JOINTFINDER_HXX__ #define __MEDPARTITIONER_JOINTFINDER_HXX__ +#include "MEDPARTITIONER.hxx" + #include #include @@ -29,7 +31,7 @@ namespace MEDPARTITIONER class MeshCollection; class ParaDomainSelector; - class JointFinder + class MEDPARTITIONER_EXPORT JointFinder { public: JointFinder(const MeshCollection& mc); diff --git a/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx b/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx index 4ecca4e64..57e9ae919 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.cxx @@ -27,7 +27,9 @@ #include "MEDPARTITIONER_MetisGraph.hxx" #include "MEDPARTITIONER_ScotchGraph.hxx" #include "MEDPARTITIONER_MeshCollectionDriver.hxx" + #include "MEDCouplingUMesh.hxx" +#include "MEDCouplingSkyLineArray.hxx" #include #include diff --git a/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx b/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx index d7c31ffda..fecaf0cc9 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MEDPartitioner.hxx @@ -20,6 +20,7 @@ #ifndef __MEDPARTITIONER_MEDPARTITIONER_HXX__ #define __MEDPARTITIONER_MEDPARTITIONER_HXX__ +#include "MEDPARTITIONER.hxx" #include "MEDPARTITIONER_Graph.hxx" #include @@ -27,19 +28,15 @@ namespace ParaMEDMEM { - class DataArrayInt; class MEDFileData; - class MEDCouplingSkyLineArray; } namespace MEDPARTITIONER { class Topology; class MeshCollection; - class ParaDomainSelector; - class Graph; - - class MEDPartitioner + + class MEDPARTITIONER_EXPORT MEDPartitioner { public: MEDPartitioner(const std::string& filename, int ndomains=1, const std::string& library="metis",bool creates_boundary_faces=false, bool create_joints=false, bool mesure_memory=false); diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx index ec806a93b..d0ad9d4cb 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx @@ -38,6 +38,7 @@ #include "MEDCouplingFieldDouble.hxx" #include "MEDCouplingMemArray.hxx" #include "MEDCouplingNormalizedUnstructuredMesh.hxx" +#include "MEDCouplingSkyLineArray.hxx" #include "MEDCouplingUMesh.hxx" #include "MEDLoader.hxx" #include "MEDLoaderBase.hxx" diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.hxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.hxx index a4eec9a4c..7f7ad1316 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.hxx @@ -24,8 +24,6 @@ #include "MEDPARTITIONER_Graph.hxx" #include "MEDPARTITIONER_Utils.hxx" -#include "MEDCouplingUMesh.hxx" - #include #include #include diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.cxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.cxx index f13015f77..68f12e7a5 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.cxx @@ -27,7 +27,9 @@ #include "MEDCouplingFieldDouble.hxx" #include "MEDCouplingRefCountObject.hxx" +#include "MEDCouplingSkyLineArray.hxx" #include "MEDCouplingUMesh.hxx" +#include "MEDFileData.hxx" #include "MEDFileField.hxx" #include "MEDFileJoint.hxx" #include "MEDFileMesh.hxx" diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.hxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.hxx index d179d17ac..c378a3408 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.hxx @@ -21,13 +21,17 @@ #define __MEDPARTITIONER_MESHCOLLECTIONDRIVER_HXX__ #include "MEDPARTITIONER.hxx" -#include "MEDFileData.hxx" + #include #include namespace ParaMEDMEM { + class DataArrayDouble; + class MEDCouplingFieldDouble; class MEDFileData; + class MEDFileMesh; + class MEDFileUMesh; } namespace MEDPARTITIONER diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedAsciiDriver.hxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedAsciiDriver.hxx index 699c0b254..2a22d9446 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedAsciiDriver.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedAsciiDriver.hxx @@ -20,12 +20,13 @@ #ifndef __MEDPARTITIONER_MESHCOLLECTIONMEDASCIIDRIVER_HXX__ #define __MEDPARTITIONER_MESHCOLLECTIONMEDASCIIDRIVER_HXX__ +#include "MEDPARTITIONER.hxx" #include "MEDPARTITIONER_MeshCollectionDriver.hxx" namespace MEDPARTITIONER { class MeshCollection; - class MeshCollectionMedAsciiDriver : public MeshCollectionDriver + class MEDPARTITIONER_EXPORT MeshCollectionMedAsciiDriver : public MeshCollectionDriver { public: MeshCollectionMedAsciiDriver(MeshCollection*); diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.hxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.hxx index e800d830d..5e2049b4d 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.hxx @@ -20,12 +20,13 @@ #ifndef __MEDPARTITIONER_MESHCOLLECTIONMEDXMLDRIVER_HXX__ #define __MEDPARTITIONER_MESHCOLLECTIONMEDXMLDRIVER_HXX__ +#include "MEDPARTITIONER.hxx" #include "MEDPARTITIONER_MeshCollectionDriver.hxx" namespace MEDPARTITIONER { class MeshCollection; - class MeshCollectionMedXmlDriver : public MeshCollectionDriver + class MEDPARTITIONER_EXPORT MeshCollectionMedXmlDriver : public MeshCollectionDriver { public: MeshCollectionMedXmlDriver(MeshCollection*); diff --git a/src/MEDPartitioner/MEDPARTITIONER_MetisGraph.cxx b/src/MEDPartitioner/MEDPARTITIONER_MetisGraph.cxx index d91ceda7f..7e3533815 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MetisGraph.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MetisGraph.cxx @@ -21,6 +21,7 @@ #include "MEDPARTITIONER_ParaDomainSelector.hxx" #include "MEDPARTITIONER_Utils.hxx" +#include "MEDCouplingSkyLineArray.hxx" #include "InterpKernelException.hxx" #include diff --git a/src/MEDPartitioner/MEDPARTITIONER_MetisGraph.hxx b/src/MEDPartitioner/MEDPARTITIONER_MetisGraph.hxx index 46bea277e..5954f9e4d 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MetisGraph.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MetisGraph.hxx @@ -20,6 +20,7 @@ #ifndef __MEDPARTITIONER_METISGRAPH_HXX__ #define __MEDPARTITIONER_METISGRAPH_HXX__ +#include "MEDPARTITIONER.hxx" #include "MEDPARTITIONER_Graph.hxx" #include diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParMetisGraph.cxx b/src/MEDPartitioner/MEDPARTITIONER_ParMetisGraph.cxx index 18ca26082..4c424f09f 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ParMetisGraph.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ParMetisGraph.cxx @@ -21,6 +21,7 @@ #include "MEDPARTITIONER_ParaDomainSelector.hxx" #include "MEDPARTITIONER_Utils.hxx" +#include "MEDCouplingSkyLineArray.hxx" #include "InterpKernelException.hxx" #include @@ -38,7 +39,7 @@ ParMETISGraph::ParMETISGraph():Graph() { } -ParMETISGraph::ParMETISGraph(MEDCouplingSkyLineArray* graph, int* edgeweight) +ParMETISGraph::ParMETISGraph(ParaMEDMEM::MEDCouplingSkyLineArray* graph, int* edgeweight) :Graph(graph,edgeweight) { } @@ -136,7 +137,7 @@ void ParMETISGraph::partGraph(int ndomain, //the fifth argument true specifies that only the pointers are passed //to the object - _partition = new MEDCouplingSkyLineArray(index,value); + _partition = new ParaMEDMEM::MEDCouplingSkyLineArray(index,value); #endif } diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParMetisGraph.hxx b/src/MEDPartitioner/MEDPARTITIONER_ParMetisGraph.hxx index 8b71b2833..2d61cec26 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ParMetisGraph.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ParMetisGraph.hxx @@ -20,6 +20,7 @@ #ifndef __MEDPARTITIONER_ParMETISGraph_HXX__ #define __MEDPARTITIONER_ParMETISGraph_HXX__ +#include "MEDPARTITIONER.hxx" #include "MEDPARTITIONER_Graph.hxx" #include @@ -30,7 +31,7 @@ namespace MEDPARTITIONER { public: ParMETISGraph(); - ParMETISGraph(MEDCouplingSkyLineArray*, int *edgeweight=0); + ParMETISGraph(ParaMEDMEM::MEDCouplingSkyLineArray*, int *edgeweight=0); virtual ~ParMETISGraph(); void partGraph(int ndomain, const std::string& options_string="", ParaDomainSelector *sel=0); }; diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.cxx b/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.cxx index cf65b32e3..7658b72f7 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.cxx @@ -22,6 +22,7 @@ #include "MEDPARTITIONER_Utils.hxx" #include "MEDCouplingUMesh.hxx" +#include "MEDCouplingSkyLineArray.hxx" #include #include diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx index a8a4ab5bf..b65d3fdd1 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx @@ -20,10 +20,12 @@ #include "MEDPARTITIONER_MeshCollection.hxx" #include "MEDPARTITIONER_Topology.hxx" #include "MEDPARTITIONER_Graph.hxx" +#include "MEDPARTITIONER_ParaDomainSelector.hxx" #include "MEDPARTITIONER_ParallelTopology.hxx" #include "MEDPARTITIONER_ConnectZone.hxx" #include "MEDPARTITIONER_Utils.hxx" +#include "MEDCouplingSkyLineArray.hxx" #include "MEDCouplingUMesh.hxx" #include "InterpKernelHashMap.hxx" diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx index 5de3f4820..f18723fb2 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx @@ -22,8 +22,6 @@ #include "MEDPARTITIONER.hxx" #include "MEDPARTITIONER_Topology.hxx" -#include "MEDPARTITIONER_ParaDomainSelector.hxx" - #include "InterpKernelHashMap.hxx" @@ -34,7 +32,7 @@ namespace MEDPARTITIONER { class Graph; class MeshCollection; - class MEDPARTITIONER_FaceModel; + class ParaDomainSelector; class MEDPARTITIONER_EXPORT ParallelTopology : public Topology { diff --git a/src/MEDPartitioner/MEDPARTITIONER_ScotchGraph.cxx b/src/MEDPartitioner/MEDPARTITIONER_ScotchGraph.cxx index c8b9f5e76..1289291e1 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ScotchGraph.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ScotchGraph.cxx @@ -21,6 +21,8 @@ #include "MEDPARTITIONER_ScotchGraph.hxx" #include "MEDPARTITIONER_Utils.hxx" +#include "MEDCouplingSkyLineArray.hxx" + #include #ifdef MED_ENABLE_SCOTCH diff --git a/src/MEDPartitioner/MEDPARTITIONER_ScotchGraph.hxx b/src/MEDPartitioner/MEDPARTITIONER_ScotchGraph.hxx index ea6510b7d..96f5854b0 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ScotchGraph.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ScotchGraph.hxx @@ -21,6 +21,7 @@ #define __MEDPARTITIONER_SCOTCHGRAPH_HXX__ #include "MEDPARTITIONER.hxx" +#include "MEDPARTITIONER_Graph.hxx" #include diff --git a/src/MEDPartitioner/MEDPARTITIONER_UserGraph.cxx b/src/MEDPartitioner/MEDPARTITIONER_UserGraph.cxx index a6070f245..1d0808471 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_UserGraph.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_UserGraph.cxx @@ -20,6 +20,8 @@ #include "MEDPARTITIONER_Graph.hxx" #include "MEDPARTITIONER_UserGraph.hxx" +#include "MEDCouplingSkyLineArray.hxx" + #include #include diff --git a/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx b/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx index a6fc144a5..d6c5f6b5b 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx @@ -27,8 +27,6 @@ namespace MEDPARTITIONER { - class MEDCouplingSkyLineArray; - class ParaDomainSelector; class MEDPARTITIONER_EXPORT UserGraph : public Graph { public: -- 2.30.2