[CHNOSZ-commits] r707 - in pkg/CHNOSZ: . inst inst/tinytest

[noreply at r-forge.r-project.org]

Author: jedick
Date: 2022-02-20 10:03:54 +0100 (Sun, 20 Feb 2022)
New Revision: 707

Modified:
   pkg/CHNOSZ/DESCRIPTION
   pkg/CHNOSZ/inst/NEWS.Rd
   pkg/CHNOSZ/inst/tinytest/test-AD.R
Log:
Submit version 1.4.3 to CRAN


Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION	2022-02-11 12:22:46 UTC (rev 706)
+++ pkg/CHNOSZ/DESCRIPTION	2022-02-20 09:03:54 UTC (rev 707)
@@ -1,6 +1,6 @@
-Date: 2022-02-11
+Date: 2022-02-20
 Package: CHNOSZ
-Version: 1.4.2-1
+Version: 1.4.3
 Title: Thermodynamic Calculations and Diagrams for Geochemistry
 Authors at R: c(
     person("Jeffrey", "Dick", , "j3ffdick at gmail.com", role = c("aut", "cre"),

Modified: pkg/CHNOSZ/inst/NEWS.Rd
===================================================================
--- pkg/CHNOSZ/inst/NEWS.Rd	2022-02-11 12:22:46 UTC (rev 706)
+++ pkg/CHNOSZ/inst/NEWS.Rd	2022-02-20 09:03:54 UTC (rev 707)
@@ -10,14 +10,15 @@
 \newcommand{\s}{\ifelse{latex}{\eqn{_{#1}}}{\ifelse{html}{\out{<sub>#1</sub>}}{#1}}}
 \newcommand{\S}{\ifelse{latex}{\eqn{^{#1}}}{\ifelse{html}{\out{<sup>#1</sup>}}{^#1}}}
 
-\section{Changes in CHNOSZ version 1.4.2-1 (2022-02-11)}{
+\section{Changes in CHNOSZ version 1.4.3 (2022-02-20)}{
 
-  \itemize{
+  \subsection{UNIT TESTING}{
+    \itemize{
 
-    \item Skip some tests in \file{test-AD.R} (specifically, for heat capacity
-    and the second derivative of water density) on CRAN that fail on M1Mac and
-    ATLAS.
+      \item Skip tests on CRAN that fail for M1mac and ATLAS (heat capacity and
+      the second derivative of \H2O density in \file{tinytest/test-AD.R}).
 
+    }
   }
 
 }

Modified: pkg/CHNOSZ/inst/tinytest/test-AD.R
===================================================================
--- pkg/CHNOSZ/inst/tinytest/test-AD.R	2022-02-11 12:22:46 UTC (rev 706)
+++ pkg/CHNOSZ/inst/tinytest/test-AD.R	2022-02-20 09:03:54 UTC (rev 707)
@@ -87,11 +87,11 @@
 if(!at_home()) exit_file("Skipping tests on CRAN")
 # This one fails on Windows (tolerance = 9 works) 20220208
 expect_equal(sout1$Cp[1:3], Cp_ref1[1:3], tolerance = 3, scale = 1, info = "AD produces correct values for CO2 along saturation curve")
-# This one fails on ATLAS and M1Mac on CRAN 20220210
+# This one fails on ATLAS and M1mac on CRAN 20220210
 expect_equal(sout1$Cp[4], Cp_ref1[4], tolerance = 800, scale = 1, info = "AD produces correct values for CO2 along saturation curve")
 # This one fails on ATLAS
 expect_equal(sout2$Cp, Cp_ref2, tolerance = 14, scale = 1, info = "AD produces correct values for CO2 at 1000 bar")
-# This one fails on M1Mac
+# This one fails on M1mac
 # g / cm3 / K^2
 expect_equal(CHNOSZ:::.d2rho1_dT2(298.15, 1, FALSE), -0.000009503, tolerance = 0.000007, scale = 1,
              info = "Fugacity, density, and density derivatives of H2O are close to values in Akinfiev and Diamond (2003)")