max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated to revised IPhreeqc using Fortran module (USE IPhreeqc) instead of include file.

Browse Source 
Updated keywords file locations.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9451 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2015-04-01 21:28:33 +00:00
parent 599603aaff
commit 5b157ab847
2 changed files with 24 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
IPhreeqc.MMS.vcxproj
View File

@ -164,7 +164,7 @@
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>src;src/phreeqcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -195,7 +195,7 @@
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>src;src/phreeqcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -222,7 +222,7 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>src;src/phreeqcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -252,7 +252,7 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>src;src/phreeqcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -280,7 +280,7 @@
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>src;src/phreeqcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -314,7 +314,7 @@
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>src;src/phreeqcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -344,7 +344,7 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>src;src/phreeqcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -377,7 +377,7 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>src;src/phreeqcpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -406,16 +406,10 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\CSelectedOutput.cpp" /> <ClCompile Include="src\CSelectedOutput.cpp" />
<ClCompile Include="src\fwrap.cpp" />
<ClCompile Include="src\fwrap2.cpp" />
<ClCompile Include="src\fwrap3.cpp" />
<ClCompile Include="src\fwrap4.cpp" />
<ClCompile Include="src\fwrap5.cpp" />
<ClCompile Include="src\fwrap6.cpp" />
<ClCompile Include="src\fwrap7.cpp" />
<ClCompile Include="src\fwrap8.cpp" />
<ClCompile Include="src\IPhreeqc.cpp" /> <ClCompile Include="src\IPhreeqc.cpp" />
<ClCompile Include="src\IPhreeqcLib.cpp" /> <ClCompile Include="src\IPhreeqcLib.cpp" />
<ClCompile Include="src\IPhreeqc_interface_F.cpp" />
<ClCompile Include="src\phreeqcpp\PhreeqcKeywords\Keywords.cpp" />
<ClCompile Include="src\phreeqcpp\SelectedOutput.cpp" /> <ClCompile Include="src\phreeqcpp\SelectedOutput.cpp" />
<ClCompile Include="src\phreeqcpp\UserPunch.cpp" /> <ClCompile Include="src\phreeqcpp\UserPunch.cpp" />
<ClCompile Include="src\Var.c"> <ClCompile Include="src\Var.c">
@ -433,7 +427,6 @@
<ClCompile Include="src\phreeqcpp\GasPhase.cxx" /> <ClCompile Include="src\phreeqcpp\GasPhase.cxx" />
<ClCompile Include="src\phreeqcpp\ISolution.cxx" /> <ClCompile Include="src\phreeqcpp\ISolution.cxx" />
<ClCompile Include="src\phreeqcpp\ISolutionComp.cxx" /> <ClCompile Include="src\phreeqcpp\ISolutionComp.cxx" />
<ClCompile Include="src\phreeqcpp\Keywords.cpp" />
<ClCompile Include="src\phreeqcpp\KineticsComp.cxx" /> <ClCompile Include="src\phreeqcpp\KineticsComp.cxx" />
<ClCompile Include="src\phreeqcpp\NameDouble.cxx" /> <ClCompile Include="src\phreeqcpp\NameDouble.cxx" />
<ClCompile Include="src\phreeqcpp\NumKeyword.cxx" /> <ClCompile Include="src\phreeqcpp\NumKeyword.cxx" />
@ -499,19 +492,12 @@
<ClCompile Include="src\phreeqcpp\transport.cpp" /> <ClCompile Include="src\phreeqcpp\transport.cpp" />
<ClCompile Include="src\phreeqcpp\utilities.cpp" /> <ClCompile Include="src\phreeqcpp\utilities.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<CustomBuild Include="src\IPhreeqcF.f">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuild>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\CSelectedOutput.hxx" /> <ClInclude Include="src\CSelectedOutput.hxx" />
<ClInclude Include="src\CVar.hxx" /> <ClInclude Include="src\CVar.hxx" />
<ClInclude Include="src\IPhreeqc.h" /> <ClInclude Include="src\IPhreeqc.h" />
<ClInclude Include="src\IPhreeqc.hpp" /> <ClInclude Include="src\IPhreeqc.hpp" />
<ClInclude Include="src\IPhreeqc_interface_F.h" />
<ClInclude Include="src\phreeqcpp\cvdense.h" /> <ClInclude Include="src\phreeqcpp\cvdense.h" />
<ClInclude Include="src\phreeqcpp\cvode.h" /> <ClInclude Include="src\phreeqcpp\cvode.h" />
<ClInclude Include="src\phreeqcpp\cxxKinetics.h" /> <ClInclude Include="src\phreeqcpp\cxxKinetics.h" />
@ -529,8 +515,6 @@
<ClInclude Include="src\phreeqcpp\input.h" /> <ClInclude Include="src\phreeqcpp\input.h" />
<ClInclude Include="src\phreeqcpp\ISolution.h" /> <ClInclude Include="src\phreeqcpp\ISolution.h" />
<ClInclude Include="src\phreeqcpp\ISolutionComp.h" /> <ClInclude Include="src\phreeqcpp\ISolutionComp.h" />
<ClInclude Include="src\phreeqcpp\Keywords.h" />
<ClInclude Include="src\phreeqcpp\kinetics.h" />
<ClInclude Include="src\phreeqcpp\KineticsComp.h" /> <ClInclude Include="src\phreeqcpp\KineticsComp.h" />
<ClInclude Include="src\phreeqcpp\Model_eqns.h" /> <ClInclude Include="src\phreeqcpp\Model_eqns.h" />
<ClInclude Include="src\phreeqcpp\NameDouble.h" /> <ClInclude Include="src\phreeqcpp\NameDouble.h" />
@ -543,6 +527,7 @@
<ClInclude Include="src\phreeqcpp\PBasic.h" /> <ClInclude Include="src\phreeqcpp\PBasic.h" />
<ClInclude Include="src\phreeqcpp\phqalloc.h" /> <ClInclude Include="src\phreeqcpp\phqalloc.h" />
<ClInclude Include="src\phreeqcpp\Phreeqc.h" /> <ClInclude Include="src\phreeqcpp\Phreeqc.h" />
<ClInclude Include="src\phreeqcpp\PhreeqcKeywords\Keywords.h" />
<ClInclude Include="src\phreeqcpp\Phreeqc_class.h" /> <ClInclude Include="src\phreeqcpp\Phreeqc_class.h" />
<ClInclude Include="src\phreeqcpp\PHRQ_base.h" /> <ClInclude Include="src\phreeqcpp\PHRQ_base.h" />
<ClInclude Include="src\phreeqcpp\PHRQ_io.h" /> <ClInclude Include="src\phreeqcpp\PHRQ_io.h" />

