diff --git a/R/aadoc.R b/R/aadoc.R index 21e2f432a..85a8a2a29 100644 --- a/R/aadoc.R +++ b/R/aadoc.R @@ -77,7 +77,7 @@ NULL #' one of the myriad halocarbon components. All of the values corresponding to #' these identifiers are read-only (\emph{i.e.}, they can only appear in #' \code{\link{GETDATA}} messages.) The forcings returned are the -#' \emph{adjusted} forcings, with the base year (typically 1750) values +#' \emph{relative} forcings, with the base year (typically 1750) values #' subtracted off. #' #' @inheritSection msgtype Note diff --git a/changelog.txt b/changelog.txt index 5336c1b7c..caf5f4622 100644 --- a/changelog.txt +++ b/changelog.txt @@ -6,7 +6,7 @@ Hector 2.2.2 * Fix bug that was causing API requests for halocarbon forcing to return absolute forcing values, rather than values relative to the base year (which is what is done for all other forcings). -* Add missing RF_VOL dependency to forcing component. In practice the +* Add missing RF_VOL (volcanic forcing) dependency to forcing component. In practice the missing dependency had no effect because the forcing component already had a dependency on the SO2 component, which also provides the volcanic forcing, but in the event that we ever split them up, diff --git a/inst/include/component_data.hpp b/inst/include/component_data.hpp index ed0907132..3de3444a3 100644 --- a/inst/include/component_data.hpp +++ b/inst/include/component_data.hpp @@ -83,7 +83,7 @@ #define D_RF_CH3Cl D_RF_PREFIX CH3Cl_COMPONENT_BASE #define D_RF_CH3Br D_RF_PREFIX CH3Br_COMPONENT_BASE -// Adjusted halocarbon forcings +// Adjusted (i.e., relative) halocarbon forcings // Forcings are tracked relative to the base year forcings, but the // halocarbon components don't know that. These capabilities allow // a caller to fetch the adjusted values from the forcing component. diff --git a/tests/testthat/test_scenarios.R b/tests/testthat/test_scenarios.R index 011efba10..e3e38f546 100644 --- a/tests/testthat/test_scenarios.R +++ b/tests/testthat/test_scenarios.R @@ -20,7 +20,7 @@ test_that('RCP scenarios are correct', { ## Get the comparison data sampleoutfile <- sprintf('sample_outputstream_rcp%s.csv', rcp) - sampledata <- read.csv(file.path(sampledir, sampleoutfile), comment.char = '#', stringsAsFactors=FALSE) + sampledata <- read.csv(file.path(sampledir, sampleoutfile), comment.char = '#', stringsAsFactors = FALSE) sampledata$scenario <- as.character(sampledata$run_name) samplekeep <- sampledata$variable %in% testvars & sampledata$year %in% dates sampledata <- sampledata[samplekeep, c('scenario', 'year','variable','value', 'units')]