diff --git a/test_problems/VCSnonideal/NaCl_equil/good_dout.txt b/test_problems/VCSnonideal/NaCl_equil/good_dout.txt index d115daae6..4f40ae571 100644 --- a/test_problems/VCSnonideal/NaCl_equil/good_dout.txt +++ b/test_problems/VCSnonideal/NaCl_equil/good_dout.txt @@ -1,9 +1,16 @@ Unknown Cantera EOS to VCSnonideal: 45012 +vcs_Cantera_convert: Species Type 4 not known vcs_Cantera_convert: Species Type 8 not known vcs_Cantera_convert: Species Type 64 not known vcs_Cantera_convert: Species Type 8 not known vcs_Cantera_convert: Species Type 8 not known +vcs_Cantera_convert: Species Type 4 not known +vcs_Cantera_convert: Species Type 4 not known +vcs_Cantera_convert: Species Type 4 not known +vcs_Cantera_convert: Species Type 4 not known vcs_Cantera_convert: Species Type 8 not known +vcs_Cantera_convert: Species Type 4 not known +vcs_Cantera_convert: Species Type 4 not known vcs_Cantera_convert: Species Type 8 not known ================================================================================ @@ -2814,16 +2821,16 @@ Chemical Potentials of the Species: (dimensionless) Counters: Iterations Time (seconds) - vcs_basopt: 3 0.00000E+00 - vcs_TP: 36 1.78000E+00 + vcs_basopt: 3 NA + vcs_TP: 36 NA -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- TCounters: Num_Calls Total_Its Total_Time (seconds) - vcs_basopt: 3 3 0.00000E+00 - vcs_TP: 1 36 1.78000E+00 - vcs_inest: 0 0.00000E+00 - vcs_TotalTime: 1.79000E+00 + vcs_basopt: 3 3 NA + vcs_TP: 1 36 NA + vcs_inest: 0 NA + vcs_TotalTime: NA Results from vcs: @@ -2847,7 +2854,6 @@ N2 4.000e+00 9.763e-01 -5.719e+07 OH 3.747e-07 9.146e-08 -2.670e+08 NaCl(S) 4.788e+00 1.000e+00 -4.326e+08 ------------------------------------------------------------- -Total time = 1.800000e+00 seconds *************** NaCl_electrolyte ***************** Moles: 2.32742 diff --git a/test_problems/VCSnonideal/NaCl_equil/good_out.txt b/test_problems/VCSnonideal/NaCl_equil/good_out.txt index 7e6f8f4cc..c7d10e9dc 100644 --- a/test_problems/VCSnonideal/NaCl_equil/good_out.txt +++ b/test_problems/VCSnonideal/NaCl_equil/good_out.txt @@ -273,16 +273,16 @@ Chemical Potentials of the Species: (dimensionless) Counters: Iterations Time (seconds) - vcs_basopt: 3 0.00000E+00 - vcs_TP: 36 1.66000E+00 + vcs_basopt: 3 NA + vcs_TP: 36 NA -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- TCounters: Num_Calls Total_Its Total_Time (seconds) - vcs_basopt: 3 3 0.00000E+00 - vcs_TP: 1 36 1.66000E+00 - vcs_inest: 0 0.00000E+00 - vcs_TotalTime: 1.68000E+00 + vcs_basopt: 3 3 NA + vcs_TP: 1 36 NA + vcs_inest: 0 NA + vcs_TotalTime: NA Results from vcs: @@ -316,7 +316,7 @@ Moles: 2.32742 density 1216.41 kg/m^3 mean mol. weight 20.0596 amu potential 0 V - pH 6.59 + pH 6.59 1 kg 1 kmol ----------- ------------ diff --git a/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp b/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp index 1bb7ef5eb..6cc458a3f 100644 --- a/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp +++ b/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp @@ -10,6 +10,7 @@ #include "Cantera.h" #include "equilibrium.h" #include "kernel/vcs_MultiPhaseEquil.h" +#include "kernel/vcs_internal.h" #include "kernel/ThermoFactory.h" #include "kernel/IdealGasPhase.h" @@ -37,6 +38,7 @@ int main(int argc, char **argv) { string inputFile = "HMW_NaCl.xml"; bool printInputFormat = false; // print cmdfile.txt format bool printedUsage = false; + VCSnonideal::vcs_timing_print_lvl = 0; /* * Process the command line arguments