diff --git a/test_problems/cxx_ex/equil_example1.cpp b/test_problems/cxx_ex/equil_example1.cpp index 4b3023eeb..3cd4be322 100755 --- a/test_problems/cxx_ex/equil_example1.cpp +++ b/test_problems/cxx_ex/equil_example1.cpp @@ -60,9 +60,6 @@ int equil_example1(int job) { } if (job <= 1) return 0; - // header - writeCanteraHeader(cout); - // create a gas mixture, and set its state //IdealGasMix gas("silane.cti", "silane"); diff --git a/test_problems/cxx_ex/example_utils.h b/test_problems/cxx_ex/example_utils.h index 2439816e1..951e557bf 100755 --- a/test_problems/cxx_ex/example_utils.h +++ b/test_problems/cxx_ex/example_utils.h @@ -53,16 +53,4 @@ void plotSoln(string fname, string fmt, string title, const G& gas, const A& sol writePlotFile(fname, fmt, title, names, soln); } -inline void writeCanteraHeader(ostream& s) { - s << endl; -#ifdef CANTERA_VERSION - s << " Cantera version " << CANTERA_VERSION << endl; -#else - s << " ???" << endl; -#endif - s << " Copyright California Institute of Technology, 2002." << endl; - s << " http://www.cantera.org" << endl; - s << endl; -} - #endif diff --git a/test_problems/cxx_ex/kinetics_example1.cpp b/test_problems/cxx_ex/kinetics_example1.cpp index d3b492dfd..c38022a98 100755 --- a/test_problems/cxx_ex/kinetics_example1.cpp +++ b/test_problems/cxx_ex/kinetics_example1.cpp @@ -47,9 +47,6 @@ int kinetics_example1(int job) { } if (job < 2) return 0; - // header - writeCanteraHeader(cout); - // create an ideal gas mixture that corresponds to GRI-Mech // 3.0 IdealGasMix* gg = new IdealGasMix("gri30.xml", "gri30"); @@ -109,8 +106,6 @@ int kinetics_example1(int job) { // print final temperature cout << " Tfinal = " << r.temperature() << endl; - cout << " number of residual function evaluations = " - << sim_ptr->integrator().nEvals() << endl; cout << "Output files:" << endl << " kin1.csv (Excel CSV file)" << endl << " kin1.dat (Tecplot data file)" << endl; diff --git a/test_problems/cxx_ex/kinetics_example2.cpp b/test_problems/cxx_ex/kinetics_example2.cpp index c814aa9d7..18289595a 100755 --- a/test_problems/cxx_ex/kinetics_example2.cpp +++ b/test_problems/cxx_ex/kinetics_example2.cpp @@ -40,9 +40,6 @@ int kinetics_example2(int job) { } if (job < 2) return 0; - // header - writeCanteraHeader(cout); - // create a GRI30 object GRI30 gas; gas.setState_TPX(1001.0, OneAtm, "H2:2.0, O2:1.0, N2:4.0"); @@ -100,9 +97,6 @@ int kinetics_example2(int job) { // print final temperature cout << " Tfinal = " << r.temperature() << endl; - cout << " number of residual function evaluations = " - << sim.integrator().nEvals() << endl; - cout << "Output files:" << endl << " kin2.csv (Excel CSV file)" << endl << " kin2.dat (Tecplot data file)" << endl; diff --git a/test_problems/cxx_ex/kinetics_example3.cpp b/test_problems/cxx_ex/kinetics_example3.cpp index bf7d80d6b..b1b9999af 100644 --- a/test_problems/cxx_ex/kinetics_example3.cpp +++ b/test_problems/cxx_ex/kinetics_example3.cpp @@ -46,9 +46,6 @@ int kinetics_example3(int job) { } if (job < 2) return 0; - // header - writeCanteraHeader(cout); - // create an ideal gas mixture that corresponds to GRI-Mech // 3.0 IdealGasMix* gg = new IdealGasMix("gri30.xml", "gri30"); @@ -105,8 +102,6 @@ int kinetics_example3(int job) { // print final temperature cout << " Tfinal = " << r.temperature() << endl; - cout << " number of residual function evaluations = " - << sim.integrator().nEvals() << endl; cout << "Output files:" << endl << " kin3.csv (Excel CSV file)" << endl << " kin3.dat (Tecplot data file)" << endl; diff --git a/test_problems/cxx_ex/output_blessed.txt b/test_problems/cxx_ex/output_blessed.txt index 441509833..8837ed380 100644 --- a/test_problems/cxx_ex/output_blessed.txt +++ b/test_problems/cxx_ex/output_blessed.txt @@ -12,13 +12,7 @@ Description: Ignition simulation using class IdealGasMix with file gri30.cti. Constant-pressure ignition of a hydrogen/oxygen/nitrogen mixture beginning at T = 1001 K and P = 1 atm. - - Cantera version 1.8.x - Copyright California Institute of Technology, 2002. - http://www.cantera.org - Tfinal = 2663.78 - number of residual function evaluations = 1876 Output files: kin1.csv (Excel CSV file) kin1.dat (Tecplot data file) @@ -32,13 +26,7 @@ Description: Ignition simulation using class GRI30. Constant-pressure ignition of a hydrogen/oxygen/nitrogen mixture beginning at T = 1001 K and P = 1 atm. - - Cantera version 1.8.x - Copyright California Institute of Technology, 2002. - http://www.cantera.org - Tfinal = 2663.78 - number of residual function evaluations = 1970 Output files: kin2.csv (Excel CSV file) kin2.dat (Tecplot data file) @@ -52,13 +40,7 @@ Description: Ignition simulation using class IdealGasMix with file gri30.cti. Constant-pressure ignition of a hydrogen/oxygen/nitrogen mixture beginning at T = 1001 K and P = 1 atm. - - Cantera version 1.8.x - Copyright California Institute of Technology, 2002. - http://www.cantera.org - Tfinal = 2663.78 - number of residual function evaluations = 1980 Output files: kin3.csv (Excel CSV file) kin3.dat (Tecplot data file) @@ -72,11 +54,6 @@ Description: Chemical equilibrium. Equilibrium composition and pressure for a range of temperatures at constant density. - Cantera version 1.8.x - Copyright California Institute of Technology, 2002. - http://www.cantera.org - - **** WARNING **** For species SI2H6, discontinuity in s/R detected at Tmid = 1000 @@ -107,11 +84,6 @@ Description: Mixture-averaged transport properties. Viscosity, thermal conductivity, and mixture-averaged diffusion coefficients at 2 atm for a range of temperatures - - Cantera version 1.8.x - Copyright California Institute of Technology, 2002. - http://www.cantera.org - Output files: tr1.csv (Excel CSV file) tr1.dat (Tecplot data file) @@ -125,11 +97,6 @@ Description: Multicomponent transport properties. Viscosity, thermal conductivity, and thermal diffusion coefficients at 2 atm for a range of temperatures - - Cantera version 1.8.x - Copyright California Institute of Technology, 2002. - http://www.cantera.org - Output files: tr2.csv (Excel CSV file) tr2.dat (Tecplot data file) diff --git a/test_problems/cxx_ex/rxnpath_example1.cpp b/test_problems/cxx_ex/rxnpath_example1.cpp index 6aacb695c..6654e9da4 100755 --- a/test_problems/cxx_ex/rxnpath_example1.cpp +++ b/test_problems/cxx_ex/rxnpath_example1.cpp @@ -91,9 +91,6 @@ int rxnpath_example1(int job) { } if (job < 2) return 0; - // header - writeCanteraHeader(cout); - // create an ideal gas mixture that corresponds to GRI-Mech // 3.0 IdealGasMix gas("gri30.cti", "gri30"); diff --git a/test_problems/cxx_ex/transport_example1.cpp b/test_problems/cxx_ex/transport_example1.cpp index 81c559aed..169d0181b 100755 --- a/test_problems/cxx_ex/transport_example1.cpp +++ b/test_problems/cxx_ex/transport_example1.cpp @@ -52,10 +52,6 @@ int transport_example1(int job) { } if (job <= 1) return 0; - // header - writeCanteraHeader(cout); - - // create a gas mixture, and set its state IdealGasMix gas("gri30.cti", "gri30"); diff --git a/test_problems/cxx_ex/transport_example2.cpp b/test_problems/cxx_ex/transport_example2.cpp index 78356c37b..7daa8df81 100755 --- a/test_problems/cxx_ex/transport_example2.cpp +++ b/test_problems/cxx_ex/transport_example2.cpp @@ -53,10 +53,6 @@ int transport_example2(int job) { } if (job <= 1) return 0; - // header - writeCanteraHeader(cout); - - // create a gas mixture, and set its state IdealGasMix gas("gri30.cti", "gri30");