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

updated urls; fixed jenkins-R-dist.sh

Browse Source
This commit is contained in:
Scott R Charlton 2020-01-30 10:44:35 -07:00
parent bcccd4a362
commit 108fe635ec
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
R/DESCRIPTION.in
View File

@ -8,7 +8,7 @@ Depends:
Author: S.R. Charlton, D.L. Parkhurst, and C.A.J. Appelo, with contributions Author: S.R. Charlton, D.L. Parkhurst, and C.A.J. Appelo, with contributions
from D. Gillespie for Chipmunk BASIC and S.D. Cohen, A.C. Hindmarsh, from D. Gillespie for Chipmunk BASIC and S.D. Cohen, A.C. Hindmarsh,
R. Serban, D. Shumaker, and A.G. Taylor for CVODE/SUNDIALS R. Serban, D. Shumaker, and A.G. Taylor for CVODE/SUNDIALS
URL: http://wwwbrr.cr.usgs.gov/projects/GWC_coupled/phreeqc URL: https://www.usgs.gov/software/phreeqc-version-3
Description: A geochemical modeling program developed by the US Geological Description: A geochemical modeling program developed by the US Geological
Survey that is designed to perform a wide variety of aqueous geochemical Survey that is designed to perform a wide variety of aqueous geochemical
calculations, including speciation, batch-reaction, one-dimensional calculations, including speciation, batch-reaction, one-dimensional

4
R/phreeqc/inst/CITATION
View File

@ -11,7 +11,7 @@ citEntry(entry="Manual",
volume = "book 6", volume = "book 6",
chapter = "A43", chapter = "A43",
pages = "497", pages = "497",
url = "http://pubs.usgs.gov/tm/06/a43", url = "https://pubs.usgs.gov/tm/06/a43",
textVersion = textVersion =
paste("Parkhurst, D.L., and Appelo, C.A.J., 2013, Description of", paste("Parkhurst, D.L., and Appelo, C.A.J., 2013, Description of",
@ -20,7 +20,7 @@ citEntry(entry="Manual",
"transport, and inverse geochemical calculations: U.S.", "transport, and inverse geochemical calculations: U.S.",
"Geological Survey Techniques and Methods, book 6, chap.", "Geological Survey Techniques and Methods, book 6, chap.",
"A43, 497 p., available only at", "A43, 497 p., available only at",
"http://pubs.usgs.gov/tm/06/a43.") "https://pubs.usgs.gov/tm/06/a43.")
) )

12
jenkins-R-dist.sh Normal file → Executable file
View File

@ -15,15 +15,19 @@ if [ -z "$VER" ]; then
VER="${ver_major}.${ver_minor}.${ver_patch}" VER="${ver_major}.${ver_minor}.${ver_patch}"
fi fi
if [ "$REL" = 'HEAD' ]; then if [ "$REL" = 'HEAD' ]; then
HEAD=`svn st -v configure.ac | awk '{print $1}')` HEAD=13021
REL="$HEAD" REL="$HEAD"
fi fi
if [ -z "$REL" ]; then
REL=13021
fi
export VER export VER
# sed files # sed files
/bin/sh jenkins-dist.sh -v ${VER} -r ${REL} -d ${DATE} -pr ${TAG} /bin/sh jenkins-dist.sh -v ${VER} -r ${REL} -d ${DATE} -pr ${TAG}
cd R cd R
mkdir -p phreeqc/man
mkdir -p phreeqc/src/phreeqcpp
mkdir -p phreeqc/R
mkdir -p phreeqc/data
make VERSION=${VER} RELEASE_DATE=${DATE} build make VERSION=${VER} RELEASE_DATE=${DATE} build
make VERSION=${VER} RELEASE_DATE=${DATE} check make VERSION=${VER} RELEASE_DATE=${DATE} check