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
Copyright update 2020
[modules/smesh.git]
/
src
/
DriverMED
/
DriverMED_R_SMESHDS_Mesh.cxx
diff --git
a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
index 14a648c8a1843b5dc6fe80d6d232ba3840e6842d..e2b117cf632a855f5c619cae9716579c19356237 100644
(file)
--- a/
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
+++ b/
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-110,7
+110,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
#endif
myFamilies.clear();
if(MYDEBUG) MESSAGE("Perform - myFile : "<<myFile);
#endif
myFamilies.clear();
if(MYDEBUG) MESSAGE("Perform - myFile : "<<myFile);
- PWrapper aMed = CrWrapper
(myFile,tru
e);
+ PWrapper aMed = CrWrapper
R(myFil
e);
aResult = DRS_EMPTY;
TInt aNbMeshes = aMed->GetNbMeshes();
aResult = DRS_EMPTY;
TInt aNbMeshes = aMed->GetNbMeshes();
@@
-156,7
+156,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
}
if(MYDEBUG) MESSAGE(aGroupName);
if ( strncmp( aGroupName.c_str(), NIG_GROUP_PREFIX, strlen(NIG_GROUP_PREFIX) ) != 0 )
}
if(MYDEBUG) MESSAGE(aGroupName);
if ( strncmp( aGroupName.c_str(), NIG_GROUP_PREFIX, strlen(NIG_GROUP_PREFIX) ) != 0 )
- aFamily->AddGroupName(
aGroupName
);
+ aFamily->AddGroupName(
fixUTF8( aGroupName )
);
}
aFamily->SetId( aFamId );
myFamilies[aFamId] = aFamily;
}
aFamily->SetId( aFamId );
myFamilies[aFamId] = aFamily;
@@
-266,7
+266,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
}
#endif
if ( !anIsNodeNum )
}
#endif
if ( !anIsNodeNum )
- aNodeIds.
swap( *(aBallInfo->myConn
));
+ aNodeIds.
assign( aBallInfo->myConn->begin(), aBallInfo->myConn->end(
));
// allocate array of diameters
vtkIdType maxID = myMesh->MaxElementID() + aNbBalls;
// allocate array of diameters
vtkIdType maxID = myMesh->MaxElementID() + aNbBalls;
@@
-1056,7
+1056,7
@@
list<string> DriverMED_R_SMESHDS_Mesh::GetMeshNames(Status& theStatus)
try {
if(MYDEBUG) MESSAGE("GetMeshNames - myFile : " << myFile);
theStatus = DRS_OK;
try {
if(MYDEBUG) MESSAGE("GetMeshNames - myFile : " << myFile);
theStatus = DRS_OK;
- PWrapper aMed = CrWrapper(myFile);
+ PWrapper aMed = CrWrapper
R
(myFile);
if (TInt aNbMeshes = aMed->GetNbMeshes()) {
for (int iMesh = 0; iMesh < aNbMeshes; iMesh++) {
if (TInt aNbMeshes = aMed->GetNbMeshes()) {
for (int iMesh = 0; iMesh < aNbMeshes; iMesh++) {