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

Printing lvls resolved -> they were turning negative

Browse source
This commit is contained in:
Harry Moffat 2008-01-18 20:50:25 +00:00
parent 8f863023a7
commit 4e56b6f7e6
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cantera/src/equil/vcs_MultiPhaseEquil.cpp
View file

@ -619,7 +619,7 @@ namespace Cantera {
* Call the thermo Program
*/
int ip1 = m_printLvl;
int ipr = m_printLvl-1;
int ipr = MAX(0, m_printLvl-1);
if (m_printLvl >= 3) {
ip1 = m_printLvl - 2;
} else {

6
Cantera/src/equil/vcs_internal.h
View file

@ -421,7 +421,7 @@ namespace VCSnonideal {
* @param length length of the vector to zero.
*/
inline void vcs_vdzero(std::vector<double> &vec_to, int length) {
(void) memset(VCS_DATA_PTR(vec_to), 0, (length) * sizeof(double));
(void) memset((void *)VCS_DATA_PTR(vec_to), 0, (length) * sizeof(double));
}
//! Zero a std int vector
@ -430,7 +430,7 @@ namespace VCSnonideal {
* @param length length of the vector to zero.
*/
inline void vcs_vizero(std::vector<int> &vec_to, int length) {
(void) memset(VCS_DATA_PTR(vec_to), 0, (length) * sizeof(int));
(void) memset((void *)VCS_DATA_PTR(vec_to), 0, (length) * sizeof(int));
}
//! Copy one std double vector into another
@ -535,8 +535,6 @@ namespace VCSnonideal {
*/
bool vcs_doubleEqual(double d1, double d2);
/****************************************************************************/
}
#endif
/****************************************************************************/

2
Cantera/src/equil/vcs_solve.cpp
View file

@ -398,7 +398,7 @@ namespace VCSnonideal {
/*
* If requested to print anything out, go ahead and do so;
*/
if (ipr) vcs_report(iconv);
if (ipr > 0) vcs_report(iconv);
/*
* Copy the results of the run back to the VCS_PROB structure,
* which is returned to the user.