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

Fix compilation errors with MSVC

Browse source 
Resolved ambiguous function calls for math functions on integer inputs
This commit is contained in:
Ray Speth 2012-02-12 02:46:52 +00:00
parent eb2cab5f2b
commit 2f23080dd3
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/base/xml.cpp
View file

@ -1435,7 +1435,7 @@ XML_Node& XML_Node::child(const std::string& aloc) const
string::size_type iloc; string::size_type iloc;
string cname; string cname;
string loc = aloc; string loc = aloc;
std::map<std::string,XML_Node*>::const_iterator i; std::multimap<std::string,XML_Node*>::const_iterator i;
while (1) { while (1) {
iloc = loc.find('/'); iloc = loc.find('/');

2
src/numerics/NonlinearSolver.cpp
View file

@ -1259,7 +1259,7 @@ int NonlinearSolver::doAffineNewtonSolve(const doublereal* const y_curr, const
* Add junk to the Hessian diagonal * Add junk to the Hessian diagonal
* -> Note, testing indicates that this will get too big for ill-conditioned systems. * -> Note, testing indicates that this will get too big for ill-conditioned systems.
*/ */
hcol = sqrt(neq_) * 1.0E-7 * hnorm; hcol = sqrt(1.0*neq_) * 1.0E-7 * hnorm;
#ifdef DEBUG_HKM_NOT #ifdef DEBUG_HKM_NOT
if (hcol > 1.0) { if (hcol > 1.0) {
hcol = 1.0E1; hcol = 1.0E1;

4
src/thermo/GibbsExcessVPSSTP.cpp
View file

@ -259,9 +259,9 @@ void GibbsExcessVPSSTP::getActivityCoefficients(doublereal* const ac) const
// Protect against roundoff when taking exponentials // Protect against roundoff when taking exponentials
for (int k = 0; k < m_kk; k++) { for (int k = 0; k < m_kk; k++) {
if (ac[k] > 700.) { if (ac[k] > 700.) {
ac[k] = exp(700.); ac[k] = exp(700.0);
} else if (ac[k] < -700.) { } else if (ac[k] < -700.) {
ac[k] = exp(-700); ac[k] = exp(-700.0);
} else { } else {
ac[k] = exp(ac[k]); ac[k] = exp(ac[k]);
} }