From 7905ea977f327c991cb1a84cd1fe038dba2b8f5f Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Mon, 4 Oct 2010 23:00:26 +0000 Subject: [PATCH] Rebaselined some test problems. --- .../min_python/negATest/negATest_blessed.out | 4 +- .../pureFluidTest/output_blessed.txt | 56 +++++++++---------- .../rankine_democxx/output_blessed.txt | 8 +-- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/test_problems/min_python/negATest/negATest_blessed.out b/test_problems/min_python/negATest/negATest_blessed.out index d170960c3..e63158035 100644 --- a/test_problems/min_python/negATest/negATest_blessed.out +++ b/test_problems/min_python/negATest/negATest_blessed.out @@ -1,7 +1,7 @@ Number of species = 12 Number of reactions = 12 rop [ 0:O ] = 0.447058 -rop [ 1:O2 ] = -0.0021443 +rop [ 1:O2 ] = -0.00214428 rop [ 2:N ] = 0 rop [ 3:NO ] = -279.361 rop [ 4:NO2 ] = 0.00214319 @@ -17,7 +17,7 @@ fwd_rop[ 0] = 479.304 rev_rop[ 0] = 97.94 fwd_rop[ 1] = -128.201 rev_rop[ 1] = -26.1964 fwd_rop[ 2] = 0 rev_rop[ 2] = 0 fwd_rop[ 3] = -0 rev_rop[ 3] = -0 -fwd_rop[ 4] = 0 rev_rop[ 4] = 1.10334e-06 +fwd_rop[ 4] = 0 rev_rop[ 4] = 1.08891e-06 fwd_rop[ 5] = 0 rev_rop[ 5] = 0 fwd_rop[ 6] = 0 rev_rop[ 6] = 0 fwd_rop[ 7] = 0 rev_rop[ 7] = 0 diff --git a/test_problems/pureFluidTest/output_blessed.txt b/test_problems/pureFluidTest/output_blessed.txt index eef045f2e..bab40b901 100644 --- a/test_problems/pureFluidTest/output_blessed.txt +++ b/test_problems/pureFluidTest/output_blessed.txt @@ -2,29 +2,29 @@ psat(273.16) = 610.157 Comparisons to NIST: (see http://webbook.nist.gov): H0(298.15) = -2.41825e+08 J/kmol -S0(298.15) = 188939 J/kmolK +S0(298.15) = 188938 J/kmolK Ideal Gas Standard State: T Cp0 S0 -(G0-H298)/T H0-H298 (K) (J/molK) (J/molK) (J/molK) (kJ/mol) - 298.15 33.5708 188.939 188.939 0 - 500 35.2032 206.633 192.788 6.92212 - 600 36.2894 213.145 195.652 10.4959 - 1000 41.2083 232.81 206.832 25.9778 + 298.15 33.5708 188.938 188.938 0 + 500 35.2032 206.631 192.787 6.92212 + 600 36.2894 213.144 195.651 10.4959 + 1000 41.2083 232.809 206.831 25.9778 H_liq(298.15, onebar) = -2.85839e+08 J/kmol -S_liq(298.15, onebar) = 70035.2 J/kmolK +S_liq(298.15, onebar) = 70034.1 J/kmolK Liquid 1bar or psat Standard State T press psat Cp0 S0 -(G0-H298)/T H0-H298 (K) (bar) (bar) (J/molK) (J/molK) (J/molK) (kJ/mol) - 273.19 1 0.00611488 75.6592 63.4258 70.3324 -1.88682 - 298.15 1 0.0316222 75.3497 70.0352 70.0352 0 - 300 1 0.0352821 75.3212 70.5012 70.0366 0.13937 - 373.15 1.01429 1.01227 75.9509 86.9605 71.7971 5.65822 - 400 2.45845 2.45354 76.7271 92.2602 72.9877 7.70899 - 500 26.4023 26.3496 83.779 109.915 78.552 15.6817 + 273.19 1 0.00611488 75.6592 63.4248 70.3314 -1.88682 + 298.15 1 0.0316222 75.3497 70.0341 70.0341 0 + 300 1 0.0352821 75.3212 70.5001 70.0356 0.13937 + 373.15 1.01429 1.01227 75.9509 86.9595 71.7961 5.65822 + 400 2.45845 2.45354 76.7271 92.2592 72.9867 7.70899 + 500 26.4023 26.3496 83.779 109.914 78.551 15.6817 Liquid Densities: T press psat Density molarVol @@ -40,30 +40,30 @@ Liquid Densities: Table of increasing Enthalpy at 1 atm Enthalpy, Temperature, x_Vapor, Density, Entropy_mass, Gibbs_mass - -1.58665e+07, 298, 0, 997.16, 3885.3, -1.7024e+07 - -1.58665e+07, 298, 0, 997.16, 3885.3, -1.7024e+07 - -1.57665e+07, 321.939, 0, 988.59, 4208.1, -1.7121e+07 - -1.56665e+07, 345.851, 0, 976.14, 4507.7, -1.7225e+07 - -1.55665e+07, 369.663, 0, 960.78, 4787.3, -1.7336e+07 + -1.58665e+07, 298, 0, 997.16, 3885.2, -1.7024e+07 + -1.58665e+07, 298, 0, 997.16, 3885.2, -1.7024e+07 + -1.57665e+07, 321.939, 0, 988.59, 4208, -1.7121e+07 + -1.56665e+07, 345.851, 0, 976.14, 4507.6, -1.7225e+07 + -1.55665e+07, 369.663, 0, 960.78, 4787.2, -1.7336e+07 -1.54665e+07, 373.177, 0.0377465, 15.583, 5055.4, -1.7353e+07 -1.53665e+07, 373.177, 0.0820536, 7.2323, 5323.4, -1.7353e+07 - -1.52665e+07, 373.177, 0.126361, 4.7088, 5591.4, -1.7353e+07 - -1.51665e+07, 373.177, 0.170668, 3.4908, 5859.4, -1.7353e+07 + -1.52665e+07, 373.177, 0.126361, 4.7088, 5591.3, -1.7353e+07 + -1.51665e+07, 373.177, 0.170668, 3.4908, 5859.3, -1.7353e+07 -1.50665e+07, 373.177, 0.214975, 2.7734, 6127.3, -1.7353e+07 - -1.49665e+07, 373.177, 0.259282, 2.3006, 6395.3, -1.7353e+07 - -1.48665e+07, 373.177, 0.303589, 1.9655, 6663.3, -1.7353e+07 + -1.49665e+07, 373.177, 0.259282, 2.3006, 6395.2, -1.7353e+07 + -1.48665e+07, 373.177, 0.303589, 1.9655, 6663.2, -1.7353e+07 -1.47665e+07, 373.177, 0.347897, 1.7157, 6931.2, -1.7353e+07 - -1.46665e+07, 373.177, 0.392204, 1.5222, 7199.2, -1.7353e+07 - -1.45665e+07, 373.177, 0.436511, 1.3679, 7467.2, -1.7353e+07 + -1.46665e+07, 373.177, 0.392204, 1.5222, 7199.1, -1.7353e+07 + -1.45665e+07, 373.177, 0.436511, 1.3679, 7467.1, -1.7353e+07 -1.44665e+07, 373.177, 0.480818, 1.242, 7735.1, -1.7353e+07 -1.43665e+07, 373.177, 0.525125, 1.1373, 8003.1, -1.7353e+07 - -1.42665e+07, 373.177, 0.569432, 1.0489, 8271.1, -1.7353e+07 + -1.42665e+07, 373.177, 0.569432, 1.0489, 8271, -1.7353e+07 -1.41665e+07, 373.177, 0.613739, 0.97328, 8539, -1.7353e+07 -1.40665e+07, 373.177, 0.658047, 0.90781, 8807, -1.7353e+07 - -1.39665e+07, 373.177, 0.702354, 0.85059, 9075, -1.7353e+07 - -1.38665e+07, 373.177, 0.746661, 0.80016, 9343, -1.7353e+07 + -1.39665e+07, 373.177, 0.702354, 0.85059, 9074.9, -1.7353e+07 + -1.38665e+07, 373.177, 0.746661, 0.80016, 9342.9, -1.7353e+07 -1.37665e+07, 373.177, 0.790968, 0.75537, 9610.9, -1.7353e+07 - -1.36665e+07, 373.177, 0.835275, 0.71533, 9878.9, -1.7353e+07 + -1.36665e+07, 373.177, 0.835275, 0.71533, 9878.8, -1.7353e+07 -1.35665e+07, 373.177, 0.879582, 0.67932, 10147, -1.7353e+07 -1.34665e+07, 373.177, 0.923889, 0.64677, 10415, -1.7353e+07 -1.33665e+07, 373.177, 0.968197, 0.61719, 10683, -1.7353e+07 @@ -81,7 +81,7 @@ Table of increasing Enthalpy at 1 atm -1.21665e+07, 918.101, 1, 0.23923, 12723, -2.3847e+07 -1.20665e+07, 962.603, 1, 0.22815, 12829, -2.4416e+07 -1.19665e+07, 1006.5, 1, 0.21819, 12931, -2.4981e+07 - -1.18665e+07, 1049.82, 1, 0.20918, 13028, -2.5544e+07 + -1.18665e+07, 1049.82, 1, 0.20918, 13028, -2.5543e+07 Critical Temp = 647 K Critical Pressure = 218 atm Critical Dens = 317 kg/m3 diff --git a/test_problems/rankine_democxx/output_blessed.txt b/test_problems/rankine_democxx/output_blessed.txt index 1aec97b1a..4503b6b4b 100644 --- a/test_problems/rankine_democxx/output_blessed.txt +++ b/test_problems/rankine_democxx/output_blessed.txt @@ -1,7 +1,7 @@ - 1 300 101325 -1.58581e+07 3913.25 0 - 2s 300.014 800000 -1.58574e+07 3913.25 0 - 2 300.126 800000 -1.58569e+07 3914.81 0 + 1 300 101325 -1.58581e+07 3913.2 0 + 2s 300.014 800000 -1.58574e+07 3913.2 0 + 2 300.126 800000 -1.5857e+07 3914.75 0 3 443.624 800000 -1.32016e+07 10183 1 4s 373.177 101325 -1.3553e+07 10183 0.89 - 4 373.177 101325 -1.34827e+07 10371.4 0.92 + 4 373.177 101325 -1.34827e+07 10371.3 0.92 efficiency = 0.105873