1.1.0

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: isogeochem
 Type: Package
 Title: Tools for Stable Isotope Geochemistry
-Version: 1.0.9.95
+Version: 1.1.0
 Authors@R:
     c(person(given = "David", family = "Bajnai",
     email = "[email protected]",
@@ -21,7 +21,7 @@ BugReports: https://github.com/davidbajnai/isogeochem/issues
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.0
+RoxygenNote: 7.2.1
 Suggests:
     shades,
     viridisLite,

R/d17O.R

@@ -106,13 +106,17 @@ d17O_c = function(temp, d18O_H2O_VSMOW, D17O_H2O = 0, min = "calcite", eq18 = "D
 #' @param lambda Triple oxygen isotope reference slope. Default `0.528`.
 #' @param step Output resolution, i.e., step size. Default `10`%.
 #'
+#' @details
+#' If both d17O and D17O values are specified for a component,
+#' the function uses the d17O values for the calculations.
+#'
 #' @return
 #' Returns a data frame:
 #' 1. d18O value of the mixture at x% mixing (‰).
-#' 2. D17O value of the mixture x% mixing (‰).
+#' 2. D17O value of the mixture at x% mixing (‰).
 #' 3. relative amount of component B in the mixture (%):
 #'   from 100% A and 0% B to 0% A and 100% B.
-#' 4. d17O value of the mixture x% mixing (‰).
+#' 4. d17O value of the mixture at x% mixing (‰).
 #'
 #' @examples
 #' # The two functions below yield the same output.
@@ -140,7 +144,7 @@ mix_d17O = function (d18O_A, d17O_A, D17O_A, d18O_B, d17O_B, D17O_B, lambda = 0.
 
   mix_d18O = ratio_B * as.numeric(d18O_B) + (1 - ratio_B) * as.numeric(d18O_A)
   mix_d17O = ratio_B * as.numeric(d17O_B) + (1 - ratio_B) * as.numeric(d17O_A)
-  mix_D17O = (prime(mix_d17O) - lambda * prime(mix_d18O))
+  mix_D17O = D17O(mix_d18O, mix_d17O, lambda)
   xB = ratio_B * 100
 
   data.frame(mix_d18O, mix_D17O, xB, mix_d17O)

README.Rmd

@@ -46,7 +46,8 @@ par(mfrow = c(1, 1), mar = c(4.5, 4.5, 0.3, 0.3))
 * model DIC speciation as a function of temperature, pH, and salinity
 * convert between the VSMOW and VPDB scales
 
-The lists of available proxy–temperature calibrations and mineralogies are constantly growing. Check out the manual for the current catalog. Please get in touch if you have suggestions to include!
+The list of available proxy–temperature calibrations is growing with each new released version.</br>
+<b>Please get in touch if you have suggestions to include!</b>
 
 ## Getting started
 

README.md

@@ -28,9 +28,9 @@ quickly calculate:
 -   model DIC speciation as a function of temperature, pH, and salinity
 -   convert between the VSMOW and VPDB scales
 
-The lists of available proxy–temperature calibrations and mineralogies
-are constantly growing. Check out the manual for the current catalog.
-Please get in touch if you have suggestions to include!
+The list of available proxy–temperature calibrations is growing with
+each new released version.</br> <b>Please get in touch if you have
+suggestions to include!</b>
 
 ## Getting started
 

codemeta.json

@@ -7,7 +7,7 @@
   "codeRepository": "https://davidbajnai.github.io/isogeochem/",
   "issueTracker": "https://github.com/davidbajnai/isogeochem/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "1.0.9.95",
+  "version": "1.1.0",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
@@ -173,5 +173,5 @@
     },
     "SystemRequirements": null
   },
-  "fileSize": "858.594KB"
+  "fileSize": "858.823KB"
 }

cran-comments.md

@@ -6,12 +6,12 @@
 
 ### Local:
 * Apple Silicon (M1), macOS 12.4 Monterey, R 4.2.1
-* Microsoft Windows 10 Pro 19044, R 4.2.1
 
 ### rhub
+* Debian Linux, R-release, GCC
 * macOS 10.13.6 High Sierra, R-release, CRAN's setup
-* Apple Silicon (M1), macOS 11.6 Big Sur, R-release
-* Oracle Solaris 10, x86, 32 bit, R-release
+* Ubuntu Linux 20.04.1 LTS, R-release, GCC
+* Windows Server 2022, R-release, 32/64 bit
 
 ## Comments
 * All links are correct in the package. However, in case of a server error, the DOI and Zenodo links may prompt a WARNING.