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
BUG: EDF 2655: Low performance of hexa to tetra splitting
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Algo.cxx
diff --git
a/src/SMESH/SMESH_Algo.cxx
b/src/SMESH/SMESH_Algo.cxx
index 79a77f8276b9a14ea9963f62ecfab9315c01a1e5..263a1e673fe1779932eaff6e1e1b68121154d308 100644
(file)
--- a/
src/SMESH/SMESH_Algo.cxx
+++ b/
src/SMESH/SMESH_Algo.cxx
@@
-754,7
+754,6
@@
void SMESH_Algo::InitComputeError()
_badInputElements.clear();
_computeCanceled = false;
_badInputElements.clear();
_computeCanceled = false;
- _computeCost = 1;
_progressTic = 0;
_progress = 0.;
}
_progressTic = 0;
_progress = 0.;
}
@@
-767,9
+766,14
@@
void SMESH_Algo::InitComputeError()
double SMESH_Algo::GetProgressByTic() const
{
double SMESH_Algo::GetProgressByTic() const
{
+ int computeCost = 0;
+ for ( size_t i = 0; i < _smToCompute.size(); ++i )
+ computeCost += _smToCompute[i]->GetComputeCost();
+
const_cast<SMESH_Algo*>( this )->_progressTic++;
const_cast<SMESH_Algo*>( this )->_progressTic++;
+
double x = 5 * _progressTic;
double x = 5 * _progressTic;
- x = ( x <
_computeCost ) ? ( x / _
computeCost ) : 1.;
+ x = ( x <
computeCost ) ? ( x /
computeCost ) : 1.;
return 0.9 * sin( x * M_PI / 2 );
}
return 0.9 * sin( x * M_PI / 2 );
}