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

Fixed an overloaded operator error

Browse source 
Fixed a compilation error that occurred in DEBUG_MODE
This commit is contained in:
Harry Moffat 2013-02-25 20:00:24 +00:00
parent 61abf3869d
commit 3cc0aa1689
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/cantera/numerics/SquareMatrix.h
View file

@ -83,6 +83,14 @@ public:
*/
virtual void mult(const doublereal* b, doublereal* prod) const;
//! Multiply A*B and write result to \c prod.
/*!
*
* @param b input DenseMatrix B of size NxN
* @param prod output output DenseMatrix prod size NxN
*/
virtual void mult(const DenseMatrix& b, DenseMatrix& prod) const;
//! Multiply b*A and write result to prod.
/*!
* @param b Vector to do the lh multiplication

11
src/numerics/SquareMatrix.cpp
View file

@ -155,6 +155,17 @@ void SquareMatrix::mult(const doublereal* b, doublereal* prod) const
DenseMatrix::mult(b, prod);
}
//====================================================================================================================
// Multiply A*B and write result to \c prod.
/*
*
* @param b input DenseMatrix B of size NxN
* @param prod output output DenseMatrix prod size NxN
*/
void SquareMatrix::mult(const DenseMatrix& b, DenseMatrix& prod) const
{
DenseMatrix::mult(b, prod);
}
//====================================================================================================================
// Multiply b*A and write result to prod.
/*
* @param b Vector to do the lh multiplication

4
src/thermo/HMWSoln.cpp
View file

@ -3159,7 +3159,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dT() const
#ifdef DEBUG_MODE
if (m_debugCalc) {
printf("%d %g: %g %g %g %g\n",
counterIJ, BMX_L[counterIJ], beta0MX_L[counterIJ],
(int) counterIJ, BMX_L[counterIJ], beta0MX_L[counterIJ],
beta1MX_L[counterIJ], beta2MX_L[counterIJ], gfunc[counterIJ]);
}
#endif
@ -4868,7 +4868,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const
printf(" %-16s %-16s %11.7f %11.7f %11.7f \n",
sni.c_str(), snj.c_str(),
BMX_P[counterIJ], BprimeMX_P[counterIJ], BphiMX_P[counterIJ]);
}(k =
}
#endif
}
}