aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--DESCRIPTION2
-rw-r--r--R/chent.R6
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 96d9174..d397694 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+commit d665fd715ac798ac54975648543e804732df45c8
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2018-06-29 14:37:30 +0200
+
+ More details for soil degradation
+
commit 9cd6a79cd5c0fc69ca0b2c689d3a77f46978beba
Author: Johannes Ranke <jranke@uni-bremen.de>
Date: 2018-06-21 12:29:51 +0200
diff --git a/DESCRIPTION b/DESCRIPTION
index f93ddd9..dd501d4 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-06-29
+Date: 2018-09-26
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 e977544..abe96a2 100644
--- a/R/chent.R
+++ b/R/chent.R
@@ -355,14 +355,16 @@ chent <- R6Class("chent",
}
},
soil_sorption = NULL,
- add_soil_sorption = function(type, Kf, Kfoc, N,
+ add_soil_sorption = function(soils, Kf, Kfoc, N,
+ type = NA,
pH_orig = NA, pH_medium = NA,
pH_H2O = NA,
perc_OC = NA, perc_clay = NA, CEC = NA,
remark = "", source, page = NA) {
new_soil_sorption = data.frame(
- type = type,
+ soils = soils,
Kf = Kf, Kfoc = Kfoc, N = N,
+ type = type,
pH_orig = pH_orig,
pH_medium = pH_medium,
pH_H2O = pH_H2O,

Contact - Imprint