From 0c2ca20d64180c92f046aa4d30fe15991d8192e0 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Fri, 12 Jan 2007 23:42:50 +0000 Subject: [PATCH] Small changes to rebaseline against results. --- .../ChemEquil_ionizedGas/ionizedGasEquil.cpp | 7 +- .../ChemEquil_ionizedGas/output_blessed.txt | 118 +++++++++--------- test_problems/ChemEquil_red1/basopt_red1.cpp | 9 +- 3 files changed, 63 insertions(+), 71 deletions(-) diff --git a/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp b/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp index 3dfa90b5c..d99b2536c 100644 --- a/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp +++ b/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp @@ -20,12 +20,9 @@ using namespace std; using namespace Cantera; -#ifdef DEBUG_HKM_EPEQUIL -extern int debug_prnt_lvl; -#endif int main(int argc, char **argv) { -#ifdef DEBUG_HKM_EPEQUIL - debug_prnt_lvl = 0; +#ifdef DEBUG_HKM + ChemEquil_print_lvl = 0; #endif try { diff --git a/test_problems/ChemEquil_ionizedGas/output_blessed.txt b/test_problems/ChemEquil_ionizedGas/output_blessed.txt index f370d2cb3..2f6abfa06 100644 --- a/test_problems/ChemEquil_ionizedGas/output_blessed.txt +++ b/test_problems/ChemEquil_ionizedGas/output_blessed.txt @@ -122,8 +122,8 @@ Initial T = 207.284, pres = 5.8944e-06 atm N 3.02253e-114 1.46712e-114 -17.7933 O 3.73447e-58 2.07057e-58 -19.266 NO 1.82556e-23 1.89829e-23 -37.0592 - NO+ 1.25826e-229 1.30837e-229 11.6852 - Electron 1.25826e-229 2.37642e-234 -541.81 + NO+ 1.2588e-229 1.30893e-229 11.6857 + Electron 1.2588e-229 2.37745e-234 -541.81 N+ 0 0 O+ 0 0 N2+ 0 0 @@ -353,12 +353,12 @@ Initial T = 414.143, pres = 1.17767e-05 atm N 6.54134e-55 3.17512e-55 -17.4013 O 5.92517e-27 3.28519e-27 -18.8747 NO 5.58575e-12 5.80828e-12 -36.2759 - NO+ 3.93876e-105 4.09561e-105 11.9791 - Electron 3.93876e-105 7.43897e-110 -254.391 - N+ 2.22844e-211 1.08163e-211 30.8538 - O+ 9.41966e-173 5.22252e-173 29.3803 - N2+ 6.09406e-170 5.91591e-170 13.4525 - O2+ 3.17559e-128 3.52133e-128 10.5057 + NO+ 3.94045e-105 4.09737e-105 11.9795 + Electron 3.94045e-105 7.44216e-110 -254.39 + N+ 2.2294e-211 1.08209e-211 30.8542 + O+ 9.4237e-173 5.22476e-173 29.3808 + N2+ 6.09667e-170 5.91845e-170 13.4529 + O2+ 3.17695e-128 3.52284e-128 10.5061 Final T = 414.143, pres = 1.17767e-05 atm Initial T = 414.143, pres = 0.000117767 atm @@ -452,12 +452,12 @@ Initial T = 414.143, pres = 0.0117767 atm N 2.06855e-56 1.00406e-56 -13.9474 O 1.8737e-28 1.03887e-28 -15.4208 NO 5.58575e-12 5.80828e-12 -29.3682 - NO+ 6.14722e-108 6.39201e-108 12.4242 - Electron 6.14722e-108 1.161e-112 -253.945 - N+ 1.09981e-215 5.33822e-216 27.845 - O+ 4.64894e-177 2.5775e-177 26.3716 - N2+ 9.51097e-173 9.23294e-173 13.8976 - O2+ 4.95613e-131 5.49573e-131 10.9508 + NO+ 6.14689e-108 6.39166e-108 12.4242 + Electron 6.14689e-108 1.16094e-112 -253.946 + N+ 1.09976e-215 5.33793e-216 27.845 + O+ 4.64869e-177 2.57736e-177 26.3716 + N2+ 9.51046e-173 9.23244e-173 13.8976 + O2+ 4.95586e-131 5.49544e-131 10.9508 Final T = 414.143, pres = 0.0117767 atm Initial T = 1153.16, pres = 3.27918e-08 atm @@ -485,12 +485,12 @@ Initial T = 1153.16, pres = 3.27918e-08 atm N 2.86312e-15 1.38975e-15 -21.3563 O 2.23425e-05 1.23879e-05 -22.8775 NO 0.000134494 0.000139854 -44.2338 - NO+ 9.0387e-22 9.39874e-22 11.6756 - Electron 9.0387e-22 1.70712e-26 -69.7353 - N+ 1.59898e-54 7.76114e-55 34.553 - O+ 3.0545e-41 1.69352e-41 33.0319 - N2+ 1.2126e-44 1.17717e-44 13.1967 - O2+ 3.22549e-30 3.5767e-30 10.1544 + NO+ 9.03856e-22 9.39859e-22 11.6755 + Electron 9.03856e-22 1.70709e-26 -69.7353 + N+ 1.59896e-54 7.76101e-55 34.553 + O+ 3.05445e-41 1.69349e-41 33.0319 + N2+ 1.21258e-44 1.17715e-44 13.1967 + O2+ 3.22543e-30 3.57664e-30 10.1544 Final T = 1152.46, pres = 3.27723e-08 atm Initial T = 1152.46, pres = 3.27723e-07 atm @@ -518,12 +518,12 @@ Initial T = 1152.46, pres = 3.27723e-07 atm N 9.11146e-16 4.42265e-16 -20.2051 O 7.08903e-06 3.93051e-06 -21.7263 NO 0.000134663 0.000140028 -41.9314 - NO+ 4.80823e-20 4.99972e-20 17.9386 - Electron 4.80823e-20 9.08113e-25 -63.4588 - N+ 2.72207e-53 1.32123e-53 39.6649 - O+ 5.17819e-40 2.87094e-40 38.1438 - N2+ 6.49547e-43 6.30561e-43 19.4598 - O2+ 1.72003e-28 1.90731e-28 16.4175 + NO+ 9.05883e-23 9.4196e-23 11.6643 + Electron 9.05883e-23 1.71091e-27 -69.7332 + N+ 5.12845e-56 2.48922e-56 33.3906 + O+ 9.75583e-43 5.40893e-43 31.8694 + N2+ 1.22376e-45 1.18799e-45 13.1855 + O2+ 3.24058e-31 3.59342e-31 10.1431 Final T = 1152.61, pres = 3.27763e-07 atm Initial T = 1152.61, pres = 3.27763e-06 atm @@ -551,12 +551,12 @@ Initial T = 1152.61, pres = 3.27763e-06 atm N 2.88709e-16 1.40138e-16 -19.0539 O 2.24413e-06 1.24425e-06 -20.575 NO 0.000134716 0.000140083 -39.6289 - NO+ 4.84916e-21 5.04226e-21 17.9428 - Electron 4.84916e-21 9.1584e-26 -63.4504 - N+ 8.71412e-55 4.22961e-55 38.5179 - O+ 1.65548e-41 9.17847e-42 36.9967 - N2+ 6.5652e-44 6.37328e-44 19.464 - O2+ 1.73602e-29 1.92503e-29 16.4217 + NO+ 9.06539e-24 9.42639e-24 11.6607 + Electron 9.06539e-24 1.71214e-28 -69.7325 + N+ 1.62909e-57 7.90717e-58 32.2358 + O+ 3.09489e-44 1.7159e-44 30.7146 + N2+ 1.22735e-46 1.19147e-46 13.1819 + O2+ 3.24545e-32 3.5988e-32 10.1396 Final T = 1152.66, pres = 3.27775e-06 atm Initial T = 1152.66, pres = 3.27775e-05 atm @@ -584,12 +584,12 @@ Initial T = 1152.66, pres = 3.27775e-05 atm N 9.1356e-17 4.43436e-17 -17.9026 O 7.09896e-07 3.936e-07 -19.4238 NO 0.000134733 0.000140101 -37.3264 - NO+ 4.85404e-22 5.04734e-22 17.9425 - Electron 4.85404e-22 9.16762e-27 -63.4494 - N+ 2.76173e-56 1.34047e-56 37.3662 - O+ 5.24445e-43 2.90767e-43 35.8451 - N2+ 6.5764e-45 6.38415e-45 19.4636 - O2+ 1.7382e-30 1.92744e-30 16.4213 + NO+ 9.06748e-25 9.42856e-25 11.6596 + Electron 9.06748e-25 1.71254e-29 -69.7322 + N+ 5.15899e-59 2.50404e-59 31.0834 + O+ 9.79676e-46 5.4316e-46 29.5622 + N2+ 1.22849e-47 1.19258e-47 13.1808 + O2+ 3.247e-33 3.60052e-33 10.1384 Final T = 1152.67, pres = 3.27779e-05 atm Initial T = 1152.67, pres = 0.000327779 atm @@ -598,7 +598,7 @@ Initial T = 1152.67, pres = 0.000327779 atm temperature 1152.68 K pressure 33.2124 Pa - density 0.0001 kg/m^3 + density 1e-04 kg/m^3 mean mol. weight 28.8565 amu 1 kg 1 kmol @@ -617,12 +617,12 @@ Initial T = 1152.67, pres = 0.000327779 atm N 2.88951e-17 1.40255e-17 -16.7513 O 2.24513e-07 1.24481e-07 -18.2725 NO 0.000134738 0.000140106 -35.0238 - NO+ 4.85477e-23 5.0481e-23 17.9422 - Electron 4.85477e-23 9.169e-28 -63.4492 - N+ 8.73799e-58 4.24119e-58 36.2147 - O+ 1.6591e-44 9.1985e-45 34.6935 - N2+ 6.57884e-46 6.38652e-46 19.4634 - O2+ 1.73859e-31 1.92788e-31 16.421 + NO+ 9.06814e-26 9.42925e-26 11.6592 + Electron 9.06814e-26 1.71266e-30 -69.7322 + N+ 1.63215e-60 7.92205e-61 29.9317 + O+ 3.099e-47 1.71817e-47 28.4106 + N2+ 1.22885e-48 1.19293e-48 13.1804 + O2+ 3.24749e-34 3.60106e-34 10.1381 Final T = 1152.68, pres = 0.00032778 atm Initial T = 1152.68, pres = 0.0032778 atm @@ -650,12 +650,12 @@ Initial T = 1152.68, pres = 0.0032778 atm N 9.13803e-18 4.43553e-18 -15.6 O 7.09996e-08 3.93655e-08 -17.1212 NO 0.00013474 0.000140108 -32.7212 - NO+ 4.85492e-24 5.04825e-24 17.9421 - Electron 4.85492e-24 9.16928e-29 -63.4492 - N+ 2.76361e-59 1.34139e-59 35.0633 - O+ 5.2471e-46 2.90914e-46 33.5421 - N2+ 6.5795e-47 6.38717e-47 19.4633 - O2+ 1.73869e-32 1.92799e-32 16.4209 + NO+ 9.06835e-27 9.42946e-27 11.6591 + Electron 9.06835e-27 1.7127e-31 -69.7322 + N+ 5.16206e-62 2.50553e-62 28.7803 + O+ 9.80088e-49 5.43388e-49 27.2592 + N2+ 1.22896e-49 1.19304e-49 13.1803 + O2+ 3.24764e-35 3.60123e-35 10.138 Final T = 1152.68, pres = 0.00327781 atm Initial T = 1152.68, pres = 0.0327781 atm @@ -683,12 +683,12 @@ Initial T = 1152.68, pres = 0.0327781 atm N 2.88976e-18 1.40267e-18 -14.4487 O 2.24523e-08 1.24486e-08 -15.9699 NO 0.00013474 0.000140109 -30.4186 - NO+ 9.89806e-28 1.02922e-27 11.7466 - Electron 9.89806e-28 1.8694e-32 -69.6446 - N+ 1.78181e-63 8.64844e-64 27.7165 - O+ 3.38296e-50 1.87561e-50 26.1954 - N2+ 1.34144e-50 1.30222e-50 13.2678 - O2+ 3.54481e-36 3.93076e-36 10.2255 + NO+ 9.8979e-28 1.0292e-27 11.7466 + Electron 9.8979e-28 1.86937e-32 -69.6446 + N+ 1.78178e-63 8.6483e-64 27.7165 + O+ 3.38291e-50 1.87558e-50 26.1954 + N2+ 1.34142e-50 1.3022e-50 13.2678 + O2+ 3.54476e-36 3.93069e-36 10.2255 Final T = 1152.68, pres = 0.0327781 atm Initial T = 3008.94, pres = 8.55633e-08 atm @@ -1060,7 +1060,7 @@ Initial T = 3318.59, pres = 0.00114605 atm temperature 3417.09 K pressure 119.127 Pa - density 0.0001 kg/m^3 + density 1e-04 kg/m^3 mean mol. weight 23.8496 amu 1 kg 1 kmol @@ -1291,7 +1291,7 @@ Initial T = 4050.35, pres = 0.00149089 atm temperature 4371.57 K pressure 161.774 Pa - density 1e-04 kg/m^3 + density 0.0001 kg/m^3 mean mol. weight 22.4679 amu 1 kg 1 kmol diff --git a/test_problems/ChemEquil_red1/basopt_red1.cpp b/test_problems/ChemEquil_red1/basopt_red1.cpp index 4ff33fef4..d5ce952ad 100644 --- a/test_problems/ChemEquil_red1/basopt_red1.cpp +++ b/test_problems/ChemEquil_red1/basopt_red1.cpp @@ -19,18 +19,13 @@ using namespace std; using namespace Cantera; -#ifdef DEBUG_HKM -extern int debug_print_lvl; -extern int debug_prnt_lvl; -#endif - int main(int argc, char **argv) { try { IdealGasMix g("red1.xml", "gri30_mix"); #ifdef DEBUG_HKM - debug_print_lvl = 0; - debug_prnt_lvl = 0; + Cantera::BasisOptimize_print_lvl = 0; + Cantera::ChemEquil_print_lvl = 0; #endif double pres = 1.0E5;