aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2018-06-21 12:29:51 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2018-06-22 10:50:40 +0200
commit9cd6a79cd5c0fc69ca0b2c689d3a77f46978beba (patch)
treef314d35c3a3c98f258c117c9608779a8b3bc2e59
parentd1786a315fe7bc68a6543de15685d59a56eaa1b1 (diff)
Add country field to soil degradation data
-rw-r--r--ChangeLog6
-rw-r--r--DESCRIPTION2
-rw-r--r--R/chent.R3
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4cecc0f..f427c74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+commit d1786a315fe7bc68a6543de15685d59a56eaa1b1
+Author: Johannes Ranke <jranke@uni-bremen.de>
+Date: 2018-05-20 12:25:51 +0200
+
+ Change pH_type to pH_medium
+
commit 7ac3347283fdcaa0a8c76af20b0a7cfa423368b9
Author: Johannes Ranke <jranke@uni-bremen.de>
Date: 2018-05-18 17:32:47 +0200
diff --git a/DESCRIPTION b/DESCRIPTION
index b11401f..a7cff9d 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-19
+Date: 2018-06-21
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 d3a74f3..1376d46 100644
--- a/R/chent.R
+++ b/R/chent.R
@@ -306,7 +306,7 @@ chent <- R6Class("chent",
},
soil_degradation = NULL,
add_soil_degradation = function(soils, DT50,
- type = NA,
+ type = NA, country = NA,
pH_orig = NA, pH_medium = NA, pH_H2O = NA,
temperature = NA, moisture = NA,
category = "lab", formulation = NA,
@@ -315,6 +315,7 @@ chent <- R6Class("chent",
soil = soils,
DT50 = DT50,
type = type,
+ country = country,
pH_orig = pH_orig,
pH_medium = pH_medium,
pH_H2O = pH_H2O,

Contact - Imprint