Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt of Management of profiles in spliter
[tools/medcoupling.git]
/
src
/
MEDLoader
/
MEDFileJoint.cxx
diff --git
a/src/MEDLoader/MEDFileJoint.cxx
b/src/MEDLoader/MEDFileJoint.cxx
index 8e7d6f3c1883a44afa347714bde4cb97ede64142..a1ed652a702e9f9ff53e858b992982964589860d 100644
(file)
--- a/
src/MEDLoader/MEDFileJoint.cxx
+++ b/
src/MEDLoader/MEDFileJoint.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D
+// Copyright (C) 2007-201
9
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-357,7
+357,7
@@
bool MEDFileJointOneStep::isEqual(const MEDFileJointOneStep *other) const
if ( getNumberOfCorrespondences() != other->getNumberOfCorrespondences() )
return false;
if ( getNumberOfCorrespondences() != other->getNumberOfCorrespondences() )
return false;
- std::vector<
int
> found( getNumberOfCorrespondences(), false );
+ std::vector<
bool
> found( getNumberOfCorrespondences(), false );
for(int i=0; i<getNumberOfCorrespondences(); i++)
{
int j;
for(int i=0; i<getNumberOfCorrespondences(); i++)
{
int j;
@@
-410,6
+410,7
@@
std::string MEDFileJointOneStep::simpleRepr() const
}
return oss.str();
}
}
return oss.str();
}
+
INTERP_KERNEL::NormalizedCellType MEDFileJointOneStep::convertGeometryType(med_geometry_type geotype)
{
INTERP_KERNEL::NormalizedCellType result=INTERP_KERNEL::NORM_ERROR;
INTERP_KERNEL::NormalizedCellType MEDFileJointOneStep::convertGeometryType(med_geometry_type geotype)
{
INTERP_KERNEL::NormalizedCellType result=INTERP_KERNEL::NORM_ERROR;
@@
-423,6
+424,7
@@
INTERP_KERNEL::NormalizedCellType MEDFileJointOneStep::convertGeometryType(med_g
}
return result;
}
}
return result;
}
+
std::size_t MEDFileJoint::getHeapMemorySizeWithoutChildren() const
{
return _joint.capacity()*sizeof(MCAuto<MEDFileJointOneStep>);
std::size_t MEDFileJoint::getHeapMemorySizeWithoutChildren() const
{
return _joint.capacity()*sizeof(MCAuto<MEDFileJointOneStep>);
@@
-545,20
+547,22
@@
bool MEDFileJoint::isEqual(const MEDFileJoint *other) const
return false;
if(_domain_number!=other->_domain_number)
return false;
return false;
if(_domain_number!=other->_domain_number)
return false;
- std::vector<int> found( getNumberOfSteps(), false );
- for(int i=0; i<getNumberOfSteps(); i++)
+ int nbTS(getNumberOfSteps());
+ if(nbTS!=other->getNumberOfSteps())
+ return false;
+ std::vector<bool> found(nbTS,false);
+ for(int i=0;i<nbTS;i++)
{
int j;
{
int j;
- for(j=0;
j<getNumberOfSteps();
j++)
+ for(j=0;
j<nbTS;
j++)
{
{
- if ( !found[ j ] &&
- getStepAtPos(i)->isEqual(other->getStepAtPos(j)))
+ if(!found[j] && getStepAtPos(i)->isEqual(other->getStepAtPos(j)))
{
{
- found[
j ] =
true;
+ found[
j]=
true;
break;
}
}
break;
}
}
- if
( j == getNumberOfSteps()
)
+ if
(j==nbTS
)
return false;
}
return true;
return false;
}
return true;