From: ageay <ageay>
Date: Mon, 6 Apr 2009 08:39:47 +0000 (+0000)
Subject: Suppression of useless dependancies to improve ParaMEDMEM_Swig.
X-Git-Tag: V5_1_main_FINAL~401
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ab07f365a7708a5397882ffad23eb53828976956;p=tools%2Fmedcoupling.git

Suppression of useless dependancies to improve ParaMEDMEM_Swig.
---

diff --git a/src/ParaMEDMEM/ComponentTopology.cxx b/src/ParaMEDMEM/ComponentTopology.cxx
index 850730108..0fa9d3355 100644
--- a/src/ParaMEDMEM/ComponentTopology.cxx
+++ b/src/ParaMEDMEM/ComponentTopology.cxx
@@ -17,6 +17,7 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #include "ComponentTopology.hxx"
+#include "ProcessorGroup.hxx"
 #include "InterpolationUtils.hxx"
 
 namespace ParaMEDMEM
diff --git a/src/ParaMEDMEM/ComponentTopology.hxx b/src/ParaMEDMEM/ComponentTopology.hxx
index 7653822c0..dff17a5e4 100644
--- a/src/ParaMEDMEM/ComponentTopology.hxx
+++ b/src/ParaMEDMEM/ComponentTopology.hxx
@@ -19,13 +19,14 @@
 #ifndef __COMPONENTTOPOLOGY_HXX__
 #define __COMPONENTTOPOLOGY_HXX__
 
-#include "ProcessorGroup.hxx"
 #include "Topology.hxx"
 
 #include <vector>
 
 namespace ParaMEDMEM
 {
+  class ProcessorGroup;
+
   class ComponentTopology
   {
   public:
diff --git a/src/ParaMEDMEM/ICoCoMEDField.cxx b/src/ParaMEDMEM/ICoCoMEDField.cxx
index 487139e93..9ba7ed5eb 100644
--- a/src/ParaMEDMEM/ICoCoMEDField.cxx
+++ b/src/ParaMEDMEM/ICoCoMEDField.cxx
@@ -19,6 +19,7 @@
 #include "ICoCoMEDField.hxx"
 #include "ICoCoTrioField.hxx"
 #include "ProcessorGroup.hxx"
+#include "ComponentTopology.hxx"
 #include "ParaMESH.hxx"
 #include "ParaFIELD.hxx"
 #include "NormalizedUnstructuredMesh.hxx"
diff --git a/src/ParaMEDMEM/ParaFIELD.cxx b/src/ParaMEDMEM/ParaFIELD.cxx
index 75eda8e0e..8750126f9 100644
--- a/src/ParaMEDMEM/ParaFIELD.cxx
+++ b/src/ParaMEDMEM/ParaFIELD.cxx
@@ -164,6 +164,12 @@ namespace ParaMEDMEM
   
     delete data_channel;
   }
+  
+  int ParaFIELD::nbComponents() const
+  {
+    return _component_topology.nbComponents();
+  }
+
 
   /*! This method retrieves the integral of component \a icomp
     over the all domain. */
diff --git a/src/ParaMEDMEM/ParaFIELD.hxx b/src/ParaMEDMEM/ParaFIELD.hxx
index 1b0db272b..b0c241db0 100644
--- a/src/ParaMEDMEM/ParaFIELD.hxx
+++ b/src/ParaMEDMEM/ParaFIELD.hxx
@@ -19,16 +19,15 @@
 #ifndef __PARAFIELD_HXX__
 #define __PARAFIELD_HXX__
 
-#include "ComponentTopology.hxx"
-#include "ParaMESH.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingUMesh.hxx"
+#include "RefCountObject.hxx"
 
 namespace ParaMEDMEM
 {
 
-  class ParaSUPPORT;
+  class ParaMESH;
   class ProcessorGroup;
+  class MEDCouplingFieldDouble;
+  class ComponentTopology;
 
   class ParaFIELD
   {
@@ -45,7 +44,7 @@ namespace ParaMEDMEM
     MEDCouplingFieldDouble* getField() const { return _field; }
     Topology* getTopology() const { return _topology; }
     ParaMESH* getSupport() const  { return _support; }
-    int nbComponents() const { return _component_topology.nbComponents(); }
+    int nbComponents() const;
     double getVolumeIntegral(int icomp) const;
     double getL2Norm()const { return -1; }
   private:
diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx
index d643fb5a8..0ca5504d4 100644
--- a/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx
+++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx
@@ -28,6 +28,7 @@
 #include "IntersectionDEC.hxx"
 #include "ParaMESH.hxx"
 #include "ParaFIELD.hxx"
+#include "ComponentTopology.hxx"
 #include "ICoCoMEDField.hxx"
 #include "MEDLoader.hxx"
  
diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx
index e2b7d25e5..69a8a307e 100644
--- a/src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx
+++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx
@@ -27,6 +27,7 @@
 #include "StructuredCoincidentDEC.hxx"
 #include "ParaMESH.hxx"
 #include "ParaFIELD.hxx"
+#include "ComponentTopology.hxx"
 #include "ICoCoMEDField.hxx"
 #include "MEDLoader.hxx"
 
diff --git a/src/ParaMEDMEM/Test/test_perf.cxx b/src/ParaMEDMEM/Test/test_perf.cxx
index db5a2c33c..30e921527 100644
--- a/src/ParaMEDMEM/Test/test_perf.cxx
+++ b/src/ParaMEDMEM/Test/test_perf.cxx
@@ -13,6 +13,7 @@
 #include "IntersectionDEC.hxx"
 #include "ParaMESH.hxx"
 #include "ParaFIELD.hxx"
+#include "ComponentTopology.hxx"
 #include "ICoCoMEDField.hxx"
 #include "MEDLoader.hxx"