X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverUNV%2FDriverUNV_W_SMDS_Mesh.cxx;h=a33d10b3886a00cf8f056aaedd05632c1932f294;hb=0e8ed41adbfcadd15e02863bb46cbf9a856422c4;hp=ffa50cbe7d5f82522b734e86bd320d5f17283fbf;hpb=8fa039a796957b302d86d90b22afc0a998573f83;p=modules%2Fsmesh.git diff --git a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx index ffa50cbe7..a33d10b38 100644 --- a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx +++ b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx @@ -1,23 +1,23 @@ -// Copyright (C) 2007-2010 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 @@ -32,9 +32,11 @@ #include "utilities.h" +#include "UNV164_Structure.hxx" #include "UNV2411_Structure.hxx" #include "UNV2412_Structure.hxx" #include "UNV2417_Structure.hxx" +#include "UNV2420_Structure.hxx" #include "UNV_Utilities.hxx" #include @@ -64,6 +66,10 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform() Status aResult = DRS_OK; std::ofstream out_stream(myFile.c_str()); try{ + + UNV164::Write( out_stream ); // unit system + UNV2420::Write( out_stream, myMeshName ); // Coordinate system + { using namespace UNV2411; TDataSet aDataSet2411; @@ -71,14 +77,15 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform() //----------------------------------- MESSAGE("Perform - myMesh->NbNodes() = "<NbNodes()); SMDS_NodeIteratorPtr aNodesIter = myMesh->nodesIterator(); - for(; aNodesIter->more();){ + TRecord aRec; + while ( aNodesIter->more() ) + { const SMDS_MeshNode* aNode = aNodesIter->next(); - TRecord aRec; + aRec.label = aNode->GetID(); aRec.coord[0] = aNode->X(); aRec.coord[1] = aNode->Y(); aRec.coord[2] = aNode->Z(); - const TNodeLab& aLabel = aNode->GetID(); - aDataSet2411.insert(TDataSet::value_type(aLabel,aRec)); + aDataSet2411.push_back( aRec ); } MESSAGE("Perform - aDataSet2411.size() = "<NbEdges() = "<NbEdges()); if(myMesh->NbEdges()){ SMDS_EdgeIteratorPtr anIter = myMesh->edgesIterator(); - for(; anIter->more();){ + while( anIter->more() ) + { const SMDS_MeshEdge* anElem = anIter->next(); - TElementLab aLabel = anElem->GetID(); int aNbNodes = anElem->NbNodes(); TRecord aRec; + aRec.label = anElem->GetID(); aRec.node_labels.reserve(aNbNodes); SMDS_ElemIteratorPtr aNodesIter; aNodesIter = anElem->nodesIteratorToUNV(); @@ -105,23 +113,27 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform() } else { aRec.fe_descriptor_id = 11; } - for(; aNodesIter->more();){ + while( aNodesIter->more()) + { const SMDS_MeshElement* aNode = aNodesIter->next(); aRec.node_labels.push_back(aNode->GetID()); } - aDataSet2412.insert(TDataSet::value_type(aLabel,aRec)); + aDataSet2412.push_back(aRec); } MESSAGE("Perform - aDataSet2412.size() = "<NbFaces() = "<NbFaces()); - if(myMesh->NbFaces()){ + if ( myMesh->NbFaces() ) + { SMDS_FaceIteratorPtr anIter = myMesh->facesIterator(); - for(; anIter->more();){ + while ( anIter->more()) + { const SMDS_MeshFace* anElem = anIter->next(); - TElementLab aLabel = anElem->GetID(); + if ( anElem->IsPoly() ) continue; int aNbNodes = anElem->NbNodes(); TRecord aRec; + aRec.label = anElem->GetID(); aRec.node_labels.reserve(aNbNodes); SMDS_ElemIteratorPtr aNodesIter; aNodesIter = anElem->nodesIteratorToUNV(); @@ -142,77 +154,54 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform() case 8: aRec.fe_descriptor_id = 45; break; + case 9: + aRec.fe_descriptor_id = 45; + aRec.node_labels.resize( 8 ); + break; default: continue; } - aDataSet2412.insert(TDataSet::value_type(aLabel,aRec)); + aDataSet2412.push_back(aRec); } MESSAGE("Perform - aDataSet2412.size() = "<NbVolumes() = "<NbVolumes()); - if(myMesh->NbVolumes()){ + if ( myMesh->NbVolumes() ) + { SMDS_VolumeIteratorPtr anIter = myMesh->volumesIterator(); - for(; anIter->more();){ + while ( anIter->more()) + { const SMDS_MeshVolume* anElem = anIter->next(); - TElementLab aLabel = anElem->GetID(); - int aNbNodes = anElem->NbNodes(); - //MESSAGE("aNbNodes="<nodesIteratorToUNV(); + SMDS_ElemIteratorPtr aNodesIter = anElem->nodesIteratorToUNV(); if ( anElem->IsPoly() ) { - MESSAGE("anElem->IsPoly"); - if ( const SMDS_VtkVolume* ph = - dynamic_cast (anElem)) - { - aNbNodes = ph->NbUniqueNodes(); - aNodesIter = ph->uniqueNodesIterator(); - } + continue; } - int anId = -1; - switch(aNbNodes){ - case 4: { - anId = 111; - break; - } - case 6: { - anId = 112; - break; - } - case 8: { - anId = 115; - break; - } - case 10: { - anId = 118; - break; - } - case 13: { - anId = 114; - break; - } - case 15: { - anId = 113; - break; - } - case 20: { - anId = 116; - break; - } + switch(aNbNodes) { + case 4: anId = 111; break; + case 6: anId = 112; break; + case 8: anId = 115; break; + case 10: anId = 118; break; + case 13: anId = 114; break; + case 15: anId = 113; break; + case 20: + case 27: anId = 116; aNbNodes = 20; break; default: continue; } if(anId>0){ TRecord aRec; + aRec.label = anElem->GetID(); aRec.fe_descriptor_id = anId; aRec.node_labels.reserve(aNbNodes); - for(; aNodesIter->more();){ + while ( aNodesIter->more() && aRec.node_labels.size() < aNbNodes ) + { const SMDS_MeshElement* aNode = aNodesIter->next(); aRec.node_labels.push_back(aNode->GetID()); } - aDataSet2412.insert(TDataSet::value_type(aLabel,aRec)); + aDataSet2412.push_back(aRec); } } MESSAGE("Perform - aDataSet2412.size() = "<