50
IPhreeqc.MMS.vcxproj.filters
View File

@ -17,30 +17,6 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\fwrap.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\fwrap2.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\fwrap3.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\fwrap4.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\fwrap5.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\fwrap6.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\fwrap7.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\fwrap8.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\IPhreeqc.cpp"> <ClCompile Include="src\IPhreeqc.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -77,9 +53,6 @@
<ClCompile Include="src\phreeqcpp\ISolutionComp.cxx"> <ClCompile Include="src\phreeqcpp\ISolutionComp.cxx">
<Filter>Source Files\phreeqcpp</Filter> <Filter>Source Files\phreeqcpp</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\phreeqcpp\Keywords.cpp">
<Filter>Source Files\phreeqcpp</Filter>
</ClCompile>
<ClCompile Include="src\phreeqcpp\KineticsComp.cxx"> <ClCompile Include="src\phreeqcpp\KineticsComp.cxx">
<Filter>Source Files\phreeqcpp</Filter> <Filter>Source Files\phreeqcpp</Filter>
</ClCompile> </ClCompile>
@ -281,6 +254,12 @@
<ClCompile Include="src\phreeqcpp\UserPunch.cpp"> <ClCompile Include="src\phreeqcpp\UserPunch.cpp">
<Filter>Source Files\phreeqcpp</Filter> <Filter>Source Files\phreeqcpp</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\phreeqcpp\PhreeqcKeywords\Keywords.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\IPhreeqc_interface_F.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\CVar.hxx"> <ClInclude Include="src\CVar.hxx">
@ -337,12 +316,6 @@
<ClInclude Include="src\phreeqcpp\ISolutionComp.h"> <ClInclude Include="src\phreeqcpp\ISolutionComp.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\phreeqcpp\Keywords.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\phreeqcpp\kinetics.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\phreeqcpp\KineticsComp.h"> <ClInclude Include="src\phreeqcpp\KineticsComp.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -481,10 +454,11 @@
<ClInclude Include="src\phreeqcpp\UserPunch.h"> <ClInclude Include="src\phreeqcpp\UserPunch.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> <ClInclude Include="src\phreeqcpp\PhreeqcKeywords\Keywords.h">
<ItemGroup> <Filter>Header Files</Filter>
<CustomBuild Include="src\IPhreeqcF.f"> </ClInclude>
<Filter>Source Files</Filter> <ClInclude Include="src\IPhreeqc_interface_F.h">
</CustomBuild> <Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>