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
2D PointLocator remapping now works properly on non-convex polygons.
[tools/medcoupling.git]
/
src
/
MEDCoupling
/
MEDCouplingTimeDiscretization.cxx
diff --git
a/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
b/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
index 873193aba4edba2031c1e08a4854d4cb9d772288..d0708847221264ec89b0d220495c83f75518149f 100644
(file)
--- a/
src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
+++ b/
src/MEDCoupling/MEDCouplingTimeDiscretization.cxx
@@
-2542,9
+2542,9
@@
void MEDCouplingLinearTime::getValueForTime(double time, const std::vector<doubl
{
double alpha=(_end.getTimeValue()-time)/(_end.getTimeValue()-_start.getTimeValue());
std::size_t nbComp=vals.size()/2;
{
double alpha=(_end.getTimeValue()-time)/(_end.getTimeValue()-_start.getTimeValue());
std::size_t nbComp=vals.size()/2;
- std::transform(vals.begin(),vals.begin()+nbComp,res,std::bind
2nd(std::multiplies<double>()
,alpha));
+ std::transform(vals.begin(),vals.begin()+nbComp,res,std::bind
(std::multiplies<double>(),std::placeholders::_1
,alpha));
std::vector<double> tmp(nbComp);
std::vector<double> tmp(nbComp);
- std::transform(vals.begin()+nbComp,vals.end(),tmp.begin(),std::bind
2nd(std::multiplies<double>()
,1-alpha));
+ std::transform(vals.begin()+nbComp,vals.end(),tmp.begin(),std::bind
(std::multiplies<double>(),std::placeholders::_1
,1-alpha));
std::transform(tmp.begin(),tmp.end(),res,res,std::plus<double>());
}
std::transform(tmp.begin(),tmp.end(),res,res,std::plus<double>());
}
@@
-2556,13
+2556,13
@@
void MEDCouplingLinearTime::getValueOnTime(mcIdType eltId, double time, double *
else
throw INTERP_KERNEL::Exception("No start array existing.");
std::size_t nbComp=_array->getNumberOfComponents();
else
throw INTERP_KERNEL::Exception("No start array existing.");
std::size_t nbComp=_array->getNumberOfComponents();
- std::transform(value,value+nbComp,value,std::bind
2nd(std::multiplies<double>()
,alpha));
+ std::transform(value,value+nbComp,value,std::bind
(std::multiplies<double>(),std::placeholders::_1
,alpha));
std::vector<double> tmp(nbComp);
if(_end_array)
_end_array->getTuple(eltId,&tmp[0]);
else
throw INTERP_KERNEL::Exception("No end array existing.");
std::vector<double> tmp(nbComp);
if(_end_array)
_end_array->getTuple(eltId,&tmp[0]);
else
throw INTERP_KERNEL::Exception("No end array existing.");
- std::transform(tmp.begin(),tmp.end(),tmp.begin(),std::bind
2nd(std::multiplies<double>()
,1-alpha));
+ std::transform(tmp.begin(),tmp.end(),tmp.begin(),std::bind
(std::multiplies<double>(),std::placeholders::_1
,1-alpha));
std::transform(tmp.begin(),tmp.end(),value,value,std::plus<double>());
}
std::transform(tmp.begin(),tmp.end(),value,value,std::plus<double>());
}