[CHNOSZ-commits] r811 - in pkg/CHNOSZ: . R inst inst/extdata/OBIGT inst/tinytest vignettes

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Wed Nov 15 08:38:37 CET 2023


Author: jedick
Date: 2023-11-15 08:38:37 +0100 (Wed, 15 Nov 2023)
New Revision: 811

Modified:
   pkg/CHNOSZ/DESCRIPTION
   pkg/CHNOSZ/R/subcrt.R
   pkg/CHNOSZ/inst/NEWS.Rd
   pkg/CHNOSZ/inst/extdata/OBIGT/SUPCRT92.csv
   pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_cr.csv
   pkg/CHNOSZ/inst/extdata/OBIGT/refs.csv
   pkg/CHNOSZ/inst/tinytest/test-subcrt.R
   pkg/CHNOSZ/vignettes/FAQ.Rmd
   pkg/CHNOSZ/vignettes/vig.bib
Log:
subcrt() now warns about T limit of Cp equations


Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION	2023-11-15 04:21:12 UTC (rev 810)
+++ pkg/CHNOSZ/DESCRIPTION	2023-11-15 07:38:37 UTC (rev 811)
@@ -1,6 +1,6 @@
 Date: 2023-11-15
 Package: CHNOSZ
-Version: 2.0.0-30
+Version: 2.0.0-31
 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/R/subcrt.R
