research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use std::max_element instead of reimplementing it

Browse source
This commit is contained in:
Ray Speth 2014-07-25 18:32:26 +00:00
parent 41a6e78ff1
commit 8aab7f527a
1 changed files with 1 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/equil/BasisOptimize.cpp
View file

@ -26,16 +26,6 @@ int BasisOptimize_print_lvl = 0;
*/
static void print_stringTrunc(const char* str, int space, int alignment);
//! Finds the location of the maximum component in a vector *x*
/*!
* @param x Vector to search
* @param j j <= i < n : i is the range of indices to search in *x*
* @param n Length of the vector
*
* @return index of the greatest value on *x* searched
*/
static size_t amax(double* x, size_t j, size_t n);
size_t Cantera::BasisOptimize(int* usedZeroedSpecies, bool doFormRxn,
MultiPhase* mphase, std::vector<size_t>& orderVectorSpecies,
std::vector<size_t>& orderVectorElements,
@ -167,7 +157,7 @@ size_t Cantera::BasisOptimize(int* usedZeroedSpecies, bool doFormRxn,
* for the largest remaining species. Return its identity.
* kk is the raw number. k is the orderVectorSpecies index.
*/
kk = amax(DATA_PTR(molNum), 0, nspecies);
kk = max_element(molNum.begin(), molNum.end()) - molNum.begin();
for (j = 0; j < nspecies; j++) {
if (orderVectorSpecies[j] == kk) {
k = j;
@ -432,28 +422,6 @@ static void print_stringTrunc(const char* str, int space, int alignment)
}
}
/*
* Finds the location of the maximum component in a double vector
* INPUT
* x(*) - Vector to search
* j <= i < n : i is the range of indices to search in X(*)
*
* RETURN
* return index of the greatest value on X(*) searched
*/
static size_t amax(double* x, size_t j, size_t n)
{
size_t largest = j;
double big = x[j];
for (size_t i = j + 1; i < n; ++i) {
if (x[i] > big) {
largest = i;
big = x[i];
}
}
return largest;
}
size_t Cantera::ElemRearrange(size_t nComponents, const vector_fp& elementAbundances,
MultiPhase* mphase,
std::vector<size_t>& orderVectorSpecies,