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

removed .list from filenames; added -as-cran to check

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8613 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2014-04-03 04:33:59 +00:00
parent 61cd91092e
commit 5153c34946
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
R/Makefile
View File

@ -715,7 +715,7 @@ $(INST)/ex2 : ../phreeqc3-examples/ex2
######################################## ########################################
check : all check : all
R CMD check phreeqc R CMD check -as-cran phreeqc
install : all install : all
R CMD INSTALL phreeqc R CMD INSTALL phreeqc

36
R/build-databases.R
View File

@ -1,22 +1,22 @@
# databases # databases
Amm.dat.string <- paste(scan("../database/Amm.dat", what="", sep="\n"), collapse="\n") ##Amm.dat.string <- paste(scan("../database/Amm.dat", what="", sep="\n"), collapse="\n")
iso.dat.string <- paste(scan("../database/iso.dat", what="", sep="\n"), collapse="\n") ##iso.dat.string <- paste(scan("../database/iso.dat", what="", sep="\n"), collapse="\n")
llnl.dat.string <- paste(scan("../database/llnl.dat", what="", sep="\n"), collapse="\n") ##llnl.dat.string <- paste(scan("../database/llnl.dat", what="", sep="\n"), collapse="\n")
minteq.dat.string <- paste(scan("../database/minteq.dat", what="", sep="\n"), collapse="\n") ##minteq.dat.string <- paste(scan("../database/minteq.dat", what="", sep="\n"), collapse="\n")
minteq.v4.dat.string <- paste(scan("../database/minteq.v4.dat", what="", sep="\n"), collapse="\n") ##minteq.v4.dat.string <- paste(scan("../database/minteq.v4.dat", what="", sep="\n"), collapse="\n")
pitzer.dat.string <- paste(scan("../database/pitzer.dat", what="", sep="\n"), collapse="\n") ##pitzer.dat.string <- paste(scan("../database/pitzer.dat", what="", sep="\n"), collapse="\n")
sit.dat.string <- paste(scan("../database/sit.dat", what="", sep="\n"), collapse="\n") ##sit.dat.string <- paste(scan("../database/sit.dat", what="", sep="\n"), collapse="\n")
phreeqc.dat.string <- paste(scan("../database/phreeqc.dat", what="", sep="\n"), collapse="\n") ##phreeqc.dat.string <- paste(scan("../database/phreeqc.dat", what="", sep="\n"), collapse="\n")
wateq4f.dat.string <- paste(scan("../database/wateq4f.dat", what="", sep="\n"), collapse="\n") ##wateq4f.dat.string <- paste(scan("../database/wateq4f.dat", what="", sep="\n"), collapse="\n")
# lists # lists
Amm.dat.list <- scan("../database/Amm.dat", what="", sep="\n") Amm.dat <- scan("../database/Amm.dat", what="", sep="\n")
iso.dat.list <- scan("../database/iso.dat", what="", sep="\n") iso.dat <- scan("../database/iso.dat", what="", sep="\n")
llnl.dat.list <- scan("../database/llnl.dat", what="", sep="\n") llnl.dat <- scan("../database/llnl.dat", what="", sep="\n")
minteq.dat.list <- scan("../database/minteq.dat", what="", sep="\n") minteq.dat <- scan("../database/minteq.dat", what="", sep="\n")
minteq.v4.dat.list <- scan("../database/minteq.v4.dat", what="", sep="\n") minteq.v4.dat <- scan("../database/minteq.v4.dat", what="", sep="\n")
pitzer.dat.list <- scan("../database/pitzer.dat", what="", sep="\n") pitzer.dat <- scan("../database/pitzer.dat", what="", sep="\n")
sit.dat.list <- scan("../database/sit.dat", what="", sep="\n") sit.dat <- scan("../database/sit.dat", what="", sep="\n")
phreeqc.dat.list <- scan("../database/phreeqc.dat", what="", sep="\n") phreeqc.dat <- scan("../database/phreeqc.dat", what="", sep="\n")
wateq4f.dat.list <- scan("../database/wateq4f.dat", what="", sep="\n") wateq4f.dat <- scan("../database/wateq4f.dat", what="", sep="\n")
save(list = ls(all=TRUE), file="phreeqc/data/databases.RData") save(list = ls(all=TRUE), file="phreeqc/data/databases.RData")
rm(list = ls(all=TRUE)) rm(list = ls(all=TRUE))

36
R/build-examples.R
View File

@ -1,23 +1,23 @@
# examples # examples
# strings # strings
ex1.string <- paste(scan("../phreeqc3-examples/ex1", what="", sep="\n"), collapse="\n") ##ex1.string <- paste(scan("../phreeqc3-examples/ex1", what="", sep="\n"), collapse="\n")
ex2.string <- paste(scan("../phreeqc3-examples/ex2", what="", sep="\n"), collapse="\n") ##ex2.string <- paste(scan("../phreeqc3-examples/ex2", what="", sep="\n"), collapse="\n")
ex3.string <- paste(scan("../phreeqc3-examples/ex3", what="", sep="\n"), collapse="\n") ##ex3.string <- paste(scan("../phreeqc3-examples/ex3", what="", sep="\n"), collapse="\n")
ex4.string <- paste(scan("../phreeqc3-examples/ex4", what="", sep="\n"), collapse="\n") ##ex4.string <- paste(scan("../phreeqc3-examples/ex4", what="", sep="\n"), collapse="\n")
ex5.string <- paste(scan("../phreeqc3-examples/ex5", what="", sep="\n"), collapse="\n") ##ex5.string <- paste(scan("../phreeqc3-examples/ex5", what="", sep="\n"), collapse="\n")
ex6.string <- paste(scan("../phreeqc3-examples/ex6", what="", sep="\n"), collapse="\n") ##ex6.string <- paste(scan("../phreeqc3-examples/ex6", what="", sep="\n"), collapse="\n")
ex7.string <- paste(scan("../phreeqc3-examples/ex7", what="", sep="\n"), collapse="\n") ##ex7.string <- paste(scan("../phreeqc3-examples/ex7", what="", sep="\n"), collapse="\n")
ex8.string <- paste(scan("../phreeqc3-examples/ex8", what="", sep="\n"), collapse="\n") ##ex8.string <- paste(scan("../phreeqc3-examples/ex8", what="", sep="\n"), collapse="\n")
ex9.string <- paste(scan("../phreeqc3-examples/ex9", what="", sep="\n"), collapse="\n") ##ex9.string <- paste(scan("../phreeqc3-examples/ex9", what="", sep="\n"), collapse="\n")
# lists # lists
ex1.list <- scan("../phreeqc3-examples/ex1", what="", sep="\n") ex1 <- scan("../phreeqc3-examples/ex1", what="", sep="\n")
ex2.list <- scan("../phreeqc3-examples/ex2", what="", sep="\n") ex2 <- scan("../phreeqc3-examples/ex2", what="", sep="\n")
ex3.list <- scan("../phreeqc3-examples/ex3", what="", sep="\n") ex3 <- scan("../phreeqc3-examples/ex3", what="", sep="\n")
ex4.list <- scan("../phreeqc3-examples/ex4", what="", sep="\n") ex4 <- scan("../phreeqc3-examples/ex4", what="", sep="\n")
ex5.list <- scan("../phreeqc3-examples/ex5", what="", sep="\n") ex5 <- scan("../phreeqc3-examples/ex5", what="", sep="\n")
ex6.list <- scan("../phreeqc3-examples/ex6", what="", sep="\n") ex6 <- scan("../phreeqc3-examples/ex6", what="", sep="\n")
ex7.list <- scan("../phreeqc3-examples/ex7", what="", sep="\n") ex7 <- scan("../phreeqc3-examples/ex7", what="", sep="\n")
ex8.list <- scan("../phreeqc3-examples/ex8", what="", sep="\n") ex8 <- scan("../phreeqc3-examples/ex8", what="", sep="\n")
ex9.list <- scan("../phreeqc3-examples/ex9", what="", sep="\n") ex9 <- scan("../phreeqc3-examples/ex9", what="", sep="\n")
save(list = ls(all=TRUE), file="phreeqc/data/examples.RData") save(list = ls(all=TRUE), file="phreeqc/data/examples.RData")
rm(list = ls(all=TRUE)) rm(list = ls(all=TRUE))