X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FDriverUNV%2FDriverUNV_R_SMDS_Mesh.cxx;h=12c091632e06d569d32d85bbf77864339de311d2;hp=af39482b53787fb44c98785a3c6d60a6c931deb1;hb=2754c581d371f9bf52b3c538a7bde55f10f6523c;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f

diff --git a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
index af39482b5..12c091632 100644
--- a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
+++ b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
@@ -1,3 +1,22 @@
+// Copyright (C) 2005  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 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
+//
+// See http://www.salome-platform.org/
+//
 #include "DriverUNV_R_SMDS_Mesh.h"
 #include "SMDS_Mesh.hxx"
 
@@ -17,14 +36,6 @@ static int MYDEBUG = 0;
 #endif
 
 
-static const SMDS_MeshNode* 
-FindNode(const SMDS_Mesh* theMesh, int theId){
-  const SMDS_MeshNode* aNode = theMesh->FindNode(theId);
-  if(aNode) return aNode;
-  EXCEPTION(runtime_error,"SMDS_Mesh::FindNode - cannot find a SMDS_MeshNode for ID = "<<theId);
-}
-
-
 Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 {
   Status aResult = DRS_OK;
@@ -39,8 +50,7 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
       for(; anIter != aDataSet2411.end(); anIter++){
 	const TNodeLab& aLabel = anIter->first;
 	const TRecord& aRec = anIter->second;
-	const SMDS_MeshNode* aNode = 
-	  myMesh->AddNodeWithID(aRec.coord[0],aRec.coord[1],aRec.coord[2],aLabel);
+	myMesh->AddNodeWithID(aRec.coord[0],aRec.coord[1],aRec.coord[2],aLabel);
       }
     }
     {
@@ -54,7 +64,6 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 	SMDS_MeshElement* anElement = NULL;
 	const TElementLab& aLabel = anIter->first;
 	const TRecord& aRec = anIter->second;
-	int aNbNodes = aRec.node_labels.size();
 	if(IsBeam(aRec.fe_descriptor_id)){
 	  anElement = myMesh->AddEdgeWithID(aRec.node_labels[0],
 					    aRec.node_labels[1],
@@ -96,8 +105,8 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 	  case 118: // Solid Quadratic Tetrahedron - TET10
 	    
 	    anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
-						aRec.node_labels[1],
 						aRec.node_labels[2],
+						aRec.node_labels[1],
 						aRec.node_labels[3],
 						aLabel);
 	    break;
@@ -125,28 +134,27 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 	    break;
 	    
 	  case 115: // Solid Linear Brick - HEX8
-	    
 	    anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
-						aRec.node_labels[1],
-						aRec.node_labels[2],
 						aRec.node_labels[3],
+						aRec.node_labels[2],
+						aRec.node_labels[1],
 						aRec.node_labels[4],
-						aRec.node_labels[5],
-						aRec.node_labels[6],
 						aRec.node_labels[7],
+						aRec.node_labels[6],
+						aRec.node_labels[5],
 						aLabel);
 	    break;
 
 	  case 116: // Solid Quadratic Brick - HEX20
 	    
 	    anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
-						aRec.node_labels[2],
-						aRec.node_labels[4],
 						aRec.node_labels[6],
+						aRec.node_labels[4],
+						aRec.node_labels[2],
 						aRec.node_labels[12],
-						aRec.node_labels[14],
-						aRec.node_labels[16],
 						aRec.node_labels[18],
+						aRec.node_labels[16],
+						aRec.node_labels[14],
 						aLabel);
 	    break;
 	  }