From b295df937d1559fc2e9e440361670526b4d5152a Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Fri, 7 Feb 2014 06:53:08 +0000 Subject: [PATCH] updated git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8461 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- R/R.cpp | 2 +- R/phreeqc/man/phrAccumulateLine.Rd | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/R/R.cpp b/R/R.cpp index 094016c7..8b642536 100644 --- a/R/R.cpp +++ b/R/R.cpp @@ -555,7 +555,7 @@ getCol(int ncol) for (r = 1; r < rows; ++r) { VarInit(&vv); s_iphreeqc.GetSelectedOutputValue(r, ncol, &vv); - if (vv.dVal == -999.999) { + if (vv.dVal == -999.999 || vv.dVal == -99.) { REAL(ans)[r-1] = NA_REAL; } else { diff --git a/R/phreeqc/man/phrAccumulateLine.Rd b/R/phreeqc/man/phrAccumulateLine.Rd index 79acee8c..b6e63760 100644 --- a/R/phreeqc/man/phrAccumulateLine.Rd +++ b/R/phreeqc/man/phrAccumulateLine.Rd @@ -5,7 +5,7 @@ Accumlulate line(s) for input to phreeqc. } \description{ -Appends a line of text to the input buffer to be run using \code{\link{phrRunAccumulated}}. +Appends a line of text to the input buffer in order to be run using \code{\link{phrRunAccumulated}}. } \usage{ phrAccumulateLine(line) @@ -20,14 +20,10 @@ The line(s) to add for input to phreeqc. %% ~~ If necessary, more details than the description above ~~ } \value{ -%% ~Describe the value returned -%% If it is a LIST, use -%% \item{comp1 }{Description of 'comp1'} -%% \item{comp2 }{Description of 'comp2'} -%% ... +This function returns NULL. } \references{ - \url{http://wwwbrr.cr.usgs.gov/projects/GWC_coupled/phreeqc/index.html} + \url{http://wwwbrr.cr.usgs.gov/projects/GWC_coupled/phreeqc} } \author{ David Parkhurst \email{dlpark@usgs.gov}\cr