mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
Rearranging IPhreeqc
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4107 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton
parent
a36dd188d5
commit
44b93e6a6e
17
test/Makefile
Normal file
17
test/Makefile
Normal file
@ -0,0 +1,17 @@
|
||||
|
||||
FFLAGS = -O3 -I../include
|
||||
LDFLAGS = -L../lib
|
||||
FLDFLAGS = -lgfortranbegin -lgfortran
|
||||
|
||||
%.o: %.f
|
||||
$(FC) $(FFLAGS) $(TARGET_ARCH) -c -o $@ $<
|
||||
|
||||
all: kinn
|
||||
|
||||
clean:
|
||||
$(RM) kinn.o kinn.exe kinn phreeqc.log phreeqc.out phreeqc.err selected.out
|
||||
|
||||
kinn: kinn.o ../lib/libiphreeqc.a
|
||||
$(CXX) $(LDFLAGS) -o kinn kinn.o -liphreeqc $(FLDFLAGS)
|
||||
|
||||
kinn.o: kinn.f ../include/IPhreeqc.f.inc
|
||||
168
test/kinn.f
Normal file
168
test/kinn.f
Normal file
@ -0,0 +1,168 @@
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
PROGRAM DRIVER
|
||||
|
||||
IMPLICIT NONE
|
||||
INCLUDE 'IPhreeqc.f.inc'
|
||||
INTEGER iresult
|
||||
INTEGER i, j, k, rows, cols
|
||||
INTEGER vtype
|
||||
CHARACTER(30) svalue
|
||||
INTEGER len
|
||||
REAL*8 dvalue
|
||||
|
||||
iresult = LoadDatabase('llnl.dat')
|
||||
|
||||
IF (iresult.NE.VR_OK) THEN
|
||||
CALL OutputLastError
|
||||
STOP
|
||||
ENDIF
|
||||
|
||||
!!!! DO 45 k=1,10
|
||||
|
||||
CALL SOLUTION(1.0, 1.0, 1.0)
|
||||
CALL EQUILIBRIUM_PHASES('calcite', 0.0, 0.010)
|
||||
CALL USER_PUNCH('Ca', 10)
|
||||
!!!! CALL OutputLines
|
||||
iresult = Run(.FALSE., .FALSE., .FALSE., .TRUE.)
|
||||
IF (iresult.NE.VR_OK) THEN
|
||||
CALL OutputLastError
|
||||
STOP
|
||||
ENDIF
|
||||
|
||||
rows = GetSelectedOutputRowCount()
|
||||
cols = GetSelectedOutputColumnCount()
|
||||
|
||||
!!!! PRINT 10, 'Rows = ', rows
|
||||
!!!! PRINT 10, 'Cols = ', cols
|
||||
10 FORMAT(A,I3)
|
||||
|
||||
!
|
||||
! output simulated selected output
|
||||
!
|
||||
! headings
|
||||
DO 20 j=1,cols
|
||||
iresult = GetSelectedOutputValue(0, j, vtype, dvalue, svalue)
|
||||
len = INDEX(svalue, ' ')
|
||||
PRINT 50, svalue(1:len-1), ACHAR(9)
|
||||
20 CONTINUE
|
||||
PRINT *
|
||||
|
||||
! values
|
||||
DO 40 i=1,rows
|
||||
DO 30 j=1,cols
|
||||
iresult = GetSelectedOutputValue(i, j, vtype, dvalue, svalue)
|
||||
IF (iresult.EQ.VR_OK) THEN
|
||||
IF (vtype.eq.TT_EMPTY) THEN
|
||||
PRINT 50, ' ', ACHAR(9)
|
||||
ELSEIF(vtype.eq.TT_DOUBLE) THEN
|
||||
PRINT 60, dvalue, ACHAR(9)
|
||||
ELSEIF(vtype.eq.TT_STRING) THEN
|
||||
len = INDEX(svalue, ' ')
|
||||
PRINT 50, svalue(1:len-1), ACHAR(9)
|
||||
ENDIF
|
||||
ELSE
|
||||
IF (iresult.eq.VR_INVALIDROW) THEN
|
||||
PRINT 50, 'INVROW', ACHAR(9)
|
||||
ELSEIF (iresult.eq.VR_INVALIDCOL) THEN
|
||||
PRINT 50, 'INVCOL', ACHAR(9)
|
||||
ELSE
|
||||
PRINT 50, 'ERROR', ACHAR(9)
|
||||
ENDIF
|
||||
ENDIF
|
||||
30 CONTINUE
|
||||
PRINT *
|
||||
40 CONTINUE
|
||||
!!!!45 CONTINUE
|
||||
|
||||
50 FORMAT(A15,A,$)
|
||||
60 FORMAT(1PG15.7E2,A,$)
|
||||
END PROGRAM DRIVER
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
SUBROUTINE SOLUTION(C, Ca, Na)
|
||||
REAL C, Ca, Na
|
||||
CHARACTER(80) line
|
||||
WRITE (line,100),'SOLUTION 1'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,110),'C ', C
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,110),'Ca ', Ca
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,110),'Na ', Na
|
||||
CALL AccumulateLine(line)
|
||||
100 FORMAT(A)
|
||||
110 FORMAT(TR4,A,F8.4)
|
||||
END SUBROUTINE SOLUTION
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
SUBROUTINE EQUILIBRIUM_PHASES(phase, si, amount)
|
||||
REAL si, amount
|
||||
CHARACTER*(*) phase
|
||||
CHARACTER(80) line
|
||||
WRITE (line,'(A)'),'EQUILIBRIUM_PHASES'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,'(TR4, A, F8.4, F8.4)'), phase, si, amount
|
||||
CALL AccumulateLine(line)
|
||||
END SUBROUTINE EQUILIBRIUM_PHASES
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
SUBROUTINE USER_PUNCH(element, max)
|
||||
CHARACTER*(*) element
|
||||
INTEGER max
|
||||
INTEGER i
|
||||
CHARACTER(800) line
|
||||
CHARACTER(80) form
|
||||
CHARACTER(30) heading(20)
|
||||
WRITE (line,200),'USER_PUNCH'
|
||||
CALL AccumulateLine(line)
|
||||
DO i = 1,max
|
||||
WRITE (heading(i), 210),
|
||||
& i, '.name ',
|
||||
& i, '.type ',
|
||||
& i, '.moles '
|
||||
END DO
|
||||
WRITE (line, *), '-head ', (heading(i), i=1,max)
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), '-start'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 220), '10 n = sys("'
|
||||
& , element, '", count, names$, types$, moles)'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 230), '20 n = ', max
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 240), '30 if count < ', max
|
||||
& , ' then n = count'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), '40 for i = 1 to count'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), '50 PUNCH names$(i), types$(i), moles(i)'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), '60 next i'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), '70 list'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), '-end'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), 'SELECTED_OUTPUT'
|
||||
CALL AccumulateLine(line)
|
||||
!!! WRITE (line, 200), '-file srctest.txt'
|
||||
!!! CALL AccumulateLine(line)
|
||||
200 FORMAT(A)
|
||||
210 FORMAT(3(I2,A))
|
||||
220 FORMAT(A,A,A)
|
||||
230 FORMAT(A,I2)
|
||||
240 FORMAT(A,I2,A)
|
||||
END SUBROUTINE USER_PUNCH
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
SUBROUTINE PHASES_FIX_PH
|
||||
CHARACTER(80) line
|
||||
INTEGER i
|
||||
WRITE (line,500),'PHASES'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,510),'Fix_H+'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,510),'H+ = H+'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,510),'log_k 0.0'
|
||||
CALL AccumulateLine(line)
|
||||
500 FORMAT(A)
|
||||
510 FORMAT(TR4,A)
|
||||
END SUBROUTINE PHASES_FIX_PH
|
||||
|
||||
168
test/kinn.for
Normal file
168
test/kinn.for
Normal file
@ -0,0 +1,168 @@
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
PROGRAM DRIVER
|
||||
|
||||
IMPLICIT NONE
|
||||
INCLUDE 'IPhreeqc.f90.inc'
|
||||
INTEGER iresult
|
||||
INTEGER i, j, k, rows, cols
|
||||
INTEGER vtype
|
||||
CHARACTER(30) svalue
|
||||
INTEGER len
|
||||
REAL*8 dvalue
|
||||
|
||||
iresult = LoadDatabase('llnl.dat')
|
||||
|
||||
IF (iresult.NE.VR_OK) THEN
|
||||
CALL OutputLastError
|
||||
STOP
|
||||
ENDIF
|
||||
|
||||
!!!! DO 45 k=1,10
|
||||
|
||||
CALL SOLUTION(1.0, 1.0, 1.0)
|
||||
CALL EQUILIBRIUM_PHASES('calcite', 0.0, 0.010)
|
||||
CALL USER_PUNCH('Ca', 10)
|
||||
!!!! CALL OutputLines
|
||||
iresult = Run(.FALSE., .FALSE., .FALSE., .TRUE.)
|
||||
IF (iresult.NE.VR_OK) THEN
|
||||
CALL OutputLastError
|
||||
STOP
|
||||
ENDIF
|
||||
|
||||
rows = GetSelectedOutputRowCount()
|
||||
cols = GetSelectedOutputColumnCount()
|
||||
|
||||
!!!! PRINT 10, 'Rows = ', rows
|
||||
!!!! PRINT 10, 'Cols = ', cols
|
||||
10 FORMAT(A,I3)
|
||||
|
||||
!
|
||||
! output simulated selected output
|
||||
!
|
||||
! headings
|
||||
DO 20 j=1,cols
|
||||
iresult = GetSelectedOutputValue(0, j, vtype, dvalue, svalue)
|
||||
len = INDEX(svalue, ' ')
|
||||
PRINT 50, svalue(1:len-1), ACHAR(9)
|
||||
20 CONTINUE
|
||||
PRINT *
|
||||
|
||||
! values
|
||||
DO 40 i=1,rows
|
||||
DO 30 j=1,cols
|
||||
iresult = GetSelectedOutputValue(i, j, vtype, dvalue, svalue)
|
||||
IF (iresult.EQ.VR_OK) THEN
|
||||
IF (vtype.eq.TT_EMPTY) THEN
|
||||
PRINT 50, ' ', ACHAR(9)
|
||||
ELSEIF(vtype.eq.TT_DOUBLE) THEN
|
||||
PRINT 60, dvalue, ACHAR(9)
|
||||
ELSEIF(vtype.eq.TT_STRING) THEN
|
||||
len = INDEX(svalue, ' ')
|
||||
PRINT 50, svalue(1:len-1), ACHAR(9)
|
||||
ENDIF
|
||||
ELSE
|
||||
IF (iresult.eq.VR_INVALIDROW) THEN
|
||||
PRINT 50, 'INVROW', ACHAR(9)
|
||||
ELSEIF (iresult.eq.VR_INVALIDCOL) THEN
|
||||
PRINT 50, 'INVCOL', ACHAR(9)
|
||||
ELSE
|
||||
PRINT 50, 'ERROR', ACHAR(9)
|
||||
ENDIF
|
||||
ENDIF
|
||||
30 CONTINUE
|
||||
PRINT *
|
||||
40 CONTINUE
|
||||
!!!!45 CONTINUE
|
||||
|
||||
50 FORMAT(A15,A,$)
|
||||
60 FORMAT(1PG15.7E2,A,$)
|
||||
END PROGRAM DRIVER
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
SUBROUTINE SOLUTION(C, Ca, Na)
|
||||
REAL C, Ca, Na
|
||||
CHARACTER(80) line
|
||||
WRITE (line,100),'SOLUTION 1'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,110),'C ', C
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,110),'Ca ', Ca
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,110),'Na ', Na
|
||||
CALL AccumulateLine(line)
|
||||
100 FORMAT(A)
|
||||
110 FORMAT(TR4,A,F8.4)
|
||||
END SUBROUTINE SOLUTION
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
SUBROUTINE EQUILIBRIUM_PHASES(phase, si, amount)
|
||||
REAL si, amount
|
||||
CHARACTER*(*) phase
|
||||
CHARACTER(80) line
|
||||
WRITE (line,'(A)'),'EQUILIBRIUM_PHASES'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,'(TR4, A, F8.4, F8.4)'), phase, si, amount
|
||||
CALL AccumulateLine(line)
|
||||
END SUBROUTINE EQUILIBRIUM_PHASES
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
SUBROUTINE USER_PUNCH(element, max)
|
||||
CHARACTER*(*) element
|
||||
INTEGER max
|
||||
INTEGER i
|
||||
CHARACTER(800) line
|
||||
CHARACTER(80) form
|
||||
CHARACTER(30) heading(20)
|
||||
WRITE (line,200),'USER_PUNCH'
|
||||
CALL AccumulateLine(line)
|
||||
DO i = 1,max
|
||||
WRITE (heading(i), 210),
|
||||
& i, '.name ',
|
||||
& i, '.type ',
|
||||
& i, '.moles '
|
||||
END DO
|
||||
WRITE (line, *), '-head ', (heading(i), i=1,max)
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), '-start'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 220), '10 n = sys("'
|
||||
& , element, '", count, names$, types$, moles)'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 230), '20 n = ', max
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 240), '30 if count < ', max
|
||||
& , ' then n = count'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), '40 for i = 1 to count'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), '50 PUNCH names$(i), types$(i), moles(i)'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), '60 next i'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), '70 list'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), '-end'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line, 200), 'SELECTED_OUTPUT'
|
||||
CALL AccumulateLine(line)
|
||||
!!! WRITE (line, 200), '-file srctest.txt'
|
||||
!!! CALL AccumulateLine(line)
|
||||
200 FORMAT(A)
|
||||
210 FORMAT(3(I2,A))
|
||||
220 FORMAT(A,A,A)
|
||||
230 FORMAT(A,I2)
|
||||
240 FORMAT(A,I2,A)
|
||||
END SUBROUTINE USER_PUNCH
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
SUBROUTINE PHASES_FIX_PH
|
||||
CHARACTER(80) line
|
||||
INTEGER i
|
||||
WRITE (line,500),'PHASES'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,510),'Fix_H+'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,510),'H+ = H+'
|
||||
CALL AccumulateLine(line)
|
||||
WRITE (line,510),'log_k 0.0'
|
||||
CALL AccumulateLine(line)
|
||||
500 FORMAT(A)
|
||||
510 FORMAT(TR4,A)
|
||||
END SUBROUTINE PHASES_FIX_PH
|
||||
|
||||
19220
test/llnl.dat
Normal file
19220
test/llnl.dat
Normal file
File diff suppressed because it is too large
Load Diff
1556
test/phreeqc.dat
Normal file
1556
test/phreeqc.dat
Normal file
File diff suppressed because it is too large
Load Diff
139
test/test.dsp
Normal file
139
test/test.dsp
Normal file
@ -0,0 +1,139 @@
|
||||
# Microsoft Developer Studio Project File - Name="test" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Console Application" 0x0103
|
||||
|
||||
CFG=test - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "test.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "test.mak" CFG="test - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "test - Win32 Release" (based on "Win32 (x86) Console Application")
|
||||
!MESSAGE "test - Win32 Debug" (based on "Win32 (x86) Console Application")
|
||||
!MESSAGE "test - Win32 Profile" (based on "Win32 (x86) Console Application")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
F90=df.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "test - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE F90 /compile_only /nologo /warn:nofileopt
|
||||
# ADD F90 /compile_only /include:"../include" /nologo /threads /warn:nofileopt
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
|
||||
# ADD LINK32 iphreeqc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "test - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE F90 /check:bounds /compile_only /debug:full /nologo /traceback /warn:argument_checking /warn:nofileopt
|
||||
# ADD F90 /check:bounds /compile_only /debug:full /include:"../include" /nologo /traceback /warn:argument_checking /warn:nofileopt
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 iphreeqcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../lib"
|
||||
# SUBTRACT LINK32 /incremental:no
|
||||
|
||||
!ELSEIF "$(CFG)" == "test - Win32 Profile"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "test___Win32_Profile"
|
||||
# PROP BASE Intermediate_Dir "test___Win32_Profile"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Profile"
|
||||
# PROP Intermediate_Dir "Profile"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE F90 /compile_only /include:"../include" /nologo /warn:nofileopt
|
||||
# ADD F90 /compile_only /include:"../include" /nologo /warn:nofileopt
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
|
||||
# ADD LINK32 iphreeqc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /profile /machine:I386 /libpath:"../lib"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "test - Win32 Release"
|
||||
# Name "test - Win32 Debug"
|
||||
# Name "test - Win32 Profile"
|
||||
# Begin Group "Source Files"
|
||||
|
||||
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\kinn.for
|
||||
DEP_F90_KINN_=\
|
||||
"..\include\IPhreeqc.f90.inc"\
|
||||
|
||||
# End Source File
|
||||
# End Group
|
||||
# Begin Group "Header Files"
|
||||
|
||||
# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
|
||||
# End Group
|
||||
# Begin Group "Resource Files"
|
||||
|
||||
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
|
||||
# End Group
|
||||
# End Target
|
||||
# End Project
|
||||
29
test/test.dsw
Normal file
29
test/test.dsw
Normal file
@ -0,0 +1,29 @@
|
||||
Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "test"=.\test.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<3>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
38
test/test.vfproj
Normal file
38
test/test.vfproj
Normal file
@ -0,0 +1,38 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application - Converted from CVF" Version="11.0" ProjectIdGuid="{14BB3A4C-1ADE-4212-8931-6514BF913874}">
|
||||
<Platforms>
|
||||
<Platform Name="Win32"/></Platforms>
|
||||
<Configurations>
|
||||
<Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">
|
||||
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" AdditionalIncludeDirectories="../include" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" WarnArgMismatch="true"/>
|
||||
<Tool Name="VFLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OUTDIR)/test.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/test.pdb" SubSystem="subSystemConsole" AdditionalDependencies="iphreeqcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
|
||||
<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>
|
||||
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/test.tlb"/>
|
||||
<Tool Name="VFCustomBuildTool"/>
|
||||
<Tool Name="VFPreLinkEventTool"/>
|
||||
<Tool Name="VFPreBuildEventTool"/>
|
||||
<Tool Name="VFPostBuildEventTool"/></Configuration>
|
||||
<Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">
|
||||
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../include" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/"/>
|
||||
<Tool Name="VFLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OUTDIR)/test.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" ProgramDatabaseFile="$(OUTDIR)/test.pdb" SubSystem="subSystemConsole" AdditionalDependencies="iphreeqc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
|
||||
<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>
|
||||
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/test.tlb"/>
|
||||
<Tool Name="VFCustomBuildTool"/>
|
||||
<Tool Name="VFPreLinkEventTool"/>
|
||||
<Tool Name="VFPreBuildEventTool"/>
|
||||
<Tool Name="VFPostBuildEventTool"/></Configuration>
|
||||
<Configuration Name="MemDebug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">
|
||||
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" AdditionalIncludeDirectories="../include" CallingConvention="callConventionCVF" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" WarnArgMismatch="true"/>
|
||||
<Tool Name="VFLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile="$(OUTDIR)/test.exe" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" AdditionalLibraryDirectories="../lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/test.pdb" SubSystem="subSystemConsole" AdditionalDependencies="IPhreeqcmd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
|
||||
<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>
|
||||
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/test.tlb"/>
|
||||
<Tool Name="VFCustomBuildTool"/>
|
||||
<Tool Name="VFPreLinkEventTool"/>
|
||||
<Tool Name="VFPreBuildEventTool"/>
|
||||
<Tool Name="VFPostBuildEventTool"/></Configuration></Configurations>
|
||||
<Files>
|
||||
<Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;fi;fd"/>
|
||||
<Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
|
||||
<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">
|
||||
<File RelativePath="kinn.for"/></Filter></Files>
|
||||
<Globals/></VisualStudioProject>
|
||||
Loading…
x
Reference in New Issue
Block a user