From 03bb47aaca010f4fd6043ed4c30effc32d626885 Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Sat, 21 Jan 2012 01:43:47 +0000 Subject: [PATCH] working on unix 2-digit exponents git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6093 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- unit/TestIPhreeqcLib.cpp | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/unit/TestIPhreeqcLib.cpp b/unit/TestIPhreeqcLib.cpp index 44c54b19..b317f8a9 100644 --- a/unit/TestIPhreeqcLib.cpp +++ b/unit/TestIPhreeqcLib.cpp @@ -3617,12 +3617,11 @@ void TestIPhreeqcLib::TestGetSelectedOutputString(void) #if defined(__GNUC__) std::string fline( " sim state soln dist_x time step pH pe C Ca Na m_CO3-2 m_CaOH+ m_NaCO3- la_CO3-2 la_CaOH+ la_NaCO3- Calcite d_Calcite si_CO2(g) si_Siderite pressure total mol volume g_CO2(g) g_N2(g) k_Albite dk_Albite k_Pyrite dk_Pyrite s_CaSO4 s_SrSO4 1.name 1.type 1.moles 2.name 2.type 2.moles 3.name 3.type 3.moles 4.name 4.type 4.moles 5.name 5.type 5.moles 6.name 6.type 6.moles \n" - " 1 i_soln 1 -99 -99 -99 7 4 1.0000e-003 1.0000e-003 1.0000e-003 4.2975e-007 1.1819e-009 1.1881e-009 -6.4686e+000 -8.9530e+000 -8.9507e+000 0.0000e+000 0.0000e+000 -2.2870 -999.9990 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 -0.0000e+000 0.0000e+000 -0.0000e+000 0.0000e+000 0.0000e+000 Ca+2 aq 9.9178e-004 CaHCO3+ aq 7.5980e-006 CaCO3 aq 6.2155e-007 CaOH+ aq 1.1819e-009 \n" - " 1 react 1 -99 0 1 7.86135 10.4001 1.1556e-003 1.1556e-003 1.0000e-003 4.2718e-006 9.7385e-009 1.1620e-008 -5.4781e+000 -8.0388e+000 -7.9621e+000 9.8444e-003 -1.5555e-004 -3.0192 -999.9990 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 -0.0000e+000 0.0000e+000 -0.0000e+000 0.0000e+000 0.0000e+000 Calcite equi 9.8444e-003 Ca+2 aq 1.1371e-003 CaHCO3+ aq 1.1598e-005 CaCO3 aq 6.8668e-006 CaOH+ aq 9.7385e-009 \n" + " 1 i_soln 1 -99 -99 -99 7 4 1.0000e-03 1.0000e-03 1.0000e-03 4.2975e-07 1.1819e-09 1.1881e-09 -6.4686e+00 -8.9530e+00 -8.9507e+00 0.0000e+00 0.0000e+00 -2.2870 -999.9990 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.0000e+00 0.0000e+00 -0.0000e+00 0.0000e+00 0.0000e+00 Ca+2 aq 9.9178e-04 CaHCO3+ aq 7.5980e-06 CaCO3 aq 6.2155e-07 CaOH+ aq 1.1819e-09 \n" + " 1 react 1 -99 0 1 7.86135 10.4014 1.1556e-03 1.1556e-03 1.0000e-03 4.2718e-06 9.7385e-09 1.1620e-08 -5.4781e+00 -8.0388e+00 -7.9621e+00 9.8444e-03 -1.5555e-04 -3.0192 -999.9990 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.0000e+00 0.0000e+00 -0.0000e+00 0.0000e+00 0.0000e+00 Calcite equi 9.8444e-03 Ca+2 aq 1.1371e-03 CaHCO3+ aq 1.1598e-05 CaCO3 aq 6.8668e-06 CaOH+ aq 9.7385e-09 \n" ); #endif - printf("actual\n%s\n", ::GetSelectedOutputString(n)); std::string sline( ::GetSelectedOutputString(n) ); CPPUNIT_ASSERT_EQUAL( fline, sline ); @@ -3729,16 +3728,12 @@ void TestIPhreeqcLib::TestGetSelectedOutputStringLine(void) #if defined(__GNUC__) const char * expected[] = { - " sim state soln dist_x time step pH pe C Ca Na m_CO3-2 m_CaOH+ m_NaCO3- la_CO3-2 la_CaOH+ la_NaCO3- Calcite d_Calcite si_CO2(g) si_Siderite pressure total mol volume g_CO2(g) g_N2(g) k_Albite dk_Albite k_Pyrite dk_Pyrite s_CaSO4 s_SrSO4 1.name 1.type 1.moles 2.name 2.type 2.moles 3.name 3.type 3.moles 4.name 4.type 4.moles 5.name 5.type 5.moles 6.name 6.type 6.moles ", - " 1 i_soln 1 -99 -99 -99 7 4 1.0000e-003 1.0000e-003 1.0000e-003 4.2975e-007 1.1819e-009 1.1881e-009 -6.4686e+000 -8.9530e+000 -8.9507e+000 0.0000e+000 0.0000e+000 -2.2870 -999.9990 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 -0.0000e+000 0.0000e+000 -0.0000e+000 0.0000e+000 0.0000e+000 Ca+2 aq 9.9178e-004 CaHCO3+ aq 7.5980e-006 CaCO3 aq 6.2155e-007 CaOH+ aq 1.1819e-009 ", - " 1 react 1 -99 0 1 7.86135 10.4001 1.1556e-003 1.1556e-003 1.0000e-003 4.2718e-006 9.7385e-009 1.1620e-008 -5.4781e+000 -8.0388e+000 -7.9621e+000 9.8444e-003 -1.5555e-004 -3.0192 -999.9990 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 -0.0000e+000 0.0000e+000 -0.0000e+000 0.0000e+000 0.0000e+000 Calcite equi 9.8444e-003 Ca+2 aq 1.1371e-003 CaHCO3+ aq 1.1598e-005 CaCO3 aq 6.8668e-006 CaOH+ aq 9.7385e-009 " + " sim state soln dist_x time step pH pe C Ca Na m_CO3-2 m_CaOH+ m_NaCO3- la_CO3-2 la_CaOH+ la_NaCO3- Calcite d_Calcite si_CO2(g) si_Siderite pressure total mol volume g_CO2(g) g_N2(g) k_Albite dk_Albite k_Pyrite dk_Pyrite s_CaSO4 s_SrSO4 1.name 1.type 1.moles 2.name 2.type 2.moles 3.name 3.type 3.moles 4.name 4.type 4.moles 5.name 5.type 5.moles 6.name 6.type 6.moles " + " 1 i_soln 1 -99 -99 -99 7 4 1.0000e-03 1.0000e-03 1.0000e-03 4.2975e-07 1.1819e-09 1.1881e-09 -6.4686e+00 -8.9530e+00 -8.9507e+00 0.0000e+00 0.0000e+00 -2.2870 -999.9990 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.0000e+00 0.0000e+00 -0.0000e+00 0.0000e+00 0.0000e+00 Ca+2 aq 9.9178e-04 CaHCO3+ aq 7.5980e-06 CaCO3 aq 6.2155e-07 CaOH+ aq 1.1819e-09 " + " 1 react 1 -99 0 1 7.86135 10.4014 1.1556e-03 1.1556e-03 1.0000e-03 4.2718e-06 9.7385e-09 1.1620e-08 -5.4781e+00 -8.0388e+00 -7.9621e+00 9.8444e-03 -1.5555e-04 -3.0192 -999.9990 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.0000e+00 0.0000e+00 -0.0000e+00 0.0000e+00 0.0000e+00 Calcite equi 9.8444e-03 Ca+2 aq 1.1371e-03 CaHCO3+ aq 1.1598e-05 CaCO3 aq 6.8668e-06 CaOH+ aq 9.7385e-09 " }; #endif - printf("actual[0]:\n%s\n", ::GetSelectedOutputStringLine(n, 0)); - printf("actual[1]:\n%s\n", ::GetSelectedOutputStringLine(n, 1)); - printf("actual[2]:\n%s\n", ::GetSelectedOutputStringLine(n, 2)); - CPPUNIT_ASSERT_EQUAL( std::string(expected[0]), std::string(::GetSelectedOutputStringLine(n, 0)) ); CPPUNIT_ASSERT_EQUAL( std::string(expected[1]), std::string(::GetSelectedOutputStringLine(n, 1)) ); CPPUNIT_ASSERT_EQUAL( std::string(expected[2]), std::string(::GetSelectedOutputStringLine(n, 2)) ); @@ -3765,8 +3760,6 @@ void TestIPhreeqcLib::TestGetSelectedOutputStringLineNotEnoughHeadings(void) CPPUNIT_ASSERT_EQUAL( 0, ::GetSelectedOutputFileOn(n) ); - int max = 6; - CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SOLUTION(n, 1.0, 1.0, 1.0) ); CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::EQUILIBRIUM_PHASES(n, "calcite", 0.0, 0.010) ); CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::USER_PUNCH_NEH(n) ); @@ -3794,16 +3787,12 @@ void TestIPhreeqcLib::TestGetSelectedOutputStringLineNotEnoughHeadings(void) #if defined(__GNUC__) const char * expected[] = { - " sim state soln dist_x time step pH pe C Ca Na m_CO3-2 m_CaOH+ m_NaCO3- la_CO3-2 la_CaOH+ la_NaCO3- Calcite d_Calcite si_CO2(g) si_Siderite pressure total mol volume g_CO2(g) g_N2(g) k_Albite dk_Albite k_Pyrite dk_Pyrite s_CaSO4 s_SrSO4 head0 head1 head2 ", - " 1 i_soln 1 -99 -99 -99 7 4 1.0000e-003 1.0000e-003 1.0000e-003 4.2975e-007 1.1819e-009 1.1881e-009 -6.4686e+000 -8.9530e+000 -8.9507e+000 0.0000e+000 0.0000e+000 -2.2870 -999.9990 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 -0.0000e+000 0.0000e+000 -0.0000e+000 0.0000e+000 0.0000e+000 have0 have1 have2 missing0 missing1 missing2 ", - " 1 react 1 -99 0 1 7.86135 10.4001 1.1556e-003 1.1556e-003 1.0000e-003 4.2718e-006 9.7385e-009 1.1620e-008 -5.4781e+000 -8.0388e+000 -7.9621e+000 9.8444e-003 -1.5555e-004 -3.0192 -999.9990 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 0.0000e+000 -0.0000e+000 0.0000e+000 -0.0000e+000 0.0000e+000 0.0000e+000 have0 have1 have2 missing0 missing1 missing2 " + " sim state soln dist_x time step pH pe C Ca Na m_CO3-2 m_CaOH+ m_NaCO3- la_CO3-2 la_CaOH+ la_NaCO3- Calcite d_Calcite si_CO2(g) si_Siderite pressure total mol volume g_CO2(g) g_N2(g) k_Albite dk_Albite k_Pyrite dk_Pyrite s_CaSO4 s_SrSO4 head0 head1 head2 " + " 1 i_soln 1 -99 -99 -99 7 4 1.0000e-03 1.0000e-03 1.0000e-03 4.2975e-07 1.1819e-09 1.1881e-09 -6.4686e+00 -8.9530e+00 -8.9507e+00 0.0000e+00 0.0000e+00 -2.2870 -999.9990 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.0000e+00 0.0000e+00 -0.0000e+00 0.0000e+00 0.0000e+00 have0 have1 have2 missing0 missing1 missing2 " + " 1 react 1 -99 0 1 7.86135 10.4014 1.1556e-03 1.1556e-03 1.0000e-03 4.2718e-06 9.7385e-09 1.1620e-08 -5.4781e+00 -8.0388e+00 -7.9621e+00 9.8444e-03 -1.5555e-04 -3.0192 -999.9990 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 0.0000e+00 -0.0000e+00 0.0000e+00 -0.0000e+00 0.0000e+00 0.0000e+00 have0 have1 have2 missing0 missing1 missing2 " }; #endif - printf("actual[0]:\n%s\n", ::GetSelectedOutputStringLine(n, 0)); - printf("actual[1]:\n%s\n", ::GetSelectedOutputStringLine(n, 1)); - printf("actual[2]:\n%s\n", ::GetSelectedOutputStringLine(n, 2)); - CPPUNIT_ASSERT_EQUAL( std::string(expected[0]), std::string(::GetSelectedOutputStringLine(n, 0)) ); CPPUNIT_ASSERT_EQUAL( std::string(expected[1]), std::string(::GetSelectedOutputStringLine(n, 1)) ); CPPUNIT_ASSERT_EQUAL( std::string(expected[2]), std::string(::GetSelectedOutputStringLine(n, 2)) );