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 for linux

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4181 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-03-19 23:59:57 +00:00
parent 49ae95b333
commit e63239bfef
3 changed files with 11 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
GNUmakefile
View File

@ -2,7 +2,6 @@ CC = g++
DEFINES = -DNDEBUG -DSWIG_SHARED_OBJ -DPHREEQC_CPP -DPHREEQC_CLASS -DUSE_PHRQ_ALLOC
CFLAGS = -Wall
CPPFLAGS = -O3 $(DEFINES) -Iinclude -Isrc -Isrc/phreeqcpp -Isrc/phreeqcpp/phreeqc
#CPPFLAGS = -g -DSWIG_SHARED_OBJ # debug
TARGET_ARCH =
FC = g95
FFLAGS = -fno-second-underscore
@ -29,18 +28,6 @@ VPATH=src:src/phreeqcpp:src/phreeqcpp/phreeqc
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
###%.o: %.f
### $(FC) -MM $<
###
###%.o: %.F
### $(FC) -MM $<
###
###%.o: %.c
### $(CC) -MM $<
###
###%.o: %.cxx
### $(CXX) -MM $<
OBJS = \
advection.o \
basic.o \
@ -123,57 +110,6 @@ OBJS = \
Utils.o \
Var.o \
POBJS = \
advection.o \
basic.o \
basicsubs.o \
cl1.o \
cvdense.o \
cvode.o \
dense.o \
dw.o \
input.o \
integrate.o \
inverse.o \
isotopes.o \
kinetics.o \
mainsubs.o \
model.o \
nvector.o \
nvector_serial.o \
p2clib.o \
parse.o \
phqalloc.o \
pitzer.o \
pitzer_structures.o \
prep.o \
print.o \
read.o \
readtr.o \
sit.o \
smalldense.o \
spread.o \
step.o \
structures.o \
sundialsmath.o \
tally.o \
tidy.o \
transport.o \
utilities.o
SOBJS = \
IPhreeqc.o \
IPhreeqcF.o \
SelectedOutput.o \
Var.o \
fwrap.o \
module_files.o \
module_output.o \
pp_sys.o
all: $(TARGET)
$(TARGET): $(OBJS)
@ -1293,9 +1229,9 @@ IPhreeqc.o: src/IPhreeqc.cpp include/IPhreeqc.h \
src/phreeqcpp/phreeqc/global.h src/phreeqcpp/phreeqc/global_structures.h \
include/IPhreeqcCallbacks.h src/SelectedOutput.hxx src/CVar.hxx \
src/ErrorReporter.hxx
fwrap2.o: src/fwrap2.c include/Var.h src/fwrap.h
fwrap3.o: src/fwrap3.c include/Var.h src/fwrap.h
module_output.o: src/module_output.c src/module_files.h src/IPhreeqc.hpp \
fwrap2.o: src/fwrap2.cpp include/Var.h src/fwrap.h
fwrap3.o: src/fwrap3.cpp include/Var.h src/fwrap.h
module_output.o: src/module_output.cpp src/module_files.h src/IPhreeqc.hpp \
src/phreeqcpp/Phreeqc.h src/phreeqcpp/phreeqc/phrqtype.h \
src/phreeqcpp/phreeqc/sundialstypes.h src/phreeqcpp/phreeqc/phrqtype.h \
src/phreeqcpp/phreeqc/nvector.h src/phreeqcpp/phreeqc/sundialstypes.h \
@ -1313,7 +1249,7 @@ module_output.o: src/module_output.c src/module_files.h src/IPhreeqc.hpp \
src/CVar.hxx src/Debug.h src/phreeqcpp/phreeqc/output.c \
src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/phrqproto.h \
src/phreeqcpp/phreeqc/phqalloc.h
module_files.o: src/module_files.c src/module_files.h \
module_files.o: src/module_files.cpp src/module_files.h \
src/phreeqcpp/phreeqc/phreeqc_files.c src/phreeqcpp/Phreeqc.h \
src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/sundialstypes.h \
src/phreeqcpp/phreeqc/phrqtype.h src/phreeqcpp/phreeqc/nvector.h \
@ -1346,8 +1282,8 @@ SelectedOutput.o: src/SelectedOutput.cpp src/phreeqcpp/phreeqc/phrqtype.h \
src/phreeqcpp/phreeqc/output.h src/phreeqcpp/phreeqc/global.h \
src/phreeqcpp/phreeqc/global_structures.h src/SelectedOutput.hxx \
src/CVar.hxx src/Debug.h include/Var.h
pp_sys.o: src/pp_sys.c
fwrap.o: src/fwrap.c src/phreeqcpp/phreeqc/phrqtype.h include/IPhreeqc.h \
pp_sys.o: src/pp_sys.cpp
fwrap.o: src/fwrap.cpp src/phreeqcpp/phreeqc/phrqtype.h include/IPhreeqc.h \
include/IPhreeqcCallbacks.h src/CVar.hxx src/Debug.h include/Var.h \
src/fwrap.h
Var.o: src/Var.c include/Var.h

