Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #24368 EDF 23667 - Duplicates nodes
[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 7c1616a2a31ee15db67d7f7d5b07ed7438528706..d0f233ecc9ed9cca4ea835da0547a661bafa31f8 100644
(file)
--- a/
src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
+++ b/
src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-47,12
+47,16
@@
Driver_Mesh::Status DriverDAT_R_SMDS_Mesh::Perform()
int NoeudsMaille[20];
int NoeudMaille;
int NoeudsMaille[20];
int NoeudMaille;
- MESSAGE("in DriverDAT_R_SMDS_Mesh::Read()");
/****************************************************************************
* OUVERTURE DU FICHIER EN LECTURE *
****************************************************************************/
/****************************************************************************
* OUVERTURE DU FICHIER EN LECTURE *
****************************************************************************/
+#if defined(WIN32) && defined(UNICODE)
+ std::wstring file2Read = Kernel_Utils::utf8_decode_s(myFile);
+ FILE* aFileId = _wfopen(file2Read.c_str(), L"r");
+#else
char *file2Read = (char *)myFile.c_str();
FILE* aFileId = fopen(file2Read, "r");
char *file2Read = (char *)myFile.c_str();
FILE* aFileId = fopen(file2Read, "r");
+#endif
if ( !aFileId ) {
fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
return DRS_FAIL;
if ( !aFileId ) {
fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
return DRS_FAIL;
@@
-72,7
+76,7
@@
Driver_Mesh::Status DriverDAT_R_SMDS_Mesh::Perform()
myMesh->AddNodeWithID(coordX, coordY, coordZ, intNumPoint);
}
myMesh->AddNodeWithID(coordX, coordY, coordZ, intNumPoint);
}
- fprintf(stdout, "%
d noeuds\n", myMesh->NbNodes(
));
+ fprintf(stdout, "%
ld noeuds\n", static_cast< long >( myMesh->NbNodes()
));
/****************************************************************************
* LECTURE DES ELEMENTS *
****************************************************************************/
/****************************************************************************
* LECTURE DES ELEMENTS *
****************************************************************************/