Suppression of useless dependancies to improve ParaMEDMEM_Swig.

diff --git a/src/ParaMEDMEM/ComponentTopology.cxx b/src/ParaMEDMEM/ComponentTopology.cxx
index 85073010872d02aa44ee8b12b6d223dff55c813d..0fa9d3355186cf4fab816309e731e92bae01a36f 100644 (file)
--- 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 7653822c0b6683cab027757f7cfd64c1f893170c..dff17a5e463ab96726830d751b3705002a3a4063 100644 (file)
--- 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 487139e93f85f1ab61fe839d19d54f3cef5419da..9ba7ed5eb76f7013734c951efee569949d0bf1f4 100644 (file)
--- 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 75eda8e0e07c72474bf1a3468e624dd7f22ca69e..8750126f989203917053b47776fefe76145a8ce0 100644 (file)
--- 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 1b0db272bf27b58ac33a5c5cc28fe9b49b1ce2c1..b0c241db0a4ec632da4fb57f1144b5f4fe0740cc 100644 (file)
--- 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 d643fb5a828b3128fe5039972d932e4fbd14bb50..0ca5504d4a4adb20408fe5ff7b0dd628a77d8673 100644 (file)
--- 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 e2b7d25e5ad54d72c26af19ef66cfd21ab691916..69a8a307ef1ed3ddbb537991f627ca410f84f095 100644 (file)
--- 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 db5a2c33c694a66d3803619e79929f85ec7e7936..30e921527c66247d5eea622476ee655d66d4c38b 100644 (file)
--- 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"