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
Patch modules/smesh.git for Doxygen typos/grammar + misc. typos
[modules/smesh.git]
/
src
/
DriverCGNS
/
DriverCGNS_Read.cxx
diff --git
a/src/DriverCGNS/DriverCGNS_Read.cxx
b/src/DriverCGNS/DriverCGNS_Read.cxx
index 4d3d1e4459aa993f2ca8549cb2162c1ccbaf969a..c784acc9fa2f598f15b1f79eb8cca26a483025f2 100644
(file)
--- a/
src/DriverCGNS/DriverCGNS_Read.cxx
+++ b/
src/DriverCGNS/DriverCGNS_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
@@
-234,7
+234,7
@@
namespace
dist2 = ( nn1[1] - nn2[1] ).Modulus();
tol = 1e-5 * ( nn1[0] - nn1[1] ).Modulus();
}
dist2 = ( nn1[1] - nn2[1] ).Modulus();
tol = 1e-5 * ( nn1[0] - nn1[1] ).Modulus();
}
- return ( dist1 < tol & dist2 < tol );
+ return ( dist1 < tol &
&
dist2 < tol );
}
return false;
}
}
return false;
}
@@
-451,7
+451,7
@@
namespace
if ( !_nodeReplacementMap.empty() )
{
map< int, int >::const_iterator it, end = _nodeReplacementMap.end();
if ( !_nodeReplacementMap.empty() )
{
map< int, int >::const_iterator it, end = _nodeReplacementMap.end();
- for (
size_
t i = 0; i < nbIds; ++i )
+ for (
in
t i = 0; i < nbIds; ++i )
if (( it = _nodeReplacementMap.find( ids[i] + idShift)) != end )
ids[i] = it->second;
else
if (( it = _nodeReplacementMap.find( ids[i] + idShift)) != end )
ids[i] = it->second;
else
@@
-459,7
+459,7
@@
namespace
}
else if ( idShift )
{
}
else if ( idShift )
{
- for (
size_
t i = 0; i < nbIds; ++i )
+ for (
in
t i = 0; i < nbIds; ++i )
ids[i] += idShift;
}
}
ids[i] += idShift;
}
}
@@
-766,7
+766,7
@@
Driver_Mesh::Status DriverCGNS_Read::Perform()
}
// Read connectivity between zones. Nodes of the zone interface will be
}
// Read connectivity between zones. Nodes of the zone interface will be
- // replaced within
g
the zones read later
+ // replaced within the zones read later
string err = zone.ReadZonesConnection( _fn, cgnsBase, zonesByName, myMesh );
if ( !err.empty() )
addMessage( err );
string err = zone.ReadZonesConnection( _fn, cgnsBase, zonesByName, myMesh );
if ( !err.empty() )
addMessage( err );
@@
-1022,7
+1022,7
@@
Driver_Mesh::Status DriverCGNS_Read::Perform()
if ( zone.IsStructured() )
{
int axis = 0; // axis perpendiculaire to which boundary elements are oriented
if ( zone.IsStructured() )
{
int axis = 0; // axis perpendiculaire to which boundary elements are oriented
- if ( ids.size() >= meshDim * 2 )
+ if (
(int)
ids.size() >= meshDim * 2 )
{
for ( ; axis < meshDim; ++axis )
if ( ids[axis] - ids[axis+meshDim] == 0 )
{
for ( ; axis < meshDim; ++axis )
if ( ids[axis] - ids[axis+meshDim] == 0 )
@@
-1127,7
+1127,7
@@
Driver_Mesh::Status DriverCGNS_Read::Perform()
if ( psType == CGNS_ENUMV( PointRange ) && ids.size() == 2 )
{
if ( psType == CGNS_ENUMV( PointRange ) && ids.size() == 2 )
{
- for ( size_t i = ids[0]; i <= ids[1]; ++i )
+ for (
cg
size_t i = ids[0]; i <= ids[1]; ++i )
if ( const SMDS_MeshElement* e = myMesh->FindElement( i ))
groupDS.Add( e );
}
if ( const SMDS_MeshElement* e = myMesh->FindElement( i ))
groupDS.Add( e );
}