[CHNOSZ-commits] r875 - in pkg/CHNOSZ: . inst/extdata/OBIGT inst/extdata/thermo

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

Author: jedick
Date: 2025-03-08 13:15:09 +0100 (Sat, 08 Mar 2025)
New Revision: 875

Modified:
   pkg/CHNOSZ/DESCRIPTION
   pkg/CHNOSZ/inst/extdata/OBIGT/SUPCRT92.csv
   pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_cr.csv
   pkg/CHNOSZ/inst/extdata/thermo/stoich.csv.xz
Log:
OBIGT: Move fluorite from SUPCRT92.csv to default database


Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION	2025-02-24 09:14:21 UTC (rev 874)
+++ pkg/CHNOSZ/DESCRIPTION	2025-03-08 12:15:09 UTC (rev 875)
@@ -1,6 +1,6 @@
-Date: 2025-02-24
+Date: 2025-03-08
 Package: CHNOSZ
-Version: 2.1.0-46
+Version: 2.1.0-47
 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/extdata/OBIGT/SUPCRT92.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/SUPCRT92.csv	2025-02-24 09:14:21 UTC (rev 874)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/SUPCRT92.csv	2025-03-08 12:15:09 UTC (rev 875)
@@ -85,7 +85,6 @@
 ferrotremolite,Fe-Tr,(Ca2Fe5)Si8O22(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,-2349100,-2511300,163.5,NA,282.8,197.93,0.05895,-4117000,0,0,0,0,800
 fluoredenite,Fl-Ed,Na(Ca2Mg5)(AlSi7)O22(F)2,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,146.7,NA,272.5,195.23,0.04674,-4492000,0,0,0,0,848
 fluoredenite,Fl-Ed,Na(Ca2Mg5)(AlSi7)O22(F)2,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-3.895,NA,145.4767,NA,272.5,198.42,0.04048,-4222000,0,0,0,0,1000
-fluorite,Fl,CaF2,cr,HDNB78,NA,1978-05-05,CGL,cal,-280493,-293000,16.39,NA,24.542,14.3,0.00728,47000,0,0,0,0,1424
 fluorphlogopite,F-Phl,KMg3(AlSi3)O10(F)2,cr,HDNB78,RH95.4,2020-07-06,CGL,cal,-1437787,-1519001,80.38,NA,146.37,96.13,0.02674,-2041000,0,0,0,0,1000
 fluortremolite,F-Tr,(Ca2Mg5)Si8O22(F)2,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,129.4,NA,270.45,183.74,0.05525,-4373000,0,0,0,0,800
 forsterite,Fo,Mg2SiO4,cr,HDNB78,NA,1978-05-05,CGL,cal,-491564,-520000,22.75,NA,43.79,35.81,0.00654,-852000,0,0,0,0,1800

Modified: pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_cr.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_cr.csv	2025-02-24 09:14:21 UTC (rev 874)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_cr.csv	2025-03-08 12:15:09 UTC (rev 875)
@@ -30,6 +30,7 @@
 covellite,Cv,CuS,cr,HDNB78,RH95.7,1978-05-05,CGL_Ttr,cal,-12612,-12500,15.9,NA,20.42,10.6,0.00264,0,0,0,0,0,780.5
 cuprite,Cpr,Cu2O,cr,HDNB78,RH95.7,1978-05-05,CGL_Ttr,cal,-35384,-40830,22.08,NA,23.437,14.08,0.00588,-76000,0,0,0,0,1509
 ferrous-oxide,Frs-Ox,FeO,cr,HDNB78,NA,1978-05-05,CGL,cal,-60097,-65020,14.52,NA,12,12.122,0.002072,-75000,0,0,0,0,1600
+fluorite,Fl,CaF2,cr,HDNB78,NA,1978-05-05,CGL,cal,-280493,-293000,16.39,NA,24.542,14.3,0.00728,47000,0,0,0,0,1424
 galena,Gn,PbS,cr,HDNB78,RH95.7,1978-05-05,CGL_Ttr,cal,-23115,-23500,21.8,NA,31.49,11.17,0.0022,0,0,0,0,0,1400
 gold,Au,Au,cr,HDNB78,RH95.7,1978-05-05,CGL_Ttr,cal,0,0,11.33,NA,10.215,5.66,0.00124,0,0,0,0,0,1336.15
 graphite,Gr,C,cr,HDNB78,NA,1978-05-05,CGL,cal,0,0,1.372,NA,5.298,4.03,0.00114,-204000,0,0,0,0,2500

Modified: pkg/CHNOSZ/inst/extdata/thermo/stoich.csv.xz
===================================================================
(Binary files differ)