From 09aa7f357e57499b9ede9ddca2d1f6d5bc471a62 Mon Sep 17 00:00:00 2001
From: Scott R Charlton <charlton@usgs.gov>
Date: Tue, 23 Mar 2010 22:25:37 +0000
Subject: [PATCH] renamed Run to RunAccumulated; fixed RunString for fortran
 wrappers fwrap2 and fwrap3

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4186 1feff8c3-07ed-0310-ac33-dd36852eb9cd
---
 IPhreeqc.cpp | 10 +++++-----
 IPhreeqc.hpp |  2 +-
 fwrap.cpp    |  8 ++++----
 fwrap.h      |  2 +-
 fwrap2.cpp   |  6 +++---
 fwrap3.cpp   |  6 +++---
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/IPhreeqc.cpp b/IPhreeqc.cpp
index 2e1ac4cc..74a7e154 100644
--- a/IPhreeqc.cpp
+++ b/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/IPhreeqc.hpp b/IPhreeqc.hpp
index f0641afd..04b53b8b 100644
--- a/IPhreeqc.hpp
+++ b/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/fwrap.cpp b/fwrap.cpp
index 32ba6538..949ffd53 100644
--- a/fwrap.cpp
+++ b/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/fwrap.h b/fwrap.h
index c90682ef..71b25d58 100644
--- a/fwrap.h
+++ b/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/fwrap2.cpp b/fwrap2.cpp
index 0cd78a14..f2c2bc36 100644
--- a/fwrap2.cpp
+++ b/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/fwrap3.cpp b/fwrap3.cpp
index 252295ad..297fd3c9 100644
--- a/fwrap3.cpp
+++ b/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)
 {