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

Remove unnecessary "APPROACH" macro

Browse source
This commit is contained in:
Ray Speth 2013-05-31 15:55:43 +00:00
parent 68aa5da406
commit e43a4a8b3c
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/kinetics/solveSP.cpp
View file

@ -644,8 +644,6 @@ void solveSP::resjac_eval(std::vector<doublereal*> &JacCol,
}
}
#define APPROACH 0.80
/*!
* This function calculates a damping factor for the Newton iteration update
* vector, dxneg, to insure that all site and bulk fractions, x, remain
@ -659,6 +657,7 @@ void solveSP::resjac_eval(std::vector<doublereal*> &JacCol,
*/
static doublereal calc_damping(doublereal x[], doublereal dxneg[], size_t dim, int* label)
{
const doublereal APPROACH = 0.80;
doublereal damp = 1.0, xnew, xtop, xbot;
static doublereal damp_old = 1.0;
@ -714,7 +713,6 @@ static doublereal calc_damping(doublereal x[], doublereal dxneg[], size_t dim, i
return damp;
} /* calc_damping */
#undef APPROACH
/*
* This function calculates the norm of an update, dx[],

4
src/numerics/solveProb.cpp
View file

@ -443,10 +443,9 @@ void solveProb::resjac_eval(std::vector<doublereal*> &JacCol,
}
#define APPROACH 0.50
doublereal solveProb::calc_damping(doublereal x[], doublereal dxneg[], size_t dim, size_t* label)
{
const doublereal APPROACH = 0.50;
doublereal damp = 1.0, xnew, xtop, xbot;
static doublereal damp_old = 1.0;
*label = npos;
@ -517,7 +516,6 @@ doublereal solveProb::calc_damping(doublereal x[], doublereal dxneg[], size_t di
return damp;
}
#undef APPROACH
/*
* This function calculates the norm of an update, dx[],