7
include/IPhreeqc.h
View File

@ -3,7 +3,6 @@
#include "IPhreeqcCallbacks.h" /* PFN_PRERUN_CALLBACK, PFN_POSTRUN_CALLBACK, PFN_CATCH_CALLBACK */
#include "Var.h" /* VRESULT */
#include <list>
#if defined(__cplusplus)
extern "C" {
@ -58,7 +57,7 @@ int LoadDatabaseString(const char *input);
*/
void UnLoadDatabase(void);
/**
/**
* Output the error messages normally stored in the phreeqc.err file to stdout.
* @par Fortran90 Interface:
* @htmlonly
@ -464,7 +463,7 @@ void ClearErrors(void);
*/
/**
/**
* Send the accumulated input to stdout.
* This is the input that will be used for the next call to Run.
* @par Fortran90 Interface:
@ -583,8 +582,6 @@ int GetComponentCount(void);
const char* GetComponent(int n);
#if defined(WIN32)
void DebugOutputLines(void);
#endif

6
unit/GNUmakefile
View File

@ -327,17 +327,17 @@ IPhreeqc.o: ../src/IPhreeqc.cpp ../include/IPhreeqc.h \
SelectedOutput.o: ../src/SelectedOutput.cpp ../src/SelectedOutput.hxx \
../src/CVar.hxx ../src/Debug.h ../include/Var.h
Var.o: ../src/Var.c ../src/../include/Var.h
fwrap.o: ../src/fwrap.c ../src/phreeqcpp/phreeqc/global.h \
fwrap.o: ../src/fwrap.cpp ../src/phreeqcpp/phreeqc/global.h \
../src/phreeqcpp/phreeqc/phrqtype.h ../src/../include/IPhreeqc.h \
../src/../include/Var.h
global.o: ../src/global.c ../src/phreeqcpp/phreeqc/global.h \
../src/phreeqcpp/phreeqc/phrqtype.h ../src/phreeqcpp/phreeqc/phqalloc.h
module_files.o: ../src/module_files.c ../src/module_files.h \
module_files.o: ../src/module_files.cpp ../src/module_files.h \
../src/phreeqcpp/phreeqc/phreeqc_files.c \
../src/phreeqcpp/phreeqc/global.h ../src/phreeqcpp/phreeqc/phrqtype.h \
../src/phreeqcpp/phreeqc/phqalloc.h ../src/phreeqcpp/phreeqc/output.h \
../src/phreeqcpp/phreeqc/phrqproto.h ../src/phreeqcpp/phreeqc/input.h
module_output.o: ../src/module_output.c ../src/module_files.h \
module_output.o: ../src/module_output.cpp ../src/module_files.h \
../src/phreeqcpp/phreeqc/output.c ../src/phreeqcpp/phreeqc/global.h \
../src/phreeqcpp/phreeqc/phrqtype.h ../src/phreeqcpp/phreeqc/output.h \
../src/phreeqcpp/phreeqc/phrqproto.h \