updating or adding when merging in the main trunk with the version in the

[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 5665790ad410454e3263633d426f830389f39b22..8459854360677b869d95fb1416372f2de5478849 100644 (file)
--- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
@@ -361,6 +361,12 @@ void DriverMED_W_SMESHDS_Mesh::Add()
                        nmailles[9]++;
                        break;
                }
                        nmailles[9]++;
                        break;
                }

+               case 4 :
+               {
+                       elem_Id[7].push_back(elem->GetID());
+                       nmailles[7]++;
+                       break;
+               }

                }
        }
 
                }
        }
 


@@ -573,12 +579,12 @@ void DriverMED_W_SMESHDS_Mesh::Add()
                                /* allocation memoire */
                                connectivite =
                                        (med_int *) malloc(sizeof(med_int) * taille * nmailles[i]);
                                /* allocation memoire */
                                connectivite =
                                        (med_int *) malloc(sizeof(med_int) * taille * nmailles[i]);

-                               nomele =
+                               /* nomele =

                                        (char *)malloc(sizeof(char) * MED_TAILLE_PNOM *
                                        (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]);
                                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++)
                                nbNodes = typmai[i] % 100;
 
                                for (j = 0; j < nmailles[i]; j++)


@@ -637,7 +643,6 @@ void DriverMED_W_SMESHDS_Mesh::Add()
                                /* liberation memoire */
                                free(connectivite);
                                free(numele);
                                /* liberation memoire */
                                free(connectivite);
                                free(numele);

-                               free(nomele);

                                free(nufael);
                                MESSAGE(" End " << typmai[i]);
                        }
                                free(nufael);
                                MESSAGE(" End " << typmai[i]);
                        }