mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 16:44:49 +01:00
fixed to run on linux; cleaned examples
This commit is contained in:
Charlton, Scott R
parent
ee7d1026e6
commit
c311b23bc3
@ -1,36 +0,0 @@
|
|||||||
SHELL=/bin/bash
|
|
||||||
HOSTNAME ?= $(shell hostname)
|
|
||||||
|
|
||||||
ifeq (${HOSTNAME}, ubuntu)
|
|
||||||
LDFLAGS = -L../../../_build/INSTALL/lib
|
|
||||||
IPHREEQC_LA = ../../../_build/INSTALL/lib/libiphreeqc.la
|
|
||||||
LIBTOOL = /usr/bin/libtool
|
|
||||||
FC = gfortran
|
|
||||||
FFLAGS =
|
|
||||||
MOD_FILES = callback.mod iphreeqc.mod mydata.mod subs.mod
|
|
||||||
endif
|
|
||||||
|
|
||||||
all: advect advect-lt
|
|
||||||
|
|
||||||
advect: advect.o
|
|
||||||
gfortran -o advect advect.o IPhreeqc_interface.o $(LDFLAGS) -liphreeqc -lstdc++
|
|
||||||
|
|
||||||
#advect.o: advect.F90 IPhreeqc_interface.o
|
|
||||||
# gfortran -c $<
|
|
||||||
advect.o: advect.lo
|
|
||||||
|
|
||||||
#IPhreeqc_interface.o: ../../../src/IPhreeqc_interface.F90
|
|
||||||
# gfortran -c $<
|
|
||||||
IPhreeqc_interface.o: IPhreeqc_interface.lo
|
|
||||||
|
|
||||||
advect-lt: advect.lo $(IPHREEQC_LA)
|
|
||||||
$(LIBTOOL) --mode=link $(FC) -o $@ $< IPhreeqc_interface.lo $(IPHREEQC_LA)
|
|
||||||
|
|
||||||
advect.lo: advect.F90 IPhreeqc_interface.lo
|
|
||||||
$(LIBTOOL) --mode=compile $(FC) $(FFLAGS) -c -o $@ $<
|
|
||||||
|
|
||||||
IPhreeqc_interface.lo: ../../../src/IPhreeqc_interface.F90
|
|
||||||
$(LIBTOOL) --mode=compile $(FC) $(FFLAGS) -c -o $@ $<
|
|
||||||
|
|
||||||
clean:
|
|
||||||
${LIBTOOL} --mode=clean rm -f advect advect-lt advect.lo IPhreeqc_interface.lo ${MOD_FILES}
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 9.00
|
|
||||||
# Visual Studio 2005
|
|
||||||
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "advect", "advect.vfproj", "{28459FF2-3C6C-469E-B0C3-2E4D483E7025}"
|
|
||||||
EndProject
|
|
||||||
Global
|
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
||||||
Debug|Win32 = Debug|Win32
|
|
||||||
Debug|x64 = Debug|x64
|
|
||||||
DebugDll|Win32 = DebugDll|Win32
|
|
||||||
DebugDll|x64 = DebugDll|x64
|
|
||||||
Release|Win32 = Release|Win32
|
|
||||||
Release|x64 = Release|x64
|
|
||||||
ReleaseDll|Win32 = ReleaseDll|Win32
|
|
||||||
ReleaseDll|x64 = ReleaseDll|x64
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Debug|Win32.Build.0 = Debug|Win32
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugDll|Win32.Build.0 = DebugDll|Win32
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugDll|x64.ActiveCfg = DebugDll|x64
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.DebugDll|x64.Build.0 = DebugDll|x64
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Release|Win32.ActiveCfg = Release|Win32
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Release|Win32.Build.0 = Release|Win32
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.Release|x64.Build.0 = Release|x64
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64
|
|
||||||
{28459FF2-3C6C-469E-B0C3-2E4D483E7025}.ReleaseDll|x64.Build.0 = ReleaseDll|x64
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
||||||
@ -1,94 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{28459FF2-3C6C-469E-B0C3-2E4D483E7025}">
|
|
||||||
<Platforms>
|
|
||||||
<Platform Name="Win32"/>
|
|
||||||
<Platform Name="x64"/></Platforms>
|
|
||||||
<Configurations>
|
|
||||||
<Configuration Name="Debug|Win32">
|
|
||||||
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../include" Interfaces="true" FixedFormLineLength="fixedLength132" WarnInterfaces="true" StringLengthArgPassing="strLenArgsMixed" 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"/>
|
|
||||||
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
|
|
||||||
<Tool Name="VFCustomBuildTool"/>
|
|
||||||
<Tool Name="VFPreLinkEventTool"/>
|
|
||||||
<Tool Name="VFPreBuildEventTool"/>
|
|
||||||
<Tool Name="VFPostBuildEventTool"/>
|
|
||||||
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
|
|
||||||
<Configuration Name="Release|Win32">
|
|
||||||
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../include" StringLengthArgPassing="strLenArgsMixed"/>
|
|
||||||
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../../lib" 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"/>
|
|
||||||
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
|
|
||||||
<Configuration Name="DebugDll|Win32">
|
|
||||||
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../include" Interfaces="true" FixedFormLineLength="fixedLength132" WarnInterfaces="true" StringLengthArgPassing="strLenArgsMixed" 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"/>
|
|
||||||
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
|
|
||||||
<Configuration Name="ReleaseDll|Win32">
|
|
||||||
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../include" StringLengthArgPassing="strLenArgsMixed" 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"/>
|
|
||||||
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
|
|
||||||
<Configuration Name="Debug|x64">
|
|
||||||
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../include" Interfaces="true" FixedFormLineLength="fixedLength132" WarnInterfaces="true" StringLengthArgPassing="strLenArgsMixed" 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"/>
|
|
||||||
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
|
|
||||||
<Configuration Name="Release|x64">
|
|
||||||
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../include" StringLengthArgPassing="strLenArgsMixed"/>
|
|
||||||
<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"/>
|
|
||||||
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
|
|
||||||
<Configuration Name="DebugDll|x64">
|
|
||||||
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../include" Interfaces="true" FixedFormLineLength="fixedLength132" WarnInterfaces="true" StringLengthArgPassing="strLenArgsMixed" 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"/>
|
|
||||||
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
|
|
||||||
<Configuration Name="ReleaseDll|x64">
|
|
||||||
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../include" StringLengthArgPassing="strLenArgsMixed" 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"/>
|
|
||||||
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
|
|
||||||
<Files>
|
|
||||||
<Filter Name="Header Files" Filter="fi;fd">
|
|
||||||
<File RelativePath=".\IPhreeqc.f90.inc"/></Filter>
|
|
||||||
<Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
|
|
||||||
<Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
|
|
||||||
<File RelativePath=".\advect.f90"/></Filter>
|
|
||||||
<File RelativePath=".\ReadMe.txt"/></Files>
|
|
||||||
<Globals/></VisualStudioProject>
|
|
||||||
Loading…
x
Reference in New Issue
Block a user