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

Removed DATABASE definitions from 15, 17, and 20.

Browse Source 
Modified Makefile accordingly.

Needed to simplify Win/test.bat

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7241 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2012-12-20 01:49:38 +00:00
parent 74643748ad
commit 5d66604480
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -3,8 +3,8 @@ CFG :=$(shell echo $(CFG1) | sed "s/CYGWIN.*/CYGWIN/")
INPUT=../examples INPUT=../examples
PHREEQCDAT=../database/phreeqc.dat PHREEQCDAT=../database/phreeqc.dat
WATEQ4FDAT=../database/wateq4f.dat
PITZERDAT=../database/pitzer.dat PITZERDAT=../database/pitzer.dat
ISODAT=../database/iso.dat
PHREEQC=../src/Class_release_64/phreeqcpp PHREEQC=../src/Class_release_64/phreeqcpp
#PHREEQC=../src/Class_debug_64/phreeqcpp #PHREEQC=../src/Class_debug_64/phreeqcpp
@ -88,11 +88,11 @@ ex15b.out: $(INPUT)/ex15b $(PHREEQC) $(INPUT)/ex15.dat
ex16.out: $(INPUT)/ex16 $(PHREEQC) $(PHREEQCDAT) ex16.out: $(INPUT)/ex16 $(PHREEQC) $(PHREEQCDAT)
$(PHREEQC) $(INPUT)/ex16 ex16.out $(PHREEQCDAT) ex16.log $(PHREEQC) $(INPUT)/ex16 ex16.out $(PHREEQCDAT) ex16.log
ex17.out: $(INPUT)/ex17 $(PHREEQC) ex17.out: $(INPUT)/ex17 $(PHREEQC) $(PITZERDAT)
$(PHREEQC) $(INPUT)/ex17 ex17.out ex17.log $(PHREEQC) $(INPUT)/ex17 ex17.out $(PITZERDAT) ex17.log
ex17b.out: $(INPUT)/ex17b $(PHREEQC) ex17b.out: $(INPUT)/ex17b $(PHREEQC) $(PITZERDAT)
$(PHREEQC) $(INPUT)/ex17b ex17b.out ex17b.log $(PHREEQC) $(INPUT)/ex17b ex17b.out $(PITZERDAT) ex17b.log
ex18.out: $(INPUT)/ex18 $(PHREEQC) $(PHREEQCDAT) ex18.out: $(INPUT)/ex18 $(PHREEQC) $(PHREEQCDAT)
$(PHREEQC) $(INPUT)/ex18 ex18.out $(PHREEQCDAT) ex18.log $(PHREEQC) $(INPUT)/ex18 ex18.out $(PHREEQCDAT) ex18.log
@ -103,11 +103,11 @@ ex19.out: $(INPUT)/ex19 $(PHREEQC) $(PHREEQCDAT)
ex19b.out: $(INPUT)/ex19b $(PHREEQC) $(PHREEQCDAT) ex19b.out: $(INPUT)/ex19b $(PHREEQC) $(PHREEQCDAT)
$(PHREEQC) $(INPUT)/ex19b ex19b.out $(PHREEQCDAT) ex19b.log $(PHREEQC) $(INPUT)/ex19b ex19b.out $(PHREEQCDAT) ex19b.log
ex20a.out: $(INPUT)/ex20a $(PHREEQC) ../database/iso.dat ex20a.out: $(INPUT)/ex20a $(PHREEQC) $(ISODAT)
$(PHREEQC) $(INPUT)/ex20a ex20a.out ../database/iso.dat ex20a.log $(PHREEQC) $(INPUT)/ex20a ex20a.out $(ISODAT) ex20a.log
ex20b.out: $(INPUT)/ex20b $(PHREEQC) ../database/iso.dat ex20b.out: $(INPUT)/ex20b $(PHREEQC) $(ISODAT)
$(PHREEQC) $(INPUT)/ex20b ex20b.out ../database/iso.dat ex20b.log $(PHREEQC) $(INPUT)/ex20b ex20b.out $(ISODAT) ex20b.log
ex21.out: $(INPUT)/ex21 $(PHREEQC) $(PHREEQCDAT) ex21.out: $(INPUT)/ex21 $(PHREEQC) $(PHREEQCDAT)
$(PHREEQC) $(INPUT)/ex21 ex21.out $(PHREEQCDAT) ex21.log $(PHREEQC) $(INPUT)/ex21 ex21.out $(PHREEQCDAT) ex21.log

