Fix bug SMESH5528 (The compilation fails on the file SMESHDriver.cxx using gcc2.95.4).

[modules/smesh.git] / src / DriverMED / DriverMED_W_SMESHDS_Mesh.cxx

diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
index 14512530488dc0231408c3c4cd52286d304579d5..8b1567f0255be142c71db66be2b12da2be7cc0c2 100644 (file)
--- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
@@ -33,6 +33,18 @@ using namespace std;
 #include <vector>
 #include "utilities.h"
 
+extern "C"
+{
+/**
+ * Factory function which will be called by SMESHDriver
+ */
+void * SMESH_createMEDMeshWriter()
+{
+       return new DriverMED_W_SMESHDS_Mesh();
+}
+
+}
+
 DriverMED_W_SMESHDS_Mesh::DriverMED_W_SMESHDS_Mesh()
 {
        ;
@@ -65,19 +77,7 @@ void DriverMED_W_SMESHDS_Mesh::SetMeshId(int aMeshId)
 
 void DriverMED_W_SMESHDS_Mesh::Write()
 {
-
-       string myClass = string("SMDS_Mesh");
-       string myExtension = string("MED");
-
-       DriverMED_W_SMDS_Mesh *myWriter = new DriverMED_W_SMDS_Mesh;
-
-       myWriter->SetMesh(myMesh);
-       //  myWriter->SetFile(myFile);
-       myWriter->SetMeshId(myMeshId);
-       myWriter->SetFileId(myFileId);
-
-       myWriter->Write();
-
+       Add();
 }
 
 void DriverMED_W_SMESHDS_Mesh::Add()
@@ -361,6 +361,12 @@ void DriverMED_W_SMESHDS_Mesh::Add()
                        nmailles[9]++;
                        break;
                }
+               case 4 :
+               {
+                       elem_Id[7].push_back(elem->GetID());
+                       nmailles[7]++;
+                       break;
+               }
                }
        }
 
@@ -514,43 +520,45 @@ void DriverMED_W_SMESHDS_Mesh::Add()
        {
                int nbFamillesElts = 0;
                SMESHDS_Mesh * mySMESHDSMesh = dynamic_cast<SMESHDS_Mesh *>(myMesh);
-               TopTools_IndexedMapOfShape myIndexToShape;
-               TopExp::MapShapes(mySMESHDSMesh->ShapeToMesh(), myIndexToShape);
-
                map<int,int> mapFamille;
 
-               if (besoinfamilledemaille == 1)
+               if(!mySMESHDSMesh->ShapeToMesh().IsNull())
                {
-                       int t;
-                       for (t = 1; t <= myIndexToShape.Extent(); t++)
-                       {
-                               const TopoDS_Shape S = myIndexToShape(t);
-                               if (mySMESHDSMesh->HasMeshElements(S))
-                               {
-                                       //MESSAGE ("********* Traitement de la Famille "<<-t);
+                       TopTools_IndexedMapOfShape myIndexToShape;
+                       TopExp::MapShapes(mySMESHDSMesh->ShapeToMesh(), myIndexToShape);
 
-                                       SMESHDS_SubMesh * SM = mySMESHDSMesh->MeshElements(S);
-                                       const vector<int>& indElt = SM->GetIDElements();
-                                       vector<int>::const_iterator ite=indElt.begin();
 
-                                       bool plein = false;
-                                       for (; ite!=indElt.end(); ite++)
-                                       {
-                                               int eltId = *ite;
-                                               mapFamille[eltId] = -t;
-                                               plein = true;
-                                       }
-                                       if (plein)
+                       if (besoinfamilledemaille == 1)
+                       {
+                               int t;
+                               for (t = 1; t <= myIndexToShape.Extent(); t++)
+                               {
+                                       const TopoDS_Shape S = myIndexToShape(t);
+                                       if (mySMESHDSMesh->HasMeshElements(S))
                                        {
-                                               nbFamillesElts++;
-                                               char famille[MED_TAILLE_NOM + 1];
-                                               sprintf(famille, "E%d", t);
-                                               CreateFamily(strdup(nommaa), strdup(famille), -t,
-                                                       attvalabs++);
+                                               //MESSAGE ("********* Traitement de la Famille "<<-t);
+       
+                                               SMESHDS_SubMesh * SM = mySMESHDSMesh->MeshElements(S);
+                                               SMDS_Iterator<const SMDS_MeshElement*> * ite=SM->GetElements();
+                                               bool plein = false;
+                                               while(ite->more())
+                                               {
+                                                       mapFamille[ite->next()->GetID()] = -t;
+                                                       plein = true;
+                                               }
+                                               if (plein)
+                                               {
+                                                       nbFamillesElts++;
+                                                       char famille[MED_TAILLE_NOM + 1];
+                                                       sprintf(famille, "E%d", t);
+                                                       CreateFamily(strdup(nommaa), strdup(famille), -t,
+                                                               attvalabs++);
+                                               }
                                        }
                                }
                        }
                }
+               else besoinfamilledemaille = 0;
 
                int indice = 1;
                for (i = 0; i < MED_NBR_GEOMETRIE_MAILLE; i++)
@@ -576,12 +584,12 @@ void DriverMED_W_SMESHDS_Mesh::Add()
                                /* allocation memoire */
                                connectivite =
                                        (med_int *) malloc(sizeof(med_int) * taille * nmailles[i]);
-                               nomele =
+                               /* nomele =
                                        (char *)malloc(sizeof(char) * MED_TAILLE_PNOM *
-                                       nmailles[i] + 1);
+                                       nmailles[i] + 1);*/
+                               nomele = "";
                                numele = (med_int *) malloc(sizeof(med_int) * nmailles[i]);
                                nufael = (med_int *) malloc(sizeof(med_int) * nmailles[i]);
-                               nomele = "";
                                nbNodes = typmai[i] % 100;
 
                                for (j = 0; j < nmailles[i]; j++)