diff --git a/include/IPhreeqc.f90.inc b/include/IPhreeqc.f90.inc
index d6e247de..2f746883 100644
--- a/include/IPhreeqc.f90.inc
+++ b/include/IPhreeqc.f90.inc
@@ -45,9 +45,9 @@
INTERFACE
- FUNCTION Run()
- INTEGER(KIND=4) :: Run
- END FUNCTION Run
+ FUNCTION RunAccumulated()
+ INTEGER(KIND=4) :: RunAccumulated
+ END FUNCTION RunAccumulated
END INTERFACE
diff --git a/include/IPhreeqc.h b/include/IPhreeqc.h
index a42bb828..33779dfc 100644
--- a/include/IPhreeqc.h
+++ b/include/IPhreeqc.h
@@ -200,14 +200,14 @@ void SetDumpStringOn(int dump_string_on);
* @htmlonly
*
*
- * FUNCTION Run()
- * INTEGER :: Run
- * END FUNCTION Run
+ * FUNCTION RunAccumulated()
+ * INTEGER :: RunAccumulated
+ * END FUNCTION RunAccumulated
*
*
* @endhtmlonly
*/
-int Run(void);
+int RunAccumulated(void);
/**
@@ -465,7 +465,7 @@ void ClearErrors(void);
/**
* 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:
* @htmlonly
*
diff --git a/src/IPhreeqc.cpp b/src/IPhreeqc.cpp
index 2e1ac4cc..74a7e154 100644
--- a/src/IPhreeqc.cpp
+++ b/src/IPhreeqc.cpp
@@ -97,9 +97,9 @@ SetDumpStringOn(int value)
}
int
-Run(void)
+RunAccumulated(void)
{
- return IPhreeqc::LibraryInstance()->Run();
+ return IPhreeqc::LibraryInstance()->RunAccumulated();
}
int
@@ -1616,9 +1616,9 @@ VRESULT IPhreeqc::AccumulateLine(const char *line)
return VR_OUTOFMEMORY;
}
-int IPhreeqc::Run(void)
+int IPhreeqc::RunAccumulated(void)
{
- static const char *sz_routine = "Run";
+ static const char *sz_routine = "RunAccumulated";
try
{
// this may throw
@@ -1638,7 +1638,7 @@ int IPhreeqc::Run(void)
}
catch(...)
{
- const char *errmsg = "Run: An unhandled exception occured.\n";
+ const char *errmsg = "RunAccumulated: An unhandled exception occured.\n";
try
{
this->error_msg(errmsg, STOP); // throws PhreeqcStop
diff --git a/src/IPhreeqc.hpp b/src/IPhreeqc.hpp
index f0641afd..04b53b8b 100644
--- a/src/IPhreeqc.hpp
+++ b/src/IPhreeqc.hpp
@@ -57,7 +57,7 @@ public:
bool GetSelectedOutputOn(void)const;
void SetSelectedOutputOn(bool bValue);
- int Run(void);
+ int RunAccumulated(void);
int RunFile(const char* filename);
int RunString(const char* input);
diff --git a/src/fwrap.cpp b/src/fwrap.cpp
index 32ba6538..949ffd53 100644
--- a/src/fwrap.cpp
+++ b/src/fwrap.cpp
@@ -180,9 +180,9 @@ GetComponentF(int *n, char* line, unsigned int line_length)
}
int
-RunF(void)
+RunAccumulatedF(void)
{
- return ::Run();
+ return ::RunAccumulated();
}
int
@@ -385,9 +385,9 @@ void __stdcall GETCOMPONENT(int *n, char* line, unsigned int 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)
{
diff --git a/src/fwrap.h b/src/fwrap.h
index c90682ef..71b25d58 100644
--- a/src/fwrap.h
+++ b/src/fwrap.h
@@ -11,7 +11,7 @@ extern "C" {
VRESULT AccumulateLineF(char *line, unsigned int line_length);
- int RunF(void);
+ int RunAccumulatedF(void);
int RunFileF(char* filename, unsigned int filename_length);
diff --git a/src/fwrap2.cpp b/src/fwrap2.cpp
index 0cd78a14..f2c2bc36 100644
--- a/src/fwrap2.cpp
+++ b/src/fwrap2.cpp
@@ -70,9 +70,9 @@ void GETCOMPONENT(int *n, char* line, unsigned int line_length)
{
GetComponentF(n, line, line_length);
}
-int RUN(void)
+int RUNACCUMULATED(void)
{
- return RunF();
+ return RunAccumulatedF();
}
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)
{
- return RunFileF(input, len);
+ return RunStringF(input, len);
}
void OUTPUTLINES(void)
{
diff --git a/src/fwrap3.cpp b/src/fwrap3.cpp
index 252295ad..297fd3c9 100644
--- a/src/fwrap3.cpp
+++ b/src/fwrap3.cpp
@@ -70,9 +70,9 @@ void getcomponent_(int *n, char* line, unsigned int line_length)
{
GetComponentF(n, line, line_length);
}
-int run_(void)
+int runaccumulated_(void)
{
- return RunF();
+ return RunAccumulatedF();
}
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)
{
- return RunFileF(input, len);
+ return RunStringF(input, len);
}
void outputlines_(void)
{
diff --git a/test/kinn.for b/test/kinn.for
index c63b38f2..9fccf03a 100644
--- a/test/kinn.for
+++ b/test/kinn.for
@@ -30,7 +30,7 @@
CALL SetLogOn(.FALSE.)
CALL SetSelectedOutputOn(.TRUE.)
CALL SetDumpOn(.FALSE.)
- iresult = Run()
+ iresult = RunAccumulated()
IF (iresult.NE.VR_OK) THEN
CALL OutputLastError
STOP
diff --git a/unit/TestInterface.cpp b/unit/TestInterface.cpp
index d27c6971..a3205553 100644
--- a/unit/TestInterface.cpp
+++ b/unit/TestInterface.cpp
@@ -182,7 +182,7 @@ void TestInterface::TestRun()
::SetLogOn(files_on);
::SetSelectedOutputOn(files_on);
::SetDumpOn(files_on);
- CPPUNIT_ASSERT_EQUAL(0, ::Run());
+ CPPUNIT_ASSERT_EQUAL(0, ::RunAccumulated());
}
void TestInterface::TestRunWithErrors()
@@ -214,7 +214,7 @@ void TestInterface::TestRunWithErrors()
::SetLogOn(files_on);
::SetSelectedOutputOn(files_on);
::SetDumpOn(files_on);
- CPPUNIT_ASSERT_EQUAL(1, ::Run());
+ CPPUNIT_ASSERT_EQUAL(1, ::RunAccumulated());
const char expected[] =
"ERROR: Numerical method failed on all combinations of convergence parameters\n"
@@ -275,7 +275,7 @@ void TestInterface::TestGetSelectedOutputRowCount()
::SetLogOn(0);
::SetSelectedOutputOn(0);
::SetDumpOn(0);
- CPPUNIT_ASSERT_EQUAL(0, ::Run());
+ CPPUNIT_ASSERT_EQUAL(0, ::RunAccumulated());
CPPUNIT_ASSERT_EQUAL(3, ::GetSelectedOutputRowCount()); // rows + header
}
@@ -297,7 +297,7 @@ void TestInterface::TestGetSelectedOutputValue()
::SetLogOn(0);
::SetSelectedOutputOn(0);
::SetDumpOn(0);
- CPPUNIT_ASSERT_EQUAL(0, ::Run());
+ CPPUNIT_ASSERT_EQUAL(0, ::RunAccumulated());
/*
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, EQUILIBRIUM_PHASES("calcite", 1.0, 1.0) );
CPPUNIT_ASSERT_EQUAL( VR_OK, USER_PUNCH("Ca", 10) );
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() );
}
@@ -956,10 +956,10 @@ void TestInterface::TestRunNoDatabaseLoaded()
::SetLogOn(0);
::SetSelectedOutputOn(0);
::SetDumpOn(0);
- CPPUNIT_ASSERT_EQUAL( 1, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 1, ::RunAccumulated() );
const char expected[] =
- "ERROR: Run: No database is loaded\n"
+ "ERROR: RunAccumulated: No database is loaded\n"
"Stopping.\n";
const char* err = ::GetLastErrorString();
@@ -1015,7 +1015,7 @@ void TestInterface::TestCase1()
::SetLogOn(0);
::SetSelectedOutputOn(1);
::SetDumpOn(0);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( true, ::FileExists("selected.out") );
CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() );
@@ -1025,7 +1025,7 @@ void TestInterface::TestCase1()
::SetLogOn(0);
::SetSelectedOutputOn(1);
::SetDumpOn(0);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( true, ::FileExists("selected.out") );
CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() );
}
@@ -1066,7 +1066,7 @@ void TestInterface::TestCase2()
::SetLogOn(0);
::SetSelectedOutputOn(1);
::SetDumpOn(0);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") );
CPPUNIT_ASSERT_EQUAL( true, ::FileExists("case2.punch") );
CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() );
@@ -1092,7 +1092,7 @@ void TestInterface::TestCase2()
::SetLogOn(0);
::SetSelectedOutputOn(1);
::SetDumpOn(0);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") );
CPPUNIT_ASSERT_EQUAL( true, ::FileExists("case2.punch") );
CPPUNIT_ASSERT_EQUAL( 62, ::GetSelectedOutputColumnCount() );
@@ -1131,7 +1131,7 @@ void TestInterface::TestPrintSelectedOutputFalse()
::SetLogOn(0);
::SetSelectedOutputOn(1);
::SetDumpOn(0);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 0, ::GetSelectedOutputColumnCount() );
CPPUNIT_ASSERT_EQUAL( 0, ::GetSelectedOutputRowCount() );
@@ -1152,7 +1152,7 @@ void TestInterface::TestPrintSelectedOutputFalse()
::SetLogOn(0);
::SetSelectedOutputOn(1);
::SetDumpOn(0);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 11, ::GetSelectedOutputColumnCount() );
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);
::SetSelectedOutputOn(0);
::SetDumpOn(0);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
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);
::SetSelectedOutputOn(selected_output_on);
::SetDumpOn(dump_on);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( true, ::FileExists(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);
::SetSelectedOutputOn(0);
::SetDumpOn(0);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( false, ::FileExists(FILENAME) );
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);
::SetSelectedOutputOn(selected_output_on);
::SetDumpOn(dump_on);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( true, ::FileExists(FILENAME) );
CPPUNIT_ASSERT( ::DeleteFile(FILENAME) );
}
@@ -1455,7 +1455,7 @@ TestInterface::TestLongHeadings()
::SetLogOn(0);
::SetSelectedOutputOn(0);
::SetDumpOn(0);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL(2, ::GetSelectedOutputRowCount());
CPPUNIT_ASSERT_EQUAL(1, ::GetSelectedOutputColumnCount());
@@ -1512,7 +1512,7 @@ TestInterface::TestDumpString()
::SetSelectedOutputOn(0);
::SetDumpOn(0);
::SetDumpStringOn(1);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
const char *expected =
#if defined(_MSC_VER)
@@ -1594,7 +1594,7 @@ TestInterface::TestGetDumpLineCount()
::SetSelectedOutputOn(0);
::SetDumpOn(0);
::SetDumpStringOn(1);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 26, ::GetDumpLineCount() );
}
@@ -1617,7 +1617,7 @@ TestInterface::TestGetDumpLine()
::SetSelectedOutputOn(0);
::SetDumpOn(0);
::SetDumpStringOn(1);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 26, ::GetDumpLineCount() );
@@ -1708,7 +1708,7 @@ TestInterface::TestGetComponentCount(void)
::SetSelectedOutputOn(0);
::SetDumpOn(0);
::SetDumpStringOn(0);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 3, ::GetComponentCount() );
@@ -1730,7 +1730,7 @@ TestInterface::TestGetComponent(void)
::SetDumpOn(0);
::SetDumpStringOn(0);
- CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
+ CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 3, ::GetComponentCount() );