avoid "unused variable" compilation warnings

[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 39b03f2d619cd4435c71d253ee0d0967f0ebc71f..a3d934c84077d39a47f4f6518876123e22bdd9ab 100644 (file)
--- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -50,7 +50,9 @@ DriverMED_W_SMESHDS_Mesh::DriverMED_W_SMESHDS_Mesh():
   myDoGroupOfNodes (false),
   myDoGroupOfEdges (false),
   myDoGroupOfFaces (false),
-  myDoGroupOfVolumes (false)
+  myDoGroupOfVolumes (false),
+  myDoGroupOf0DElems(false),
+  myDoGroupOfBalls(false)
 {}
 
 void DriverMED_W_SMESHDS_Mesh::SetFile(const std::string& theFileName, 
@@ -411,7 +413,7 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
     if (myDoGroupOfFaces && nbFaces) myFacesDefaultFamilyId = REST_FACES_FAMILY;
     if (myDoGroupOfVolumes && nbVolumes) myVolumesDefaultFamilyId = REST_VOLUMES_FAMILY;
     if (myDoGroupOf0DElems && nb0DElements) my0DElementsDefaultFamilyId = REST_0DELEM_FAMILY;
-    if (myDoGroupOfVolumes && nbVolumes) myBallsDefaultFamilyId = REST_BALL_FAMILY;
+    if (myDoGroupOfBalls && nbBalls) myBallsDefaultFamilyId = REST_BALL_FAMILY;
 
     MESSAGE("Perform - aFamilyInfo");
     //cout << " DriverMED_Family::MakeFamilies() " << endl;
@@ -530,28 +532,33 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
     anEntity = eARETE;
 #endif
     aTElemTypeDatas.push_back( TElemTypeData(anEntity,
-                                            eSEG2,
-                                            nbElemInfo.NbEdges( ORDER_LINEAR ),
-                                            SMDSAbs_Edge));
+                                             eSEG2,
+                                             nbElemInfo.NbEdges( ORDER_LINEAR ),
+                                             SMDSAbs_Edge));
     aTElemTypeDatas.push_back( TElemTypeData(anEntity,
-                                            eSEG3,
-                                            nbElemInfo.NbEdges( ORDER_QUADRATIC ),
-                                            SMDSAbs_Edge));
+                                             eSEG3,
+                                             nbElemInfo.NbEdges( ORDER_QUADRATIC ),
+                                             SMDSAbs_Edge));
 #ifdef _ELEMENTS_BY_DIM_
     anEntity = eFACE;
 #endif
     aTElemTypeDatas.push_back( TElemTypeData(anEntity,
-                                            eTRIA3,
-                                            nbElemInfo.NbTriangles( ORDER_LINEAR ),
-                                            SMDSAbs_Face));
+                                             eTRIA3,
+                                             nbElemInfo.NbTriangles( ORDER_LINEAR ),
+                                             SMDSAbs_Face));
     aTElemTypeDatas.push_back( TElemTypeData(anEntity,
-                                            eTRIA6,
-                                            nbElemInfo.NbTriangles( ORDER_QUADRATIC ),
-                                            SMDSAbs_Face));
+                                             eTRIA6,
+                                             nbElemInfo.NbTriangles( ORDER_QUADRATIC ) -
+                                             nbElemInfo.NbBiQuadTriangles(),
+                                             SMDSAbs_Face));
     aTElemTypeDatas.push_back( TElemTypeData(anEntity,
-                                            eQUAD4,
-                                            nbElemInfo.NbQuadrangles( ORDER_LINEAR ),
-                                            SMDSAbs_Face));
+                                             eTRIA7,
+                                             nbElemInfo.NbBiQuadTriangles(),
+                                             SMDSAbs_Face));
+    aTElemTypeDatas.push_back( TElemTypeData(anEntity,
+                                             eQUAD4,
+                                             nbElemInfo.NbQuadrangles( ORDER_LINEAR ),
+                                             SMDSAbs_Face));
     aTElemTypeDatas.push_back( TElemTypeData(anEntity,
                                              eQUAD8,
                                              nbElemInfo.NbQuadrangles( ORDER_QUADRATIC ) -
@@ -576,25 +583,25 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
     anEntity = eMAILLE;
 #endif
     aTElemTypeDatas.push_back( TElemTypeData(anEntity,
-                                            eTETRA4,
-                                            nbElemInfo.NbTetras( ORDER_LINEAR ),
-                                            SMDSAbs_Volume));
+                                             eTETRA4,
+                                             nbElemInfo.NbTetras( ORDER_LINEAR ),
+                                             SMDSAbs_Volume));
     aTElemTypeDatas.push_back( TElemTypeData(anEntity,
-                                            eTETRA10,
-                                            nbElemInfo.NbTetras( ORDER_QUADRATIC ),
-                                            SMDSAbs_Volume));
+                                             eTETRA10,
+                                             nbElemInfo.NbTetras( ORDER_QUADRATIC ),
+                                             SMDSAbs_Volume));
     aTElemTypeDatas.push_back( TElemTypeData(anEntity,
-                                            ePYRA5,
-                                            nbElemInfo.NbPyramids( ORDER_LINEAR ),
-                                            SMDSAbs_Volume));
+                                             ePYRA5,
+                                             nbElemInfo.NbPyramids( ORDER_LINEAR ),
+                                             SMDSAbs_Volume));
     aTElemTypeDatas.push_back( TElemTypeData(anEntity,
-                                            ePYRA13,
-                                            nbElemInfo.NbPyramids( ORDER_QUADRATIC ),
-                                            SMDSAbs_Volume));
+                                             ePYRA13,
+                                             nbElemInfo.NbPyramids( ORDER_QUADRATIC ),
+                                             SMDSAbs_Volume));
     aTElemTypeDatas.push_back( TElemTypeData(anEntity,
-                                            ePENTA6,
-                                            nbElemInfo.NbPrisms( ORDER_LINEAR ),
-                                            SMDSAbs_Volume));
+                                             ePENTA6,
+                                             nbElemInfo.NbPrisms( ORDER_LINEAR ),
+                                             SMDSAbs_Volume));
     aTElemTypeDatas.push_back( TElemTypeData(anEntity,
                                              ePENTA15,
                                              nbElemInfo.NbPrisms( ORDER_QUADRATIC ),