[CHNOSZ-commits] r298 - in pkg/CHNOSZ: . inst inst/extdata/Berman

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

Author: jedick
Date: 2017-12-13 06:42:11 +0100 (Wed, 13 Dec 2017)
New Revision: 298

Modified:
   pkg/CHNOSZ/DESCRIPTION
   pkg/CHNOSZ/inst/NEWS
   pkg/CHNOSZ/inst/extdata/Berman/DS10.csv
Log:
correct swapped v1,v2,v3,v4 parameters in extdata/Berman/DS10.csv


Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION	2017-12-12 15:19:11 UTC (rev 297)
+++ pkg/CHNOSZ/DESCRIPTION	2017-12-13 05:42:11 UTC (rev 298)
@@ -1,6 +1,6 @@
-Date: 2017-12-12
+Date: 2017-12-13
 Package: CHNOSZ
-Version: 1.1.3-4
+Version: 1.1.3-5
 Title: Thermodynamic Calculations for Geobiochemistry
 Authors at R: c(
     person("Jeffrey", "Dick", , "j3ffdick at gmail.com", role = c("aut", "cre"),

Modified: pkg/CHNOSZ/inst/NEWS
===================================================================
--- pkg/CHNOSZ/inst/NEWS	2017-12-12 15:19:11 UTC (rev 297)
+++ pkg/CHNOSZ/inst/NEWS	2017-12-13 05:42:11 UTC (rev 298)
@@ -1,4 +1,4 @@
-CHANGES IN CHNOSZ 1.1.3-4 (2017-12-12)
+CHANGES IN CHNOSZ 1.1.3-5 (2017-12-13)
 --------------------------------------
 
 - Lines in 1-D diagram()s can optionally be drawn as splines using the
@@ -13,6 +13,8 @@
 - Add mineral data from Berman and Aranovich, 1996 to
   extdata/Berman/BA96.csv.
 
+- Correct swapped v1 <-> v3 and v2 <-> v4 in extdata/Berman/DS10.csv.
+
 CHANGES IN CHNOSZ 1.1.3 (2017-11-13)
 ------------------------------------
 

Modified: pkg/CHNOSZ/inst/extdata/Berman/DS10.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/Berman/DS10.csv	2017-12-12 15:19:11 UTC (rev 297)
+++ pkg/CHNOSZ/inst/extdata/Berman/DS10.csv	2017-12-13 05:42:11 UTC (rev 298)
@@ -1,6 +1,6 @@
 name,GfPrTr,HfPrTr,SPrTr,VPrTr,k0,k1,k2,k3,v1,v2,v3,v4,Tlambda,Tref,dTdP,l1,l2,DtH,Tmax,Tmin,d0,d1,d2,d3,d4,d5
-hedenbergite,-2674300,-2837802.5,173.59,6.785,353.31148,-31.06646,20.47911742,-56.3018581,27.96487,0,-1.7457,0.151,,,,,,,,,,,,,,
-andradite,-5419000,-5761985.8,316.4,13.167,569.7558,-14.4144,-224.41040802,314.6543781,20.72525,5610,-0.6539136,0.01635,,,,,,,,,,,,,,
-ferro-actinolite,-9839000,-10518042.6,685.1,28.26,1321.15758,-89.66454,-217.05844286,323.6159154,28.4,0,-1.5,0,,,,,,,,,,,,,,
-grunerite,-8964807,-9623000,725,27.8,1347.83,-93.5691,-202.2848,303.919,28.4,0,-1.5,0,,,,,,,,,,,,,,
-ilvaite,-3440000,-3695605.5,291.5,10.016,682.79138,-87.87112,301.8356871,-566.6432624,18.01543,11520,-0.6838,0.0024,,,,,,,,,,,,,,
+hedenbergite,-2674300,-2837802.5,173.59,6.785,353.31148,-31.06646,20.47911742,-56.3018581,-1.7457,15.1,27.96487,0,,,,,,,,,,,,,,
+andradite,-5419000,-5761985.8,316.4,13.167,569.7558,-14.4144,-224.41040802,314.6543781,-0.6539136,1.635,20.72525,56.1,,,,,,,,,,,,,,
+ferro-actinolite,-9839000,-10518042.6,685.1,28.26,1321.15758,-89.66454,-217.05844286,323.6159154,-1.5,0,28.4,0,,,,,,,,,,,,,,
+grunerite,-8964807,-9623000,725,27.8,1347.83,-93.5691,-202.2848,303.919,-1.5,0,28.4,0,,,,,,,,,,,,,,
+ilvaite,-3440000,-3695605.5,291.5,10.016,682.79138,-87.87112,301.8356871,-566.6432624,-0.6838,0.24,18.01543,115.2,,,,,,,,,,,,,,