From 76322811977e9c0372182a18fa9e74c96f989c8d Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Fri, 22 Oct 2010 20:18:10 +0000 Subject: [PATCH] Changed table at the start of debug printing --- Cantera/src/equil/vcs_MultiPhaseEquil.h | 13 +++++++++++-- Cantera/src/equil/vcs_solve_TP.cpp | 20 ++++++++++---------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/Cantera/src/equil/vcs_MultiPhaseEquil.h b/Cantera/src/equil/vcs_MultiPhaseEquil.h index 9abff4bb5..c090c5a7c 100644 --- a/Cantera/src/equil/vcs_MultiPhaseEquil.h +++ b/Cantera/src/equil/vcs_MultiPhaseEquil.h @@ -642,9 +642,18 @@ namespace VCSnonideal { * This object owns the pointer. */ VCSnonideal::VCS_SOLVE *m_vsolvePtr; + }; + //! Global hook for turning on and off time printing. + /*! + * Default is to allow printing. But, you can assign this to zero + * globally to turn off all time printing. + * This is helpful for test suite purposes where you are interested + * in differences in text files. + */ + extern int vcs_timing_print_lvl; + } - - #endif + diff --git a/Cantera/src/equil/vcs_solve_TP.cpp b/Cantera/src/equil/vcs_solve_TP.cpp index d6de12ad7..8348a9ebb 100644 --- a/Cantera/src/equil/vcs_solve_TP.cpp +++ b/Cantera/src/equil/vcs_solve_TP.cpp @@ -216,20 +216,20 @@ namespace VCSnonideal { if (m_VCS_UnitsFormat == VCS_UNITS_MKS) { plogf(" Stan. Chem. Pot. in J/kmol\n"); } - plogf("\n SPECIES FORMULA VECTOR"); - print_space(29); - plogf(" STAN_CHEM_POT EQUILIBRIUM_EST. Species_Type\n\n"); - print_space(14); - for (i = 0; i < m_numElemConstraints; ++i) plogf(" %-2.2s", m_elementName[i].c_str()); - plogf(" SI(I)\n"); + plogf("\n SPECIES FORMULA VECTOR "); + print_space(41); + plogf(" STAN_CHEM_POT EQUILIBRIUM_EST. Species_Type\n\n"); + print_space(20); + for (i = 0; i < m_numElemConstraints; ++i) plogf("%-4.4s ", m_elementName[i].c_str()); + plogf(" PhaseID\n"); RT = vcs_nondimMult_TP(m_VCS_UnitsFormat, m_temperature); for (i = 0; i < m_numSpeciesTot; ++i) { - plogf(" %-12s", m_speciesName[i].c_str()); + plogf(" %-18.18s", m_speciesName[i].c_str()); for (j = 0; j < m_numElemConstraints; ++j) { - plogf("%3g", m_formulaMatrix[j][i]); + plogf("% -7.3g ", m_formulaMatrix[j][i]); } - plogf("%3d", m_phaseID[i]); - print_space(47-m_numElemConstraints*3); + plogf(" %3d ", m_phaseID[i]); + print_space(55-m_numElemConstraints*8); plogf("%12.5E %12.5E", RT * m_SSfeSpecies[i], m_molNumSpecies_old[i]); if (m_speciesUnknownType[i] == VCS_SPECIES_TYPE_MOLNUM) { plogf(" Mol_Num");