updated tests

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4368 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2025-12-15 16:18:22 +01:00 · 2010-05-11 03:45:10 +00:00 · 2010-05-11 03:45:10 +00:00 · cec9449f9c
commit cec9449f9c
parent 5d19f28a86
11 changed files with 507 additions and 342 deletions
--- a/IPhreeqc.sln
+++ b/IPhreeqc.sln
@ -21,6 +21,9 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test_f90", "tests\test_f90.
 	EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test_f", "tests\test_f.vfproj", "{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}"
+	ProjectSection(ProjectDependencies) = postProject
+		{F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} = {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -53,8 +56,8 @@ Global
 		{270BB952-FCB2-4FA8-821E-BB750E83C902}.Debug|Win32.ActiveCfg = Debug|Win32
 		{270BB952-FCB2-4FA8-821E-BB750E83C902}.Debug|Win32.Build.0 = Debug|Win32
 		{270BB952-FCB2-4FA8-821E-BB750E83C902}.Debug|x64.ActiveCfg = Debug|x64
-		{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|Win32.ActiveCfg = Release|Win32
-		{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|Win32.Build.0 = Release|Win32
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|Win32.ActiveCfg = Debug|Win32
+		{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|Win32.Build.0 = Debug|Win32
 		{270BB952-FCB2-4FA8-821E-BB750E83C902}.DebugDll|x64.ActiveCfg = Debug|x64
 		{270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|Win32.ActiveCfg = Release|Win32
 		{270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|Win32.Build.0 = Release|Win32
@ -91,25 +94,25 @@ Global
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.Debug|x64.ActiveCfg = Debug|x64
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugDll|Win32.Build.0 = DebugDll|Win32
-		{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugDll|x64.ActiveCfg = Debug|Win32
+		{003309EE-36BE-493B-87D4-FE68918DA9AF}.DebugDll|x64.ActiveCfg = Debug|x64
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.Release|Win32.ActiveCfg = Release|Win32
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.Release|Win32.Build.0 = Release|Win32
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.Release|x64.ActiveCfg = Release|x64
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
 		{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
-		{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseDll|x64.ActiveCfg = Release|Win32
+		{003309EE-36BE-493B-87D4-FE68918DA9AF}.ReleaseDll|x64.ActiveCfg = Release|x64
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Debug|Win32.ActiveCfg = Debug|Win32
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Debug|Win32.Build.0 = Debug|Win32
-		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Debug|x64.ActiveCfg = Debug|Win32
-		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.DebugDll|Win32.ActiveCfg = Debug|Win32
-		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.DebugDll|Win32.Build.0 = Debug|Win32
-		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.DebugDll|x64.ActiveCfg = Debug|Win32
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Debug|x64.ActiveCfg = Debug|x64
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.DebugDll|Win32.Build.0 = DebugDll|Win32
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.DebugDll|x64.ActiveCfg = Debug|x64
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Release|Win32.ActiveCfg = Release|Win32
 		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Release|Win32.Build.0 = Release|Win32
-		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Release|x64.ActiveCfg = Release|Win32
-		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseDll|Win32.ActiveCfg = Release|Win32
-		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseDll|Win32.Build.0 = Release|Win32
-		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseDll|x64.ActiveCfg = Release|Win32
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.Release|x64.ActiveCfg = Release|x64
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
+		{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}.ReleaseDll|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/include/IPhreeqc.hpp
+++ b/include/IPhreeqc.hpp
@ -515,6 +515,10 @@ protected:
 	bool                       DumpOn;
 	bool                       DumpStringOn;

+#if defined(_MSC_VER)
+#pragma warning(disable:4251) /* disable warning C4251: 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2' */
+#endif
+
 	IErrorReporter            *ErrorReporter;
 	std::string                ErrorString;
 	std::vector< std::string > ErrorLines;
@ -532,6 +536,10 @@ protected:

 	std::list< std::string >   Components;

+#if defined(_MSC_VER)
+#pragma warning(default:4251) /* reset warning C4251 */
+#endif
+
 private:
 	Phreeqc* PhreeqcPtr;

--- a/include/Var.h
+++ b/include/Var.h
@ -6,6 +6,12 @@
 #ifndef __VAR_H_INC
 #define __VAR_H_INC

+#if defined(_WINDLL)
+#define DLL_EXPORT __declspec(dllexport)
+#else
+#define DLL_EXPORT
+#endif
+
 /*! \brief Enumeration used to determine the type of data stored in a VAR.
 */
 typedef enum {
@ -47,14 +53,14 @@ extern "C" {
 /** Initializes a VAR.
 *  @param pvar Pointer to the VAR that will be initialized.
 */
-void VarInit(VAR* pvar);
+DLL_EXPORT void VarInit(VAR* pvar);

 /** Clears a VAR.
 *  @param pvar Pointer to the VAR that will be freed and initialized.
 *  @retval VR_OK Success.
 *  @retval VR_BADVARTYPE The \c VAR was invalid (probably uninitialized).
 */
-VRESULT VarClear(VAR* pvar);
+DLL_EXPORT VRESULT VarClear(VAR* pvar);

 /** Frees the destination VAR and makes a copy of the source VAR.
 *  @param pvarDest Pointer to the VAR to receive the copy.
@ -64,19 +70,19 @@ VRESULT VarClear(VAR* pvar);
 *  @retval VR_OUTOFMEMORY Memory could not be allocated for the copy.
 *  @return The return value is one of the following.
 */
-VRESULT VarCopy(VAR* pvarDest, const VAR* pvarSrc);
+DLL_EXPORT VRESULT VarCopy(VAR* pvarDest, const VAR* pvarSrc);


 /** Allocates a new string for use in a VAR and copies the passed string into it.
 *  @param pSrc Pointer to the VAR that will be initialized.
 *  @return A pointer to the string on success NULL otherwise.
 */
-char* VarAllocString(const char* pSrc);
+DLL_EXPORT char* VarAllocString(const char* pSrc);

 /** Frees a string allocated using VarAllocString.
 *  @param pSrc Pointer to the string to be freed.
 */
-void VarFreeString(char* pSrc);
+DLL_EXPORT void VarFreeString(char* pSrc);

 #if defined(__cplusplus)
 }
--- a/tests/test_c.c
+++ b/tests/test_c.c
@ -9,6 +9,8 @@ int
 main(int argc, const char* argv[])
 {
  int id;
+  int r, c;
+  VAR v;

  id = CreateIPhreeqc();
  if (id < 0)
@ -58,12 +60,24 @@ main(int argc, const char* argv[])
    return EXIT_FAILURE;
  }

-  if (RunFile(id, "ex1") != 0)
+  if (RunFile(id, "ex2") != 0)
  {
    OutputError(id);
    return EXIT_FAILURE;
  }

+  for (r = 0; r < GetSelectedOutputRowCount(id); ++r)
+  {
+	  for (c = 0; c < GetSelectedOutputColumnCount(id); ++c)
+	  {
+		  if (GetSelectedOutputValue(id, r, c, &v) != IPQ_OK)
+		  {
+			return EXIT_FAILURE;
+		  }
+		  VarClear(&v);
+	  }
+  }
+
  if (DestroyIPhreeqc(id) != IPQ_OK)
  {
    OutputError(id);
--- a/tests/test_c.vcproj
+++ b/tests/test_c.vcproj
@ -94,87 +94,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex1.in ex1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="IPhreeqc.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex1.in ex1"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -254,6 +174,87 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="IPhreeqc.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../lib"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -334,6 +335,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -412,7 +414,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex1.in ex1"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -492,6 +494,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -571,7 +574,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex1.in ex1"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -652,6 +655,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
--- a/tests/test_cxx.cxx
+++ b/tests/test_cxx.cxx
@ -93,11 +93,28 @@ main(int argc, const char* argv[])
    return EXIT_FAILURE;
  }

-  if (iphreeqc.RunFile("ex1") != 0)
+  if (iphreeqc.RunFile("ex2") != 0)
  {
    std::cout << iphreeqc.GetErrorString();
    return EXIT_FAILURE;
  }

+  for (int r = 0; r < iphreeqc.GetSelectedOutputRowCount(); ++r)
+  {
+	  for (int c = 0; c < iphreeqc.GetSelectedOutputColumnCount(); ++c)
+	  {
+		  VAR v;
+		  if (iphreeqc.GetSelectedOutputValue(r, c, &v) != VR_OK)
+		  {
+			return EXIT_FAILURE;
+		  }
+		  if (VarClear(&v) != VR_OK)
+		  {
+			return EXIT_FAILURE;
+		  }
+	  }
+  }
+
+
  return EXIT_SUCCESS;
 }
--- a/tests/test_cxx.vcproj
+++ b/tests/test_cxx.vcproj
@ -94,86 +94,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex1.in ex1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="IPhreeqc.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex1.in ex1"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex1.in ex1&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -253,6 +174,86 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="IPhreeqc.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\lib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex1.in ex1&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -332,6 +333,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -410,7 +412,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex1.in ex1"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex1.in ex1&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -490,6 +492,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -568,7 +571,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex1.in ex1"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex1.in ex1&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -648,6 +651,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="copy phreeqc.dat.in phreeqc.dat&#x0D;&#x0A;copy ex2.in ex2&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
--- a/tests/test_f.f
+++ b/tests/test_f.f
@ -1,140 +1,155 @@
-      FUNCTION F_MAIN()
-
-      IMPLICIT NONE
-      INCLUDE 'IPhreeqc.f.inc'
-      INTEGER(KIND=4) id
-
-      INTEGER(KIND=4) F_MAIN
-      INTEGER(KIND=4) TestGetSet
-
-      INTEGER(KIND=4) EXIT_SUCCESS
-      PARAMETER (EXIT_SUCCESS=0)
-
-      INTEGER(KIND=4) EXIT_FAILURE
-      PARAMETER (EXIT_FAILURE=1)
-
-      EXTERNAL GetDumpOn
-      EXTERNAL SetDumpOn
-
-      EXTERNAL GetDumpStringOn
-      EXTERNAL SetDumpStringOn
-
-      EXTERNAL GetErrorOn
-      EXTERNAL SetErrorOn
-
-      EXTERNAL GetLogOn
-      EXTERNAL SetLogOn
-
-      EXTERNAL GetOutputOn
-      EXTERNAL SetOutputOn
-
-      EXTERNAL GetSelectedOutputOn
-      EXTERNAL SetSelectedOutputOn
-
-      id = CreateIPhreeqc()
-      IF (id.LT.0) THEN
-         F_MAIN = EXIT_FAILURE
-         RETURN
-      ENDIF
-
-C     Dump
-      IF (TestGetSet(id,GetDumpOn,SetDumpOn).NE.0) THEN
-         F_MAIN = EXIT_FAILURE
-         RETURN
-      ENDIF
-      
-C     Dump string
-      IF (TestGetSet(id,GetDumpStringOn,SetDumpStringOn).NE.0) THEN
-         F_MAIN = EXIT_FAILURE
-         RETURN
-      ENDIF
-      
-C     Error
-      IF (TestGetSet(id,GetErrorOn,SetErrorOn).NE.0) THEN
-         F_MAIN = EXIT_FAILURE
-         RETURN
-      ENDIF
-      
-C     Log
-      IF (TestGetSet(id,GetLogOn,SetLogOn).NE.0) THEN
-         F_MAIN = EXIT_FAILURE
-         RETURN
-      ENDIF
-      
-C     Output
-      IF (TestGetSet(id,GetOutputOn,SetOutputOn).NE.0) THEN
-         F_MAIN = EXIT_FAILURE
-         RETURN
-      ENDIF
-      
-C     Selected output
-      IF (TestGetSet(id,GetSelectedOutputOn,SetSelectedOutputOn)
-     &     .NE.0) THEN
-         F_MAIN = EXIT_FAILURE
-         RETURN
-      ENDIF
-      
-      IF (LoadDatabase(id, "phreeqc.dat").NE.0) THEN
-         CALL OutputError(id)
-         F_MAIN = EXIT_FAILURE
-         RETURN
-      ENDIF
-      
-      IF (RunFile(id, "ex1").NE.0) THEN
-         CALL OutputError(id)
-         F_MAIN = EXIT_FAILURE
-         RETURN
-      ENDIF
-      
-      IF (DestroyIPhreeqc(id).NE.0) THEN
-         CALL OutputError(id)
-         F_MAIN = EXIT_FAILURE
-         RETURN
-      ENDIF
-      
-      F_MAIN = EXIT_SUCCESS
-      RETURN
-      
-      END FUNCTION F_MAIN
-      
-      
-      FUNCTION TestGetSet(id,getFunc,setFunc)
-      
-      IMPLICIT NONE
-      INCLUDE 'IPhreeqc.f.inc'
-      INTEGER(KIND=4) id
-      INTEGER(KIND=4) TestGetSet
-      
-      LOGICAL(KIND=4) getFunc
-      INTEGER(KIND=4) setFunc
-      
-      INTEGER(KIND=4) EXIT_SUCCESS
-      PARAMETER (EXIT_SUCCESS=0)
-      
-      INTEGER(KIND=4) EXIT_FAILURE
-      PARAMETER (EXIT_FAILURE=1)
-      
-      IF (getFunc(id)) THEN
-         TestGetSet = EXIT_FAILURE
-         RETURN
-      ENDIF
-      
-      IF (setFunc(id,.TRUE.).NE.IPQ_OK) THEN
-         TestGetSet = EXIT_FAILURE
-         RETURN
-      ENDIF
-      
-      IF (.NOT.getFunc(id)) THEN
-         TestGetSet = EXIT_FAILURE
-         RETURN
-      ENDIF
-      
-      IF (setFunc(id,.FALSE.).NE.IPQ_OK) THEN
-         TestGetSet = EXIT_FAILURE
-         RETURN
-      ENDIF
-      
-      TestGetSet = EXIT_SUCCESS
-      RETURN
-      
-      END FUNCTION TestGetSet
+      FUNCTION F_MAIN()
+
+      IMPLICIT NONE
+      INCLUDE 'IPhreeqc.f.inc'
+      INTEGER(KIND=4) id
+
+      INTEGER(KIND=4)    r
+      INTEGER(KIND=4)    c
+      INTEGER(KIND=4)    t
+      REAL(KIND=8)       d
+      CHARACTER(LEN=80)  s
+
+      INTEGER(KIND=4) F_MAIN
+      INTEGER(KIND=4) TestGetSet
+
+      INTEGER(KIND=4) EXIT_SUCCESS
+      PARAMETER (EXIT_SUCCESS=0)
+
+      INTEGER(KIND=4) EXIT_FAILURE
+      PARAMETER (EXIT_FAILURE=1)
+
+      EXTERNAL GetDumpOn
+      EXTERNAL SetDumpOn
+
+      EXTERNAL GetDumpStringOn
+      EXTERNAL SetDumpStringOn
+
+      EXTERNAL GetErrorOn
+      EXTERNAL SetErrorOn
+
+      EXTERNAL GetLogOn
+      EXTERNAL SetLogOn
+
+      EXTERNAL GetOutputOn
+      EXTERNAL SetOutputOn
+
+      EXTERNAL GetSelectedOutputOn
+      EXTERNAL SetSelectedOutputOn
+
+      id = CreateIPhreeqc()
+      IF (id.LT.0) THEN
+         F_MAIN = EXIT_FAILURE
+         RETURN
+      ENDIF
+
+C     Dump
+      IF (TestGetSet(id,GetDumpOn,SetDumpOn).NE.0) THEN
+         F_MAIN = EXIT_FAILURE
+         RETURN
+      ENDIF
+      
+C     Dump string
+      IF (TestGetSet(id,GetDumpStringOn,SetDumpStringOn).NE.0) THEN
+         F_MAIN = EXIT_FAILURE
+         RETURN
+      ENDIF
+      
+C     Error
+      IF (TestGetSet(id,GetErrorOn,SetErrorOn).NE.0) THEN
+         F_MAIN = EXIT_FAILURE
+         RETURN
+      ENDIF
+      
+C     Log
+      IF (TestGetSet(id,GetLogOn,SetLogOn).NE.0) THEN
+         F_MAIN = EXIT_FAILURE
+         RETURN
+      ENDIF
+      
+C     Output
+      IF (TestGetSet(id,GetOutputOn,SetOutputOn).NE.0) THEN
+         F_MAIN = EXIT_FAILURE
+         RETURN
+      ENDIF
+      
+C     Selected output
+      IF (TestGetSet(id,GetSelectedOutputOn,SetSelectedOutputOn)
+     &     .NE.0) THEN
+         F_MAIN = EXIT_FAILURE
+         RETURN
+      ENDIF
+      
+      IF (LoadDatabase(id, "phreeqc.dat").NE.0) THEN
+         CALL OutputError(id)
+         F_MAIN = EXIT_FAILURE
+         RETURN
+      ENDIF
+      
+      IF (RunFile(id, "ex2").NE.0) THEN
+         CALL OutputError(id)
+         F_MAIN = EXIT_FAILURE
+         RETURN
+      ENDIF
+      
+      DO 20 r=1,GetSelectedOutputRowCount(id)
+        DO 10 c=1,GetSelectedOutputColumnCount(id)
+            IF (GetSelectedOutputValue(id,r,c,t,d,s).EQ.IPQ_OK) THEN
+                F_MAIN = EXIT_FAILURE
+                RETURN
+            ENDIF
+ 10     CONTINUE
+ 20   CONTINUE
+      
+      IF (DestroyIPhreeqc(id).NE.0) THEN
+         CALL OutputError(id)
+         F_MAIN = EXIT_FAILURE
+         RETURN
+      ENDIF
+      
+      F_MAIN = EXIT_SUCCESS
+      RETURN
+      
+      END FUNCTION F_MAIN
+      
+      
+      FUNCTION TestGetSet(id,getFunc,setFunc)
+      
+      IMPLICIT NONE
+      INCLUDE 'IPhreeqc.f.inc'
+      INTEGER(KIND=4) id
+      INTEGER(KIND=4) TestGetSet
+      
+      LOGICAL(KIND=4) getFunc
+      INTEGER(KIND=4) setFunc
+      
+      INTEGER(KIND=4) EXIT_SUCCESS
+      PARAMETER (EXIT_SUCCESS=0)
+      
+      INTEGER(KIND=4) EXIT_FAILURE
+      PARAMETER (EXIT_FAILURE=1)
+      
+      IF (getFunc(id)) THEN
+         TestGetSet = EXIT_FAILURE
+         RETURN
+      ENDIF
+      
+      IF (setFunc(id,.TRUE.).NE.IPQ_OK) THEN
+         TestGetSet = EXIT_FAILURE
+         RETURN
+      ENDIF
+      
+      IF (.NOT.getFunc(id)) THEN
+         TestGetSet = EXIT_FAILURE
+         RETURN
+      ENDIF
+      
+      IF (setFunc(id,.FALSE.).NE.IPQ_OK) THEN
+         TestGetSet = EXIT_FAILURE
+         RETURN
+      ENDIF
+      
+      TestGetSet = EXIT_SUCCESS
+      RETURN
+      
+      END FUNCTION TestGetSet
--- a/tests/test_f.vfproj
+++ b/tests/test_f.vfproj
@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{66E68C3F-EFCE-47EE-80F1-4D8F6F8AB450}">
 	<Platforms>
-		<Platform Name="Win32"/></Platforms>
+		<Platform Name="Win32"/>
+		<Platform Name="x64"/></Platforms>
 	<Configurations>
-		<Configuration Name="Debug|Win32">
+		<Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
 				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
 				<Tool Name="VFResourceCompilerTool"/>
@ -11,9 +12,10 @@
 				<Tool Name="VFCustomBuildTool"/>
 				<Tool Name="VFPreLinkEventTool"/>
 				<Tool Name="VFPreBuildEventTool"/>
-				<Tool Name="VFPostBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
-		<Configuration Name="Release|Win32">
+		<Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include"/>
 				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
 				<Tool Name="VFResourceCompilerTool"/>
@ -21,7 +23,74 @@
 				<Tool Name="VFCustomBuildTool"/>
 				<Tool Name="VFPreLinkEventTool"/>
 				<Tool Name="VFPreBuildEventTool"/>
-				<Tool Name="VFPostBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="DebugDll|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dll" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="ReleaseDll|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include" RuntimeLibrary="rtMultiThreadedDLL"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dll" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../libx64" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../libx64" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="DebugDll|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dllx64" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
+		<Configuration Name="ReleaseDll|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)">
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include" RuntimeLibrary="rtMultiThreadedDLL"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dllx64" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
 	<Files>
 		<Filter Name="Header Files" Filter="fi;fd"/>
--- a/tests/test_f90.f90
+++ b/tests/test_f90.f90
@ -3,6 +3,13 @@ FUNCTION F_MAIN()
  IMPLICIT NONE
  INCLUDE 'IPhreeqc.f90.inc'
  INTEGER(KIND=4) id
+  
+  INTEGER(KIND=4)   r
+  INTEGER(KIND=4)   c
+  INTEGER(KIND=4)   t
+  REAL(KIND=8)      d
+  CHARACTER(LEN=80) s
+  
  INTEGER(KIND=4) F_MAIN
  INTEGER(KIND=4) TestGetSet
  
@ -57,12 +64,22 @@ FUNCTION F_MAIN()
     RETURN
  ENDIF
  
-  IF (RunFile(id, "ex1").NE.0) THEN
+  IF (RunFile(id, "ex2").NE.0) THEN
     CALL OutputError(id)
     F_MAIN = EXIT_FAILURE
     RETURN
  ENDIF
  
+  DO r=1,GetSelectedOutputRowCount(id)
+    DO c=1,GetSelectedOutputColumnCount(id)
+        IF (GetSelectedOutputValue(id,r,c,t,d,s).EQ.IPQ_OK) THEN
+            F_MAIN = EXIT_FAILURE
+            RETURN
+        ENDIF
+     ENDDO
+  ENDDO
+  
+  
  IF (DestroyIPhreeqc(id).NE.0) THEN
     CALL OutputError(id)
     F_MAIN = EXIT_FAILURE
--- a/tests/test_f90.vfproj
+++ b/tests/test_f90.vfproj
@ -4,7 +4,7 @@
 		<Platform Name="Win32"/>
 		<Platform Name="x64"/></Platforms>
 	<Configurations>
-		<Configuration Name="Debug|Win32">
+		<Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
 				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
 				<Tool Name="VFResourceCompilerTool"/>
@ -12,9 +12,10 @@
 				<Tool Name="VFCustomBuildTool"/>
 				<Tool Name="VFPreLinkEventTool"/>
 				<Tool Name="VFPreBuildEventTool"/>
-				<Tool Name="VFPostBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
-		<Configuration Name="Release|Win32">
+		<Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include"/>
 				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
 				<Tool Name="VFResourceCompilerTool"/>
@ -22,7 +23,8 @@
 				<Tool Name="VFCustomBuildTool"/>
 				<Tool Name="VFPreLinkEventTool"/>
 				<Tool Name="VFPreBuildEventTool"/>
-				<Tool Name="VFPostBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
 		<Configuration Name="Debug|x64">
 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
@ -32,7 +34,8 @@
 				<Tool Name="VFCustomBuildTool"/>
 				<Tool Name="VFPreLinkEventTool"/>
 				<Tool Name="VFPreBuildEventTool"/>
-				<Tool Name="VFPostBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
 		<Configuration Name="Release|x64">
 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include"/>
@ -42,9 +45,10 @@
 				<Tool Name="VFCustomBuildTool"/>
 				<Tool Name="VFPreLinkEventTool"/>
 				<Tool Name="VFPreBuildEventTool"/>
-				<Tool Name="VFPostBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
-		<Configuration Name="ReleaseDll|Win32">
+		<Configuration Name="ReleaseDll|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include" RuntimeLibrary="rtMultiThreadedDLL"/>
 				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dll" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqc.lib"/>
 				<Tool Name="VFResourceCompilerTool"/>
@ -52,7 +56,8 @@
 				<Tool Name="VFCustomBuildTool"/>
 				<Tool Name="VFPreLinkEventTool"/>
 				<Tool Name="VFPreBuildEventTool"/>
-				<Tool Name="VFPostBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
 		<Configuration Name="ReleaseDll|x64">
 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include"/>
@ -62,9 +67,10 @@
 				<Tool Name="VFCustomBuildTool"/>
 				<Tool Name="VFPreLinkEventTool"/>
 				<Tool Name="VFPreBuildEventTool"/>
-				<Tool Name="VFPostBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
-		<Configuration Name="DebugDll|Win32">
+		<Configuration Name="DebugDll|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
 				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../dll" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcd.lib"/>
 				<Tool Name="VFResourceCompilerTool"/>
@ -72,7 +78,8 @@
 				<Tool Name="VFCustomBuildTool"/>
 				<Tool Name="VFPreLinkEventTool"/>
 				<Tool Name="VFPreBuildEventTool"/>
-				<Tool Name="VFPostBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
 		<Configuration Name="DebugDll|x64">
 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../include" Interfaces="true" WarnInterfaces="true" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
@ -82,7 +89,8 @@
 				<Tool Name="VFCustomBuildTool"/>
 				<Tool Name="VFPreLinkEventTool"/>
 				<Tool Name="VFPreBuildEventTool"/>
-				<Tool Name="VFPostBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy phreeqc.dat.in phreeqc.dat
+copy ex2.in ex2"/>
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
 	<Files>
 		<Filter Name="Header Files" Filter="fi;fd"/>