max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated for latest phreeqcpp

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6004 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2012-01-10 00:04:35 +00:00
parent b66f62eea1
commit 89a2a78689
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IPhreeqc.vcproj
View File

@ -953,6 +953,10 @@
RelativePath=".\src\phreeqcpp\ExchComp.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\GasComp.cxx"
>
</File>
<File
RelativePath=".\src\phreeqcpp\GasPhase.cxx"
>

12
unit/TestIPhreeqc.cpp
View File

@ -796,7 +796,7 @@ EXPECTED selected.out:
// react
CPPUNIT_ASSERT_EQUAL(VR_OK, obj.GetSelectedOutputValue(2, col, &v));
CPPUNIT_ASSERT_EQUAL(TT_STRING, v.type);
CPPUNIT_ASSERT_EQUAL( std::string("calcite"), std::string(v.sVal));
CPPUNIT_ASSERT_EQUAL( std::string("Calcite"), std::string(v.sVal));
// 1.type
//
@ -2127,12 +2127,12 @@ void TestIPhreeqc::TestSetOutputFileName(void)
CPPUNIT_ASSERT_EQUAL( std::string(""), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" Aragonite -1.21 -9.55 -8.34 CaCO3"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" Calcite -1.07 -9.55 -8.48 CaCO3"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" CH4(g) -64.51* -67.37 -2.86 CH4 Delta_V -54.21 cm3/mol"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" CO2(g) -2.29* -3.76 -1.47 CO2 Delta_V -18.07 cm3/mol"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" CH4(g) -64.51 -67.37 -2.86 CH4"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" CO2(g) -2.29 -3.76 -1.47 CO2"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" H2(g) -22.00 -25.15 -3.15 H2"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" H2O(g) -1.51* -0.00 1.51 H2O Delta_V 18.07 cm3/mol"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" O2(g) -39.12* -42.08 -2.96 O2 Delta_V 36.14 cm3/mol"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" * with Delta_V * (P - 1) / 2.3RT."), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" H2O(g) -1.51 -0.00 1.51 H2O"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" O2(g) -39.12 -42.08 -2.96 O2"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(""), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(""), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string("------------------"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string("End of simulation."), lines[line++] );

12
unit/TestIPhreeqcLib.cpp
View File

@ -889,7 +889,7 @@ void TestIPhreeqcLib::TestGetSelectedOutputValue(void)
// react
CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::GetSelectedOutputValue(n, 2, col, &v));
CPPUNIT_ASSERT_EQUAL(TT_STRING, v.type);
CPPUNIT_ASSERT_EQUAL( std::string("calcite"), std::string(v.sVal));
CPPUNIT_ASSERT_EQUAL( std::string("Calcite"), std::string(v.sVal));
// 1.type
//
@ -2566,12 +2566,12 @@ void TestIPhreeqcLib::TestSetOutputFileName(void)
CPPUNIT_ASSERT_EQUAL( std::string(""), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" Aragonite -1.21 -9.55 -8.34 CaCO3"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" Calcite -1.07 -9.55 -8.48 CaCO3"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" CH4(g) -64.51* -67.37 -2.86 CH4 Delta_V -54.21 cm3/mol"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" CO2(g) -2.29* -3.76 -1.47 CO2 Delta_V -18.07 cm3/mol"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" CH4(g) -64.51 -67.37 -2.86 CH4"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" CO2(g) -2.29 -3.76 -1.47 CO2"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" H2(g) -22.00 -25.15 -3.15 H2"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" H2O(g) -1.51* -0.00 1.51 H2O Delta_V 18.07 cm3/mol"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" O2(g) -39.12* -42.08 -2.96 O2 Delta_V 36.14 cm3/mol"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" * with Delta_V * (P - 1) / 2.3RT."), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" H2O(g) -1.51 -0.00 1.51 H2O"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(" O2(g) -39.12 -42.08 -2.96 O2"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(""), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string(""), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string("------------------"), lines[line++] );
CPPUNIT_ASSERT_EQUAL( std::string("End of simulation."), lines[line++] );