X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverDAT%2FDriverDAT_W_SMDS_Mesh.cxx;h=a86d1b2954c189c842503a854a0ff485098ca8d2;hb=20d9e162bd67182cbfa841bbfc9319919f4703e3;hp=1f8d5ab61bd45d0ff85d58b30097a54938f08881;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f;p=modules%2Fsmesh.git diff --git a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx index 1f8d5ab61..a86d1b295 100644 --- a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx +++ b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx @@ -1,21 +1,24 @@ -// Copyright (C) 2003 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// Copyright (C) 2007-2016 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 +// +// 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, or (at your option) any later version. +// +// 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/ or email : webmaster.salome@opencascade.com +// #include @@ -25,18 +28,20 @@ #include "utilities.h" +#include + using namespace std; Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform() { + Kernel_Utils::Localizer loc; Status aResult = DRS_OK; int nbNodes, nbCells; - int i; - + char *file2Read = (char *)myFile.c_str(); FILE* aFileId = fopen(file2Read, "w+"); - if (aFileId < 0) { + if ( !aFileId ) { fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read); return DRS_FAIL; } @@ -44,15 +49,12 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform() /**************************************************************************** * NOMBRES D'OBJETS * ****************************************************************************/ - fprintf(stdout, "\n(****************************)\n"); - fprintf(stdout, "(* INFORMATIONS GENERALES : *)\n"); - fprintf(stdout, "(****************************)\n"); - + /* Combien de noeuds ? */ nbNodes = myMesh->NbNodes(); - + /* Combien de mailles, faces ou aretes ? */ - int nb_of_nodes, nb_of_edges, nb_of_faces, nb_of_volumes; + int nb_of_edges, nb_of_faces, nb_of_volumes; nb_of_edges = myMesh->NbEdges(); nb_of_faces = myMesh->NbFaces(); nb_of_volumes = myMesh->NbVolumes(); @@ -60,29 +62,23 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform() SCRUTE(nb_of_edges); SCRUTE(nb_of_faces); SCRUTE(nb_of_volumes); - - fprintf(stdout, "%d %d\n", nbNodes, nbCells); + + //fprintf(stdout, "%d %d\n", nbNodes, nbCells); fprintf(aFileId, "%d %d\n", nbNodes, nbCells); - + /**************************************************************************** * ECRITURE DES NOEUDS * ****************************************************************************/ - fprintf(stdout, "\n(************************)\n"); - fprintf(stdout, "(* NOEUDS DU MAILLAGE : *)\n"); - fprintf(stdout, "(************************)\n"); - + SMDS_NodeIteratorPtr itNodes=myMesh->nodesIterator(); - while(itNodes->more()){ + while(itNodes->more()){ const SMDS_MeshNode * node = itNodes->next(); - fprintf(aFileId, "%d %e %e %e\n", node->GetID(), node->X(), node->Y(), node->Z()); + fprintf(aFileId, "%d %.14e %.14e %.14e\n", node->GetID(), node->X(), node->Y(), node->Z()); } - + /**************************************************************************** * ECRITURE DES ELEMENTS * ****************************************************************************/ - fprintf(stdout, "\n(**************************)\n"); - fprintf(stdout, "(* ELEMENTS DU MAILLAGE : *)\n"); - fprintf(stdout, "(**************************)"); /* Ecriture des connectivites, noms, numeros des mailles */ SMDS_EdgeIteratorPtr itEdges=myMesh->edgesIterator(); @@ -105,17 +101,10 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform() SMDS_FaceIteratorPtr itFaces=myMesh->facesIterator(); while(itFaces->more()){ const SMDS_MeshElement * elem = itFaces->next(); - switch (elem->NbNodes()) { - case 3: - fprintf(aFileId, "%d %d ", elem->GetID(), 203); - break; - case 4: - fprintf(aFileId, "%d %d ", elem->GetID(), 204); - break; - case 6: - fprintf(aFileId, "%d %d ", elem->GetID(), 206); - break; - } + if ( elem->IsPoly() ) + fprintf(aFileId, "%d %d ", elem->GetID(), 400+elem->NbNodes()); + else + fprintf(aFileId, "%d %d ", elem->GetID(), 200+elem->NbNodes()); SMDS_ElemIteratorPtr it=elem->nodesIterator(); while(it->more()) fprintf(aFileId, "%d ", it->next()->GetID()); @@ -125,12 +114,10 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform() SMDS_VolumeIteratorPtr itVolumes=myMesh->volumesIterator(); while(itVolumes->more()){ const SMDS_MeshElement * elem = itVolumes->next(); - switch (elem->NbNodes()) { - case 8: - fprintf(aFileId, "%d %d ", elem->GetID(), 308); - break; - } - + if ( elem->IsPoly() ) + fprintf(aFileId, "%d %d ", elem->GetID(), 500+elem->NbNodes()); + else + fprintf(aFileId, "%d %d ", elem->GetID(), 300+elem->NbNodes()); SMDS_ElemIteratorPtr it=elem->nodesIterator(); while(it->more()) fprintf(aFileId, "%d ", it->next()->GetID());