diff --git a/include/cantera/numerics/SquareMatrix.h b/include/cantera/numerics/SquareMatrix.h index 34e3d869b..c89b902c2 100644 --- a/include/cantera/numerics/SquareMatrix.h +++ b/include/cantera/numerics/SquareMatrix.h @@ -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 diff --git a/src/numerics/SquareMatrix.cpp b/src/numerics/SquareMatrix.cpp index 198a90b95..8274a48d3 100644 --- a/src/numerics/SquareMatrix.cpp +++ b/src/numerics/SquareMatrix.cpp @@ -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 diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp index a03d88ddc..2a116e1d1 100644 --- a/src/thermo/HMWSoln.cpp +++ b/src/thermo/HMWSoln.cpp @@ -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 } }