diff --git a/IPhreeqc.sln b/IPhreeqc.sln index 0cbb6983..90914702 100644 --- a/IPhreeqc.sln +++ b/IPhreeqc.sln @@ -5,27 +5,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IPhreeqc", "IPhreeqc.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit", "unit\unit.vcproj", "{270BB952-FCB2-4FA8-821E-BB750E83C902}" EndProject -Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test", "test\test.vfproj", "{14BB3A4C-1ADE-4212-8931-6514BF913874}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_c", "tests\test_c.vcproj", "{6F2B675D-2585-4AD6-866D-4DDA00279B00}" ProjectSection(ProjectDependencies) = postProject {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} = {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} EndProjectSection EndProject -Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test2", "test2\test2.vfproj", "{0BF09B12-56BE-42FC-B39E-61AE515D8858}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cxx", "tests\test_cxx.vcproj", "{3102214A-D304-48FC-B2DF-94D838DC4B2A}" ProjectSection(ProjectDependencies) = postProject {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} = {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} EndProjectSection EndProject -Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "testf90", "testf90\testf90.vfproj", "{29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}" - ProjectSection(ProjectDependencies) = postProject - {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} = {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} - EndProjectSection -EndProject -Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test_getline", "test_getline\test_getline.vfproj", "{D95AB257-163E-4ABD-8577-94FB8D1EF62C}" - ProjectSection(ProjectDependencies) = postProject - {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} = {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testcpp", "testcpp\testcpp.vcproj", "{046110C9-CD5B-404D-B197-E295656CBF7F}" +Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test_f90", "tests\test_f90.vfproj", "{003309EE-36BE-493B-87D4-FE68918DA9AF}" ProjectSection(ProjectDependencies) = postProject {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} = {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7} EndProjectSection @@ -36,8 +26,6 @@ Global Debug|x64 = Debug|x64 DebugDll|Win32 = DebugDll|Win32 DebugDll|x64 = DebugDll|x64 - MemDebug|Win32 = MemDebug|Win32 - MemDebug|x64 = MemDebug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 ReleaseDll|Win32 = ReleaseDll|Win32 @@ -52,10 +40,6 @@ Global {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.DebugDll|Win32.Build.0 = DebugDll|Win32 {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.DebugDll|x64.ActiveCfg = DebugDll|x64 {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.DebugDll|x64.Build.0 = DebugDll|x64 - {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.MemDebug|Win32.ActiveCfg = MemDebug|Win32 - {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.MemDebug|Win32.Build.0 = MemDebug|Win32 - {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.MemDebug|x64.ActiveCfg = MemDebug|x64 - {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.MemDebug|x64.Build.0 = MemDebug|x64 {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.Release|Win32.ActiveCfg = Release|Win32 {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.Release|Win32.Build.0 = Release|Win32 {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.Release|x64.ActiveCfg = Release|x64 @@ -66,94 +50,52 @@ Global {F9C18E06-F73A-4EB0-92E0-AE1713EA7FD7}.ReleaseDll|x64.Build.0 = ReleaseDll|x64 {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|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|x64.ActiveCfg = Debug|Win32 - {270BB952-FCB2-4FA8-821E-BB750E83C902}.MemDebug|Win32.ActiveCfg = MemDebug|Win32 - {270BB952-FCB2-4FA8-821E-BB750E83C902}.MemDebug|Win32.Build.0 = MemDebug|Win32 - {270BB952-FCB2-4FA8-821E-BB750E83C902}.MemDebug|x64.ActiveCfg = MemDebug|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 - {270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|x64.ActiveCfg = Release|Win32 + {270BB952-FCB2-4FA8-821E-BB750E83C902}.Release|x64.ActiveCfg = Release|x64 {270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseDll|Win32.ActiveCfg = Release|Win32 {270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseDll|Win32.Build.0 = Release|Win32 - {270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseDll|x64.ActiveCfg = Release|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.Debug|Win32.ActiveCfg = Debug|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.Debug|Win32.Build.0 = Debug|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.Debug|x64.ActiveCfg = Debug|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.DebugDll|Win32.Build.0 = DebugDll|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.DebugDll|x64.ActiveCfg = DebugDll|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.MemDebug|Win32.ActiveCfg = MemDebug|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.MemDebug|Win32.Build.0 = MemDebug|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.MemDebug|x64.ActiveCfg = MemDebug|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.Release|Win32.ActiveCfg = Release|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.Release|Win32.Build.0 = Release|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.Release|x64.ActiveCfg = Release|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32 - {14BB3A4C-1ADE-4212-8931-6514BF913874}.ReleaseDll|x64.ActiveCfg = ReleaseDll|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.Debug|Win32.ActiveCfg = Debug|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.Debug|Win32.Build.0 = Debug|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.Debug|x64.ActiveCfg = Debug|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.DebugDll|Win32.Build.0 = DebugDll|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.DebugDll|x64.ActiveCfg = DebugDll|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.MemDebug|Win32.ActiveCfg = MemDebug|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.MemDebug|Win32.Build.0 = MemDebug|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.MemDebug|x64.ActiveCfg = MemDebug|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.Release|Win32.ActiveCfg = Release|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.Release|Win32.Build.0 = Release|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.Release|x64.ActiveCfg = Release|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32 - {0BF09B12-56BE-42FC-B39E-61AE515D8858}.ReleaseDll|x64.ActiveCfg = ReleaseDll|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Debug|Win32.ActiveCfg = Debug|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Debug|Win32.Build.0 = Debug|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Debug|x64.ActiveCfg = Debug|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.DebugDll|Win32.Build.0 = DebugDll|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.DebugDll|x64.ActiveCfg = DebugDll|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.MemDebug|Win32.ActiveCfg = Debug|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.MemDebug|Win32.Build.0 = Debug|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.MemDebug|x64.ActiveCfg = Debug|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Release|Win32.ActiveCfg = Release|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Release|Win32.Build.0 = Release|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.Release|x64.ActiveCfg = Release|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32 - {29C3C862-28CA-4BF2-BAF5-A8F8ABF15C12}.ReleaseDll|x64.ActiveCfg = ReleaseDll|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Debug|Win32.ActiveCfg = Debug|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Debug|Win32.Build.0 = Debug|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Debug|x64.ActiveCfg = Debug|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.DebugDll|Win32.Build.0 = DebugDll|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.DebugDll|x64.ActiveCfg = DebugDll|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.MemDebug|Win32.ActiveCfg = Debug|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.MemDebug|Win32.Build.0 = Debug|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.MemDebug|x64.ActiveCfg = Debug|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Release|Win32.ActiveCfg = Release|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Release|Win32.Build.0 = Release|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.Release|x64.ActiveCfg = Release|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32 - {D95AB257-163E-4ABD-8577-94FB8D1EF62C}.ReleaseDll|x64.ActiveCfg = ReleaseDll|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.Debug|Win32.ActiveCfg = Debug|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.Debug|Win32.Build.0 = Debug|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.Debug|x64.ActiveCfg = Debug|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.DebugDll|Win32.Build.0 = DebugDll|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.DebugDll|x64.ActiveCfg = DebugDll|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.MemDebug|Win32.ActiveCfg = Debug|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.MemDebug|Win32.Build.0 = Debug|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.MemDebug|x64.ActiveCfg = Debug|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.Release|Win32.ActiveCfg = Release|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.Release|Win32.Build.0 = Release|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.Release|x64.ActiveCfg = Release|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32 - {046110C9-CD5B-404D-B197-E295656CBF7F}.ReleaseDll|x64.ActiveCfg = ReleaseDll|Win32 + {270BB952-FCB2-4FA8-821E-BB750E83C902}.ReleaseDll|x64.ActiveCfg = Release|x64 + {6F2B675D-2585-4AD6-866D-4DDA00279B00}.Debug|Win32.ActiveCfg = Debug|Win32 + {6F2B675D-2585-4AD6-866D-4DDA00279B00}.Debug|Win32.Build.0 = Debug|Win32 + {6F2B675D-2585-4AD6-866D-4DDA00279B00}.Debug|x64.ActiveCfg = Debug|x64 + {6F2B675D-2585-4AD6-866D-4DDA00279B00}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 + {6F2B675D-2585-4AD6-866D-4DDA00279B00}.DebugDll|Win32.Build.0 = DebugDll|Win32 + {6F2B675D-2585-4AD6-866D-4DDA00279B00}.DebugDll|x64.ActiveCfg = Debug|x64 + {6F2B675D-2585-4AD6-866D-4DDA00279B00}.Release|Win32.ActiveCfg = Release|Win32 + {6F2B675D-2585-4AD6-866D-4DDA00279B00}.Release|Win32.Build.0 = Release|Win32 + {6F2B675D-2585-4AD6-866D-4DDA00279B00}.Release|x64.ActiveCfg = Release|x64 + {6F2B675D-2585-4AD6-866D-4DDA00279B00}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32 + {6F2B675D-2585-4AD6-866D-4DDA00279B00}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32 + {6F2B675D-2585-4AD6-866D-4DDA00279B00}.ReleaseDll|x64.ActiveCfg = Release|x64 + {3102214A-D304-48FC-B2DF-94D838DC4B2A}.Debug|Win32.ActiveCfg = Debug|Win32 + {3102214A-D304-48FC-B2DF-94D838DC4B2A}.Debug|Win32.Build.0 = Debug|Win32 + {3102214A-D304-48FC-B2DF-94D838DC4B2A}.Debug|x64.ActiveCfg = Debug|x64 + {3102214A-D304-48FC-B2DF-94D838DC4B2A}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 + {3102214A-D304-48FC-B2DF-94D838DC4B2A}.DebugDll|Win32.Build.0 = DebugDll|Win32 + {3102214A-D304-48FC-B2DF-94D838DC4B2A}.DebugDll|x64.ActiveCfg = Debug|x64 + {3102214A-D304-48FC-B2DF-94D838DC4B2A}.Release|Win32.ActiveCfg = Release|Win32 + {3102214A-D304-48FC-B2DF-94D838DC4B2A}.Release|Win32.Build.0 = Release|Win32 + {3102214A-D304-48FC-B2DF-94D838DC4B2A}.Release|x64.ActiveCfg = Release|x64 + {3102214A-D304-48FC-B2DF-94D838DC4B2A}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32 + {3102214A-D304-48FC-B2DF-94D838DC4B2A}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32 + {3102214A-D304-48FC-B2DF-94D838DC4B2A}.ReleaseDll|x64.ActiveCfg = Release|x64 + {003309EE-36BE-493B-87D4-FE68918DA9AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {003309EE-36BE-493B-87D4-FE68918DA9AF}.Debug|Win32.Build.0 = Debug|Win32 + {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}.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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/IPhreeqc.vcproj b/IPhreeqc.vcproj index 719b053a..6cf289c3 100644 --- a/IPhreeqc.vcproj +++ b/IPhreeqc.vcproj @@ -19,7 +19,7 @@ @@ -71,7 +68,6 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -462,7 +140,6 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -825,46 +655,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -875,6 +665,16 @@ CompileAs="2" /> + + + @@ -886,7 +686,7 @@ /> + + + @@ -927,38 +737,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -967,6 +745,14 @@ CompileAs="2" /> + + + @@ -976,7 +762,7 @@ /> + + + @@ -1023,38 +817,6 @@ Name="VCCLCompilerTool" /> - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - @@ -1163,6 +901,16 @@ CompileAs="2" /> + + + @@ -1174,7 +922,7 @@ /> + + + @@ -1218,38 +976,6 @@ Name="VCCLCompilerTool" /> - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - @@ -1649,6 +1319,16 @@ CompileAs="2" /> + + + @@ -1660,7 +1340,7 @@ /> + + + @@ -1703,46 +1393,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -1753,6 +1403,16 @@ CompileAs="2" /> + + + @@ -1764,7 +1424,7 @@ /> + + + @@ -1807,46 +1477,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -1857,6 +1487,16 @@ CompileAs="2" /> + + + @@ -1868,7 +1508,7 @@ /> + + + @@ -1911,46 +1561,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -1961,6 +1571,16 @@ CompileAs="2" /> + + + @@ -1972,7 +1592,7 @@ /> + + + @@ -2016,50 +1646,6 @@ CompileAs="2" /> - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - @@ -2179,6 +1747,16 @@ CompileAs="2" /> + + + @@ -2190,7 +1768,7 @@ /> + + + @@ -2233,46 +1821,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -2283,6 +1831,16 @@ CompileAs="2" /> + + + @@ -2294,7 +1852,7 @@ /> + + + @@ -2337,46 +1905,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -2387,6 +1915,16 @@ CompileAs="2" /> + + + @@ -2398,7 +1936,7 @@ /> + + + @@ -2441,46 +1989,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -2491,6 +1999,16 @@ CompileAs="2" /> + + + @@ -2502,7 +2020,7 @@ /> + + + @@ -2545,46 +2073,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -2595,6 +2083,16 @@ CompileAs="2" /> + + + @@ -2606,7 +2104,7 @@ /> + + + @@ -2649,46 +2157,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -2699,6 +2167,16 @@ CompileAs="2" /> + + + @@ -2710,7 +2188,7 @@ /> + + + @@ -2753,46 +2241,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -2803,6 +2251,16 @@ CompileAs="2" /> + + + @@ -2814,7 +2272,7 @@ /> + + + @@ -2857,46 +2325,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -2907,6 +2335,16 @@ CompileAs="2" /> + + + @@ -2918,7 +2356,7 @@ /> + + + @@ -2961,46 +2409,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -3011,6 +2419,16 @@ CompileAs="2" /> + + + @@ -3022,7 +2440,7 @@ /> + + + @@ -3066,50 +2494,6 @@ CompileAs="2" /> - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - @@ -3229,6 +2595,16 @@ CompileAs="2" /> + + + @@ -3240,7 +2616,7 @@ /> + + + @@ -3283,46 +2669,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -3333,6 +2679,16 @@ CompileAs="2" /> + + + @@ -3344,7 +2700,7 @@ /> + + + @@ -3387,46 +2753,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -3437,6 +2763,16 @@ CompileAs="2" /> + + + @@ -3448,7 +2784,7 @@ /> + + + @@ -3491,46 +2837,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -3541,6 +2847,16 @@ CompileAs="2" /> + + + @@ -3552,7 +2868,7 @@ /> + + + @@ -3593,38 +2919,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -3633,6 +2927,14 @@ CompileAs="2" /> + + + @@ -3642,7 +2944,7 @@ /> + + + @@ -3679,46 +2989,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -3729,6 +2999,16 @@ CompileAs="2" /> + + + @@ -3740,7 +3020,7 @@ /> + + + @@ -3783,46 +3073,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -3833,6 +3083,16 @@ CompileAs="2" /> + + + @@ -3844,7 +3104,7 @@ /> + + + @@ -3887,46 +3157,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -3937,6 +3167,16 @@ CompileAs="2" /> + + + @@ -3948,7 +3188,7 @@ /> + + + @@ -3991,46 +3241,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -4041,6 +3251,16 @@ CompileAs="2" /> + + + @@ -4052,7 +3272,7 @@ /> + + + @@ -4095,46 +3325,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -4145,6 +3335,16 @@ CompileAs="2" /> + + + @@ -4156,7 +3356,7 @@ /> + + + @@ -4199,46 +3409,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -4249,6 +3419,16 @@ CompileAs="2" /> + + + @@ -4260,7 +3440,7 @@ /> + + + @@ -4303,46 +3493,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -4353,6 +3503,16 @@ CompileAs="2" /> + + + @@ -4364,7 +3524,7 @@ /> + + + @@ -4407,46 +3577,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -4457,6 +3587,16 @@ CompileAs="2" /> + + + @@ -4468,7 +3608,7 @@ /> + + + @@ -4511,46 +3661,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -4561,6 +3671,16 @@ CompileAs="2" /> + + + @@ -4572,7 +3692,7 @@ /> + + + @@ -4615,46 +3745,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -4665,6 +3755,16 @@ CompileAs="2" /> + + + @@ -4676,7 +3776,7 @@ /> + + + @@ -4717,38 +3827,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -4757,6 +3835,14 @@ CompileAs="2" /> + + + @@ -4766,7 +3852,7 @@ /> + + + @@ -4803,46 +3897,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -4853,6 +3907,16 @@ CompileAs="2" /> + + + @@ -4864,7 +3928,7 @@ /> + + + @@ -4907,46 +3981,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -4957,6 +3991,16 @@ CompileAs="2" /> + + + @@ -4968,7 +4012,7 @@ /> + + + @@ -5011,46 +4065,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -5061,6 +4075,16 @@ CompileAs="2" /> + + + @@ -5072,7 +4096,7 @@ /> + + + @@ -5115,46 +4149,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -5165,6 +4159,16 @@ CompileAs="2" /> + + + @@ -5176,7 +4180,7 @@ /> + + + @@ -5219,46 +4233,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -5269,6 +4243,16 @@ CompileAs="2" /> + + + @@ -5280,7 +4264,7 @@ /> + + + @@ -5323,46 +4317,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -5373,6 +4327,16 @@ CompileAs="2" /> + + + @@ -5384,7 +4348,7 @@ /> + + + @@ -5427,46 +4401,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -5477,6 +4411,16 @@ CompileAs="2" /> + + + @@ -5488,7 +4432,7 @@ /> + + + @@ -5531,46 +4485,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -5581,6 +4495,16 @@ CompileAs="2" /> + + + @@ -5592,7 +4516,7 @@ /> + + + @@ -5635,46 +4569,6 @@ CompileAs="2" /> - - - - - - - - - - - - @@ -5685,6 +4579,16 @@ CompileAs="2" /> + + + @@ -5696,7 +4600,7 @@ /> + + + diff --git a/IPhreeqc.vcproj.GS.charlton.user b/IPhreeqc.vcproj.GS.charlton.user index 3361e6a4..a75ed681 100644 --- a/IPhreeqc.vcproj.GS.charlton.user +++ b/IPhreeqc.vcproj.GS.charlton.user @@ -117,62 +117,6 @@ MPIAcceptFilter="" /> - - - - - - diff --git a/include/IPhreeqc.f.inc b/include/IPhreeqc.f.inc index dd28c091..fc57d613 100644 --- a/include/IPhreeqc.f.inc +++ b/include/IPhreeqc.f.inc @@ -45,7 +45,6 @@ C INTEGER(KIND=4) AccumulateLine INTEGER(KIND=4) CreateIPhreeqc INTEGER(KIND=4) DestroyIPhreeqc - INTEGER(KIND=4) GetComponent INTEGER(KIND=4) GetComponentCount INTEGER(KIND=4) GetDumpLine INTEGER(KIND=4) GetDumpLineCount diff --git a/include/IPhreeqc.f90.inc b/include/IPhreeqc.f90.inc index 8cd3fc60..908f51d2 100644 --- a/include/IPhreeqc.f90.inc +++ b/include/IPhreeqc.f90.inc @@ -84,7 +84,7 @@ INTERFACE FUNCTION GetDumpStringOn(ID) INTEGER(KIND=4), INTENT(IN) :: ID - LOGICAL(KIND=4) :: GetDumpOn + LOGICAL(KIND=4) :: GetDumpStringOn END FUNCTION GetDumpStringOn END INTERFACE diff --git a/src/IPhreeqcLib.cpp b/src/IPhreeqcLib.cpp index ce4d9432..e81cac14 100644 --- a/src/IPhreeqcLib.cpp +++ b/src/IPhreeqcLib.cpp @@ -154,7 +154,7 @@ GetComponentCount(int id) IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); if (IPhreeqcPtr) { - return IPhreeqcPtr->ListComponents().size(); + return (int)IPhreeqcPtr->ListComponents().size(); } return IPQ_BADINSTANCE; } diff --git a/src/fwrap.cpp b/src/fwrap.cpp index d556b3d0..28d92338 100644 --- a/src/fwrap.cpp +++ b/src/fwrap.cpp @@ -344,7 +344,7 @@ UnLoadDatabaseF(int *id) } -#if defined(_WIN32) +#if defined(_WIN32) && !defined(_M_AMD64) #if defined(__cplusplus) extern "C" { @@ -353,15 +353,15 @@ extern "C" { // // Intel Fortran compiler 9.1 /iface:cvf // -DLL_EXPORT int __stdcall ACCUMULATELINE(int *id, char *line, unsigned int len) +DLL_EXPORT int __stdcall ACCUMULATELINE(int *id, char *line, unsigned int len) { return AccumulateLineF(id, line, len); } -DLL_EXPORT int __stdcall CREATEIPHREEQC(void) +DLL_EXPORT int __stdcall CREATEIPHREEQC(void) { return CreateIPhreeqcF(); } -DLL_EXPORT int __stdcall DESTROYIPHREEQC(int *id) +DLL_EXPORT int __stdcall DESTROYIPHREEQC(int *id) { return DestroyIPhreeqcF(id); } @@ -369,7 +369,7 @@ DLL_EXPORT void __stdcall GETCOMPONENT(int *id, int *n, char* line, unsigned int { GetComponentF(id, n, line, line_length); } -DLL_EXPORT int __stdcall GETCOMPONENTCOUNT(int *id) +DLL_EXPORT int __stdcall GETCOMPONENTCOUNT(int *id) { return GetComponentCountF(id); } @@ -377,35 +377,51 @@ DLL_EXPORT void __stdcall GETDUMPLINE(int *id, int *n, char* line, unsigned int { GetDumpLineF(id, n, line, line_length); } -DLL_EXPORT int __stdcall GETDUMPLINECOUNT(int *id) +DLL_EXPORT int __stdcall GETDUMPLINECOUNT(int *id) { return GetDumpLineCountF(id); } +DLL_EXPORT int __stdcall GETDUMPON(int *id) +{ + return GetDumpOnF(id); +} +DLL_EXPORT int __stdcall GETDUMPSTRINGON(int *id) +{ + return GetDumpStringOnF(id); +} DLL_EXPORT void __stdcall GETERRORLINE(int *id, int *n, char* line, unsigned int line_length) { GetErrorLineF(id, n, line, line_length); } -DLL_EXPORT int __stdcall GETERRORLINECOUNT(int *id) +DLL_EXPORT int __stdcall GETERRORLINECOUNT(int *id) { return GetErrorLineCountF(id); } -DLL_EXPORT int __stdcall GETLOGON(int *id) +DLL_EXPORT int __stdcall GETERRORON(int *id) { - return GetLogonF(id); + return GetErrorOnF(id); } -DLL_EXPORT int __stdcall GETOUTPUTON(int *id) +DLL_EXPORT int __stdcall GETLOGON(int *id) { - return GetOutputF(id); + return GetLogOnF(id); } -DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id) +DLL_EXPORT int __stdcall GETOUTPUTON(int *id) +{ + return GetOutputOnF(id); +} +DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id) { return GetSelectedOutputColumnCountF(id); } -DLL_EXPORT int __stdcall GETSELECTEDOUTPUTROWCOUNT(int *id) +DLL_EXPORT int __stdcall GETSELECTEDOUTPUTON(int *id) +{ + return GetSelectedOutputOnF(id); +} +DLL_EXPORT int __stdcall GETSELECTEDOUTPUTROWCOUNT(int *id) { return GetSelectedOutputRowCountF(id); } -DLL_EXPORT int __stdcall GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length) +DLL_EXPORT int __stdcall GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length) { return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length); } @@ -413,15 +429,15 @@ DLL_EXPORT void __stdcall GETWARNINGLINE(int *id, int *n, char* line, unsigned i { GetWarningLineF(id, n, line, line_length); } -DLL_EXPORT int __stdcall GETWARNINGLINECOUNT(int *id) +DLL_EXPORT int __stdcall GETWARNINGLINECOUNT(int *id) { return GetWarningLineCountF(id); } -DLL_EXPORT int __stdcall LOADDATABASE(int *id, char *filename, unsigned int len) +DLL_EXPORT int __stdcall LOADDATABASE(int *id, char *filename, unsigned int len) { return LoadDatabaseF(id, filename, len); } -DLL_EXPORT int __stdcall LOADDATABASESTRING(int *id, char *input, unsigned int len) +DLL_EXPORT int __stdcall LOADDATABASESTRING(int *id, char *input, unsigned int len) { return LoadDatabaseStringF(id, input, len); } @@ -437,15 +453,15 @@ DLL_EXPORT void __stdcall OUTPUTWARNING(int *id) { OutputWarningF(id); } -DLL_EXPORT int __stdcall RUNACCUMULATED(int *id) +DLL_EXPORT int __stdcall RUNACCUMULATED(int *id) { return RunAccumulatedF(id); } -DLL_EXPORT int __stdcall RUNFILE(int *id, char *filename, unsigned int len) +DLL_EXPORT int __stdcall RUNFILE(int *id, char *filename, unsigned int len) { return RunFileF(id, filename, len); } -DLL_EXPORT int __stdcall RUNSTRING(int *id, char *input, unsigned int len) +DLL_EXPORT int __stdcall RUNSTRING(int *id, char *input, unsigned int len) { return RunStringF(id, input, len); } @@ -473,7 +489,7 @@ DLL_EXPORT void __stdcall SETSELECTEDOUTPUTON(int *id, int *selected_on) { SetSelectedOutputOnF(id, selected_on); } -DLL_EXPORT int __stdcall UNLOADDATABASE(int *id) +DLL_EXPORT int __stdcall UNLOADDATABASE(int *id) { return UnLoadDatabaseF(id); } diff --git a/src/fwrap.h b/src/fwrap.h index e9fd1731..134b79fa 100644 --- a/src/fwrap.h +++ b/src/fwrap.h @@ -56,11 +56,11 @@ extern "C" { void GetComponentF(int *id, int* n, char* line, unsigned int line_length); int GetDumpLineCountF(int *id); void GetDumpLineF(int *id, int* n, char* line, unsigned int line_length); + int GetDumpOnF(int *id); + int GetDumpStringOnF(int *id); int GetErrorLineCountF(int *id); void GetErrorLineF(int *id, int* n, char* line, unsigned int line_length); int GetErrorOnF(int *id); - int GetDumpOnF(int *id); - int GetDumpStringOnF(int *id); int GetLogOnF(int *id); int GetOutputOnF(int *id); int GetSelectedOutputColumnCountF(int *id); diff --git a/src/fwrap2.cpp b/src/fwrap2.cpp index 3c93c98e..5dd58b55 100644 --- a/src/fwrap2.cpp +++ b/src/fwrap2.cpp @@ -3,6 +3,7 @@ #if defined(_WIN32) + #if defined(__cplusplus) extern "C" { #endif @@ -10,53 +11,117 @@ extern "C" { // // Intel Fortran compiler 9.1 /iface:cvf // -DLL_EXPORT int CREATEIPHREEQC(void) +DLL_EXPORT int ACCUMULATELINE(int *id, char *line, unsigned int len) +{ + return AccumulateLineF(id, line, len); +} +DLL_EXPORT int CREATEIPHREEQC(void) { return CreateIPhreeqcF(); } -DLL_EXPORT int DESTROYIPHREEQC(int *id) +DLL_EXPORT int DESTROYIPHREEQC(int *id) { return DestroyIPhreeqcF(id); } -DLL_EXPORT int LOADDATABASE(int *id, char *filename, unsigned int len) +DLL_EXPORT void GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length) +{ + GetComponentF(id, n, line, line_length); +} +DLL_EXPORT int GETCOMPONENTCOUNT(int *id) +{ + return GetComponentCountF(id); +} +DLL_EXPORT void GETDUMPLINE(int *id, int *n, char* line, unsigned int line_length) +{ + GetDumpLineF(id, n, line, line_length); +} +DLL_EXPORT int GETDUMPLINECOUNT(int *id) +{ + return GetDumpLineCountF(id); +} +DLL_EXPORT int GETDUMPON(int *id) +{ + return GetDumpOnF(id); +} +DLL_EXPORT int GETDUMPSTRINGON(int *id) +{ + return GetDumpStringOnF(id); +} +DLL_EXPORT void GETERRORLINE(int *id, int *n, char* line, unsigned int line_length) +{ + GetErrorLineF(id, n, line, line_length); +} +DLL_EXPORT int GETERRORLINECOUNT(int *id) +{ + return GetErrorLineCountF(id); +} +DLL_EXPORT int GETERRORON(int *id) +{ + return GetErrorOnF(id); +} +DLL_EXPORT int GETLOGON(int *id) +{ + return GetLogOnF(id); +} +DLL_EXPORT int GETOUTPUTON(int *id) +{ + return GetOutputOnF(id); +} +DLL_EXPORT int GETSELECTEDOUTPUTCOLUMNCOUNT(int *id) +{ + return GetSelectedOutputColumnCountF(id); +} +DLL_EXPORT int GETSELECTEDOUTPUTON(int *id) +{ + return GetSelectedOutputOnF(id); +} +DLL_EXPORT int GETSELECTEDOUTPUTROWCOUNT(int *id) +{ + return GetSelectedOutputRowCountF(id); +} +DLL_EXPORT int GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length) +{ + return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length); +} +DLL_EXPORT void GETWARNINGLINE(int *id, int *n, char* line, unsigned int line_length) +{ + GetWarningLineF(id, n, line, line_length); +} +DLL_EXPORT int GETWARNINGLINECOUNT(int *id) +{ + return GetWarningLineCountF(id); +} +DLL_EXPORT int LOADDATABASE(int *id, char *filename, unsigned int len) { return LoadDatabaseF(id, filename, len); } -DLL_EXPORT int LOADDATABASESTRING(int *id, char *input, unsigned int len) +DLL_EXPORT int LOADDATABASESTRING(int *id, char *input, unsigned int len) { return LoadDatabaseStringF(id, input, len); } -DLL_EXPORT int UNLOADDATABASE(int *id) -{ - return UnLoadDatabaseF(id); -} DLL_EXPORT void OUTPUTERROR(int *id) { OutputErrorF(id); } +DLL_EXPORT void OUTPUTLINES(int *id) +{ + OutputLinesF(id); +} DLL_EXPORT void OUTPUTWARNING(int *id) { OutputWarningF(id); } -DLL_EXPORT int ACCUMULATELINE(int *id, char *line, unsigned int len) +DLL_EXPORT int RUNACCUMULATED(int *id) { - return AccumulateLineF(id, line, len); + return RunAccumulatedF(id); } -DLL_EXPORT void SETSELECTEDOUTPUTON(int *id, int *selected_on) +DLL_EXPORT int RUNFILE(int *id, char *filename, unsigned int len) { - SetSelectedOutputOnF(id, selected_on); + return RunFileF(id, filename, len); } -DLL_EXPORT void SETOUTPUTON(int *id, int *output_on) +DLL_EXPORT int RUNSTRING(int *id, char *input, unsigned int len) { - SetOutputOnF(id, output_on); -} -DLL_EXPORT void SETERRORON(int *id, int *error_on) -{ - SetErrorOnF(id, error_on); -} -DLL_EXPORT void SETLOGON(int *id, int *log_on) -{ - SetLogOnF(id, log_on); + return RunStringF(id, input, len); } DLL_EXPORT void SETDUMPON(int *id, int *dump_on) { @@ -66,65 +131,25 @@ DLL_EXPORT void SETDUMPSTRINGON(int *id, int *dump_string_on) { SetDumpStringOnF(id, dump_string_on); } -DLL_EXPORT int GETDUMPLINECOUNT(int *id) +DLL_EXPORT void SETERRORON(int *id, int *error_on) { - return GetDumpLineCountF(id); + SetErrorOnF(id, error_on); } -DLL_EXPORT void GETDUMPLINE(int *id, int *n, char* line, unsigned int line_length) +DLL_EXPORT void SETLOGON(int *id, int *log_on) { - GetDumpLineF(id, n, line, line_length); + SetLogOnF(id, log_on); } -DLL_EXPORT int GETERRORLINECOUNT(int *id) +DLL_EXPORT void SETOUTPUTON(int *id, int *output_on) { - return GetErrorLineCountF(id); + SetOutputOnF(id, output_on); } -DLL_EXPORT void GETERRORLINE(int *id, int *n, char* line, unsigned int line_length) +DLL_EXPORT void SETSELECTEDOUTPUTON(int *id, int *selected_on) { - GetErrorLineF(id, n, line, line_length); + SetSelectedOutputOnF(id, selected_on); } -DLL_EXPORT int GETWARNINGLINECOUNT(int *id) +DLL_EXPORT int UNLOADDATABASE(int *id) { - return GetWarningLineCountF(id); -} -DLL_EXPORT void GETWARNINGLINE(int *id, int *n, char* line, unsigned int line_length) -{ - GetWarningLineF(id, n, line, line_length); -} -DLL_EXPORT int GETCOMPONENTCOUNT(int *id) -{ - return GetComponentCountF(id); -} -DLL_EXPORT void GETCOMPONENT(int *id, int *n, char* line, unsigned int line_length) -{ - GetComponentF(id, n, line, line_length); -} -DLL_EXPORT int RUNACCUMULATED(int *id) -{ - return RunAccumulatedF(id); -} -DLL_EXPORT int RUNFILE(int *id, char *filename, unsigned int len) -{ - return RunFileF(id, filename, len); -} -DLL_EXPORT int RUNSTRING(int *id, char *input, unsigned int len) -{ - return RunStringF(id, input, len); -} -DLL_EXPORT void OUTPUTLINES(int *id) -{ - OutputLinesF(id); -} -DLL_EXPORT int GETSELECTEDOUTPUTROWCOUNT(int *id) -{ - return GetSelectedOutputRowCountF(id); -} -DLL_EXPORT int GETSELECTEDOUTPUTCOLUMNCOUNT(int *id) -{ - return GetSelectedOutputColumnCountF(id); -} -DLL_EXPORT int GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length) -{ - return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length); + return UnLoadDatabaseF(id); } #if defined(__cplusplus) diff --git a/src/fwrap3.cpp b/src/fwrap3.cpp index 0409d8dd..56e0cd7c 100644 --- a/src/fwrap3.cpp +++ b/src/fwrap3.cpp @@ -10,45 +10,125 @@ extern "C" { // // Intel Fortran compiler 9.1 /iface:cref /assume:underscore // -DLL_EXPORT int createiphreeqc_(void) +DLL_EXPORT int accumulateline_(int *id, char *line, unsigned int len) +{ + return AccumulateLineF(id, line, len); +} +DLL_EXPORT int createiphreeqc_(void) { return CreateIPhreeqcF(); } -DLL_EXPORT int destroyiphreeqc_(int *id) +DLL_EXPORT int destroyiphreeqc_(int *id) { return DestroyIPhreeqcF(id); } -DLL_EXPORT int loaddatabase_(int *id, char *filename, unsigned int len) +DLL_EXPORT void getcomponent_(int *id, int *n, char* line, unsigned int line_length) +{ + GetComponentF(id, n, line, line_length); +} +DLL_EXPORT int getcomponentcount_(int *id) +{ + return GetComponentCountF(id); +} +DLL_EXPORT void getdumpline_(int *id, int *n, char* line, unsigned int line_length) +{ + GetDumpLineF(id, n, line, line_length); +} +DLL_EXPORT int getdumplinecount_(int *id) +{ + return GetDumpLineCountF(id); +} +DLL_EXPORT int getdumpon_(int *id) +{ + return GetDumpOnF(id); +} +DLL_EXPORT int getdumpstringon_(int *id) +{ + return GetDumpStringOnF(id); +} +DLL_EXPORT void geterrorline_(int *id, int *n, char* line, unsigned int line_length) +{ + GetErrorLineF(id, n, line, line_length); +} +DLL_EXPORT int geterrorlinecount_(int *id) +{ + return GetErrorLineCountF(id); +} +DLL_EXPORT int geterroron_(int *id) +{ + return GetErrorOnF(id); +} +DLL_EXPORT int getlogon_(int *id) +{ + return GetLogOnF(id); +} +DLL_EXPORT int getoutputon_(int *id) +{ + return GetOutputOnF(id); +} +DLL_EXPORT int getselectedoutputcolumncount_(int *id) +{ + return GetSelectedOutputColumnCountF(id); +} +DLL_EXPORT int getselectedoutputon_(int *id) +{ + return GetSelectedOutputOnF(id); +} +DLL_EXPORT int getselectedoutputrowcount_(int *id) +{ + return GetSelectedOutputRowCountF(id); +} +DLL_EXPORT int getselectedoutputvalue_(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length) +{ + return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length); +} +DLL_EXPORT void getwarningline_(int *id, int *n, char* line, unsigned int line_length) +{ + GetWarningLineF(id, n, line, line_length); +} +DLL_EXPORT int getwarninglinecount_(int *id) +{ + return GetWarningLineCountF(id); +} +DLL_EXPORT int loaddatabase_(int *id, char *filename, unsigned int len) { return LoadDatabaseF(id, filename, len); } -DLL_EXPORT int loaddatabasestring_(int *id, char *input, unsigned int len) +DLL_EXPORT int loaddatabasestring_(int *id, char *input, unsigned int len) { return LoadDatabaseStringF(id, input, len); } -DLL_EXPORT int unloaddatabase_(int *id) -{ - return UnLoadDatabaseF(id); -} DLL_EXPORT void outputerror_(int *id) { OutputErrorF(id); } +DLL_EXPORT void outputlines_(int *id) +{ + OutputLinesF(id); +} DLL_EXPORT void outputwarning_(int *id) { OutputWarningF(id); } -DLL_EXPORT int accumulateline_(int *id, char *line, unsigned int len) +DLL_EXPORT int runaccumulated_(int *id) { - return AccumulateLineF(id, line, len); + return RunAccumulatedF(id); } -DLL_EXPORT void setselectedoutputon_(int *id, int *selected_on) +DLL_EXPORT int runfile_(int *id, char *filename, unsigned int len) { - SetSelectedOutputOnF(id, selected_on); + return RunFileF(id, filename, len); } -DLL_EXPORT void setoutputon_(int *id, int *output_on) +DLL_EXPORT int runstring_(int *id, char *input, unsigned int len) { - SetOutputOnF(id, output_on); + return RunStringF(id, input, len); +} +DLL_EXPORT void setdumpon_(int *id, int *dump_on) +{ + SetDumpOnF(id, dump_on); +} +DLL_EXPORT void setdumpstringon_(int *id, int *dump_string_on) +{ + SetDumpStringOnF(id, dump_string_on); } DLL_EXPORT void seterroron_(int *id, int *error_on) { @@ -58,73 +138,17 @@ DLL_EXPORT void setlogon_(int *id, int *log_on) { SetLogOnF(id, log_on); } -DLL_EXPORT void setdumpon_(int *id, int *dump_on) +DLL_EXPORT void setoutputon_(int *id, int *output_on) { - SetLogOnF(id, dump_on); + SetOutputOnF(id, output_on); } -DLL_EXPORT void setdumpstringon_(int *id, int *dump_string_on) +DLL_EXPORT void setselectedoutputon_(int *id, int *selected_on) { - SetDumpStringOnF(id, dump_string_on); + SetSelectedOutputOnF(id, selected_on); } -DLL_EXPORT int getdumplinecount_(int *id) +DLL_EXPORT int unloaddatabase_(int *id) { - return GetDumpLineCountF(id); -} -DLL_EXPORT void getdumpline_(int *id, int *n, char* line, unsigned int line_length) -{ - GetDumpLineF(id, n, line, line_length); -} -DLL_EXPORT int geterrorlinecount_(int *id) -{ - return GetErrorLineCountF(id); -} -DLL_EXPORT void geterrorline_(int *id, int *n, char* line, unsigned int line_length) -{ - GetErrorLineF(id, n, line, line_length); -} -DLL_EXPORT int getwarninglinecount_(int *id) -{ - return GetWarningLineCountF(id); -} -DLL_EXPORT void getwarningline_(int *id, int *n, char* line, unsigned int line_length) -{ - GetWarningLineF(id, n, line, line_length); -} -DLL_EXPORT int getcomponentcount_(int *id) -{ - return GetComponentCountF(id); -} -DLL_EXPORT void getcomponent_(int *id, int *n, char* line, unsigned int line_length) -{ - GetComponentF(id, n, line, line_length); -} -DLL_EXPORT int runaccumulated_(int *id) -{ - return RunAccumulatedF(id); -} -DLL_EXPORT int runfile_(int *id, char *filename, unsigned int len) -{ - return RunFileF(id, filename, len); -} -DLL_EXPORT int runstring_(int *id, char *input, unsigned int len) -{ - return RunStringF(id, input, len); -} -DLL_EXPORT void outputlines_(int *id) -{ - OutputLinesF(id); -} -DLL_EXPORT int getselectedoutputrowcount_(int *id) -{ - return GetSelectedOutputRowCountF(id); -} -DLL_EXPORT int getselectedoutputcolumncount_(int *id) -{ - return GetSelectedOutputColumnCountF(id); -} -DLL_EXPORT int getselectedoutputvalue_(int *id, int *row, int *col, int *vtype, double* dvalue, char* svalue, unsigned int svalue_length) -{ - return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length); + return UnLoadDatabaseF(id); } #if defined(__cplusplus) diff --git a/test/test.vfproj b/test/test.vfproj index 9e838c7d..3f6ee77b 100644 --- a/test/test.vfproj +++ b/test/test.vfproj @@ -23,16 +23,6 @@ - - - - - - - - - - diff --git a/test2/test2.vfproj b/test2/test2.vfproj index c3c9987d..93250a76 100644 --- a/test2/test2.vfproj +++ b/test2/test2.vfproj @@ -23,16 +23,6 @@ - - - - - - - - - - diff --git a/unit/unit.vcproj b/unit/unit.vcproj index 2b1188c7..10ea95e2 100644 --- a/unit/unit.vcproj +++ b/unit/unit.vcproj @@ -10,6 +10,9 @@ + @@ -194,9 +197,9 @@ /> @@ -224,7 +228,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1.10)/include";../include;../src;../src/phreeqcpp;../src/phreeqcpp/phreeqc" - PreprocessorDefinitions="CPPUNIT;WIN32_MEMORY_DEBUG;SWIG_SHARED_OBJ;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;PHREEQC_CPP;PHREEQC_CLASS" + PreprocessorDefinitions="CPPUNIT;SWIG_SHARED_OBJ;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;PHREEQC_CPP;PHREEQC_CLASS;USE_PHRQ_ALLOC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -232,7 +236,7 @@ BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> + + + + + + + + + + + + + + + + + + + + @@ -314,7 +407,16 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +