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

working on making CRAN compliant

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8662 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2014-04-19 03:52:33 +00:00
parent 77c5fcde7b
commit 08872129ce
6 changed files with 336 additions and 395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
R/Makefile
View File

@ -226,13 +226,13 @@ XSRC = \
$(IDEST)/Makevars
DATA = \
$(DATADIR)/csv.RData \
$(DATADIR)/databases.RData \
$(DATADIR)/examples.RData
$(DATADIR)/csv.rda \
$(DATADIR)/databases.rda \
$(DATADIR)/examples.rda
all: $(PSRC) $(XSRC) $(DATA) $(MAN)/phreeqc-package.Rd
$(DATADIR)/databases.RData : $(DBS) build-databases.R
$(DATADIR)/databases.rda : $(DBS) build-databases.R
R --no-save --no-restore CMD BATCH build-databases.R
%.ascii : $(DBDIR)/%.dat

2
R/build-csv.R
View File

@ -1,4 +1,4 @@
# SE_to_export_03142014.csv
CO2.df <- read.csv("SE_to_export_03142014.csv")
save(list = ls(all=TRUE), file="phreeqc/data/csv.RData")
save(list = ls(all=TRUE), file="phreeqc/data/csv.rda")
rm(list = ls(all=TRUE))

5
R/build-databases.R
View File

@ -18,5 +18,6 @@ pitzer.dat <- scan("pitzer.ascii", what="", sep="\n")
sit.dat <- scan("sit.ascii", what="", sep="\n")
phreeqc.dat <- scan("phreeqc.ascii", what="", sep="\n")
wateq4f.dat <- scan("wateq4f.ascii", what="", sep="\n")
save(list = ls(all=TRUE), file="phreeqc/data/databases.RData")
rm(list = ls(all=TRUE))
##save(list = ls(all=TRUE), file="phreeqc/data/databases.RData")
save(list = ls(all = TRUE), compress = "xz", file = "phreeqc/data/databases.rda")
rm(list = ls(all = TRUE))

2
R/build-examples.R
View File

@ -19,5 +19,5 @@ ex6 <- scan("../phreeqc3-examples/ex6", what="", sep="\n")
ex7 <- scan("../phreeqc3-examples/ex7", what="", sep="\n")
ex8 <- scan("../phreeqc3-examples/ex8", 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.rda")
rm(list = ls(all=TRUE))

3
R/phreeqc/DESCRIPTION
View File

@ -3,8 +3,7 @@ Version: 1.0.0
Title: R interface to the phreeqc geochemical modeling program
License: Unlimited
NeedsCompilation: yes
Depends:
methods
Depends: R (>= 2.10)
Author: David Parkhurst <dlpark@usgs.gov> and C.A.J. Appelo
<appt@hydrochemistry.eu>
URL: http://wwwbrr.cr.usgs.gov/projects/GWC_coupled/phreeqc

711
R/phreeqc/R/phreeqc.R
View File

File diff suppressed because it is too large Load Diff