2
ex15
View File

@ -1,4 +1,4 @@
DATABASE ex15.dat # must use DATABASE ex15.dat
TITLE Example 15.--1D Transport: Kinetic Biodegradation, Cell Growth, and Sorption TITLE Example 15.--1D Transport: Kinetic Biodegradation, Cell Growth, and Sorption
*********** ***********
PLEASE NOTE: This problem requires database file ex15.dat!! PLEASE NOTE: This problem requires database file ex15.dat!!

4
ex15a
View File

@ -1,4 +1,4 @@
DATABASE ex15.dat # must use DATABASE ex15.dat
TITLE Example 15.--1D Transport: Kinetic Biodegradation, Cell Growth, and Sorption TITLE Example 15.--1D Transport: Kinetic Biodegradation, Cell Growth, and Sorption
*********** ***********
PLEASE NOTE: This problem requires database file ex15.dat!! PLEASE NOTE: This problem requires database file ex15.dat!!
@ -100,7 +100,7 @@ USER_PUNCH
30 punch KIN("CoNta_sorption")/3.75e3 30 punch KIN("CoNta_sorption")/3.75e3
40 punch KIN("Biomass") 40 punch KIN("Biomass")
-end -end
USER_GRAPH USER_GRAPH Example 15A
-headings 10_cells: Co+2 CoNTA- HNTA-2 pH -headings 10_cells: Co+2 CoNTA- HNTA-2 pH
-chart_title "Example 15" -chart_title "Example 15"
-axis_titles "Time / hours" "umol / kgw" "pH" -axis_titles "Time / hours" "umol / kgw" "pH"

4
ex15b
View File

@ -1,4 +1,4 @@
DATABASE ex15.dat # must use DATABASE ex15.dat
TITLE Example 15.--1D Transport: Kinetic Biodegradation, Cell Growth, and Sorption TITLE Example 15.--1D Transport: Kinetic Biodegradation, Cell Growth, and Sorption
*********** ***********
PLEASE NOTE: This problem requires database file ex15.dat!! PLEASE NOTE: This problem requires database file ex15.dat!!
@ -116,7 +116,7 @@ TRANSPORT First 20 hours have NTA and cobalt in infilling solution
-print_cells 10 -print_cells 10
-print_frequency 5 -print_frequency 5
-warnings false -warnings false
USER_GRAPH USER_GRAPH Example 15B
-headings 10_cells: Co+2 CoNTA- Biomass -headings 10_cells: Co+2 CoNTA- Biomass
-chart_title "Example 15, Sorbed Species" -chart_title "Example 15, Sorbed Species"
-axis_titles "Time / hours" "nmol / kgw" "Biomass / (mg/L)" -axis_titles "Time / hours" "nmol / kgw" "Biomass / (mg/L)"

2
ex17
View File

@ -1,4 +1,4 @@
DATABASE ../database/pitzer.dat #must use DATABASE pitzer.dat
TITLE Example 17.--Inverse modeling of Black Sea water evaporation TITLE Example 17.--Inverse modeling of Black Sea water evaporation
SOLUTION 1 Black Sea water SOLUTION 1 Black Sea water
units mg/L units mg/L

2
ex17b
View File

@ -1,4 +1,4 @@
DATABASE ../database/pitzer.dat #must use DATABASE pitzer.dat
SOLUTION 1 Black Sea water SOLUTION 1 Black Sea water
units mg/L units mg/L
density 1.014 density 1.014

2
ex20a
View File

@ -1,4 +1,4 @@
DATABASE ../database/iso.dat #must use DATABASE iso.dat
TITLE Example 20A.--Calculate carbonate solid solution TITLE Example 20A.--Calculate carbonate solid solution
PRINT PRINT
-censor_species 1e-006 -censor_species 1e-006

2
ex20b
View File

@ -1,4 +1,4 @@
DATABASE ../database/iso.dat #must use DATABASE iso.dat
TITLE Example 20B.--Isotope evolution. TITLE Example 20B.--Isotope evolution.
PRINT PRINT
-censor_species 1e-006 -censor_species 1e-006