[CHNOSZ-commits] r306 - in pkg/CHNOSZ: . R inst inst/extdata/Berman inst/extdata/Berman/unused man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed Mar 7 16:46:30 CET 2018
Author: jedick
Date: 2018-03-07 16:46:30 +0100 (Wed, 07 Mar 2018)
New Revision: 306
Modified:
pkg/CHNOSZ/DESCRIPTION
pkg/CHNOSZ/R/berman.R
pkg/CHNOSZ/inst/NEWS
pkg/CHNOSZ/inst/extdata/Berman/BDat17.csv
pkg/CHNOSZ/inst/extdata/Berman/Ber88.csv
pkg/CHNOSZ/inst/extdata/Berman/Ber90.csv
pkg/CHNOSZ/inst/extdata/Berman/DS10.csv
pkg/CHNOSZ/inst/extdata/Berman/FDM+14.csv
pkg/CHNOSZ/inst/extdata/Berman/JUN92.csv
pkg/CHNOSZ/inst/extdata/Berman/SHD91.csv
pkg/CHNOSZ/inst/extdata/Berman/ZS92.csv
pkg/CHNOSZ/inst/extdata/Berman/unused/BA96.csv
pkg/CHNOSZ/man/extdata.Rd
Log:
extdata/Berman/*.csv: remove/change value multipliers
Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION 2018-02-27 01:20:37 UTC (rev 305)
+++ pkg/CHNOSZ/DESCRIPTION 2018-03-07 15:46:30 UTC (rev 306)
@@ -1,6 +1,6 @@
-Date: 2018-02-27
+Date: 2018-03-07
Package: CHNOSZ
-Version: 1.1.3-13
+Version: 1.1.3-14
Title: Thermodynamic Calculations for Geobiochemistry
Authors at R: c(
person("Jeffrey", "Dick", , "j3ffdick at gmail.com", role = c("aut", "cre"),
Modified: pkg/CHNOSZ/R/berman.R
===================================================================
--- pkg/CHNOSZ/R/berman.R 2018-02-27 01:20:37 UTC (rev 305)
+++ pkg/CHNOSZ/R/berman.R 2018-03-07 15:46:30 UTC (rev 306)
@@ -28,10 +28,10 @@
dat <- dat[!duplicated(dat$name), ]
# remove the multipliers
multexp <- c(0, 0, 0, 0, # Ber88 Table 2
- 0, -2, -5, -7, # Table 3a
- 6, 12, 6, 10, # Table 4
- 0, 0, 0, 2, 5, 0, # Table 3b
- 0, 0, 0, -3, -5, 2, 6, -4 # Table 5
+ 0, 0, 0, 0, # Table 3a
+ 5, 5, 5, 8, # Table 4
+ 0, 0, 0, 0, 0, 0, # Table 3b
+ 0, 0, 0, 0, 0, 0, 0, 0 # Table 5
)
dat[, 2:27] <- t(t(dat[, 2:27]) / 10^multexp)
# if name is missing, return the entire data frame (used in test-berman.R)
Modified: pkg/CHNOSZ/inst/NEWS
===================================================================
--- pkg/CHNOSZ/inst/NEWS 2018-02-27 01:20:37 UTC (rev 305)
+++ pkg/CHNOSZ/inst/NEWS 2018-03-07 15:46:30 UTC (rev 306)
@@ -1,4 +1,4 @@
-CHANGES IN CHNOSZ 1.1.3-13 (2018-02-27)
+CHANGES IN CHNOSZ 1.1.3-14 (2018-03-07)
---------------------------------------
- Lines in 1-D diagram()s can optionally be drawn as splines using the
@@ -34,6 +34,9 @@
- read.fasta(): add support for file connections created using
archive::archive_read (https://github.com/jimhester/archive).
+- Change files in extdata/Berman to be more like winTWQ format (no
+ value multipliers, except 10^5, 10^5, 10^5, and 10^8 on v1 to v4).
+
CHANGES IN CHNOSZ 1.1.3 (2017-11-13)
------------------------------------
Modified: pkg/CHNOSZ/inst/extdata/Berman/BDat17.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/Berman/BDat17.csv 2018-02-27 01:20:37 UTC (rev 305)
+++ pkg/CHNOSZ/inst/extdata/Berman/BDat17.csv 2018-03-07 15:46:30 UTC (rev 306)
@@ -1,2 +1,2 @@
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
-antigorite,-66076529,-71364156,3602.996,174.246,7394.51,0,-5483.63,8728.412,-1.485,4,27.2,80,,,,,,,,,,,,,,
+antigorite,-66076529,-71364156,3602.996,174.246,7394.51,0,-548363000,87284120000,-0.1485,4E-07,2.72,0.8,,,,,,,,,,,,,,
Modified: pkg/CHNOSZ/inst/extdata/Berman/Ber88.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/Berman/Ber88.csv 2018-02-27 01:20:37 UTC (rev 305)
+++ pkg/CHNOSZ/inst/extdata/Berman/Ber88.csv 2018-03-07 15:46:30 UTC (rev 306)
@@ -1,68 +1,68 @@
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
-akermanite,-3663786,-3860441,212,9.252,387.06,-29.388,0,-4.079,-0.785,0,25.011,67.224,358,298,0,0,0,452,,,,,,,,
-albite,-3703293,-3921618,224.412,10.083,393.64,-24.155,-78.928,107.064,-1.945,4.861,26.307,32.407,,,,,,,,,,,,,,
-"albite,high",-3703293,-3921618,224.412,10.083,393.64,-24.155,-78.928,107.064,-1.945,4.861,26.307,32.407,,,,,,,,,,,,,,
-"albite,low",-3711715,-3935100,207.443,10.043,393.64,-24.155,-78.928,107.064,-1.945,4.861,26.307,32.407,,,,,,,,,,,,,,
-almandine,-4941728,-5265502,339.927,11.511,573.96,-14.831,-292.92,502.208,-0.558,0.321,18.613,74.539,,,,,,,,,,,,,,
-andalusite,-2441806,-2589972,91.434,5.147,236.48,-11.029,-75.268,93.644,-0.77,1.923,23.443,7.189,,,,,,,,,,,,,,
-anorthite,-4003221,-4228730,200.186,10.075,439.37,-37.341,0,-31.702,-1.272,3.176,10.918,41.985,,,,,,,,,,,,,,
-anthophyllite,-11342582,-12069032,535.195,26.56,1219.31,-57.665,-347.661,440.09,-1.259,0,27.06,31.325,,,,,,,,,,,,,,
-antigorite,-66076529,-71364156,3602.996,174.246,7394.51,0,-5483.63,8728.412,-1.978,4.944,24.965,39.444,,,,,,,,,,,,,,
-brucite,-834868,-925937,63.064,2.468,136.84,-5.371,-43.619,55.269,-2.023,6.726,32.854,10.94,,,,,,,,,,,,,,
-Ca-Al-pyroxene,-3122310,-3298767,140.751,6.356,310.7,-16.716,-74.553,94.878,-0.87,2.171,22.25,52.863,,,,,,,,,,,,,,
-calcite,-1128295,-1206819,91.725,3.69,178.19,-16.577,-4.827,16.66,-1.4,0,8.907,227.402,,,,,,,,,,,,,,
-chrysotile,-4035373,-4363356,220.134,10.72,610.02,-55.812,-18.573,19.547,-1.81,4.524,27.151,67.351,,,,,,,,,,,,,,
-clinochlore,-8250546,-8909590,435.154,21.147,1214.28,-112.171,0,-125.625,-1.819,0,26.452,0,,,,,,,,,,,,,,
-coesite,-852585,-907604,39.424,2.064,94.907,-7.673,-5.279,2.627,-1.037,3,7.396,43.605,,,,,,,,,,,,,,
-cordierite,-8651517,-9158727,417.97,23.311,954.39,-79.623,-23.173,-37.021,-1.158,0,3.003,18.017,,,,,,,,,,,,,,
-corundum,-1582199,-1675700,50.82,2.558,155.02,-8.284,-38.614,40.908,-0.385,0.375,21.342,47.18,,,,,,,,,,,,,,
-"cristobalite,alpha",-853918,-907753,43.394,2.587,83.51,-3.747,-24.554,28.007,-2.515,0,20.824,0,535,298,0.048,-14.216,44.142,0,,,,,,,,
-"cristobalite,beta",-853327,-906377,46.029,2.73,83.51,-3.747,-24.554,28.007,-1.1,5.535,3.189,0,,,,,,,,,,,,,,
-diaspore,-920806,-999378,35.308,1.776,143.24,-15.404,-3.231,6.463,-0.599,0,29.718,0,,,,,,,,,,,,,,
-diopside,-3026202,-3200583,142.5,6.62,305.41,-16.049,-71.66,92.184,-0.872,1.707,27.795,83.082,,,,,,,,,,,,,,
-dolomite,-2162354,-2325248,154.89,6.432,328.48,-25.544,-46.885,79.038,-1.07,0,14.23,363.778,,,,,,,1423,298,-9.42,0,3.85,1.732,5.02,0
-"enstatite,clino",-1458601,-1545926,66.325,3.131,139.96,-4.97,-44.002,53.571,-0.75,0.448,21.915,74.92,,,,,,,,,,,,,,
-enstatite,-1458181,-1545552,66.17,3.133,166.58,-12.006,-22.706,27.915,-0.749,0.447,24.656,74.67,,,,,,,,,,,,,,
-"enstatite,proto",-1456965,-1543959,67.438,3.242,166.58,-12.006,-22.706,27.915,-0.75,0.448,16.832,116.65,,,,,,,,,,,,,,
-fayalite,-1380154,-1479360,150.93,4.63,248.93,-19.239,0,-13.91,-0.73,0,26.546,79.482,,,,,,,,,,,,,,
-ferrosilite,-1117472,-1194375,95.882,3.296,169.06,-11.93,-20.971,29.253,-0.99,0,31.808,75.85,,,,,,,,,,,,,,
-forsterite,-2055023,-2174420,94.01,4.366,238.64,-20.013,0,-11.624,-0.791,1.351,29.464,88.633,,,,,,,,,,,,,,
-gehlenite,-3785954,-3988158,198.6,9.033,373.09,-22.768,-47.785,47.791,-0.996,2.488,24.926,5.664,,,,,,,1600,698,-221.74,0,172.91,36.95,-146.9,0
-grossular,-6270974,-6632859,255.15,12.538,573.43,-20.394,-188.872,231.931,-0.654,1.635,18.994,79.756,,,,,,,,,,,,,,
-hematite,-743681,-825627,87.437,3.027,146.86,0,-55.768,52.563,-0.479,0.304,38.31,1.65,955,298,0,-7.403,27.921,1287,,,,,,,,
-ilmenite,-1155320,-1231947,108.628,3.17,150,-4.416,-33.237,34.815,-0.584,1.23,27.248,29.968,,,,,,,,,,,,,,
-jadeite,-2846482,-3025118,133.574,6.034,311.29,-20.051,-53.503,66.257,-0.86,2.149,23.118,25.785,,,,,,,,,,,,,,
-kaolinite,-3799770,-4120327,203.7,9.952,523.23,-44.267,-22.443,9.231,-1.2,0,32,0,,,,,,,,,,,,,,
-kyanite,-2443370,-2594220,82.43,4.412,262.68,-20.014,-19.997,-6.318,-0.646,0,23.973,0,,,,,,,,,,,,,,
-lawsonite,-4509709,-4865666,229.176,10.144,728.67,-82.481,0,85.056,-0.769,1.922,26.283,0,,,,,,,,,,,,,,
-lime,-603350,-635090,37.75,1.676,58.79,-1.339,-11.471,10.298,-1.022,2.565,34.61,67.406,,,,,,,,,,,,,,
-magnesite,-1029875,-1113636,65.21,2.803,162.3,-11.093,-48.826,87.466,-0.89,2.212,18.436,415.968,,,,,,,,,,,,,,
-magnetite,-1014235,-1117403,146.114,4.452,207.93,0,-72.433,66.436,-0.582,1.751,30.291,138.47,848,298,0,-19.502,61.037,1565,,,,,,,,
-margarite,-5852244,-6236603,265.084,12.958,699.8,-55.871,-68.077,73.432,-1.155,2.886,21.019,124.556,,,,,,,,,,,,,,
-meionite,-13105915,-13849723,730,34.036,1511.35,-132.433,0,-75.161,-1.11,0,9.34,0,,,,,,,,,,,,,,
-merwinite,-4309707,-4537497,251.777,9.847,453.62,-32.5,0,-34.423,-0.551,1.381,29.376,87.235,,,,,,,,,,,,,,
-monticellite,-2132222,-2250027,108.3,5.148,226.34,-15.427,-11.797,-2.329,-0.904,2,27.863,76.339,,,,,,,,,,,,,,
-muscovite,-5596723,-5976740,293.157,14.087,651.49,-38.732,-185.232,274.247,-1.717,4.295,33.527,0,,,,,,,,,,,,,,
-paragonite,-5563572,-5944208,277.699,13.216,577.57,-14.728,-322.144,505.008,-1.973,4.933,39.424,59.701,,,,,,,,,,,,,,
-periclase,-569209,-601500,26.951,1.125,61.11,-2.962,-6.212,0.584,-0.622,1.511,37.477,3.556,,,,,,,,,,,,,,
-phlogopite,-5827224,-6207342,334.158,14.977,610.38,-20.838,-215.33,284.104,-1.697,0,34.447,0,,,,,,,,,,,,,,
-K-feldspar,-3745415,-3970791,214.145,10.869,381.37,-19.41,-120.373,183.643,-1.805,5.112,15.145,54.85,,,,,,,1436,298,282.98,-4.83,36.21,-15.733,34.77,41.063
-"K-feldspar,high",-3738804,-3959704,229.157,10.896,381.37,-19.41,-120.373,183.643,-1.805,5.112,15.145,54.85,,,,,,,,,,,,,,
-"K-feldspar,low",-3745415,-3970791,214.145,10.869,381.37,-19.41,-120.373,183.643,-1.805,5.112,15.145,54.85,,,,,,,,,,,,,,
-prehnite,-5820154,-6198606,288.634,14.016,716.05,-64.046,-21.825,26.85,-1.427,0,1.468,1128.353,,,,,,,,,,,,,,
-pyrope,-5936009,-6286548,266.359,11.316,640.72,-45.421,-47.019,0,-0.576,0.442,22.519,37.044,,,,,,,,,,,,,,
-pyrophyllite,-5266865,-5640781,239.4,12.76,665.93,-58.974,-49.799,66.181,-1.354,0,12.637,381.661,,,,,,,,,,,,,,
-quartz,-856288,-910700,41.46,2.269,80.01,-2.403,-35.467,49.157,-2.434,10.137,23.895,0,848,373,0.0237,-9.187,24.607,0,,,,,,,,
-"quartz,beta",-855033,-908627,44.207,2.37,80.01,-2.403,-35.467,49.157,-1.238,7.087,0,0,,,,,,,,,,,,,,
-rutile,-889497,-944750,50.46,1.882,77.84,0,-33.678,40.294,-0.454,0.584,25.716,15.409,,,,,,,,,,,,,,
-sillimanite,-2439265,-2586091,95.93,4.983,256.73,-18.872,-29.774,25.096,-0.753,0,13.431,0,,,,,,,,,,,,,,
-sphene,-2455134,-2596652,129.29,5.565,234.62,-10.403,-51.183,59.146,-0.59,0,25.2,0,,,,,,,,,,,,,,
-spinel,-2176537,-2300313,84.535,3.977,235.9,-17.666,-17.104,4.062,-0.489,0,21.691,50.528,,,,,,,,,,,,,,
-talc,-5517657,-5897387,261.24,13.61,664.11,-51.872,-21.472,-32.737,-1.699,5.665,29.447,0,,,,,,,,,,,,,,
-tremolite,-11578548,-12305578,551.15,27.268,1229.36,-64.019,-320.899,420.881,-1.392,3.481,24.374,98.338,,,,,,,,,,,,,,
-"tridymite,low",-854026,-907750,43.77,2.675,75.37,0,-59.581,95.825,-2.508,0,19.339,0,383,298,0,42.67,-144.575,130,,,,,,,,
-"tridymite,high",-853844,-907045,45.524,2.737,75.37,0,-59.581,95.825,-0.74,3.735,4.829,0,,,,,,,,,,,,,,
-wollastonite,-1546123,-1631500,81.81,3.983,149.07,-6.903,-36.593,48.435,-1.245,3.113,28.18,0,,,,,,,,,,,,,,
-pseudowollastonite,-1543085,-1627427,85.279,4.016,141.16,-4.172,-58.576,94.074,-1.245,3.113,28.18,0,,,,,,,,,,,,,,
-zoisite,-6494148,-6889488,297.576,13.588,749.17,-65.093,-23.805,12.486,-0.515,1.288,34.67,0,,,,,,,,,,,,,,
-clinozoisite,-6496497,-6894968,287.076,13.673,749.17,-65.093,-23.805,12.486,-0.515,1.288,34.67,0,,,,,,,,,,,,,,
+akermanite,-3663786,-3860441,212,9.252,387.06,-2938.8,0,-40790000,-0.0785,0,2.5011,0.67224,358,298,0,0,0,452,,,,,,,,
+albite,-3703293,-3921618,224.412,10.083,393.64,-2415.5,-7892800,1070640000,-0.1945,4.861E-07,2.6307,0.32407,,,,,,,,,,,,,,
+"albite,high",-3703293,-3921618,224.412,10.083,393.64,-2415.5,-7892800,1070640000,-0.1945,4.861E-07,2.6307,0.32407,,,,,,,,,,,,,,
+"albite,low",-3711715,-3935100,207.443,10.043,393.64,-2415.5,-7892800,1070640000,-0.1945,4.861E-07,2.6307,0.32407,,,,,,,,,,,,,,
+almandine,-4941728,-5265502,339.927,11.511,573.96,-1483.1,-29292000,5022080000,-0.0558,3.21E-08,1.8613,0.74539,,,,,,,,,,,,,,
+andalusite,-2441806,-2589972,91.434,5.147,236.48,-1102.9,-7526800,936440000,-0.077,1.923E-07,2.3443,0.07189,,,,,,,,,,,,,,
+anorthite,-4003221,-4228730,200.186,10.075,439.37,-3734.1,0,-317020000,-0.1272,3.176E-07,1.0918,0.41985,,,,,,,,,,,,,,
+anthophyllite,-11342582,-12069032,535.195,26.56,1219.31,-5766.5,-34766100,4400900000,-0.1259,0,2.706,0.31325,,,,,,,,,,,,,,
+antigorite,-66076529,-71364156,3602.996,174.246,7394.51,0,-548363000,87284120000,-0.1978,4.944E-07,2.4965,0.39444,,,,,,,,,,,,,,
+brucite,-834868,-925937,63.064,2.468,136.84,-537.1,-4361900,552690000,-0.2023,6.726E-07,3.2854,0.1094,,,,,,,,,,,,,,
+Ca-Al-pyroxene,-3122310,-3298767,140.751,6.356,310.7,-1671.6,-7455300,948780000,-0.087,2.171E-07,2.225,0.52863,,,,,,,,,,,,,,
+calcite,-1128295,-1206819,91.725,3.69,178.19,-1657.7,-482700,166600000,-0.14,0,0.8907,2.27402,,,,,,,,,,,,,,
+chrysotile,-4035373,-4363356,220.134,10.72,610.02,-5581.2,-1857300,195470000,-0.181,4.524E-07,2.7151,0.67351,,,,,,,,,,,,,,
+clinochlore,-8250546,-8909590,435.154,21.147,1214.28,-11217.1,0,-1256250000,-0.1819,0,2.6452,0,,,,,,,,,,,,,,
+coesite,-852585,-907604,39.424,2.064,94.907,-767.3,-527900,26270000,-0.1037,3E-07,0.7396,0.43605,,,,,,,,,,,,,,
+cordierite,-8651517,-9158727,417.97,23.311,954.39,-7962.3,-2317300,-370210000,-0.1158,0,0.3003,0.18017,,,,,,,,,,,,,,
+corundum,-1582199,-1675700,50.82,2.558,155.02,-828.4,-3861400,409080000,-0.0385,3.75E-08,2.1342,0.4718,,,,,,,,,,,,,,
+"cristobalite,alpha",-853918,-907753,43.394,2.587,83.51,-374.7,-2455400,280070000,-0.2515,0,2.0824,0,535,298,0.048,-0.14216,0.00044142,0,,,,,,,,
+"cristobalite,beta",-853327,-906377,46.029,2.73,83.51,-374.7,-2455400,280070000,-0.11,5.535E-07,0.3189,0,,,,,,,,,,,,,,
+diaspore,-920806,-999378,35.308,1.776,143.24,-1540.4,-323100,64630000,-0.0599,0,2.9718,0,,,,,,,,,,,,,,
+diopside,-3026202,-3200583,142.5,6.62,305.41,-1604.9,-7166000,921840000,-0.0872,1.707E-07,2.7795,0.83082,,,,,,,,,,,,,,
+dolomite,-2162354,-2325248,154.89,6.432,328.48,-2554.4,-4688500,790380000,-0.107,0,1.423,3.63778,,,,,,,1423,298,-9.42,0,385000,0.01732,5.02E-06,0
+"enstatite,clino",-1458601,-1545926,66.325,3.131,139.96,-497,-4400200,535710000,-0.075,4.48E-08,2.1915,0.7492,,,,,,,,,,,,,,
+enstatite,-1458181,-1545552,66.17,3.133,166.58,-1200.6,-2270600,279150000,-0.0749,4.47E-08,2.4656,0.7467,,,,,,,,,,,,,,
+"enstatite,proto",-1456965,-1543959,67.438,3.242,166.58,-1200.6,-2270600,279150000,-0.075,4.48E-08,1.6832,1.1665,,,,,,,,,,,,,,
+fayalite,-1380154,-1479360,150.93,4.63,248.93,-1923.9,0,-139100000,-0.073,0,2.6546,0.79482,,,,,,,,,,,,,,
+ferrosilite,-1117472,-1194375,95.882,3.296,169.06,-1193,-2097100,292530000,-0.099,0,3.1808,0.7585,,,,,,,,,,,,,,
+forsterite,-2055023,-2174420,94.01,4.366,238.64,-2001.3,0,-116240000,-0.0791,1.351E-07,2.9464,0.88633,,,,,,,,,,,,,,
+gehlenite,-3785954,-3988158,198.6,9.033,373.09,-2276.8,-4778500,477910000,-0.0996,2.488E-07,2.4926,0.05664,,,,,,,1600,698,-221.74,0,17291000,0.3695,-0.0001469,0
+grossular,-6270974,-6632859,255.15,12.538,573.43,-2039.4,-18887200,2319310000,-0.0654,1.635E-07,1.8994,0.79756,,,,,,,,,,,,,,
+hematite,-743681,-825627,87.437,3.027,146.86,0,-5576800,525630000,-0.0479,3.04E-08,3.831,0.0165,955,298,0,-0.07403,0.00027921,1287,,,,,,,,
+ilmenite,-1155320,-1231947,108.628,3.17,150,-441.6,-3323700,348150000,-0.0584,1.23E-07,2.7248,0.29968,,,,,,,,,,,,,,
+jadeite,-2846482,-3025118,133.574,6.034,311.29,-2005.1,-5350300,662570000,-0.086,2.149E-07,2.3118,0.25785,,,,,,,,,,,,,,
+kaolinite,-3799770,-4120327,203.7,9.952,523.23,-4426.7,-2244300,92310000,-0.12,0,3.2,0,,,,,,,,,,,,,,
+kyanite,-2443370,-2594220,82.43,4.412,262.68,-2001.4,-1999700,-63180000,-0.0646,0,2.3973,0,,,,,,,,,,,,,,
+lawsonite,-4509709,-4865666,229.176,10.144,728.67,-8248.1,0,850560000,-0.0769,1.922E-07,2.6283,0,,,,,,,,,,,,,,
+lime,-603350,-635090,37.75,1.676,58.79,-133.9,-1147100,102980000,-0.1022,2.565E-07,3.461,0.67406,,,,,,,,,,,,,,
+magnesite,-1029875,-1113636,65.21,2.803,162.3,-1109.3,-4882600,874660000,-0.089,2.212E-07,1.8436,4.15968,,,,,,,,,,,,,,
+magnetite,-1014235,-1117403,146.114,4.452,207.93,0,-7243300,664360000,-0.0582,1.751E-07,3.0291,1.3847,848,298,0,-0.19502,0.00061037,1565,,,,,,,,
+margarite,-5852244,-6236603,265.084,12.958,699.8,-5587.1,-6807700,734320000,-0.1155,2.886E-07,2.1019,1.24556,,,,,,,,,,,,,,
+meionite,-13105915,-13849723,730,34.036,1511.35,-13243.3,0,-751610000,-0.111,0,0.934,0,,,,,,,,,,,,,,
+merwinite,-4309707,-4537497,251.777,9.847,453.62,-3250,0,-344230000,-0.0551,1.381E-07,2.9376,0.87235,,,,,,,,,,,,,,
+monticellite,-2132222,-2250027,108.3,5.148,226.34,-1542.7,-1179700,-23290000,-0.0904,2E-07,2.7863,0.76339,,,,,,,,,,,,,,
+muscovite,-5596723,-5976740,293.157,14.087,651.49,-3873.2,-18523200,2742470000,-0.1717,4.295E-07,3.3527,0,,,,,,,,,,,,,,
+paragonite,-5563572,-5944208,277.699,13.216,577.57,-1472.8,-32214400,5050080000,-0.1973,4.933E-07,3.9424,0.59701,,,,,,,,,,,,,,
+periclase,-569209,-601500,26.951,1.125,61.11,-296.2,-621200,5840000,-0.0622,1.511E-07,3.7477,0.03556,,,,,,,,,,,,,,
+phlogopite,-5827224,-6207342,334.158,14.977,610.38,-2083.8,-21533000,2841040000,-0.1697,0,3.4447,0,,,,,,,,,,,,,,
+K-feldspar,-3745415,-3970791,214.145,10.869,381.37,-1941,-12037300,1836430000,-0.1805,5.112E-07,1.5145,0.5485,,,,,,,1436,298,282.98,-4830,3621000,-0.15733,3.477E-05,410630
+"K-feldspar,high",-3738804,-3959704,229.157,10.896,381.37,-1941,-12037300,1836430000,-0.1805,5.112E-07,1.5145,0.5485,,,,,,,,,,,,,,
+"K-feldspar,low",-3745415,-3970791,214.145,10.869,381.37,-1941,-12037300,1836430000,-0.1805,5.112E-07,1.5145,0.5485,,,,,,,,,,,,,,
+prehnite,-5820154,-6198606,288.634,14.016,716.05,-6404.6,-2182500,268500000,-0.1427,0,0.1468,11.28353,,,,,,,,,,,,,,
+pyrope,-5936009,-6286548,266.359,11.316,640.72,-4542.1,-4701900,0,-0.0576,4.42E-08,2.2519,0.37044,,,,,,,,,,,,,,
+pyrophyllite,-5266865,-5640781,239.4,12.76,665.93,-5897.4,-4979900,661810000,-0.1354,0,1.2637,3.81661,,,,,,,,,,,,,,
+quartz,-856288,-910700,41.46,2.269,80.01,-240.3,-3546700,491570000,-0.2434,1.0137E-06,2.3895,0,848,373,0.0237,-0.09187,0.00024607,0,,,,,,,,
+"quartz,beta",-855033,-908627,44.207,2.37,80.01,-240.3,-3546700,491570000,-0.1238,7.087E-07,0,0,,,,,,,,,,,,,,
+rutile,-889497,-944750,50.46,1.882,77.84,0,-3367800,402940000,-0.0454,5.84E-08,2.5716,0.15409,,,,,,,,,,,,,,
+sillimanite,-2439265,-2586091,95.93,4.983,256.73,-1887.2,-2977400,250960000,-0.0753,0,1.3431,0,,,,,,,,,,,,,,
+sphene,-2455134,-2596652,129.29,5.565,234.62,-1040.3,-5118300,591460000,-0.059,0,2.52,0,,,,,,,,,,,,,,
+spinel,-2176537,-2300313,84.535,3.977,235.9,-1766.6,-1710400,40620000,-0.0489,0,2.1691,0.50528,,,,,,,,,,,,,,
+talc,-5517657,-5897387,261.24,13.61,664.11,-5187.2,-2147200,-327370000,-0.1699,5.665E-07,2.9447,0,,,,,,,,,,,,,,
+tremolite,-11578548,-12305578,551.15,27.268,1229.36,-6401.9,-32089900,4208810000,-0.1392,3.481E-07,2.4374,0.98338,,,,,,,,,,,,,,
+"tridymite,low",-854026,-907750,43.77,2.675,75.37,0,-5958100,958250000,-0.2508,0,1.9339,0,383,298,0,0.4267,-0.00144575,130,,,,,,,,
+"tridymite,high",-853844,-907045,45.524,2.737,75.37,0,-5958100,958250000,-0.074,3.735E-07,0.4829,0,,,,,,,,,,,,,,
+wollastonite,-1546123,-1631500,81.81,3.983,149.07,-690.3,-3659300,484350000,-0.1245,3.113E-07,2.818,0,,,,,,,,,,,,,,
+pseudowollastonite,-1543085,-1627427,85.279,4.016,141.16,-417.2,-5857600,940740000,-0.1245,3.113E-07,2.818,0,,,,,,,,,,,,,,
+zoisite,-6494148,-6889488,297.576,13.588,749.17,-6509.3,-2380500,124860000,-0.0515,1.288E-07,3.467,0,,,,,,,,,,,,,,
+clinozoisite,-6496497,-6894968,287.076,13.673,749.17,-6509.3,-2380500,124860000,-0.0515,1.288E-07,3.467,0,,,,,,,,,,,,,,
Modified: pkg/CHNOSZ/inst/extdata/Berman/Ber90.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/Berman/Ber90.csv 2018-02-27 01:20:37 UTC (rev 305)
+++ pkg/CHNOSZ/inst/extdata/Berman/Ber90.csv 2018-03-07 15:46:30 UTC (rev 306)
@@ -1,5 +1,5 @@
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
-almandine,-4943492,-5267216,340.007,11.511,573.96,-14.831,-292.92,502.208,-0.558,0.321,18.613,74.539,,,,,,,,,,,,,,
-annite,-4793115,-5142800,420,15.408,727.21,-47.7504,-138.319,211.906,-1.697,0,34.447,0,,,,,,,,,,,,,,
-ilmenite,-1155794,-1232448,108.628,3.17,150,-4.416,-33.237,34.815,-0.584,1.23,27.248,29.968,,,,,,,,,,,,,,
-phlogopite,-5830350,-6210391,334.346,14.977,610.38,-20.838,-215.33,284.104,-1.697,0,34.447,0,,,,,,,,,,,,,,
+almandine,-4943492,-5267216,340.007,11.511,573.96,-1483.1,-29292000,5022080000,-0.0558,3.21E-08,1.8613,0.74539,,,,,,,,,,,,,,
+annite,-4793115,-5142800,420,15.408,727.21,-4775.04,-13831900,2119060000,-0.1697,0,3.4447,0,,,,,,,,,,,,,,
+ilmenite,-1155794,-1232448,108.628,3.17,150,-441.6,-3323700,348150000,-0.0584,1.23E-07,2.7248,0.29968,,,,,,,,,,,,,,
+phlogopite,-5830350,-6210391,334.346,14.977,610.38,-2083.8,-21533000,2841040000,-0.1697,0,3.4447,0,,,,,,,,,,,,,,
Modified: pkg/CHNOSZ/inst/extdata/Berman/DS10.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/Berman/DS10.csv 2018-02-27 01:20:37 UTC (rev 305)
+++ pkg/CHNOSZ/inst/extdata/Berman/DS10.csv 2018-03-07 15:46:30 UTC (rev 306)
@@ -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,-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,,,,,,,,,,,,,,
+hedenbergite,-2674300,-2837802.5,173.59,6.785,353.31148,-3106.646,2047911.742,-563018581,-0.17457,1.51E-06,2.796487,0,,,,,,,,,,,,,,
+andradite,-5419000,-5761985.8,316.4,13.167,569.7558,-1441.44,-22441040.802,3146543781,-0.06539136,1.635E-07,2.072525,0.561,,,,,,,,,,,,,,
+ferro-actinolite,-9839000,-10518042.6,685.1,28.26,1321.15758,-8966.454,-21705844.286,3236159154,-0.15,0,2.84,0,,,,,,,,,,,,,,
+grunerite,-8964807,-9623000,725,27.8,1347.83,-9356.91,-20228480,3039190000,-0.15,0,2.84,0,,,,,,,,,,,,,,
+ilvaite,-3440000,-3695605.5,291.5,10.016,682.79138,-8787.112,30183568.71,-5666432624,-0.06838,2.4E-08,1.801543,1.152,,,,,,,,,,,,,,
Modified: pkg/CHNOSZ/inst/extdata/Berman/FDM+14.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/Berman/FDM+14.csv 2018-02-27 01:20:37 UTC (rev 305)
+++ pkg/CHNOSZ/inst/extdata/Berman/FDM+14.csv 2018-03-07 15:46:30 UTC (rev 306)
@@ -1,2 +1,2 @@
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
-aragonite,-1128353.67,-1207213.7,88.7,3.42,195,-21,-0.1,22,-1.345,1.7,41.8,0,,,,,,,,,,,,,,
+aragonite,-1128353.67,-1207213.7,88.7,3.42,195,-2100,-10000,220000000,-0.1345,1.7E-07,4.18,0,,,,,,,,,,,,,,
Modified: pkg/CHNOSZ/inst/extdata/Berman/JUN92.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/Berman/JUN92.csv 2018-02-27 01:20:37 UTC (rev 305)
+++ pkg/CHNOSZ/inst/extdata/Berman/JUN92.csv 2018-03-07 15:46:30 UTC (rev 306)
@@ -1,3 +1,3 @@
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
-glaucophane,-11225858,-11960500,535,26.05,1717.5,-192.72,70.5,0,-1.16,2.9,22,88,,,,,,,,,,,,,,
-pumpellyite,-13448936,-14402300,584,29.55,1576,-106.038,-283.042,383.8351,-0.51516,1.288,34.67,0,,,,,,,,,,,,,,
+glaucophane,-11225858,-11960500,535,26.05,1717.5,-19272,7050000,0,-0.116,2.9E-07,2.2,0.88,,,,,,,,,,,,,,
+pumpellyite,-13448936,-14402300,584,29.55,1576,-10603.8,-28304200,3838351000,-0.051516,1.288E-07,3.467,0,,,,,,,,,,,,,,
Modified: pkg/CHNOSZ/inst/extdata/Berman/SHD91.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/Berman/SHD91.csv 2018-02-27 01:20:37 UTC (rev 305)
+++ pkg/CHNOSZ/inst/extdata/Berman/SHD91.csv 2018-03-07 15:46:30 UTC (rev 306)
@@ -1,12 +1,12 @@
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
-muscovite,-5603417,-5983434,293.157,14.087,651.49,-38.732,-185.232,274.247,-1.717,4.295,33.527,0,,,,,,,,,,,,,,
-phlogopite,-5837044,-6217085,334.346,14.977,610.38,-20.838,-215.33,284.104,-1.697,0,34.447,0,,,,,,,,,,,,,,
-K-feldspar,-3752109,-3977485,214.145,10.869,381.37,-19.41,-120.373,183.643,-1.805,5.112,15.145,54.85,,,,,,,1436,298,282.98,-4.83,36.21,-15.733,34.77,41.063
-"K-feldspar,high",-3745498,-3966398,229.157,10.896,381.37,-19.41,-120.373,183.643,-1.805,5.112,15.145,54.85,,,,,,,,,,,,,,
-"K-feldspar,low",-3752109,-3977485,214.145,10.869,381.37,-19.41,-120.373,183.643,-1.805,5.112,15.145,54.85,,,,,,,,,,,,,,
-paragonite,-5570375,-5951011,277.699,13.216,577.57,-14.728,-322.144,505.008,-1.973,4.933,39.424,59.701,,,,,,,,,,,,,,
-albite,-3710096,-3928421,224.412,10.083,393.64,-24.155,-78.928,107.064,-1.945,4.861,26.307,32.407,,,,,,,,,,,,,,
-"albite,high",-3710096,-3928421,224.412,10.083,393.64,-24.155,-78.928,107.064,-1.945,4.861,26.307,32.407,,,,,,,,,,,,,,
-"albite,low",-3718518,-3941903,207.443,10.043,393.64,-24.155,-78.928,107.064,-1.945,4.861,26.307,32.407,,,,,,,,,,,,,,
-jadeite,-2853285,-3031921,133.574,6.034,311.29,-20.051,-53.503,66.257,-0.86,2.149,23.118,25.785,,,,,,,,,,,,,,
-annite,-4799809,-5149494,420,15.408,727.21,-47.7504,-138.319,211.906,-1.697,0,34.447,0,,,,,,,,,,,,,,
+muscovite,-5603417,-5983434,293.157,14.087,651.49,-3873.2,-18523200,2742470000,-0.1717,4.295E-07,3.3527,0,,,,,,,,,,,,,,
+phlogopite,-5837044,-6217085,334.346,14.977,610.38,-2083.8,-21533000,2841040000,-0.1697,0,3.4447,0,,,,,,,,,,,,,,
+K-feldspar,-3752109,-3977485,214.145,10.869,381.37,-1941,-12037300,1836430000,-0.1805,5.112E-07,1.5145,0.5485,,,,,,,1436,298,282.98,-4830,3621000,-0.15733,3.477E-05,410630
+"K-feldspar,high",-3745498,-3966398,229.157,10.896,381.37,-1941,-12037300,1836430000,-0.1805,5.112E-07,1.5145,0.5485,,,,,,,,,,,,,,
+"K-feldspar,low",-3752109,-3977485,214.145,10.869,381.37,-1941,-12037300,1836430000,-0.1805,5.112E-07,1.5145,0.5485,,,,,,,,,,,,,,
+paragonite,-5570375,-5951011,277.699,13.216,577.57,-1472.8,-32214400,5050080000,-0.1973,4.933E-07,3.9424,0.59701,,,,,,,,,,,,,,
+albite,-3710096,-3928421,224.412,10.083,393.64,-2415.5,-7892800,1070640000,-0.1945,4.861E-07,2.6307,0.32407,,,,,,,,,,,,,,
+"albite,high",-3710096,-3928421,224.412,10.083,393.64,-2415.5,-7892800,1070640000,-0.1945,4.861E-07,2.6307,0.32407,,,,,,,,,,,,,,
+"albite,low",-3718518,-3941903,207.443,10.043,393.64,-2415.5,-7892800,1070640000,-0.1945,4.861E-07,2.6307,0.32407,,,,,,,,,,,,,,
+jadeite,-2853285,-3031921,133.574,6.034,311.29,-2005.1,-5350300,662570000,-0.086,2.149E-07,2.3118,0.25785,,,,,,,,,,,,,,
+annite,-4799809,-5149494,420,15.408,727.21,-4775.04,-13831900,2119060000,-0.1697,0,3.4447,0,,,,,,,,,,,,,,
Modified: pkg/CHNOSZ/inst/extdata/Berman/ZS92.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/Berman/ZS92.csv 2018-02-27 01:20:37 UTC (rev 305)
+++ pkg/CHNOSZ/inst/extdata/Berman/ZS92.csv 2018-03-07 15:46:30 UTC (rev 306)
@@ -1,11 +1,11 @@
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
-fluormuscovite,-5772803,-6111401,299.03,14.087,680.36024,-65.15743,0,11.058312,-1.7169021,4.2947,33.5273302,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
-fluorphlogopite,-6063382,-6403168,336.394,14.637,653.70816,-51.7519,0,-32.459472,-1.6969784,0,34.4473262,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
-fluorannite,-4983910,-5293254,422.291,15.075,742.82736,-68.1741,0,41.844184,-1.6969784,0,34.4473262,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
-fluortremolite,-11782144,-12457969,570.279,27.045,1272.64728,-94.93496,0,-1.05177392,-1.3917727,3.4809,24.3738877,98.338,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
-fluorapatite,-6443050,-6823447,387.857,15.753,668.77056,-45.34201,0,-74.634192,0,0,0,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
-hydroxyapatite,-6297702,-6694689,398.735,15.822,758.81024,-64.80598,0,-44.793904,0,0,0,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
-chlorapatite,-6217424,-6597260,399.907,16.403,663.87528,-44.35877,0,-69.023448,0,0,0,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
-fluortalc,-5717018,-6056244,264.052,13.33,602.74704,-47.66831,0,-29.2588712,-1.6988979,5.665,29.4468112,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
-chlorphlogopite,-5600840,-5939422,360.703,16.59,573.45904,-20.63549,-164.657136,210.576536,-1.6969784,0,34.4473262,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
-chlorannite,-4582036,-4890196,449.529,17.247,690.44368,-47.60137,-87.253136,137.682888,-1.6969784,0,34.4473262,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
+fluormuscovite,-5772803,-6111401,299.03,14.087,680.36024,-6515.743,0,110583120,-0.17169021,4.2947E-07,3.35273302,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
+fluorphlogopite,-6063382,-6403168,336.394,14.637,653.70816,-5175.19,0,-324594720,-0.16969784,0,3.44473262,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
+fluorannite,-4983910,-5293254,422.291,15.075,742.82736,-6817.41,0,418441840,-0.16969784,0,3.44473262,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
+fluortremolite,-11782144,-12457969,570.279,27.045,1272.64728,-9493.496,0,-10517739.2,-0.13917727,3.4809E-07,2.43738877,0.98338,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
+fluorapatite,-6443050,-6823447,387.857,15.753,668.77056,-4534.201,0,-746341920,0,0,0,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
+hydroxyapatite,-6297702,-6694689,398.735,15.822,758.81024,-6480.598,0,-447939040,0,0,0,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
+chlorapatite,-6217424,-6597260,399.907,16.403,663.87528,-4435.877,0,-690234480,0,0,0,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
+fluortalc,-5717018,-6056244,264.052,13.33,602.74704,-4766.831,0,-292588712,-0.16988979,5.665E-07,2.94468112,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
+chlorphlogopite,-5600840,-5939422,360.703,16.59,573.45904,-2063.549,-16465713.6,2105765360,-0.16969784,0,3.44473262,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
+chlorannite,-4582036,-4890196,449.529,17.247,690.44368,-4760.137,-8725313.6,1376828880,-0.16969784,0,3.44473262,0,NA,NA,NA,NA,NA,NA,NA,NA,,,,,,
Modified: pkg/CHNOSZ/inst/extdata/Berman/unused/BA96.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/Berman/unused/BA96.csv 2018-02-27 01:20:37 UTC (rev 305)
+++ pkg/CHNOSZ/inst/extdata/Berman/unused/BA96.csv 2018-03-07 15:46:30 UTC (rev 306)
@@ -1,21 +1,21 @@
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
-almandine,,-5265440,341.51,11.529,621.43,-32.879,-150.81,221.187,-0.57,0.434,18.599,74.711,,,,,,,,,,,,,,
-anthophyllite,,-12074470,537.4,26.33,1233.79,-71.34,-221.638,233.394,-1.139,0,28.105,62.894,,,,,,,,,,,,,,
-cordierite,,-9161480,416.23,23.311,954.39,-79.623,-23.173,-37.021,-1.158,0,3.003,18.017,,,,,,,,,,,,,,
-Fe-cordierite,,-8430550,482.18,23.706,983.48,-84.037,-18.703,-8.568,-1.7,0,4.265,0,,,,,,,,,,,,,,
-fayalite,,-1477170,151.73,4.639,252,-20.137,0,-6.219,-0.822,1.944,26.21,84.233,,,,,,,,,,,,,,
-ferrosilite,,-1192910,96.47,3.295,174.2,-13.93,-4.544,-3.771,-0.911,0.303,31.406,80.4,,,,,,,,,,,,,,
-forsterite,,-2174420,94.18,4.36,233.18,-18.016,0,-26.794,-0.791,1.351,29.464,88.633,,,,,,,,,,,,,,
-geikelite,,-1570520,74.41,3.077,146.2,-4.16,-39.998,40.233,-0.529,0,23.314,88.328,,,,,,,,,,,,,,
-hematite,,-826740,87.36,3.027,146.86,0,-55.768,52.563,-0.479,0.304,38.31,1.65,955,298,0,-7.403,27.921,1287,,,,,,,,
-hercynite,,-1945360,123.13,4.08,251.77,-20.444,-13.483,13.15,-0.51,0,15.819,96.276,,,,,,,,,,,,,,
-ilmenite,,-1233320,108.5,3.17,150,-4.416,-33.237,34.815,-0.529,0,23.314,88.328,,,,,,,,,,,,,,
-iron-a,,0,27.45,0.709,51.87,-3.794,-25.43,50.68,-0.602,0,45.071,14.104,1042,298,-0.00057,-22.208,34.823,1000,,,,,,,,
-iron-g,,7720,35.64,0.691,66.24,-12.371,63.733,-106.04,-0.467,-1.445,47.153,14.451,,,,,,,,,,,,,,
-magnetite,,-1116960,146.04,4.452,207.93,0,-72.433,66.436,-0.582,1.751,30.291,138.47,848,298,0,-19.502,61.037,1565,,,,,,,,
-enstatite,,-1546040,66.18,3.133,166.58,-12.006,-22.706,27.915,-0.749,0.447,24.656,74.67,,,,,,,,,,,,,,
-orthocorundum,,-1634950,33.93,3.123,119.38,7.748,-65.091,42.288,-0.749,0.447,24.656,74.67,,,,,,,,,,,,,,
-pyrope,,-6284740,268.8,11.311,590.9,-28.27,-133.208,126.033,-0.576,0.442,22.519,37.044,,,,,,,,,,,,,,
-rutile,,-944750,50.88,1.883,77.84,0,-33.678,40.294,-0.454,0.585,25.716,15.409,,,,,,,,,,,,,,
-spinel,,-2302160,80.37,3.978,244.67,-20.04,,,-0.489,0,21.691,50.528,,,,,,,,,,,,,,
-talc,,-5898960,261.21,13.61,664.11,-51.872,-21.472,-32.737,-1.847,5.878,25.616,0,,,,,,,,,,,,,,
+almandine,,-5265440,341.51,11.529,621.43,-3287.9,-15081000,2211870000,-0.057,4.34E-08,1.8599,0.74711,,,,,,,,,,,,,,
+anthophyllite,,-12074470,537.4,26.33,1233.79,-7134,-22163800,2333940000,-0.1139,0,2.8105,0.62894,,,,,,,,,,,,,,
+cordierite,,-9161480,416.23,23.311,954.39,-7962.3,-2317300,-370210000,-0.1158,0,0.3003,0.18017,,,,,,,,,,,,,,
+Fe-cordierite,,-8430550,482.18,23.706,983.48,-8403.7,-1870300,-85680000,-0.17,0,0.4265,0,,,,,,,,,,,,,,
+fayalite,,-1477170,151.73,4.639,252,-2013.7,0,-62190000,-0.0822,1.944E-07,2.621,0.84233,,,,,,,,,,,,,,
+ferrosilite,,-1192910,96.47,3.295,174.2,-1393,-454400,-37710000,-0.0911,3.03E-08,3.1406,0.804,,,,,,,,,,,,,,
+forsterite,,-2174420,94.18,4.36,233.18,-1801.6,0,-267940000,-0.0791,1.351E-07,2.9464,0.88633,,,,,,,,,,,,,,
+geikelite,,-1570520,74.41,3.077,146.2,-416,-3999800,402330000,-0.0529,0,2.3314,0.88328,,,,,,,,,,,,,,
+hematite,,-826740,87.36,3.027,146.86,0,-5576800,525630000,-0.0479,3.04E-08,3.831,0.0165,955,298,0,-0.07403,0.00027921,1287,,,,,,,,
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/chnosz -r 306
More information about the CHNOSZ-commits
mailing list