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

adding ColdChem.dat to R dist

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@12482 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2017-03-03 02:44:40 +00:00
parent 44e78b0291
commit 1d7e2cb9e9
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
R/Makefile
View File

@ -17,6 +17,7 @@ VERSION ?= 1.0
DBS = \ DBS = \
Amm.ascii \ Amm.ascii \
ColdChem.ascii \
ex15.ascii \ ex15.ascii \
iso.ascii \ iso.ascii \
llnl.ascii \ llnl.ascii \

4
R/build-databases.R
View File

@ -1,5 +1,6 @@
# 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")
##ColdChem.dat.string <- paste(scan("../database/ColdChem.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")
@ -10,6 +11,7 @@
##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 <- scan("Amm.ascii", what="", sep="\n") Amm.dat <- scan("Amm.ascii", what="", sep="\n")
ColdChem.dat <- scan("ColdChem.ascii", what="", sep="\n")
ex15.dat <- scan("ex15.ascii", what="", sep="\n") ex15.dat <- scan("ex15.ascii", what="", sep="\n")
iso.dat <- scan("iso.ascii", what="", sep="\n") iso.dat <- scan("iso.ascii", what="", sep="\n")
llnl.dat <- scan("llnl.ascii", what="", sep="\n") llnl.dat <- scan("llnl.ascii", what="", sep="\n")
@ -19,5 +21,5 @@ pitzer.dat <- scan("pitzer.ascii", what="", sep="\n")
sit.dat <- scan("sit.ascii", what="", sep="\n") sit.dat <- scan("sit.ascii", what="", sep="\n")
phreeqc.dat <- scan("phreeqc.ascii", what="", sep="\n") phreeqc.dat <- scan("phreeqc.ascii", what="", sep="\n")
wateq4f.dat <- scan("wateq4f.ascii", what="", sep="\n") wateq4f.dat <- scan("wateq4f.ascii", what="", sep="\n")
save(list = ls(all = TRUE), file = "phreeqc/data/databases.rda") save(list = ls(all = TRUE), file = "phreeqc/data/databases.rda", compress = "xz")
rm(list = ls(all = TRUE)) rm(list = ls(all = TRUE))

17
R/phreeqc.R.in
View File

@ -1403,7 +1403,7 @@ NULL
##' @name Amm.dat ##' @name Amm.dat
##' @title The Amm.dat database. ##' @title The Amm.dat database.
##' @description Amm.dat is the same as phreeqc.dat, except that ammmonia redox ##' @description Amm.dat is the same as phreeqc.dat, except that ammonia redox
##' state has been decoupled from the rest of the nitrogen system; that is, ##' state has been decoupled from the rest of the nitrogen system; that is,
##' ammonia has been defined as a separate component. The database has been ##' ammonia has been defined as a separate component. The database has been
##' reformatted for use by \code{\link{phrLoadDatabaseString}}. ##' reformatted for use by \code{\link{phrLoadDatabaseString}}.
@ -1417,6 +1417,21 @@ NULL
##' @name ColdChem.dat
##' @title The ColdChem.dat database.
##' @description ColdChem.dat is a low-temperature thermodynamic model for the
##' Na-K-Ca-Mg-Cl system incorporating new experimental heat capacities in
##' KCl, MgCl2, and CaCl2 solutions. Jonathan D. Toner and David C. Catling
##' The database has been reformatted for use by \code{\link{phrLoadDatabaseString}}.
##' @docType data
##' @family Databases
##' @source \url{http://wwwbrr.cr.usgs.gov/projects/GWC_coupled/phreeqc}
##' @usage ColdChem.dat # phrLoadDatabaseString(ColdChem.dat)
##' @keywords dataset
NULL
##' @name wateq4f.dat ##' @name wateq4f.dat
##' @title The wateq4f.dat database. ##' @title The wateq4f.dat database.
##' @description wateq4f.dat is a database derived from WATEQ4F. The database ##' @description wateq4f.dat is a database derived from WATEQ4F. The database