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

changed so that 'dist' and 'time' are always doubles for R

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8446 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2014-02-06 00:40:58 +00:00
parent 9bbc3aa629
commit da57470970
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
unit/TestIPhreeqc.cpp
View File

@ -636,26 +636,26 @@ EXPECTED selected.out:
CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type);
CPPUNIT_ASSERT_EQUAL( 1L, v.lVal ); CPPUNIT_ASSERT_EQUAL( 1L, v.lVal );
// dist_x -- sometimes as double sometimes as long (depends on state) // dist_x -- (always as double)
// //
++col; ++col;
// i_soln // i_soln
CPPUNIT_ASSERT_EQUAL(VR_OK, obj.GetSelectedOutputValue(1, col, &v)); CPPUNIT_ASSERT_EQUAL(VR_OK, obj.GetSelectedOutputValue(1, col, &v));
CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type);
CPPUNIT_ASSERT_EQUAL( -99L, v.lVal ); CPPUNIT_ASSERT_EQUAL( -99., v.dVal );
// react // react
CPPUNIT_ASSERT_EQUAL(VR_OK, obj.GetSelectedOutputValue(2, col, &v)); CPPUNIT_ASSERT_EQUAL(VR_OK, obj.GetSelectedOutputValue(2, col, &v));
CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type);
CPPUNIT_ASSERT_EQUAL( -99L, v.lVal ); CPPUNIT_ASSERT_EQUAL( -99., v.dVal );
// time -- sometimes as double sometimes as long (depends on state) // time -- (always as double)
// //
++col; ++col;
// i_soln // i_soln
CPPUNIT_ASSERT_EQUAL(VR_OK, obj.GetSelectedOutputValue(1, col, &v)); CPPUNIT_ASSERT_EQUAL(VR_OK, obj.GetSelectedOutputValue(1, col, &v));
CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type);
CPPUNIT_ASSERT_EQUAL( -99L, v.lVal ); CPPUNIT_ASSERT_EQUAL( -99., v.dVal );
// react // react
CPPUNIT_ASSERT_EQUAL(VR_OK, obj.GetSelectedOutputValue(2, col, &v)); CPPUNIT_ASSERT_EQUAL(VR_OK, obj.GetSelectedOutputValue(2, col, &v));
CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type); CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type);

12
unit/TestIPhreeqcLib.cpp
View File

@ -760,12 +760,12 @@ void TestIPhreeqcLib::TestGetSelectedOutputValue(void)
++col; ++col;
// i_soln // i_soln
CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::GetSelectedOutputValue(n, 1, col, &v)); CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::GetSelectedOutputValue(n, 1, col, &v));
CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type);
CPPUNIT_ASSERT_EQUAL( -99L, v.lVal ); CPPUNIT_ASSERT_EQUAL( -99., v.dVal );
// react // react
CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::GetSelectedOutputValue(n, 2, col, &v)); CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::GetSelectedOutputValue(n, 2, col, &v));
CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type);
CPPUNIT_ASSERT_EQUAL( -99L, v.lVal ); CPPUNIT_ASSERT_EQUAL( -99., v.dVal );
// time -- sometimes as double sometimes as long (depends on state) // time -- sometimes as double sometimes as long (depends on state)
@ -773,8 +773,8 @@ void TestIPhreeqcLib::TestGetSelectedOutputValue(void)
++col; ++col;
// i_soln // i_soln
CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::GetSelectedOutputValue(n, 1, col, &v)); CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::GetSelectedOutputValue(n, 1, col, &v));
CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type);
CPPUNIT_ASSERT_EQUAL( -99L, v.lVal ); CPPUNIT_ASSERT_EQUAL( -99., v.dVal );
// react // react
CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::GetSelectedOutputValue(n, 2, col, &v)); CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::GetSelectedOutputValue(n, 2, col, &v));
CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type); CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type);