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

renamed Run to RunAccumulated; fixed RunString for fortran wrappers fwrap2 and fwrap3

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4186 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-03-23 22:25:37 +00:00
parent 236c8fdcde
commit 4eadde168a
10 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/IPhreeqc.f90.inc
View File

@ -45,9 +45,9 @@
INTERFACE INTERFACE
FUNCTION Run() FUNCTION RunAccumulated()
INTEGER(KIND=4) :: Run INTEGER(KIND=4) :: RunAccumulated
END FUNCTION Run END FUNCTION RunAccumulated
END INTERFACE END INTERFACE

10
include/IPhreeqc.h
View File

@ -200,14 +200,14 @@ void SetDumpStringOn(int dump_string_on);
* @htmlonly * @htmlonly
* <CODE> * <CODE>
* <PRE> * <PRE>
* FUNCTION Run() * FUNCTION RunAccumulated()
* INTEGER :: Run * INTEGER :: RunAccumulated
* END FUNCTION Run * END FUNCTION RunAccumulated
* </PRE> * </PRE>
* </CODE> * </CODE>
* @endhtmlonly * @endhtmlonly
*/ */
int Run(void); int RunAccumulated(void);
/** /**
@ -465,7 +465,7 @@ void ClearErrors(void);
/** /**
* Send the accumulated input to stdout. * Send the accumulated input to stdout.
* This is the input that will be used for the next call to Run. * This is the input that will be used for the next call to RunAccumulated.
* @par Fortran90 Interface: * @par Fortran90 Interface:
* @htmlonly * @htmlonly
* <CODE> * <CODE>

10
src/IPhreeqc.cpp
View File

@ -97,9 +97,9 @@ SetDumpStringOn(int value)
} }
int int
Run(void) RunAccumulated(void)
{ {
return IPhreeqc::LibraryInstance()->Run(); return IPhreeqc::LibraryInstance()->RunAccumulated();
} }
int int
@ -1616,9 +1616,9 @@ VRESULT IPhreeqc::AccumulateLine(const char *line)
return VR_OUTOFMEMORY; return VR_OUTOFMEMORY;
} }
int IPhreeqc::Run(void) int IPhreeqc::RunAccumulated(void)
{ {
static const char *sz_routine = "Run"; static const char *sz_routine = "RunAccumulated";
try try
{ {
// this may throw // this may throw
@ -1638,7 +1638,7 @@ int IPhreeqc::Run(void)
} }
catch(...) catch(...)
{ {
const char *errmsg = "Run: An unhandled exception occured.\n"; const char *errmsg = "RunAccumulated: An unhandled exception occured.\n";
try try
{ {
this->error_msg(errmsg, STOP); // throws PhreeqcStop this->error_msg(errmsg, STOP); // throws PhreeqcStop

2
src/IPhreeqc.hpp
View File

@ -57,7 +57,7 @@ public:
bool GetSelectedOutputOn(void)const; bool GetSelectedOutputOn(void)const;
void SetSelectedOutputOn(bool bValue); void SetSelectedOutputOn(bool bValue);
int Run(void); int RunAccumulated(void);
int RunFile(const char* filename); int RunFile(const char* filename);
int RunString(const char* input); int RunString(const char* input);

8
src/fwrap.cpp
View File

@ -180,9 +180,9 @@ GetComponentF(int *n, char* line, unsigned int line_length)
} }
int int
RunF(void) RunAccumulatedF(void)
{ {
return ::Run(); return ::RunAccumulated();
} }
int int
@ -385,9 +385,9 @@ void __stdcall GETCOMPONENT(int *n, char* line, unsigned int line_length)
{ {
GetComponentF(n, line, line_length); GetComponentF(n, line, line_length);
} }
int __stdcall RUN(void) int __stdcall RUNACCUMULATED(void)
{ {
return RunF(); return RunAccumulatedF();
} }
int __stdcall RUNFILE(char *filename, unsigned int len) int __stdcall RUNFILE(char *filename, unsigned int len)
{ {

2
src/fwrap.h
View File

@ -11,7 +11,7 @@ extern "C" {
VRESULT AccumulateLineF(char *line, unsigned int line_length); VRESULT AccumulateLineF(char *line, unsigned int line_length);
int RunF(void); int RunAccumulatedF(void);
int RunFileF(char* filename, unsigned int filename_length); int RunFileF(char* filename, unsigned int filename_length);

6
src/fwrap2.cpp
View File

@ -70,9 +70,9 @@ void GETCOMPONENT(int *n, char* line, unsigned int line_length)
{ {
GetComponentF(n, line, line_length); GetComponentF(n, line, line_length);
} }
int RUN(void) int RUNACCUMULATED(void)
{ {
return RunF(); return RunAccumulatedF();
} }
int RUNFILE(char *filename, unsigned int len) int RUNFILE(char *filename, unsigned int len)
{ {
@ -80,7 +80,7 @@ int RUNFILE(char *filename, unsigned int len)
} }
int RUNSTRING(char *input, unsigned int len) int RUNSTRING(char *input, unsigned int len)
{ {
return RunFileF(input, len); return RunStringF(input, len);
} }
void OUTPUTLINES(void) void OUTPUTLINES(void)
{ {

6
src/fwrap3.cpp
View File

@ -70,9 +70,9 @@ void getcomponent_(int *n, char* line, unsigned int line_length)
{ {
GetComponentF(n, line, line_length); GetComponentF(n, line, line_length);
} }
int run_(void) int runaccumulated_(void)
{ {
return RunF(); return RunAccumulatedF();
} }
int runfile_(char *filename, unsigned int len) int runfile_(char *filename, unsigned int len)
{ {
@ -80,7 +80,7 @@ int runfile_(char *filename, unsigned int len)
} }
int runstring_(char *input, unsigned int len) int runstring_(char *input, unsigned int len)
{ {
return RunFileF(input, len); return RunStringF(input, len);
} }
void outputlines_(void) void outputlines_(void)
{ {

2
test/kinn.for
View File

@ -30,7 +30,7 @@
CALL SetLogOn(.FALSE.) CALL SetLogOn(.FALSE.)
CALL SetSelectedOutputOn(.TRUE.) CALL SetSelectedOutputOn(.TRUE.)
CALL SetDumpOn(.FALSE.) CALL SetDumpOn(.FALSE.)
iresult = Run() iresult = RunAccumulated()
IF (iresult.NE.VR_OK) THEN IF (iresult.NE.VR_OK) THEN
CALL OutputLastError CALL OutputLastError
STOP STOP

46
unit/TestInterface.cpp
View File

@ -182,7 +182,7 @@ void TestInterface::TestRun()
::SetLogOn(files_on); ::SetLogOn(files_on);
::SetSelectedOutputOn(files_on); ::SetSelectedOutputOn(files_on);
::SetDumpOn(files_on); ::SetDumpOn(files_on);
CPPUNIT_ASSERT_EQUAL(0, ::Run()); CPPUNIT_ASSERT_EQUAL(0, ::RunAccumulated());
} }
void TestInterface::TestRunWithErrors() void TestInterface::TestRunWithErrors()
@ -214,7 +214,7 @@ void TestInterface::TestRunWithErrors()
::SetLogOn(files_on); ::SetLogOn(files_on);
::SetSelectedOutputOn(files_on); ::SetSelectedOutputOn(files_on);
::SetDumpOn(files_on); ::SetDumpOn(files_on);
CPPUNIT_ASSERT_EQUAL(1, ::Run()); CPPUNIT_ASSERT_EQUAL(1, ::RunAccumulated());
const char expected[] = const char expected[] =
"ERROR: Numerical method failed on all combinations of convergence parameters\n" "ERROR: Numerical method failed on all combinations of convergence parameters\n"
@ -275,7 +275,7 @@ void TestInterface::TestGetSelectedOutputRowCount()
::SetLogOn(0); ::SetLogOn(0);
::SetSelectedOutputOn(0); ::SetSelectedOutputOn(0);
::SetDumpOn(0); ::SetDumpOn(0);
CPPUNIT_ASSERT_EQUAL(0, ::Run()); CPPUNIT_ASSERT_EQUAL(0, ::RunAccumulated());
CPPUNIT_ASSERT_EQUAL(3, ::GetSelectedOutputRowCount()); // rows + header CPPUNIT_ASSERT_EQUAL(3, ::GetSelectedOutputRowCount()); // rows + header
} }
@ -297,7 +297,7 @@ void TestInterface::TestGetSelectedOutputValue()
::SetLogOn(0); ::SetLogOn(0);
::SetSelectedOutputOn(0); ::SetSelectedOutputOn(0);
::SetDumpOn(0); ::SetDumpOn(0);
CPPUNIT_ASSERT_EQUAL(0, ::Run()); CPPUNIT_ASSERT_EQUAL(0, ::RunAccumulated());
/* /*
EXPECTED selected.out: EXPECTED selected.out:
@ -889,7 +889,7 @@ void TestInterface::TestGetSelectedOutputColumnCount()
CPPUNIT_ASSERT_EQUAL( VR_OK, SOLUTION(1.0, 1.0, 1.0) ); CPPUNIT_ASSERT_EQUAL( VR_OK, SOLUTION(1.0, 1.0, 1.0) );
CPPUNIT_ASSERT_EQUAL( VR_OK, EQUILIBRIUM_PHASES("calcite", 1.0, 1.0) ); CPPUNIT_ASSERT_EQUAL( VR_OK, EQUILIBRIUM_PHASES("calcite", 1.0, 1.0) );
CPPUNIT_ASSERT_EQUAL( VR_OK, USER_PUNCH("Ca", 10) ); CPPUNIT_ASSERT_EQUAL( VR_OK, USER_PUNCH("Ca", 10) );
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() ); CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() );
} }
@ -956,10 +956,10 @@ void TestInterface::TestRunNoDatabaseLoaded()
::SetLogOn(0); ::SetLogOn(0);
::SetSelectedOutputOn(0); ::SetSelectedOutputOn(0);
::SetDumpOn(0); ::SetDumpOn(0);
CPPUNIT_ASSERT_EQUAL( 1, ::Run() ); CPPUNIT_ASSERT_EQUAL( 1, ::RunAccumulated() );
const char expected[] = const char expected[] =
"ERROR: Run: No database is loaded\n" "ERROR: RunAccumulated: No database is loaded\n"
"Stopping.\n"; "Stopping.\n";
const char* err = ::GetLastErrorString(); const char* err = ::GetLastErrorString();
@ -1015,7 +1015,7 @@ void TestInterface::TestCase1()
::SetLogOn(0); ::SetLogOn(0);
::SetSelectedOutputOn(1); ::SetSelectedOutputOn(1);
::SetDumpOn(0); ::SetDumpOn(0);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( true, ::FileExists("selected.out") ); CPPUNIT_ASSERT_EQUAL( true, ::FileExists("selected.out") );
CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() ); CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() );
@ -1025,7 +1025,7 @@ void TestInterface::TestCase1()
::SetLogOn(0); ::SetLogOn(0);
::SetSelectedOutputOn(1); ::SetSelectedOutputOn(1);
::SetDumpOn(0); ::SetDumpOn(0);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( true, ::FileExists("selected.out") ); CPPUNIT_ASSERT_EQUAL( true, ::FileExists("selected.out") );
CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() ); CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() );
} }
@ -1066,7 +1066,7 @@ void TestInterface::TestCase2()
::SetLogOn(0); ::SetLogOn(0);
::SetSelectedOutputOn(1); ::SetSelectedOutputOn(1);
::SetDumpOn(0); ::SetDumpOn(0);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") ); CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") );
CPPUNIT_ASSERT_EQUAL( true, ::FileExists("case2.punch") ); CPPUNIT_ASSERT_EQUAL( true, ::FileExists("case2.punch") );
CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() ); CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() );
@ -1092,7 +1092,7 @@ void TestInterface::TestCase2()
::SetLogOn(0); ::SetLogOn(0);
::SetSelectedOutputOn(1); ::SetSelectedOutputOn(1);
::SetDumpOn(0); ::SetDumpOn(0);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") ); CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") );
CPPUNIT_ASSERT_EQUAL( true, ::FileExists("case2.punch") ); CPPUNIT_ASSERT_EQUAL( true, ::FileExists("case2.punch") );
CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() ); CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() );
@ -1131,7 +1131,7 @@ void TestInterface::TestPrintSelectedOutputFalse()
::SetLogOn(0); ::SetLogOn(0);
::SetSelectedOutputOn(1); ::SetSelectedOutputOn(1);
::SetDumpOn(0); ::SetDumpOn(0);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 0, ::GetSelectedOutputColumnCount() ); CPPUNIT_ASSERT_EQUAL( 0, ::GetSelectedOutputColumnCount() );
CPPUNIT_ASSERT_EQUAL( 0, ::GetSelectedOutputRowCount() ); CPPUNIT_ASSERT_EQUAL( 0, ::GetSelectedOutputRowCount() );
@ -1152,7 +1152,7 @@ void TestInterface::TestPrintSelectedOutputFalse()
::SetLogOn(0); ::SetLogOn(0);
::SetSelectedOutputOn(1); ::SetSelectedOutputOn(1);
::SetDumpOn(0); ::SetDumpOn(0);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 11, ::GetSelectedOutputColumnCount() ); CPPUNIT_ASSERT_EQUAL( 11, ::GetSelectedOutputColumnCount() );
CPPUNIT_ASSERT_EQUAL( 2, ::GetSelectedOutputRowCount() ); CPPUNIT_ASSERT_EQUAL( 2, ::GetSelectedOutputRowCount() );
@ -1359,7 +1359,7 @@ void TestOnOff(const char* FILENAME, int output_on, int error_on, int log_on, in
::SetLogOn(0); ::SetLogOn(0);
::SetSelectedOutputOn(0); ::SetSelectedOutputOn(0);
::SetDumpOn(0); ::SetDumpOn(0);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( false, ::FileExists(FILENAME) ); CPPUNIT_ASSERT_EQUAL( false, ::FileExists(FILENAME) );
@ -1381,7 +1381,7 @@ void TestOnOff(const char* FILENAME, int output_on, int error_on, int log_on, in
::SetLogOn(log_on); ::SetLogOn(log_on);
::SetSelectedOutputOn(selected_output_on); ::SetSelectedOutputOn(selected_output_on);
::SetDumpOn(dump_on); ::SetDumpOn(dump_on);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( true, ::FileExists(FILENAME) ); CPPUNIT_ASSERT_EQUAL( true, ::FileExists(FILENAME) );
CPPUNIT_ASSERT( ::DeleteFile(FILENAME) ); CPPUNIT_ASSERT( ::DeleteFile(FILENAME) );
@ -1404,7 +1404,7 @@ void TestOnOff(const char* FILENAME, int output_on, int error_on, int log_on, in
::SetLogOn(0); ::SetLogOn(0);
::SetSelectedOutputOn(0); ::SetSelectedOutputOn(0);
::SetDumpOn(0); ::SetDumpOn(0);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( false, ::FileExists(FILENAME) ); CPPUNIT_ASSERT_EQUAL( false, ::FileExists(FILENAME) );
CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase("phreeqc.dat") ); CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase("phreeqc.dat") );
@ -1424,7 +1424,7 @@ void TestOnOff(const char* FILENAME, int output_on, int error_on, int log_on, in
::SetLogOn(log_on); ::SetLogOn(log_on);
::SetSelectedOutputOn(selected_output_on); ::SetSelectedOutputOn(selected_output_on);
::SetDumpOn(dump_on); ::SetDumpOn(dump_on);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( true, ::FileExists(FILENAME) ); CPPUNIT_ASSERT_EQUAL( true, ::FileExists(FILENAME) );
CPPUNIT_ASSERT( ::DeleteFile(FILENAME) ); CPPUNIT_ASSERT( ::DeleteFile(FILENAME) );
} }
@ -1455,7 +1455,7 @@ TestInterface::TestLongHeadings()
::SetLogOn(0); ::SetLogOn(0);
::SetSelectedOutputOn(0); ::SetSelectedOutputOn(0);
::SetDumpOn(0); ::SetDumpOn(0);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL(2, ::GetSelectedOutputRowCount()); CPPUNIT_ASSERT_EQUAL(2, ::GetSelectedOutputRowCount());
CPPUNIT_ASSERT_EQUAL(1, ::GetSelectedOutputColumnCount()); CPPUNIT_ASSERT_EQUAL(1, ::GetSelectedOutputColumnCount());
@ -1512,7 +1512,7 @@ TestInterface::TestDumpString()
::SetSelectedOutputOn(0); ::SetSelectedOutputOn(0);
::SetDumpOn(0); ::SetDumpOn(0);
::SetDumpStringOn(1); ::SetDumpStringOn(1);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
const char *expected = const char *expected =
#if defined(_MSC_VER) #if defined(_MSC_VER)
@ -1594,7 +1594,7 @@ TestInterface::TestGetDumpLineCount()
::SetSelectedOutputOn(0); ::SetSelectedOutputOn(0);
::SetDumpOn(0); ::SetDumpOn(0);
::SetDumpStringOn(1); ::SetDumpStringOn(1);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 26, ::GetDumpLineCount() ); CPPUNIT_ASSERT_EQUAL( 26, ::GetDumpLineCount() );
} }
@ -1617,7 +1617,7 @@ TestInterface::TestGetDumpLine()
::SetSelectedOutputOn(0); ::SetSelectedOutputOn(0);
::SetDumpOn(0); ::SetDumpOn(0);
::SetDumpStringOn(1); ::SetDumpStringOn(1);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 26, ::GetDumpLineCount() ); CPPUNIT_ASSERT_EQUAL( 26, ::GetDumpLineCount() );
@ -1708,7 +1708,7 @@ TestInterface::TestGetComponentCount(void)
::SetSelectedOutputOn(0); ::SetSelectedOutputOn(0);
::SetDumpOn(0); ::SetDumpOn(0);
::SetDumpStringOn(0); ::SetDumpStringOn(0);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 3, ::GetComponentCount() ); CPPUNIT_ASSERT_EQUAL( 3, ::GetComponentCount() );
@ -1730,7 +1730,7 @@ TestInterface::TestGetComponent(void)
::SetDumpOn(0); ::SetDumpOn(0);
::SetDumpStringOn(0); ::SetDumpStringOn(0);
CPPUNIT_ASSERT_EQUAL( 0, ::Run() ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 3, ::GetComponentCount() ); CPPUNIT_ASSERT_EQUAL( 3, ::GetComponentCount() );