From d1786a315fe7bc68a6543de15685d59a56eaa1b1 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Sun, 20 May 2018 12:25:51 +0200 Subject: Change pH_type to pH_medium --- ChangeLog | 6 ++++++ DESCRIPTION | 2 +- R/chent.R | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e32bd3..4cecc0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +commit 7ac3347283fdcaa0a8c76af20b0a7cfa423368b9 +Author: Johannes Ranke +Date: 2018-05-18 17:32:47 +0200 + + Revisited soil degradation and sorption + commit 12e69e162df47660d139cb3c4a5c9bff0f6a1d85 Author: Johannes Ranke Date: 2018-05-16 17:13:05 +0200 diff --git a/DESCRIPTION b/DESCRIPTION index 5d4d81c..b11401f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: chents Type: Package Title: Chemical Entities as R Objects Version: 0.2-6 -Date: 2018-05-18 +Date: 2018-05-19 Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), email = "jranke@uni-bremen.de")) Description: Utilities for dealing with chemical entities and associated diff --git a/R/chent.R b/R/chent.R index 3bf0afe..d3a74f3 100644 --- a/R/chent.R +++ b/R/chent.R @@ -307,7 +307,7 @@ chent <- R6Class("chent", soil_degradation = NULL, add_soil_degradation = function(soils, DT50, type = NA, - pH_orig = NA, pH_type = NA, pH_H2O = NA, + pH_orig = NA, pH_medium = NA, pH_H2O = NA, temperature = NA, moisture = NA, category = "lab", formulation = NA, remark = "", source, page = NA) { @@ -316,7 +316,7 @@ chent <- R6Class("chent", DT50 = DT50, type = type, pH_orig = pH_orig, - pH_type = pH_type, + pH_medium = pH_medium, pH_H2O = pH_H2O, temperature = temperature, moisture = moisture, @@ -350,7 +350,7 @@ chent <- R6Class("chent", }, soil_sorption = NULL, add_soil_sorption = function(type, Kf, Kfoc, N, - pH_orig = NA, pH_type = NA, + pH_orig = NA, pH_medium = NA, pH_H2O = NA, perc_OC = NA, perc_clay = NA, CEC = NA, remark = "", source, page = NA) { @@ -358,7 +358,7 @@ chent <- R6Class("chent", type = type, Kf = Kf, Kfoc = Kfoc, N = N, pH_orig = pH_orig, - pH_type = pH_type, + pH_medium = pH_medium, pH_H2O = pH_H2O, perc_OC = perc_OC, perc_clay = perc_clay, CEC = CEC, remark = remark, -- cgit v1.2.1