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

fixes compile error on linux;

Browse Source 
changes made for TestIPhreeqc::case2 

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7923 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2013-08-13 21:26:16 +00:00
parent 7f9ba4d91a
commit 60684008e7
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/IPhreeqc.cpp
View File

@ -1002,6 +1002,10 @@ void IPhreeqc::do_run(const char* sz_routine, std::istream* pis, PFN_PRERUN_CALL
ASSERT((*it).second.Get_punch_ostream() == 0);
}
}
else
{
ASSERT(TRUE);
}
if (this->PhreeqcPtr->pr.punch == FALSE)
{
@ -1010,6 +1014,7 @@ void IPhreeqc::do_run(const char* sz_routine, std::istream* pis, PFN_PRERUN_CALL
// PRINT; -selected_output false
// is given as input
// Note: this also disables the CSelectedOutput object
ASSERT(TRUE);
}
else
{
@ -1050,6 +1055,10 @@ void IPhreeqc::do_run(const char* sz_routine, std::istream* pis, PFN_PRERUN_CALL
this->PhreeqcPtr->tidy_punch();
}
}
else
{
ASSERT(TRUE);
}
}
else
{
@ -1063,7 +1072,7 @@ void IPhreeqc::do_run(const char* sz_routine, std::istream* pis, PFN_PRERUN_CALL
// another do_run with SELECTED_OUTPUT
//
std::string filename = this->SelectedOutputFileName;
if (!this->punch_open((*it).second.Get_file_name().c_str(), (*it).first))
if (!this->punch_open((*it).second.Get_file_name().c_str(), std::ios_base::out, (*it).first))
{
std::ostringstream oss;
oss << sz_routine << ": Unable to open:" << "\"" << filename << "\".\n";
@ -1082,10 +1091,19 @@ void IPhreeqc::do_run(const char* sz_routine, std::istream* pis, PFN_PRERUN_CALL
this->PhreeqcPtr->tidy_punch();
}
}
else
{
ASSERT(TRUE);
}
}
}
}
}
else
{
ASSERT(TRUE);
}
if (!this->SelectedOutputFileOn) ASSERT(!this->punch_ostream);

8
unit/unit.cpp
View File

@ -75,11 +75,11 @@ int main(int argc, char **argv)
s.startTimer();
#endif
runner.addTest(TestVar::suite());
runner.addTest(TestCVar::suite());
runner.addTest(TestSelectedOutput::suite());
// COMMENT: {8/12/2013 6:53:42 PM} runner.addTest(TestVar::suite());
// COMMENT: {8/12/2013 6:53:42 PM} runner.addTest(TestCVar::suite());
// COMMENT: {8/12/2013 6:53:42 PM} runner.addTest(TestSelectedOutput::suite());
runner.addTest(TestIPhreeqc::suite());
runner.addTest(TestIPhreeqcLib::suite());
// COMMENT: {8/12/2013 6:53:42 PM} runner.addTest(TestIPhreeqcLib::suite());
runner.setOutputter(CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cout));