===================================================================
--- pkg/CHNOSZ/R/subcrt.R	2023-11-15 04:21:12 UTC (rev 810)
+++ pkg/CHNOSZ/R/subcrt.R	2023-11-15 07:38:37 UTC (rev 811)
@@ -343,7 +343,7 @@
     if("G" %in% eosprop) {
       # 20080304 This code is weird and hard to read - needs a lot of cleanup!
       # 20120219 Cleaned up somewhat; using exceed.Ttr and NA instead of do.phases and 999999
-      # the numbers of the cgl species (becomes 0 for any that aren't cgl)
+      # The numbers of the cgl species (becomes 0 for any that aren't cgl)
       ncgl <- iscgl
       ncgl[iscgl] <- 1:nrow(param)
       for(i in 1:length(iscgl)) {
@@ -370,27 +370,45 @@
 #            }
 #          }
 #        }
-        # Check if we're above the temperature limit or transition temperature
-        # T limit (or Ttr) from the database
-        warn.above <- TRUE
+
+        # Check for a polymorphic transition
+        is.polymorphic.transition <- FALSE
         Ttr <- thermo$OBIGT$z.T[iphases[i]]
-        # Calculate Ttr at higher P if a phase transition is present
         if(i < nrow(reaction)) {
-          # If the next one is cr2, cr3, etc we have a transition
+          # If the next one is cr2, cr3, etc we have a polymorphic transition
           if(reaction$state[i+1] %in% c("cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7", "cr8", "cr9") & reaction$name[i+1] == reaction$name[i]) {
+            # Calculate Ttr at higher P for a polymorphic transition
             Ttr <- Ttr(iphases[i], iphases[i+1], P = P, dPdT = dPdTtr(iphases[i], iphases[i+1]))
-            # We don't warn here about the transition
-            warn.above <- FALSE
+            # Put in NA for G
+            p.cgl[[ncgl[i]]]$G[T > Ttr] <- NA
+            is.polymorphic.transition <- TRUE
           }
         }
-        if(any(is.na(Ttr))) next
-        if(!all(Ttr == 0) & any(T > Ttr)) {
-          if(!exceed.Ttr) {
-            p.cgl[[ncgl[i]]]$G[T > Ttr] <- NA
-            if(warn.above) message(paste0("subcrt: G is shown as NA for ", myname, "(", mystate, ") above its transition temperature of ", Ttr, " K (use exceed.Ttr = TRUE to output G)"))
-          } else {
-            if(warn.above) message(paste0("subcrt: extrapolating G for ", myname, "(", mystate, ") above its transition temperature of ", Ttr, " K (use exceed.Ttr = FALSE to prevent this)"))
+
+        if(!is.polymorphic.transition) {
+          # Check if we're above the T limit for a Cp equation or T for phase change (e.g. melting or vaporization) listed in OBIGT
+          is.Cp.equation <- FALSE
+          if(all(is.na(Ttr))) next
+          if(all(Ttr == 0)) next
+          ineg <- Ttr < 0
+          if(any(ineg)) {
+            # This is the T limit for a Cp equation (not a phase change)
+            Ttr[ineg] <- -Ttr[ineg]
+            is.Cp.equation <- TRUE
           }
+          if(any(T > Ttr)) {
+            if(!exceed.Ttr) {
+                if(is.Cp.equation) {
+                  warning(paste0("above T limit of ", Ttr, " K for the Cp equation for ", myname, "(", mystate, ")"))
+                } else {
+                  message(paste0("subcrt: G is set to NA for ", myname, "(", mystate, ") above its stability limit of ", Ttr, " K (use exceed.Ttr = TRUE to output G)"))
+                  p.cgl[[ncgl[i]]]$G[T > Ttr] <- NA
+                  print(p.cgl)
+                }
+            } else {
+              message(paste0("subcrt: showing G for ", myname, "(", mystate, ") above its stability limit of ", Ttr, " K (use exceed.Ttr = FALSE to prevent this)"))
+            }
+          }
         }
         # Use variable-pressure standard Gibbs energy for gases if varP is TRUE (not the default)
         if(mystate == "gas" & thermo$opt$varP) p.cgl[[ncgl[i]]]$G <- p.cgl[[ncgl[i]]]$G - convert(log10(P), "G", T = T)
@@ -399,7 +417,6 @@
     outprops <- c(outprops,p.cgl)
   }
 
-
   # Water
   if(any(isH2O)) {
     p.H2O <- H2O.PT[, match(eosprop, colnames(H2O.PT)), drop = FALSE]

Modified: pkg/CHNOSZ/inst/NEWS.Rd
===================================================================
--- pkg/CHNOSZ/inst/NEWS.Rd	2023-11-15 04:21:12 UTC (rev 810)
+++ pkg/CHNOSZ/inst/NEWS.Rd	2023-11-15 07:38:37 UTC (rev 811)
@@ -2,17 +2,20 @@
 \title{News for Package 'CHNOSZ'}
 \encoding{UTF-8}
 
-% macros
+% Macros
 \newcommand{\degC}{\ifelse{latex}{\eqn{^{\circ}}C}{\ifelse{html}{\out{°}C}{°C}}}
 \newcommand{\H2O}{\ifelse{latex}{\eqn{\mathrm{H_{2}O}}}{\ifelse{html}{\out{H<sub>2</sub>O}}{H2O}}}
 \newcommand{\Hplus}{\ifelse{latex}{\eqn{\mathrm{H^{+}}}}{\ifelse{html}{\out{H<sup>+</sup>}}{H+}}}
-% subscript and superscript
+% Subscript and superscript
 \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}}}
-% links to vignettes 20220723
+% Links to vignettes 20220723
 \newcommand{\viglink}{\ifelse{html}{\out{<a href="../CHNOSZ/doc/#1.html"><strong>#1.Rmd</strong></a>}}{\bold{#1.Rmd}}}
+% Heat capacity and standard Gibbs energy 20231115
+\newcommand{\Cp}{\ifelse{latex}{\eqn{C_P}}{\ifelse{html}{\out{<I>C<sub>P</sub></I>}}{Cp}}}
+\newcommand{\DG0}{\ifelse{latex}{\eqn{{\Delta}G^{\circ}}}{\ifelse{html}{\out{Δ<I>G</I>°}}{ΔG°}}}
 
-\section{Changes in CHNOSZ version 2.0.0-28 (2023-11-14)}{
+\section{Changes in CHNOSZ version 2.0.0-31 (2023-11-15)}{
 
     \itemize{
 
@@ -26,6 +29,7 @@
         \item When and why do equal-activity boundaries depend on total activity?
         \item How can minerals with polymorphic transitions be added to the database?
         \item How can I make a diagram with the trisulfur radical ion (S\s{3}\S{-})?
+        \item In OBIGT, what is the meaning of \code{T} for solids, liquids, and gases?
 
       }
 
@@ -62,11 +66,13 @@
       update several others (Arg\S{+}, Arg\S{-}, Asp\S{-}, Glu\S{-}, His\S{+},
       Lys\S{+}, Lys\S{-}, and Tyr\S{-}). Thanks to Grayson Boyer.
 
-      \item In the default (inorganic_cr.csv) and optional (SUPCRT92.csv) data
-      files, remove T values that represent temperature limit of Cp equations
-      (these are now listed as NA). Temperatures of polymorphic phase
-      transitions and melting or decomposition temperatures (only available for
-      some minerals) have been retained. See FAQ for more details.
+      \item \code{subcrt()} now outputs \DG0 and issues a warning above the
+      temperature limit for \Cp equations for minerals and other \samp{CGL}
+      species. The previous behavior of setting \DG0 to NA and issuing a
+      message is now reserved for phase stability limits (i.e., melting,
+      vaporization, or decomposition). The temperature limit for \Cp equations
+      is stored as the opposite (negative) value in OBIGT. See \viglink{FAQ}
+      for details.
 
     }
 

Modified: pkg/CHNOSZ/inst/extdata/OBIGT/SUPCRT92.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/SUPCRT92.csv	2023-11-15 04:21:12 UTC (rev 810)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/SUPCRT92.csv	2023-11-15 07:38:37 UTC (rev 811)
@@ -1,178 +1,178 @@
 name,abbrv,formula,state,ref1,ref2,date,model,E_units,G,H,S,Cp,V,a1.a,a2.b,a3.c,a4.d,c1.e,c2.f,omega.lambda,z.T
 aegerine,Agt,NaFe(SiO3)2,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,36.7,NA,64.37,46.16,0.01931,-946000,0,0,0,0,950
 aegerine,Agt,NaFe(SiO3)2,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-82.386,NA,34.6051,NA,64.37,52.42,0.01001,-768000,0,0,0,0,1050
-aegerine,Agt,NaFe(SiO3)2,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,478.346,NA,36.6502,NA,64.37,50.27,0.01089,-768000,0,0,0,0,NA
-akermanite,Ak,Ca2MgSi2O7,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-879362,-926497,50.03,NA,92.81,60.09,0.0114,-1140000,0,0,0,0,NA
+aegerine,Agt,NaFe(SiO3)2,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,478.346,NA,36.6502,NA,64.37,50.27,0.01089,-768000,0,0,0,0,-1400
+akermanite,Ak,Ca2MgSi2O7,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-879362,-926497,50.03,NA,92.81,60.09,0.0114,-1140000,0,0,0,0,-1700
 albite,Ab,Na(AlSi3)O8,cr,HDNB78,NA,1978-05-05,CGL,cal,-886308,-939680,49.51,NA,100.25,61.7,0.0139,-1501000,0,0,0,0,473
-albite,Ab,Na(AlSi3)O8,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-886096.268,NA,53.9193,NA,100.25,81.88,0.003554,-5015400,0,0,0,0,NA
+albite,Ab,Na(AlSi3)O8,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-886096.268,NA,53.9193,NA,100.25,81.88,0.003554,-5015400,0,0,0,0,-1200
 "albite,high",Hi-Ab,NaAlSi3O8,cr,HDNB78,NA,1978-05-05,CGL,cal,-884509,-937050,52.3,NA,100.43,61.7,0.0139,-1501000,0,0,0,0,623
-"albite,high",Hi-Ab,NaAlSi3O8,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-884768.678,NA,50.4797,NA,100.43,64.17,0.0139,-1501000,0,0,0,0,NA
-"albite,low",Lo-Ab,Na(AlSi3)O8,cr,HDNB78,NA,1978-05-05,CGL,cal,-886308,-939680,49.51,NA,100.07,61.7,0.0139,-1501000,0,0,0,0,NA
+"albite,high",Hi-Ab,NaAlSi3O8,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-884768.678,NA,50.4797,NA,100.43,64.17,0.0139,-1501000,0,0,0,0,-1400
+"albite,low",Lo-Ab,Na(AlSi3)O8,cr,HDNB78,NA,1978-05-05,CGL,cal,-886308,-939680,49.51,NA,100.07,61.7,0.0139,-1501000,0,0,0,0,-1400
 almandine,Alm,Fe3Al2Si3O12,cr,HDNB78,RH95.3,2020-07-06,CGL,cal,-1181142,-1258293,81.88,82.05,115.28,97.52,0.03364,-1873000,0,0,0,0,848
-almandine,Alm,Fe3Al2Si3O12,cr2,HDNB78,OBIGT.1,2020-07-06,CGL,cal,-1181153.741,NA,78.21,NA,115.28,107.09,0.01486,-1063000,0,0,0,0,NA
+almandine,Alm,Fe3Al2Si3O12,cr2,HDNB78,OBIGT.1,2020-07-06,CGL,cal,-1181153.741,NA,78.21,NA,115.28,107.09,0.01486,-1063000,0,0,0,0,-1600
 "amesite,14A",14A-Am,Mg4Al2(Al2Si2)O10(OH)8,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,108.9,NA,205.4,172.59,0.03498,-4167000,0,0,0,0,848
-"amesite,14A",14A-Am,Mg4Al2(Al2Si2)O10(OH)8,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,3.895,NA,110.1233,NA,205.4,169.4,0.04124,-4437000,0,0,0,0,NA
-"amesite,7A",Ams-7A,Mg2Al(AlSi)O5(OH)4,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,52,NA,103,81.03,0.024738,-2023000,0,0,0,0,NA
-"amorphous silica",Amor-Sl,SiO2,cr,HDNB78,NA,1978-05-05,CGL,cal,-202892,-214568,14.34,NA,29,5.93,0.0472,-2278000,0,0,0,0,NA
-analcime,Anl,NaAlSi2O6*H2O,cr,HDNB78,NA,1978-05-05,CGL,cal,-738098,-790193,56,NA,97.1,53.49,0.02414,-888000,0,0,0,0,NA
-"analcime,dehydrated",Dhyd-Anl,NaAlSi2O6,cr,HDNB78,NA,1978-05-05,CGL,cal,-674989,-714678,41.9,NA,89.1,42.09,0.02414,-888000,0,0,0,0,NA
-andalusite,And,Al2SiO5,cr,HDNB78,NA,1978-05-05,CGL,cal,-580587,-615866,22.2,NA,51.53,41.310833,0.006292556,-1239206.3,0,0,0,0,NA
-andradite,Adr,Ca3Fe2Si3O12,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-1296819,-1380345,70.13,NA,131.85,113.532,0.015636,-3088900,0,0,0,0,NA
-annite,Ann,KFe3(AlSi3)O10(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,-1147156,-1232195,95.2,NA,154.32,106.43,0.02977,-1931000,0,0,0,0,NA
-anorthite,An,Ca(Al2Si2)O8,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-954078,-1007552,49.1,NA,100.79,63.311,0.014794,-1544000,0,0,0,0,NA
+"amesite,14A",14A-Am,Mg4Al2(Al2Si2)O10(OH)8,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,3.895,NA,110.1233,NA,205.4,169.4,0.04124,-4437000,0,0,0,0,-1000
+"amesite,7A",Ams-7A,Mg2Al(AlSi)O5(OH)4,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,52,NA,103,81.03,0.024738,-2023000,0,0,0,0,-1000
+"amorphous silica",Amor-Sl,SiO2,cr,HDNB78,NA,1978-05-05,CGL,cal,-202892,-214568,14.34,NA,29,5.93,0.0472,-2278000,0,0,0,0,-622
+analcime,Anl,NaAlSi2O6*H2O,cr,HDNB78,NA,1978-05-05,CGL,cal,-738098,-790193,56,NA,97.1,53.49,0.02414,-888000,0,0,0,0,-1000
+"analcime,dehydrated",Dhyd-Anl,NaAlSi2O6,cr,HDNB78,NA,1978-05-05,CGL,cal,-674989,-714678,41.9,NA,89.1,42.09,0.02414,-888000,0,0,0,0,-1000
+andalusite,And,Al2SiO5,cr,HDNB78,NA,1978-05-05,CGL,cal,-580587,-615866,22.2,NA,51.53,41.310833,0.006292556,-1239206.3,0,0,0,0,-1043
+andradite,Adr,Ca3Fe2Si3O12,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-1296819,-1380345,70.13,NA,131.85,113.532,0.015636,-3088900,0,0,0,0,-1100
+annite,Ann,KFe3(AlSi3)O10(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,-1147156,-1232195,95.2,NA,154.32,106.43,0.02977,-1931000,0,0,0,0,-1000
+anorthite,An,Ca(Al2Si2)O8,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-954078,-1007552,49.1,NA,100.79,63.311,0.014794,-1544000,0,0,0,0,-1700
 anthophyllite,Ath,Mg7Si8O22(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,-2715430,-2888749,128.6,NA,264.4,180.682,0.060574,-3846200,0,0,0,0,903
 anthophyllite,Ath,Mg7Si8O22(OH)2,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-2718479.297,NA,108.796,NA,264.4,197.542,0.041614,-1334200,0,0,0,0,1258
-anthophyllite,Ath,Mg7Si8O22(OH)2,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-2719529.932,NA,105.9454,NA,264.4,199.522,0.041614,-1334200,0,0,0,0,NA
+anthophyllite,Ath,Mg7Si8O22(OH)2,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-2719529.932,NA,105.9454,NA,264.4,199.522,0.041614,-1334200,0,0,0,0,-1800
 antigorite,Atg,Mg48Si34O85(OH)62,cr,HDNB78,NA,1978-05-05,CGL,cal,-15808020,-17070891,861.36,NA,1749.13,1228.45,0.51376,-28668000,0,0,0,0,848
-antigorite,Atg,Mg48Si34O85(OH)62,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-15808027.845,NA,858.9133,NA,1749.13,1234.83,0.50124,-28128000,0,0,0,0,NA
-aragonite,Arg,CaCO3,cr,HDNB78,PB82,1990-03-09,CGL,cal,-269683,-288531,21.56,NA,34.15,20.13,0.01024,-334000,0,0,0,0,NA
-boehmite,Bhm,AlO(OH),cr,HDNB78,NA,1978-05-05,CGL,cal,-217250,-235078,11.58,NA,19.535,14.435,0.0042,0,0,0,0,0,NA
-brucite,Brc,Mg(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,-199646,-221390,15.09,NA,24.63,24.147,0.0040124,-611000,0,0,0,0,NA
-Ca-Al-pyroxene,Ca-Al-Px,CaAl(AlSi)O6,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-742067,-783793,35,NA,63.5,54.13,0.00642,-1490000,0,0,0,0,NA
+antigorite,Atg,Mg48Si34O85(OH)62,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-15808027.845,NA,858.9133,NA,1749.13,1234.83,0.50124,-28128000,0,0,0,0,-1000
+aragonite,Arg,CaCO3,cr,HDNB78,PB82,1990-03-09,CGL,cal,-269683,-288531,21.56,NA,34.15,20.13,0.01024,-334000,0,0,0,0,-600
+boehmite,Bhm,AlO(OH),cr,HDNB78,NA,1978-05-05,CGL,cal,-217250,-235078,11.58,NA,19.535,14.435,0.0042,0,0,0,0,0,-500
+brucite,Brc,Mg(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,-199646,-221390,15.09,NA,24.63,24.147,0.0040124,-611000,0,0,0,0,-900
+Ca-Al-pyroxene,Ca-Al-Px,CaAl(AlSi)O6,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-742067,-783793,35,NA,63.5,54.13,0.00642,-1490000,0,0,0,0,-1400
 Ca-phillipsite,Ca-Php,Ca(Al2Si5)O14*5H2O,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,166.6,NA,265,145.82,0.05267,-1913000,0,0,0,0,848
-Ca-phillipsite,Ca-Php,Ca(Al2Si5)O14*5H2O,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-3.895,NA,165.3767,NA,265,149.01,0.04641,-1643000,0,0,0,0,NA
-calcite,Cal,CaCO3,cr,HDNB78,PB82,1990-03-09,CGL,cal,-269880,-288552,22.15,NA,36.934,24.98,0.00524,-620000,0,0,0,0,NA
-celadonite,Cln,K(MgAl)Si4O10(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,74.9,NA,157.1,80.25,0.0253,-1854000,0,0,0,0,NA
-chabazite,Cbz,Ca(Al2Si4)O12*6H2O,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,152.9,NA,247.76,146,0.04447,-1643000,0,0,0,0,NA
-chalcedony,Cha,SiO2,cr,HDNB78,NA,1978-05-05,CGL,cal,-204276,-217282,9.88,NA,22.688,11.22,0.0082,-270000,0,0,0,0,NA
-chloritoid,Cld,FeAl2SiO5(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,42.1,NA,69.8,60.63,0.01713,-1363000,0,0,0,0,NA
-chrysotile,Ctl,Mg3Si2O5(OH)4,cr,HDNB78,NA,1978-05-05,CGL,cal,-964871,-1043123,52.9,NA,108.5,75.82,0.0316,-1758000,0,0,0,0,NA
-"clinochlore,14A",14A-Cnc,Mg5Al(AlSi3)O10(OH)8,cr,HDNB78,NA,1978-05-05,CGL,cal,-1961703,-2116964,111.2,NA,207.11,166.5,0.0421,-3747000,0,0,0,0,NA
+Ca-phillipsite,Ca-Php,Ca(Al2Si5)O14*5H2O,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-3.895,NA,165.3767,NA,265,149.01,0.04641,-1643000,0,0,0,0,-1000
+calcite,Cal,CaCO3,cr,HDNB78,PB82,1990-03-09,CGL,cal,-269880,-288552,22.15,NA,36.934,24.98,0.00524,-620000,0,0,0,0,-1200
+celadonite,Cln,K(MgAl)Si4O10(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,74.9,NA,157.1,80.25,0.0253,-1854000,0,0,0,0,-1000
+chabazite,Cbz,Ca(Al2Si4)O12*6H2O,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,152.9,NA,247.76,146,0.04447,-1643000,0,0,0,0,-1000
+chalcedony,Cha,SiO2,cr,HDNB78,NA,1978-05-05,CGL,cal,-204276,-217282,9.88,NA,22.688,11.22,0.0082,-270000,0,0,0,0,-848
+chloritoid,Cld,FeAl2SiO5(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,42.1,NA,69.8,60.63,0.01713,-1363000,0,0,0,0,-1000
+chrysotile,Ctl,Mg3Si2O5(OH)4,cr,HDNB78,NA,1978-05-05,CGL,cal,-964871,-1043123,52.9,NA,108.5,75.82,0.0316,-1758000,0,0,0,0,-1000
+"clinochlore,14A",14A-Cnc,Mg5Al(AlSi3)O10(OH)8,cr,HDNB78,NA,1978-05-05,CGL,cal,-1961703,-2116964,111.2,NA,207.11,166.5,0.0421,-3747000,0,0,0,0,-900
 "clinochlore,7A",7A-Cnc,Mg5Al(AlSi3)O10(OH)8,cr,HDNB78,NA,1978-05-05,CGL,cal,-1957101,-2113197,106.5,NA,211.5,162.82,0.05062,-4088000,0,0,0,0,848
-"clinochlore,7A",7A-Cnc,Mg5Al(AlSi3)O10(OH)8,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-1957104.895,NA,105.2767,NA,211.5,166.01,0.04436,-3818000,0,0,0,0,NA
-clinozoisite,Czo,Ca2Al3Si3O12(OH),cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-1549240,-1643781,70.64,NA,136.2,106.118,0.025214,-2714500,0,0,0,0,NA
+"clinochlore,7A",7A-Cnc,Mg5Al(AlSi3)O10(OH)8,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-1957104.895,NA,105.2767,NA,211.5,166.01,0.04436,-3818000,0,0,0,0,-900
+clinozoisite,Czo,Ca2Al3Si3O12(OH),cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-1549240,-1643781,70.64,NA,136.2,106.118,0.025214,-2714500,0,0,0,0,-700
 coesite,Cos,SiO2,cr,HDNB78,NA,1978-05-05,CGL,cal,-203541,-216614,9.65,NA,20.641,11,0.0082,-270000,0,0,0,0,848
-coesite,Cos,SiO2,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-203544.895,NA,8.4267,NA,20.641,14.19,0.00194,0,0,0,0,0,NA
-"cordierite,dry",Crd,Mg2Al3(AlSi5)O18,cr,HDNB78,NA,1978-05-05,CGL,cal,-2061279,-2183199,97.33,NA,233.22,143.83,0.0258,-3860000,0,0,0,0,NA
-"cordierite,hydrous",Hyd-Crd,Mg2Al3(AlSi5)O18*H2O,cr,HDNB78,NA,1978-05-05,CGL,cal,-2121350,-2255676,111.43,NA,241.22,155.23,0.0258,-3860000,0,0,0,0,NA
-corundum,Crn,Al2O3,cr,HDNB78,NA,1978-05-05,CGL,cal,-374824,-397145,12.18,NA,25.575,27.49,0.00282,-838000,0,0,0,0,NA
+coesite,Cos,SiO2,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-203544.895,NA,8.4267,NA,20.641,14.19,0.00194,0,0,0,0,0,-2000
+"cordierite,dry",Crd,Mg2Al3(AlSi5)O18,cr,HDNB78,NA,1978-05-05,CGL,cal,-2061279,-2183199,97.33,NA,233.22,143.83,0.0258,-3860000,0,0,0,0,-1700
+"cordierite,hydrous",Hyd-Crd,Mg2Al3(AlSi5)O18*H2O,cr,HDNB78,NA,1978-05-05,CGL,cal,-2121350,-2255676,111.43,NA,241.22,155.23,0.0258,-3860000,0,0,0,0,-1700
+corundum,Crn,Al2O3,cr,HDNB78,NA,1978-05-05,CGL,cal,-374824,-397145,12.18,NA,25.575,27.49,0.00282,-838000,0,0,0,0,-1800
 cristobalite,Crs,SiO2,cr,HDNB78,NA,1978-05-05,CGL,cal,-203895,-216755,10.372,NA,25.74,13.98,0.00334,-381000,0,0,0,0,543
-cristobalite,Crs,SiO2,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-203677.53,-216037.379,12.0495,NA,25.74,17.39,0.00031,-989000,0,0,0,0,NA
-"cristobalite,alpha",A-Crs,SiO2,cr,HDNB78,NA,1978-05-05,CGL,cal,-203895,-216755,10.372,NA,25.74,13.98,0.00334,-381000,0,0,0,0,NA
-"cristobalite,beta",B-Crs,SiO2,cr,HDNB78,NA,1978-05-05,CGL,cal,-203290,-215675,11.963,NA,27.38,17.39,0.00031,-989000,0,0,0,0,NA
+cristobalite,Crs,SiO2,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-203677.53,-216037.379,12.0495,NA,25.74,17.39,0.00031,-989000,0,0,0,0,-2000
+"cristobalite,alpha",A-Crs,SiO2,cr,HDNB78,NA,1978-05-05,CGL,cal,-203895,-216755,10.372,NA,25.74,13.98,0.00334,-381000,0,0,0,0,-1000
+"cristobalite,beta",B-Crs,SiO2,cr,HDNB78,NA,1978-05-05,CGL,cal,-203290,-215675,11.963,NA,27.38,17.39,0.00031,-989000,0,0,0,0,-2000
 "cronstedtite,7A",7A-Csd,Fe2Fe(FeSi)O5(OH)4,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,73.5,NA,110.9,84.79,0.04184,-1247600,0,0,0,0,950
 "cronstedtite,7A",7A-Csd,Fe2Fe(FeSi)O5(OH)4,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-160.595,NA,69.3289,NA,110.9,97.3,0.02324,-893000,0,0,0,0,1050
-"cronstedtite,7A",7A-Csd,Fe2Fe(FeSi)O5(OH)4,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,957.096,NA,73.4065,NA,110.9,93.01,0.025,-893000,0,0,0,0,NA
-cummingtonite,Cum,Mg7Si8O22(OH)2,cr,HDNB78,NA,2015-08-16,CGL,cal,NA,NA,127.5,NA,271.9,185.24,0.05861,-4166000,0,0,0,0,NA
-"daphnite,14A",Dph-14A,Fe5Al(AlSi3)O10(OH)8,cr,HDNB78,SLOP98.2,1978-05-05,CGL,cal,-1550482,-1695426,142.5,NA,213.42,176.21,0.04376,-3382000,0,0,0,0,NA
+"cronstedtite,7A",7A-Csd,Fe2Fe(FeSi)O5(OH)4,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,957.096,NA,73.4065,NA,110.9,93.01,0.025,-893000,0,0,0,0,-1500
+cummingtonite,Cum,Mg7Si8O22(OH)2,cr,HDNB78,NA,2015-08-16,CGL,cal,NA,NA,127.5,NA,271.9,185.24,0.05861,-4166000,0,0,0,0,-800
+"daphnite,14A",Dph-14A,Fe5Al(AlSi3)O10(OH)8,cr,HDNB78,SLOP98.2,1978-05-05,CGL,cal,-1550482,-1695426,142.5,NA,213.42,176.21,0.04376,-3382000,0,0,0,0,-1000
 "daphnite,7A",7A-Dph,Fe5Al(AlSi3)O10(OH)8,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,138.9,NA,221.2,172.53,0.05228,-3723000,0,0,0,0,848
-"daphnite,7A",7A-Dph,Fe5Al(AlSi3)O10(OH)8,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,3.159,NA,137.726,NA,221.2,175.72,0.04602,-3463000,0,0,0,0,NA
-diaspore,Dsp,AlO(OH),cr,HDNB78,NA,1978-05-05,CGL,cal,-218402,-237170,8.43,NA,17.76,14.435,0.0042,0,0,0,0,0,NA
-dickite,Dck,Al2Si2O5(OH)4,cr,HDNB78,RH95.3,2020-07-06,CGL,cal,-907266,-984345,47.11,57.26,99.3,72.77,0.0292,-2152000,0,0,0,0,NA
-diopside,Di,CaMg(SiO3)2,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-723780,-765378,34.2,NA,66.09,52.87,0.00784,-1574000,0,0,0,0,NA
-dolomite,Dol,CaMg(CO3)2,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-517760,-556631,37.09,NA,64.365,41.557,0.023952,-988400,0,0,0,0,NA
-"dolomite,disordered",Dis-Dol,CaMg(CO3)2,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-515653,-553704,39.84,NA,64.39,44.711,0.017779,-1094800,0,0,0,0,NA
-"dolomite,ordered",Ord-Dol,CaMg(CO3)2,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-517760,-556631,37.09,NA,64.34,44.711,0.017779,-1094800,0,0,0,0,NA
+"daphnite,7A",7A-Dph,Fe5Al(AlSi3)O10(OH)8,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,3.159,NA,137.726,NA,221.2,175.72,0.04602,-3463000,0,0,0,0,-1000
+diaspore,Dsp,AlO(OH),cr,HDNB78,NA,1978-05-05,CGL,cal,-218402,-237170,8.43,NA,17.76,14.435,0.0042,0,0,0,0,0,-500
+dickite,Dck,Al2Si2O5(OH)4,cr,HDNB78,RH95.3,2020-07-06,CGL,cal,-907266,-984345,47.11,57.26,99.3,72.77,0.0292,-2152000,0,0,0,0,-1000
+diopside,Di,CaMg(SiO3)2,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-723780,-765378,34.2,NA,66.09,52.87,0.00784,-1574000,0,0,0,0,-1600
+dolomite,Dol,CaMg(CO3)2,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-517760,-556631,37.09,NA,64.365,41.557,0.023952,-988400,0,0,0,0,-1000
+"dolomite,disordered",Dis-Dol,CaMg(CO3)2,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-515653,-553704,39.84,NA,64.39,44.711,0.017779,-1094800,0,0,0,0,-1000
+"dolomite,ordered",Ord-Dol,CaMg(CO3)2,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-517760,-556631,37.09,NA,64.34,44.711,0.017779,-1094800,0,0,0,0,-1000
 edenite,Ed,Na(Ca2Mg5)(AlSi7)O22(OH2),cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,161,NA,271,199.71,0.04878,-4601000,0,0,0,0,848
-edenite,Ed,Na(Ca2Mg5)(AlSi7)O22(OH2),cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-3.895,NA,159.7767,NA,271,202.9,0.04252,-4331000,0,0,0,0,NA
+edenite,Ed,Na(Ca2Mg5)(AlSi7)O22(OH2),cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-3.895,NA,159.7767,NA,271,202.9,0.04252,-4331000,0,0,0,0,-1000
 enstatite,En,MgSiO3,cr,HDNB78,NA,1978-05-05,CGL,cal,-348930,-369686,16.2,NA,31.276,24.55,0.00474,-628000,0,0,0,0,903
 enstatite,En,MgSiO3,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-349581.153,-371758.464,11.4328,NA,31.296,28.765,0,0,0,0,0,0,1258
-enstatite,En,MgSiO3,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-349546.21,-371843.59,11.0302,NA,32.386,29.26,0,0,0,0,0,0,NA
-epidote,Ep,Ca2FeAl2Si3O12(OH),cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-1450906,-1543992,75.28,NA,139.2,117.622,0.012816,-3186400,0,0,0,0,NA
-"epidote,ordered",Ord-Ep,Ca2FeAl2Si3O12(OH),cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-1450906,-1544016,75.2,NA,139.2,113.78,0.01469,-2892000,0,0,0,0,NA
+enstatite,En,MgSiO3,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-349546.21,-371843.59,11.0302,NA,32.386,29.26,0,0,0,0,0,0,-1800
+epidote,Ep,Ca2FeAl2Si3O12(OH),cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-1450906,-1543992,75.28,NA,139.2,117.622,0.012816,-3186400,0,0,0,0,-1100
+"epidote,ordered",Ord-Ep,Ca2FeAl2Si3O12(OH),cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-1450906,-1544016,75.2,NA,139.2,113.78,0.01469,-2892000,0,0,0,0,-1100
 epistilbite,Eps,Ca(Al2Si6)O16*5H2O,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,152.9,NA,267.56,157.04,0.06087,-2183000,0,0,0,0,848
-epistilbite,Eps,Ca(Al2Si6)O16*5H2O,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-7.845,NA,150.4533,NA,267.56,163.42,0.04835,-1643000,0,0,0,0,NA
-fayalite,Fa,Fe2SiO4,cr,HDNB78,NA,1978-05-05,CGL,cal,-330233,-354119,35.45,NA,46.39,36.51,0.00936,-670000,0,0,0,0,NA
+epistilbite,Eps,Ca(Al2Si6)O16*5H2O,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-7.845,NA,150.4533,NA,267.56,163.42,0.04835,-1643000,0,0,0,0,-1000
+fayalite,Fa,Fe2SiO4,cr,HDNB78,NA,1978-05-05,CGL,cal,-330233,-354119,35.45,NA,46.39,36.51,0.00936,-670000,0,0,0,0,-1490
 ferroedenite,Fe-Ed,Na(Ca2Fe5)(AlSi7)O22(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,193.7,NA,280.9,209.42,0.05044,-4236000,0,0,0,0,848
-ferroedenite,Fe-Ed,Na(Ca2Fe5)(AlSi7)O22(OH)2,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-3.895,NA,192.4767,NA,280.9,212.61,0.04418,-3966000,0,0,0,0,NA
+ferroedenite,Fe-Ed,Na(Ca2Fe5)(AlSi7)O22(OH)2,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-3.895,NA,192.4767,NA,280.9,212.61,0.04418,-3966000,0,0,0,0,-1000
 ferrogedrite,Fe-Ged,(Fe5Al2)(Al2Si6)O22(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,153.5,NA,265.9,196.27,0.05839,-3901000,0,0,0,0,903
 ferrogedrite,Fe-Ged,(Fe5Al2)(Al2Si6)O22(OH)2,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-1524.649,NA,143.598,NA,265.9,204.7,0.04891,-2645000,0,0,0,0,1258
-ferrogedrite,Fe-Ged,(Fe5Al2)(Al2Si6)O22(OH)2,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-2049.966,NA,142.1727,NA,265.9,205.69,0.04891,-2645000,0,0,0,0,NA
-ferropargasite,Fe-Prg,Na(Ca2Fe4Al)(Al2Si6)O22(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,-2526187,-2686900,185.5,NA,279.89,213.57,0.04299,-4729000,0,0,0,0,NA
+ferrogedrite,Fe-Ged,(Fe5Al2)(Al2Si6)O22(OH)2,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-2049.966,NA,142.1727,NA,265.9,205.69,0.04891,-2645000,0,0,0,0,-1500
+ferropargasite,Fe-Prg,Na(Ca2Fe4Al)(Al2Si6)O22(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,-2526187,-2686900,185.5,NA,279.89,213.57,0.04299,-4729000,0,0,0,0,-1000
 ferrosilite,Fs,FeSiO3,cr,HDNB78,Hel85,1978-05-05,CGL,cal,-267588,-285658,21.63,NA,32.952,26.49,0.00507,-555000,0,0,0,0,413
-ferrosilite,Fs,FeSiO3,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-267566.749,-285550.307,21.9199,NA,33.008,23.865,0.00878,-470000,0,0,0,0,NA
-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,NA
+ferrosilite,Fs,FeSiO3,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-267566.749,-285550.307,21.9199,NA,33.008,23.865,0.00878,-470000,0,0,0,0,-1400
+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,NA
-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,NA
-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,NA
-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,NA
-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,NA
-gehlenite,Gh,Ca2(Al2Si)O7,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-903148,-951225,48.1,NA,90.24,63.74,0.008,-1512000,0,0,0,0,NA
-gibbsite,Gbs,Al(OH)3,cr,HDNB78,NA,1978-05-05,CGL,cal,-276168,-309065,16.75,NA,31.956,8.65,0.0456,0,0,0,0,0,NA
-glaucophane,Gln,Na2(Mg3Al2)Si8O22(OH)2,cr,HDNB78,RH95.3,2020-07-06,CGL,cal,-2684226,-2859465,129.35,154.27,269.7,190.26,0.05936,-5001000,0,0,0,0,NA
-greenalite,Grn,Fe3Si2O5(OH)4,cr,HDNB78,NA,1978-05-05,CGL,cal,-715340,-644110,72.6,NA,115,81.65,0.0326,-1539000,0,0,0,0,NA
-grossular,Grs,Ca3Al2Si3O12,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-1496307,-1582737,60.87,NA,125.3,104.017,0.017013,-2731800,0,0,0,0,NA
-grunerite,Gru,Fe7Si8O22(OH)2,cr,HDNB78,RH95.3,2020-07-06,CGL,cal,-2142639,-2299952,173.28,162.78,256.67,198.83,0.06093,-3955000,0,0,0,0,NA
-halloysite,Hal,Al2Si2O5(OH)4,cr,HDNB78,RH95.3,2020-11-10,CGL,cal,-903609,-980282,48.52,58.87,99.3,72.77,0.0292,-2152000,0,0,0,0,NA
+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
+gehlenite,Gh,Ca2(Al2Si)O7,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-903148,-951225,48.1,NA,90.24,63.74,0.008,-1512000,0,0,0,0,-1800
+gibbsite,Gbs,Al(OH)3,cr,HDNB78,NA,1978-05-05,CGL,cal,-276168,-309065,16.75,NA,31.956,8.65,0.0456,0,0,0,0,0,-425
+glaucophane,Gln,Na2(Mg3Al2)Si8O22(OH)2,cr,HDNB78,RH95.3,2020-07-06,CGL,cal,-2684226,-2859465,129.35,154.27,269.7,190.26,0.05936,-5001000,0,0,0,0,-800
+greenalite,Grn,Fe3Si2O5(OH)4,cr,HDNB78,NA,1978-05-05,CGL,cal,-715340,-644110,72.6,NA,115,81.65,0.0326,-1539000,0,0,0,0,-1000
+grossular,Grs,Ca3Al2Si3O12,cr,HDNB78,SPRONS92.2,1990-03-15,CGL,cal,-1496307,-1582737,60.87,NA,125.3,104.017,0.017013,-2731800,0,0,0,0,-1000
+grunerite,Gru,Fe7Si8O22(OH)2,cr,HDNB78,RH95.3,2020-07-06,CGL,cal,-2142639,-2299952,173.28,162.78,256.67,198.83,0.06093,-3955000,0,0,0,0,-800
+halloysite,Hal,Al2Si2O5(OH)4,cr,HDNB78,RH95.3,2020-11-10,CGL,cal,-903609,-980282,48.52,58.87,99.3,72.77,0.0292,-2152000,0,0,0,0,-1000
 hastingsite,Hs,Na(Ca2Fe4Fe)(Al2Si6)O22(OH)2,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,189.2,NA,280.3,211.57,0.05088,-4488000,0,0,0,0,950
 hastingsite,Hs,Na(Ca2Fe4Fe)(Al2Si6)O22(OH)2,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-79.315,NA,187.1167,NA,280.3,217.82,0.04158,-4310000,0,0,0,0,1050
-hastingsite,Hs,Na(Ca2Fe4Fe)(Al2Si6)O22(OH)2,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,477.644,NA,189.1492,NA,280.3,215.68,0.04246,-4310000,0,0,0,0,NA
-hedenbergite,Hd,CaFe(SiO3)2,cr,HDNB78,SPRONS92.2,1990-03-05,CGL,cal,-638998,-678276,40.7,NA,68.27,54.81,0.00817,-1501000,0,0,0,0,NA
+hastingsite,Hs,Na(Ca2Fe4Fe)(Al2Si6)O22(OH)2,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,477.644,NA,189.1492,NA,280.3,215.68,0.04246,-4310000,0,0,0,0,-1500
+hedenbergite,Hd,CaFe(SiO3)2,cr,HDNB78,SPRONS92.2,1990-03-05,CGL,cal,-638998,-678276,40.7,NA,68.27,54.81,0.00817,-1501000,0,0,0,0,-1600
 hematite,Hem,Fe2O3,cr,HDNB78,NA,1978-05-05,CGL,cal,-178155,-197720,20.94,NA,30.274,23.49,0.0186,-355000,0,0,0,0,950
 hematite,Hem,Fe2O3,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-178206.12,-198965.094,16.9353,NA,30.274,36,0,0,0,0,0,0,1050
-hematite,Hem,Fe2O3,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-177088.429,-196631.631,21.0129,NA,30.274,31.71,0.00176,0,0,0,0,0,NA
+hematite,Hem,Fe2O3,cr3,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-177088.429,-196631.631,21.0129,NA,30.274,31.71,0.00176,0,0,0,0,0,-1800
 heulandite,Hul,Ca(Al2Si7)O18*6H2O,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,182.4,NA,316.37,179.66,0.06907,-2453000,0,0,0,0,848
-heulandite,Hul,Ca(Al2Si7)O18*6H2O,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-11.741,NA,178.73,NA,316.37,189.23,0.05029,-1643000,0,0,0,0,NA
-jadeite,Jd,NaAl(SiO3)2,cr,HDNB78,NA,1978-05-05,CGL,cal,-679445,-722116,31.9,NA,60.4,48.16,0.01142,-1187000,0,0,0,0,NA
-K-feldspar,K-Fs,K(AlSi3)O8,cr,HDNB78,NA,1978-05-05,CGL,cal,-895374,-949188,51.13,NA,108.87,76.617,0.004311,-2994500,0,0,0,0,NA
+heulandite,Hul,Ca(Al2Si7)O18*6H2O,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-11.741,NA,178.73,NA,316.37,189.23,0.05029,-1643000,0,0,0,0,-1000
+jadeite,Jd,NaAl(SiO3)2,cr,HDNB78,NA,1978-05-05,CGL,cal,-679445,-722116,31.9,NA,60.4,48.16,0.01142,-1187000,0,0,0,0,-1400
+K-feldspar,K-Fs,K(AlSi3)O8,cr,HDNB78,NA,1978-05-05,CGL,cal,-895374,-949188,51.13,NA,108.87,76.617,0.004311,-2994500,0,0,0,0,-1400
 K-phillipsite,K-Php,K2(Al2Si5)O14*5H2O,cr,HDNB78,NA,1978-05-05,CGL,cal,NA,NA,172.1,NA,265,152.66,0.06024,-1845000,0,0,0,0,848
-K-phillipsite,K-Php,K2(Al2Si5)O14*5H2O,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-3.895,NA,170.8767,NA,265,155.85,0.05398,-1575000,0,0,0,0,NA
+K-phillipsite,K-Php,K2(Al2Si5)O14*5H2O,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-3.895,NA,170.8767,NA,265,155.85,0.05398,-1575000,0,0,0,0,-1000
 kalsilite,Kls,K(AlSi)O4,cr,HDNB78,NA,1978-05-05,CGL,cal,-481750,-509408,31.85,NA,59.89,29.43,0.01736,-532000,0,0,0,0,810
-kalsilite,Kls,K(AlSi)O4,cr2,HDNB78,OBIGT.1,1978-05-05,CGL,cal,-482526.312,-512142.073,25.2837,NA,59.89,42.5,0,0,0,0,0,0,NA
-kaolinite,Kln,Al2Si2O5(OH)4,cr,HDNB78,NA,1978-05-05,CGL,cal,-905614,-982221,48.53,NA,99.52,72.77,0.0292,-2152000,0,0,0,0,NA
[TRUNCATED]

To get the complete diff run:
    svnlook diff /svnroot/chnosz -r 811


More information about the CHNOSZ-commits mailing list