From 5f7d1799292b7020b4c4869e9b2e1b4440f3dec3 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Sun, 20 Aug 2006 00:00:59 +0000 Subject: [PATCH] Refined the regression test slightly, to make it less stringent. Added to make clean rule --- .../cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp | 2 +- .../cathermo/HMW_graph_VvT/Makefile.in | 2 +- .../cathermo/HMW_graph_VvT/V_standalone.cpp | 9 ++---- .../cathermo/HMW_graph_VvT/output_blessed.txt | 30 +++++++++---------- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp index 00757bd07..05857bf3c 100755 --- a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp +++ b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp @@ -299,7 +299,7 @@ int main(int argc, char **argv) if (i != TTable.NPoints+1) { printf("%13g, %13g, %13g, %13g, %13g, %13g, " - "%13g, %13g, %13g, %13g\n", + "%13.5g, %13g, %13g, %13g\n", T, pres*1.0E-5, Aphi, Av, Delta_V0s*1.0E3, Delta_Vs*1.0E3, Vex*1.0E3, phiV*1.0E3, molarV*1.0E3 , molarV0*1.0E3 ); #ifdef DEBUG_HKM diff --git a/test_problems/cathermo/HMW_graph_VvT/Makefile.in b/test_problems/cathermo/HMW_graph_VvT/Makefile.in index 8c086e038..89c73e104 100644 --- a/test_problems/cathermo/HMW_graph_VvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_VvT/Makefile.in @@ -108,7 +108,7 @@ endif @ ./runtest clean: - $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends + $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends *.o ../../../bin/rm_cvsignore (if test -d SunWS_cache ; then \ $(RM) -rf SunWS_cache ; \ diff --git a/test_problems/cathermo/HMW_graph_VvT/V_standalone.cpp b/test_problems/cathermo/HMW_graph_VvT/V_standalone.cpp index bc319eb57..0b2c08bda 100644 --- a/test_problems/cathermo/HMW_graph_VvT/V_standalone.cpp +++ b/test_problems/cathermo/HMW_graph_VvT/V_standalone.cpp @@ -154,16 +154,13 @@ double calc(double temp, double Iionic) { double molecWeight = 18.01528; - double RT = GasConst * temp * 1.0E-3; - - + //double RT = GasConst * temp * 1.0E-3; double xo = 1.0 / (molecWeight/1000. * 2 * m + 1.0); printf(" no = %g\n", xo); - return phiV; } -main() { +int main() { printf("Standalone test of the apparent relative molal excess volume, phiV:\n"); printf(" (Check against simple formula in \n"); @@ -178,5 +175,5 @@ main() { printf("Ionic Strength = %g\n", Iionic); res = calc(273.15 + 200., Iionic); - + return 0; } diff --git a/test_problems/cathermo/HMW_graph_VvT/output_blessed.txt b/test_problems/cathermo/HMW_graph_VvT/output_blessed.txt index b72613c52..f93d20186 100644 --- a/test_problems/cathermo/HMW_graph_VvT/output_blessed.txt +++ b/test_problems/cathermo/HMW_graph_VvT/output_blessed.txt @@ -15,22 +15,22 @@ phiV: phiV, calculated from the program, is checked T, Pres, Aphi, A_V, Delta_V0, Delta_Vs, Vex, phiV, MolarV, MolarV0 Kelvin, bar, sqrt(kg/gmol),sqrt(kg/gmol)cm3/gmol,cm**3/gmolSalt,cm**3/gmolSalt,cm**3/gmolSoln,cm**3/gmolSalt,cm**3/gmol, cm**3/gmol - 273.15, 1.01325, 0.376717, 1.5062, -10.3142, -8.58207, 0.157016, 1.73214, 16.4205, 16.2635 - 298.15, 1.01325, 0.391447, 1.87435, -10.3142, -8.1587, 0.195394, 2.15551, 16.5003, 16.3049 - 323.15, 1.01325, 0.410293, 2.37352, -10.3142, -7.58465, 0.247431, 2.72956, 16.6872, 16.4398 - 348.15, 1.01325, 0.433273, 3.06983, -10.3142, -6.78389, 0.320018, 3.53032, 16.9618, 16.6418 - 373.15, 1.01418, 0.460559, 4.05167, -10.3142, -5.65477, 0.422371, 4.65945, 17.3246, 16.9022 - 398.15, 2.32238, 0.492454, 5.4513, -10.3142, -4.04518, 0.568278, 6.26903, 17.7872, 17.2189 - 423.15, 4.76165, 0.529514, 7.48096, -10.3142, -1.71106, 0.779862, 8.60316, 18.3759, 17.596 - 448.15, 8.92602, 0.572549, 10.4889, -10.3142, 1.74806, 1.09343, 12.0623, 19.1351, 18.0417 - 473.15, 15.5493, 0.622769, 15.0764, -10.3142, 7.02378, 1.57166, 17.338, 20.1415, 18.5698 - 498.15, 25.4972, 0.682036, 22.3389, -10.3142, 15.3757, 2.32875, 25.6899, 21.531, 19.2022 - 523.15, 39.7617, 0.753389, 34.4316, -10.3142, 29.2824, 3.58936, 39.5966, 23.5634, 19.974 - 548.15, 59.4639, 0.842213, 56.0339, -10.3142, 54.1252, 5.84132, 64.4394, 26.7856, 20.9443 + 273.15, 1.01325, 0.376717, 1.5062, -10.3142, -8.58207, 0.15702, 1.73214, 16.4205, 16.2635 + 298.15, 1.01325, 0.391447, 1.87435, -10.3142, -8.1587, 0.19539, 2.15551, 16.5003, 16.3049 + 323.15, 1.01325, 0.410293, 2.37352, -10.3142, -7.58465, 0.24743, 2.72956, 16.6872, 16.4398 + 348.15, 1.01325, 0.433273, 3.06983, -10.3142, -6.78389, 0.32002, 3.53032, 16.9618, 16.6418 + 373.15, 1.01418, 0.460559, 4.05167, -10.3142, -5.65477, 0.42237, 4.65945, 17.3246, 16.9022 + 398.15, 2.32238, 0.492454, 5.4513, -10.3142, -4.04518, 0.56828, 6.26903, 17.7872, 17.2189 + 423.15, 4.76165, 0.529514, 7.48096, -10.3142, -1.71106, 0.77986, 8.60316, 18.3759, 17.596 + 448.15, 8.92602, 0.572549, 10.4889, -10.3142, 1.74806, 1.0934, 12.0623, 19.1351, 18.0417 + 473.15, 15.5493, 0.622769, 15.0764, -10.3142, 7.02378, 1.5717, 17.338, 20.1415, 18.5698 + 498.15, 25.4972, 0.682036, 22.3389, -10.3142, 15.3757, 2.3287, 25.6899, 21.531, 19.2022 + 523.15, 39.7617, 0.753389, 34.4316, -10.3142, 29.2824, 3.5894, 39.5966, 23.5634, 19.974 + 548.15, 59.4639, 0.842213, 56.0339, -10.3142, 54.1252, 5.8413, 64.4394, 26.7856, 20.9443 573.15, 85.879, 0.959258, 98.8138, -10.3142, 103.322, 10.301, 113.637, 32.5242, 22.2232 - 598.15, 120.51, 1.13023, 198.467, -10.3142, 217.925, 20.6895, 228.239, 44.7424, 24.053 - 623.15, 165.294, 1.43872, 494.888, -10.3142, 558.811, 51.5903, 569.125, 78.7661, 27.1758 - 323.15, 1.01325, 0.410293, 2.37352, -10.3142, -7.58465, 0.247431, 2.72956, 16.6872, 16.4398 + 598.15, 120.51, 1.13023, 198.467, -10.3142, 217.925, 20.689, 228.239, 44.7424, 24.053 + 623.15, 165.294, 1.43872, 494.888, -10.3142, 558.811, 51.59, 569.125, 78.7661, 27.1758 + 323.15, 1.01325, 0.410293, 2.37352, -10.3142, -7.58465, 0.24743, 2.72956, 16.6872, 16.4398 Breakdown of Volume Calculation at 323.15 K, 1atm: Species MoleFrac Molal V0 partV (partV - V0) H2O(L) 0.818703 0 18.2334 18.1515 -0.0819526