Merge from V6_5_BR 05/06/2012

[modules/smesh.git] / src / DriverDAT / DriverDAT_R_SMDS_Mesh.cxx

diff --git a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
index b44499f9ce056c17018ec83d6c3402c72e3f6de4..d44951e8689d9f90d59042fea28eef73a00485fe 100644 (file)
--- a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
+++ b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include <stdio.h>
 
 #include "DriverDAT_R_SMDS_Mesh.h"
@@ -43,12 +44,9 @@ Driver_Mesh::Status DriverDAT_R_SMDS_Mesh::Perform()
   
   int intNumMaille, Degre;
   int ValElement;
-  int ValDegre;
   int NoeudsMaille[20];
   int NoeudMaille;
   
-  bool ok;
-  
   MESSAGE("in DriverDAT_R_SMDS_Mesh::Read()");
   /****************************************************************************
    *                      OUVERTURE DU FICHIER EN LECTURE                      *
@@ -71,7 +69,7 @@ Driver_Mesh::Status DriverDAT_R_SMDS_Mesh::Perform()
   
   for (i = 0; i < nbNodes; i++){
     fscanf(aFileId, "%d %e %e %e\n", &intNumPoint, &coordX, &coordY, &coordZ);
-    ok = myMesh->AddNodeWithID(coordX, coordY, coordZ, intNumPoint);
+    myMesh->AddNodeWithID(coordX, coordY, coordZ, intNumPoint);
   }
   
   fprintf(stdout, "%d noeuds\n", myMesh->NbNodes());
@@ -99,29 +97,25 @@ Driver_Mesh::Status DriverDAT_R_SMDS_Mesh::Perform()
     switch (ValElement) {
     case 102:
     case 103:
-      ValDegre = 3;
       nbNoeuds = 2;
-      ok = myMesh->AddEdgeWithID(NoeudsMaille[0], NoeudsMaille[1], 
+      myMesh->AddEdgeWithID(NoeudsMaille[0], NoeudsMaille[1], 
                                  intNumMaille);
       break;
     case 204:
     case 208:
-      ValDegre = 9;
       nbNoeuds = 4;
-      ok = myMesh->AddFaceWithID(NoeudsMaille[0], NoeudsMaille[1],
+      myMesh->AddFaceWithID(NoeudsMaille[0], NoeudsMaille[1],
                                  NoeudsMaille[2], NoeudsMaille[3], 
                                  intNumMaille);
       break;
     case 203:
     case 206:
-      ValDegre = 5;
       nbNoeuds = 3;
-      ok = myMesh->AddFaceWithID(NoeudsMaille[0], NoeudsMaille[1],
+      myMesh->AddFaceWithID(NoeudsMaille[0], NoeudsMaille[1],
                                  NoeudsMaille[2], intNumMaille);
       break;
     case 308:
     case 320:
-      ValDegre = 12;
       nbNoeuds = 8;
       if (ValElement == 320){
         //A voir, correspondance VTK
@@ -130,7 +124,7 @@ Driver_Mesh::Status DriverDAT_R_SMDS_Mesh::Perform()
         NoeudsMaille[6] = NoeudsMaille[10];
         NoeudsMaille[7] = NoeudsMaille[11];
       }
-      ok = myMesh->AddVolumeWithID(NoeudsMaille[0], NoeudsMaille[1],
+      myMesh->AddVolumeWithID(NoeudsMaille[0], NoeudsMaille[1],
                                    NoeudsMaille[2], NoeudsMaille[3], 
                                    NoeudsMaille[4], NoeudsMaille[5], 
                                    NoeudsMaille[6], NoeudsMaille[7],
@@ -138,17 +132,15 @@ Driver_Mesh::Status DriverDAT_R_SMDS_Mesh::Perform()
       break;
     case 304:
     case 310:
-      ValDegre = 10;
       nbNoeuds = 4;
       if (ValElement == 310)
         NoeudsMaille[3] = NoeudsMaille[6];
-      ok = myMesh->AddVolumeWithID(NoeudsMaille[0], NoeudsMaille[1],
+      myMesh->AddVolumeWithID(NoeudsMaille[0], NoeudsMaille[1],
                                    NoeudsMaille[2], NoeudsMaille[3], 
                                    intNumMaille);
       break;
     case 306:
     case 315:
-      ValDegre = 12;
       nbNoeuds = 8;
       if (ValElement == 315) {
         NoeudsMaille[3] = NoeudsMaille[6];
@@ -160,7 +152,7 @@ Driver_Mesh::Status DriverDAT_R_SMDS_Mesh::Perform()
       NoeudsMaille[5] = NoeudsMaille[4];
       NoeudsMaille[4] = NoeudsMaille[3];
       NoeudsMaille[3] = NoeudsMaille[2];
-      ok = myMesh->AddVolumeWithID(NoeudsMaille[0], NoeudsMaille[1],
+      myMesh->AddVolumeWithID(NoeudsMaille[0], NoeudsMaille[1],
                                    NoeudsMaille[2], NoeudsMaille[3], 
                                    NoeudsMaille[4], NoeudsMaille[5], 
                                    intNumMaille);