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
Merge branch 'master' of salome:modules/smesh
[modules/smesh.git]
/
src
/
DriverGMF
/
DriverGMF_Read.cxx
diff --git
a/src/DriverGMF/DriverGMF_Read.cxx
b/src/DriverGMF/DriverGMF_Read.cxx
index 6fdeaab0f2a54018a5196c7eee5a48d6f3a86508..54edf6a9c8413a0ab6f1e40bd62caa89026769f3 100644
(file)
--- a/
src/DriverGMF/DriverGMF_Read.cxx
+++ b/
src/DriverGMF/DriverGMF_Read.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-299,7
+299,7
@@
Driver_Mesh::Status DriverGMF_Read::Perform()
for ( int i = 1; i <= nbPyr; ++i )
{
GmfGetLin(meshID, GmfPyramids, &iN[0], &iN[1], &iN[2], &iN[3], &iN[4], &ref);
for ( int i = 1; i <= nbPyr; ++i )
{
GmfGetLin(meshID, GmfPyramids, &iN[0], &iN[1], &iN[2], &iN[3], &iN[4], &ref);
- if ( !myMesh->AddVolumeWithID( iN[
0], iN[2], iN[1], iN[3
], iN[4], pyrIDShift + i ))
+ if ( !myMesh->AddVolumeWithID( iN[
3], iN[2], iN[1], iN[0
], iN[4], pyrIDShift + i ))
status = storeBadNodeIds( "GmfPyramids",i, 5, iN[0], iN[1],iN[2], iN[3], iN[4] );
}
}
status = storeBadNodeIds( "GmfPyramids",i, 5, iN[0], iN[1],iN[2], iN[3], iN[4] );
}
}
@@
-407,7
+407,7
@@
Driver_Mesh::Status DriverGMF_Read::Perform()
{
// get ids of existing groups
std::set< int > groupIDs;
{
// get ids of existing groups
std::set< int > groupIDs;
- const std::set<SMESHDS_GroupBase*>& groups = myMesh->GetGroups();
+ const std::set<SMESHDS_GroupBase*>&
groups = myMesh->GetGroups();
std::set<SMESHDS_GroupBase*>::const_iterator grIter = groups.begin();
for ( ; grIter != groups.end(); ++grIter )
groupIDs.insert( (*grIter)->GetID() );
std::set<SMESHDS_GroupBase*>::const_iterator grIter = groups.begin();
for ( ; grIter != groups.end(); ++grIter )
groupIDs.insert( (*grIter)->GetID() );