X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverMED%2FDriverMED_W_SMESHDS_Mesh.cxx;h=9072221a1f3f26e1e87ac19bccab84fa971360d8;hb=refs%2Ftags%2FT_After_Join_BR-D5-38-2003;hp=980a648d03b6d8d33736ac13eb29fcd12fafbd83;hpb=aeef41e893791465b04f5ce306640a42605849b9;p=modules%2Fsmesh.git

diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
index 980a648d0..9072221a1 100644
--- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
@@ -329,12 +329,11 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
       int aFamId = (*aFamsIter)->GetId();
 
       const set<const SMDS_MeshElement *>& anElems = (*aFamsIter)->GetElements();
-	  set<const SMDS_MeshElement *>::const_iterator anElemsIter = anElems.begin();
+      set<const SMDS_MeshElement *>::const_iterator anElemsIter = anElems.begin();
       for (; anElemsIter != anElems.end(); anElemsIter++)
       {
         anElemFamMap[*anElemsIter] = aFamId;
       }
-//      delete (*aFamsIter);
     }
 
     // Storing SMDS nodes to the MED file for the MED mesh
@@ -373,8 +372,9 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
     const ERepere SMDS_COORDINATE_SYSTEM = eCART;
 
     PNodeInfo aNodeInfo = myMed->CrNodeInfo(aMeshInfo,
-					    SMDS_COORDINATE_SYSTEM,
 					    aCoordinates,
+					    eFULL_INTERLACE,
+					    SMDS_COORDINATE_SYSTEM,
 					    aCoordNames,
 					    aCoordUnits,
 					    aFamilyNums,
@@ -421,8 +421,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
       PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
 					      SMDS_MED_ENTITY,
 					      eSEG2,
-					      SMDS_MED_CONNECTIVITY,
 					      aConnectivity,
+					      SMDS_MED_CONNECTIVITY,
 					      aFamilyNums,
 					      anElemNums);
       myMed->SetCellInfo(aCellInfo);
@@ -532,8 +532,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
 	PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
 						SMDS_MED_ENTITY,
 						eTRIA3,
-						SMDS_MED_CONNECTIVITY,
 						aTriaConn,
+						SMDS_MED_CONNECTIVITY,
 						aTriaFamilyNums,
 						anTriaElemNums);
 	MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<eTRIA3<<"; aNbElems = "<<aNbElems);
@@ -543,8 +543,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
 	PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
 						SMDS_MED_ENTITY,
 						eQUAD4,
-						SMDS_MED_CONNECTIVITY,
 						aQuadConn,
+						SMDS_MED_CONNECTIVITY,
 						aQuadFamilyNums,
 						aQuadElemNums);
 	MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<eQUAD4<<"; aNbElems = "<<aNbElems);
@@ -558,9 +558,9 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
 	PPolygoneInfo aCellInfo = myMed->CrPolygoneInfo(aMeshInfo,
                                                         SMDS_MED_ENTITY,
                                                         ePOLYGONE,
-                                                        SMDS_MED_CONNECTIVITY,
                                                         aPolygoneConn,
                                                         aPolygoneInds,
+                                                        SMDS_MED_CONNECTIVITY,
                                                         aPolygoneFamilyNums,
                                                         aPolygoneElemNums);
 	MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<ePOLYGONE<<"; aNbElems = "<<aNbElems);
@@ -722,8 +722,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
 	PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
 						SMDS_MED_ENTITY,
 						eTETRA4,
-						SMDS_MED_CONNECTIVITY,
 						aTetraConn,
+						SMDS_MED_CONNECTIVITY,
 						aTetraFamilyNums,
 						anTetraElemNums);
 	MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<eTETRA4<<"; aNbElems = "<<aNbElems);
@@ -733,8 +733,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
 	PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
 						SMDS_MED_ENTITY,
 						ePYRA5,
-						SMDS_MED_CONNECTIVITY,
 						aPyraConn,
+						SMDS_MED_CONNECTIVITY,
 						aPyraFamilyNums,
 						anPyraElemNums);
 	MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<ePYRA5<<"; aNbElems = "<<aNbElems);
@@ -744,8 +744,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
 	PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
 						SMDS_MED_ENTITY,
 						ePENTA6,
-						SMDS_MED_CONNECTIVITY,
 						aPentaConn,
+						SMDS_MED_CONNECTIVITY,
 						aPentaFamilyNums,
 						anPentaElemNums);
 	MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<ePENTA6<<"; aNbElems = "<<aNbElems);
@@ -755,8 +755,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
 	PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
 						SMDS_MED_ENTITY,
 						eHEXA8,
-						SMDS_MED_CONNECTIVITY,
 						aHexaConn,
+						SMDS_MED_CONNECTIVITY,
 						aHexaFamilyNums,
 						aHexaElemNums);
 	MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<eHEXA8<<"; aNbElems = "<<aNbElems);
@@ -770,10 +770,10 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
 	PPolyedreInfo aCellInfo = myMed->CrPolyedreInfo(aMeshInfo,
                                                         SMDS_MED_ENTITY,
                                                         ePOLYEDRE,
-                                                        SMDS_MED_CONNECTIVITY,
-                                                        aPolyedreConn,
-                                                        aPolyedreFaces,
                                                         aPolyedreInds,
+                                                        aPolyedreFaces,
+                                                        aPolyedreConn,
+                                                        SMDS_MED_CONNECTIVITY,
                                                         aPolyedreFamilyNums,
                                                         aPolyedreElemNums);
 	MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<ePOLYEDRE<<"; aNbElems = "<<aNbElems);