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

updated database paths for running on linux

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7953 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2013-08-23 04:58:59 +00:00
parent 7bdca161c8
commit c93bc1968a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/IPhreeqc.cpp
View File

@ -41,8 +41,8 @@ IPhreeqc::IPhreeqc(void)
, ErrorReporter(0) , ErrorReporter(0)
, WarningStringOn(true) , WarningStringOn(true)
, WarningReporter(0) , WarningReporter(0)
, PtrSelectedOutput(0)
, CurrentSelectedOutputUserNumber(1) , CurrentSelectedOutputUserNumber(1)
, PtrSelectedOutput(0)
, SelectedOutputStringOn(false) , SelectedOutputStringOn(false)
, PhreeqcPtr(0) , PhreeqcPtr(0)
, input_file(0) , input_file(0)

10
unit/TestIPhreeqc.cpp
View File

@ -3476,7 +3476,7 @@ void TestIPhreeqc::TestRunFileMultiPunchOn(void)
IPhreeqc obj; IPhreeqc obj;
CPPUNIT_ASSERT_EQUAL(0, obj.LoadDatabase("..\\database\\phreeqc.dat")); CPPUNIT_ASSERT_EQUAL(0, obj.LoadDatabase("../database/phreeqc.dat"));
obj.SetSelectedOutputFileOn(true); obj.SetSelectedOutputFileOn(true);
CPPUNIT_ASSERT_EQUAL(0, obj.RunFile("multi_punch")); CPPUNIT_ASSERT_EQUAL(0, obj.RunFile("multi_punch"));
@ -3498,7 +3498,7 @@ void TestIPhreeqc::TestRunFileMultiPunchOff(void)
IPhreeqc obj; IPhreeqc obj;
CPPUNIT_ASSERT_EQUAL(0, obj.LoadDatabase("..\\database\\phreeqc.dat")); CPPUNIT_ASSERT_EQUAL(0, obj.LoadDatabase("../database/phreeqc.dat"));
obj.SetOutputFileOn(false); obj.SetOutputFileOn(false);
obj.SetErrorFileOn(false); obj.SetErrorFileOn(false);
obj.SetLogFileOn(false); obj.SetLogFileOn(false);
@ -3527,7 +3527,7 @@ void TestIPhreeqc::TestRunFileMultiPunchSet(void)
IPhreeqc obj; IPhreeqc obj;
CPPUNIT_ASSERT_EQUAL(0, obj.LoadDatabase("..\\database\\phreeqc.dat")); CPPUNIT_ASSERT_EQUAL(0, obj.LoadDatabase("../database/phreeqc.dat"));
obj.SetSelectedOutputFileOn(true); obj.SetSelectedOutputFileOn(true);
obj.SetSelectedOutputFileName(called.GetName().c_str()); obj.SetSelectedOutputFileName(called.GetName().c_str());
CPPUNIT_ASSERT_EQUAL(0, obj.RunFile("multi_punch")); CPPUNIT_ASSERT_EQUAL(0, obj.RunFile("multi_punch"));
@ -3555,7 +3555,7 @@ void TestIPhreeqc::TestRunFileMultiPunchNoSet(void)
FileTest unset3(obj.sel_file_name(3)); FileTest unset3(obj.sel_file_name(3));
CPPUNIT_ASSERT( unset3.RemoveExisting() ); CPPUNIT_ASSERT( unset3.RemoveExisting() );
CPPUNIT_ASSERT_EQUAL(0, obj.LoadDatabase("..\\database\\phreeqc.dat")); CPPUNIT_ASSERT_EQUAL(0, obj.LoadDatabase("../database/phreeqc.dat"));
obj.SetSelectedOutputFileOn(true); obj.SetSelectedOutputFileOn(true);
obj.SetSelectedOutputFileName(set.GetName().c_str()); obj.SetSelectedOutputFileName(set.GetName().c_str());
CPPUNIT_ASSERT_EQUAL(0, obj.RunFile("multi_punch_no_set")); CPPUNIT_ASSERT_EQUAL(0, obj.RunFile("multi_punch_no_set"));
@ -3570,7 +3570,7 @@ void TestIPhreeqc::TestMultiPunchSelectedOutputStringOn(void)
{ {
IPhreeqc obj; IPhreeqc obj;
CPPUNIT_ASSERT_EQUAL(0, obj.LoadDatabase("..\\database\\phreeqc.dat")); CPPUNIT_ASSERT_EQUAL(0, obj.LoadDatabase("../database/phreeqc.dat"));
obj.SetSelectedOutputStringOn(true); obj.SetSelectedOutputStringOn(true);
CPPUNIT_ASSERT_EQUAL(0, obj.RunFile("multi_punch")); CPPUNIT_ASSERT_EQUAL(0, obj.RunFile("multi_punch"));