[CHNOSZ-commits] r375 - in pkg/CHNOSZ: . data demo inst inst/extdata/OBIGT man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Jan 27 17:54:59 CET 2019
Author: jedick
Date: 2019-01-27 17:54:58 +0100 (Sun, 27 Jan 2019)
New Revision: 375
Added:
pkg/CHNOSZ/inst/extdata/OBIGT/SLOP98.csv
Modified:
pkg/CHNOSZ/DESCRIPTION
pkg/CHNOSZ/data/refs.csv
pkg/CHNOSZ/demo/gold.R
pkg/CHNOSZ/demo/sources.R
pkg/CHNOSZ/inst/NEWS
pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_aq.csv.xz
pkg/CHNOSZ/inst/extdata/OBIGT/organic_aq.csv.xz
pkg/CHNOSZ/man/CHNOSZ-package.Rd
pkg/CHNOSZ/man/util.data.Rd
Log:
update aqueous Au species and move superseded data to extdata/OBIGT/SLOP98.csv
Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION 2019-01-27 08:31:35 UTC (rev 374)
+++ pkg/CHNOSZ/DESCRIPTION 2019-01-27 16:54:58 UTC (rev 375)
@@ -1,6 +1,6 @@
Date: 2019-01-27
Package: CHNOSZ
-Version: 1.1.3-82
+Version: 1.1.3-83
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/data/refs.csv
===================================================================
--- pkg/CHNOSZ/data/refs.csv 2019-01-27 08:31:35 UTC (rev 374)
+++ pkg/CHNOSZ/data/refs.csv 2019-01-27 16:54:58 UTC (rev 375)
@@ -9,7 +9,7 @@
HDNB78,"H. C. Helgeson, J. M. Delany et al.",1978,"Am. J. Sci. 278A, 1-229","data for minerals and phase transitions",http://www.worldcat.org/oclc/13594862
HDNB78.1,"H. C. Helgeson, J. M. Delany et al.",1978,"Am. J. Sci. 278A, 1-229","litharge S, V, and Cp parameters",http://www.worldcat.org/oclc/13594862
HDNB78.2,"H. C. Helgeson, J. M. Delany et al.",1978,"Am. J. Sci. 278A, 1-229","celestite V and Cp parameters",http://www.worldcat.org/oclc/13594862
-RHF78,"R. A. Robie, B. S. Hemingway and J. R. Fisher",1978,"U. S. Geological Survey Bull. 1452","chlorargyrite",http://pubs.er.usgs.gov/publication/b1452
+RHF78,"R. A. Robie, B. S. Hemingway and J. R. Fisher",1978,"U. S. Geological Survey Bull. 1452",chlorargyrite,http://pubs.er.usgs.gov/publication/b1452
RHF78.1,"R. A. Robie, B. S. Hemingway and J. R. Fisher",1978,"U. S. Geological Survey Bull. 1452","dickite, fluorphlogopite, halloysite, and pyrope",http://pubs.er.usgs.gov/publication/b1452
RHF78.2,"R. A. Robie, B. S. Hemingway and J. R. Fisher",1978,"U. S. Geological Survey Bull. 1452",iron,http://pubs.er.usgs.gov/publication/b1452
RHF78.3,"R. A. Robie, B. S. Hemingway and J. R. Fisher",1978,"U. S. Geological Survey Bull. 1452","gibbsite GHS",http://pubs.er.usgs.gov/publication/b1452
@@ -33,7 +33,7 @@
SH90,"E. L. Shock and H. C. Helgeson",1990,"Geochim. Cosmochim. Acta 54, 915-945","organic species",https://doi.org/10.1016/0016-7037(90)90429-O
SH90.1,"E. L. Shock and H. C. Helgeson",1990,"Geochim. Cosmochim. Acta 54, 915-945","formic acid, formate, and propanoate",https://doi.org/10.1016/0016-7037(90)90429-O
BN91,"J. W. Ball and D. K. Nordstrom",1991,"User's manual for WATEQ4F, with revised thermodynamic data base and text cases for calculating speciation of major, trace, and redox elements in natural waters. USGS Open-File Report 91-183","arsenopyrite: G",https://pubs.er.usgs.gov/publication/ofr91183
-HRA91,"B. S. Hemingway et al.",1991,"Am. Mineral. 76, 445-457","bohemite",http://pubs.er.usgs.gov/publication/70016664
+HRA91,"B. S. Hemingway et al.",1991,"Am. Mineral. 76, 445-457",bohemite,http://pubs.er.usgs.gov/publication/70016664
SHD91,"D. A. Sverjensky, J. J. Hemley and W. M. D'Angelo",1991,"Geochim. Cosmochim. Acta 55, 989-1004","G and H revisions for K- and Al-bearing silicates",https://doi.org/10.1016/0016-7037(89)90341-4
SHD91.1,"D. A. Sverjensky, J. J. Hemley and W. M. D'Angelo",1991,"Geochim. Cosmochim. Acta 55, 989-1004","phlogopite: H and S modified by @Ber90, followed by G and H revision for K-bearing silicates [after @SHD91]",https://doi.org/10.1016/0016-7037(89)90341-4
SHD91.2,"D. A. Sverjensky, J. J. Hemley and W. M. D'Angelo",1991,"Geochim. Cosmochim. Acta 55, 989-1004","annite: G and H revision for K-bearing silicates [after @SHD91]",https://doi.org/10.1016/0016-7037(89)90341-4
@@ -45,6 +45,7 @@
Sho93,"E. L. Shock",1993,"Geochim. Cosmochim. Acta 57, 3341-3349","ethylacetate and acetamide",https://doi.org/10.1016/0016-7037(93)90542-5
Sho93.1,"E. L. Shock",1993,"Geochim. Cosmochim. Acta 57, 3341-3349","carbon monoxide and ethylene",https://doi.org/10.1016/0016-7037(93)90542-5
SK93,"E. L. Shock and C. M. Koretsky",1993,"Geochim. Cosmochim. Acta 57, 4899-4922","metal-acetate complexes",https://doi.org/10.1016/0016-7037(93)90128-J
+SK93.1,"E. L. Shock and C. M. Koretsky",1993,"Geochim. Cosmochim. Acta 57, 4899-4922","Au-acetate complexes",https://doi.org/10.1016/0016-7037(93)90128-J
SM93,"E. L. Shock and W. B. McKinnon",1993,"Icarus 106, 464-477","CO, HCN, urea",https://doi.org/10.1006/icar.1993.1185
SS93,"M. D. Schulte and E. L. Shock",1993,"Geochim. Cosmochim. Acta 57, 3835-3846",aldehydes,https://doi.org/10.1016/0016-7037(93)90337-V
HSS95,"J. R. Haas, E. L. Shock and D. C. Sassani",1995,"Geochim. Cosmochim. Acta 59, 4329-4350","complexes of rare earth elements",https://doi.org/10.1016/0016-7037(95)00314-P
@@ -65,8 +66,10 @@
SSB97,"E. L. Shock, D. C. Sassani and H. Betz",1997,"Geochim. Cosmochim. Acta 61, 4245-4266","uranium species",https://doi.org/10.1016/S0016-7037(97)00240-8
SSB97.1,"E. L. Shock, D. C. Sassani and H. Betz",1997,"Geochim. Cosmochim. Acta 61, 4245-4266",uraninite,https://doi.org/10.1016/S0016-7037(97)00240-8
SSH97,"D. A. Sverjensky, E. L. Shock and H. C. Helgeson",1997,"Geochim. Cosmochim. Acta 61, 1359-1412","metal complexes",https://doi.org/10.1016/S0016-7037(97)00009-4
+SSH97.1,"D. A. Sverjensky, E. L. Shock and H. C. Helgeson",1997,"Geochim. Cosmochim. Acta 61, 1359-1412","Au(HS)<sub>2</sub><sup>-</sup> and Au-chloride complexes",https://doi.org/10.1016/S0016-7037(97)00009-4
SSWS97,"E. L. Shock, D. C. Sassani et al.",1997,"Geochim. Cosmochim. Acta 61, 907-950","inorganic ions and hydroxide complexes",https://doi.org/10.1016/S0016-7037(96)00339-0
SSWS97.1,"E. L. Shock, D. C. Sassani et al.",1997,"Geochim. Cosmochim. Acta 61, 907-950","zincite and litharge",https://doi.org/10.1016/S0016-7037(96)00339-0
+SSWS97.2,"E. L. Shock, D. C. Sassani et al.",1997,"Geochim. Cosmochim. Acta 61, 907-950","Au<sup>+</sup> and Au<sup>+3</sup>",https://doi.org/10.1016/S0016-7037(96)00339-0
TSD97,"Y. Tardy, R. Schaul, J. Duplay",1997,"C. R. Acad. Sci. Paris 324, 969-976","humic acid, microflora, and plants",https://doi.org/10.1016/S1251-8050(97)83981-X
HOKR98,"H. C. Helgeson, C. E. Owens et al.",1998,"Geochim. Cosmochim. Acta 62, 985-1081","organic molecules and groups",https://doi.org/10.1016/S0016-7037(97)00219-6
HOKR98.1,"H. C. Helgeson, C. E. Owens et al.",1998,"Geochim. Cosmochim. Acta 62, 985-1081","amino acids",https://doi.org/10.1016/S0016-7037(97)00219-6
@@ -78,7 +81,7 @@
SLOP98.11,"E. L. Shock et al.",1998,"slop98.dat computer data file",""Data and parameters as used by @MS97. "",http://geopig.asu.edu/?q=tools
SS98a,"D. C. Sassani and E. L. Shock",1998,"Geochim. Cosmochim. Acta 62, 2643-2671","platinum-group ions and complexes",https://doi.org/10.1016/S0016-7037(98)00049-0
SS98a.1,"D. C. Sassani and E. L. Shock",1998,"Geochim. Cosmochim. Acta 62, 2643-2671","platinum-group solids",https://doi.org/10.1016/S0016-7037(98)00049-0
-SS98a.2,"D. C. Sassani and E. L. Shock",1998,"Geochim. Cosmochim. Acta 62, 2643-2671",Rh+3,https://doi.org/10.1016/S0016-7037(98)00049-0
+SS98a.2,"D. C. Sassani and E. L. Shock",1998,"Geochim. Cosmochim. Acta 62, 2643-2671",Rh<sup>+3</sup>,https://doi.org/10.1016/S0016-7037(98)00049-0
HS99,"J. R. Haas and E. L. Shock",1998,"Geochim. Cosmochim. Acta 63, 3429-3441","chloroethylene species",https://doi.org/10.1016/S0016-7037(99)00276-8
MS99,"W. M. Murphy and E. L. Shock",1999,"Rev. Mineral. Geochem. 38, 221-253",actinides,http://rimg.geoscienceworld.org/content/38/1/221
PSK99,"P. Prapaipong, E. L. Shock and C. M. Koretsky",1999,"Geochim. Cosmochim. Acta 63, 2547-2577","metal-dicarboxylate complexes",https://doi.org/10.1016/S0016-7037(99)00146-5
@@ -87,18 +90,19 @@
AP01,"J. P. Amend and A. V. Plyasunov",2001,"Geochim. Cosmochim. Acta 65, 3901-3917",carbohydrates,https://doi.org/10.1016/S0016-7037(01)00707-4
AS01,"J. P. Amend and E. L. Shock",2001,"FEMS Microbiol. Rev. 25, 175-243","NO and N<sub>2</sub>O",https://doi.org/10.1111/j.1574-6976.2001.tb00576.x
AS01.1,"J. P. Amend and E. L. Shock",2001,"FEMS Microbiol. Rev. 25, 175-243","selenium and molybdenite",https://doi.org/10.1111/j.1574-6976.2001.tb00576.x
+AZ01,"N. N. Akinfiev and A. V. Zotov",2001,"Geochem. Int. 39, 990-1006",AuCl<sub>2</sub><sup>-</sup>,http://pleiades.online/cgi-perl/search.pl?type=abstract&name=geochem&number=10&year=1&page=990
MVT01,"L. Mercury, P. Vieillard. and Y. Tardy",2001,"Appl. Geochem. 16, 161-181","polymorphs of ice",https://doi.org/10.1016/S0883-2927(00)00025-1
PS01,"A. V. Plyasunov and E. L. Shock",2001,"Geochim. Cosmochim. Acta 65, 3879-3900","aqueous nonelectrolytes",https://doi.org/10.1016/S0016-7037(01)00678-0
PS01.1,"A. V. Plyasunov and E. L. Shock",2001,"Geochim. Cosmochim. Acta 65, 3879-3900","acetic acid, propanoic acid, and methane",https://doi.org/10.1016/S0016-7037(01)00678-0
Ric01,"L. Richard",2001,"Geochim. Cosmochim. Acta 65, 3827-3877","organic sulfur compounds",https://doi.org/10.1016/S0016-7037(01)00761-X
-Ste01,"A. Stefansson",2001,"Chem. Geol. 172, 225-250",aqueous H<sub>4</sub>SiO<sub>4</sub>,http://dx.doi.org/10.1016/S0009-2541(00)00263-1
+Ste01,"A. Stefansson",2001,"Chem. Geol. 172, 225-250","aqueous H<sub>4</sub>SiO<sub>4</sub>",http://dx.doi.org/10.1016/S0009-2541(00)00263-1
SSW01,"M. D. Schulte, E. L. Shock and R. H. Wood",2001,"Geochim. Cosmochim. Acta 65, 3919-3930","AsH<sub>3</sub>, CF<sub>4</sub>, CH<sub>3</sub>F, Cl<sub>2</sub>, ClO<sub>2</sub>, N<sub>2</sub>O, NF<sub>3</sub>, NO, PH<sub>3</sub>, and SF<sub>6</sub>",https://doi.org/10.1016/S0016-7037(01)00717-7
TS01,"B. Tagirov and J. Schott",2001,"Geochim. Cosmochim. Acta 65, 3965-3992","aqueous Al species",http://dx.doi.org/10.1016/S0016-7037(01)00705-0
MGN03,"J. Majzlan, K.-D. Grevel and A. Navrotsky",2003,"Am. Mineral. 88, 855-859","goethite, lepidocrocite, and maghemite GHS",https://doi.org/10.2138/am-2003-5-614
NA03,"D. K. Nordstrom and D. G. Archer",2003,"Arsenic thermodynamic data and environmental geochemistry. In Arsenic in Groundwater, eds. Welch and Stollenwerk, Kluwer","As oxide and sulfide minerals",
NA03.1,"D. K. Nordstrom and D. G. Archer",2003,"Arsenic thermodynamic data and environmental geochemistry. In Arsenic in Groundwater, eds. Welch and Stollenwerk, Kluwer","aqueous As oxides and sulfides",
MLS+03,"J. Majzlan, B. E. Lang et al.",2003,"Am. Mineral. 88, 846-854","goethite, lepidocrocite, and maghemite Cp",https://doi.org/10.2138/am-2003-5-613
-AS04,"J. Apps and N. Spycher",2004,"Data qualification for thermodynamic data used to support THC calculations. Bechtel SAIC Company, LLC. ANL-NBS-HS-000043 REV 00 (DOC.20041118.0004)",aqueous SiO<sub>2</sub>,
+AS04,"J. Apps and N. Spycher",2004,"Data qualification for thermodynamic data used to support THC calculations. Bechtel SAIC Company, LLC. ANL-NBS-HS-000043 REV 00 (DOC.20041118.0004)","aqueous SiO<sub>2</sub>",
MSB+04,"J. Majzlan, R. Stevens et al.",2004,"Phys. Chem. Mineral. 31, 518-531","hydronium jarosite",https://doi.org/10.1007/s00269-004-0405-z
SR04,"M. D. Schulte and K. L. Rogers",2004,"Geochim. Cosmochim. Acta 68, 1087-1097","alkane thiols",https://doi.org/10.1016/j.gca.2003.06.001
ZZX+05,"Y. Zhu et al.",2005,"J. Hazard. Mater. A120, 37-44","barium arsenate and barium hydrogen arsenate: G",https://doi.org/10.1016/j.jhazmat.2004.12.025
@@ -114,12 +118,13 @@
MNM+06,"J. Majzlan, A. Navrotsky et al.",2006,"Eur. J. Mineral. 18, 175-186","coquimbite, ferricopiapite, and rhomboclase",https://doi.org/10.1127/0935-1221/2006/0018-0175
Dic07,"J. M. Dick",2007,"Ph.D. Dissertation, Univ. of California","glutathione, cystine, and cystine sidechain",
MA07,"L. Marini and M. Accornero",2007,"Environ. Geol. 52, 1343-1363","metal-arsenate and metal-arsenite complexes",https://doi.org/10.1007/s00254-006-0578-5
-SLOP07.1,"E. L. Shock et al.",2007,"slop07.dat computer data file","corrected charge of Pu(Oxal)+2",http://geopig.asu.edu/?q=tools
+SLOP07.1,"E. L. Shock et al.",2007,"slop07.dat computer data file","corrected charge of Pu(Oxal)<sup>+2</sup>",http://geopig.asu.edu/?q=tools
SLOP07.2,"E. L. Shock et al.",2007,"slop07.dat computer data file","high-temperature HKF parameters from @AP01",http://geopig.asu.edu/?q=tools
Ric08,"L. Richard",2008,"personal communication",alkenes,
GM09,"K.-D. Grevel and J. Majzlan",2009,"Geochim. Cosmochim. Acta 73, 6805 - 6815","kieserite, starkeyite, hexahydrite, and epsomite",https://doi.org/10.1016/j.gca.2009.08.005
HRMNS09,"H. C. Helgeson, L. Richard et al.",2009,"Geochim. Cosmochim. Acta 73, 594-695",kerogens,https://doi.org/10.1016/j.gca.2008.03.004
AML10,"M. Accornero, L. Marini and M. Lelli",2010,"Appl. Geochem. 25, 242-260","metal-chromate complexes",https://doi.org/10.1016/j.apgeochem.2009.11.010
+AZ10,"N. N. Akinfiev and A. V. Zotov",2010,"Geochem. Int. 48, 714-720","AuHS and Au(HS)<sub>2</sub><sup>-</sup>",https://doi.org/10.1134/S0016702910070074
DS10,"J. Delgado Martin and A. Soler i Gil",2010,"Eur. J. Mineral. 22, 363-380","hedenbergite, andradite, ferro-actinolite, grunerite, and ilvaite",https://doi.org/10.1127/0935-1221/2010/0022-2021
MA10,"L. Marini and M. Accornero",2010,"Environ. Earth Sci. 59, 1601-1606","corrected values",https://doi.org/10.1007/s12665-009-0369-x
Sch10,"M. Schulte",2010,"Aquat. Geochem. 16, 621-637","organic sulfides",https://doi.org/10.1007/s10498-010-9102-3
@@ -131,6 +136,8 @@
DEH+13,"J. M. Dick, K. A. Evans et al.",2013,"Geochim. Cosmochim. Acta 122, 247-266","phenanthrene and methylphenanthrene isomers",https://doi.org/10.1016/j.gca.2013.08.020
FDM+14,"S. Facq et al.",2014,"Geochim. Cosmochim. Acta 132, 375-390","CO<sub>2</sub>, CO<sub>3</sub><sup>-2</sup>, and HCO<sub>3</sub><sup>-</sup>",https://doi.org/10.1016/j.gca.2014.01.030
FDM+14.1,"S. Facq et al.",2014,"Geochim. Cosmochim. Acta 132, 375-390","aragonite; source of data: `berman.dat`",https://doi.org/10.1016/j.gca.2014.01.030
+PAB+14,"G. S. Pokrovski, N. N. Akinfiev et al., 2014",2014,"Geol. Soc. Spec. Publ. 402, 9-70","Au<sup>+</sup>, Au(OH)<sub>2</sub><sup>-</sup>, AuCl, and AuOH",https://doi.org/10.1144/SP402.4
+PAB+14.1,"G. S. Pokrovski, N. N. Akinfiev et al., 2014",2014,"Geol. Soc. Spec. Publ. 402, 9-70","corrected H of AuHS",https://doi.org/10.1144/SP402.4
SHA14,"D. A. Sverjensky et al.",2014,"Geochim. Cosmochim. Acta 129, 125-145","SiO<sub>2</sub> and Si<sub>2</sub>O<sub>4</sub>",https://doi.org/10.1016/j.gca.2013.12.019
SHA14.1,"D. A. Sverjensky et al.",2014,"Geochim. Cosmochim. Acta 129, 125-145","revisions for AlO<sub>2</sub><sup>-</sup> and HAlO<sub>2</sub>",https://doi.org/10.1016/j.gca.2013.12.019
SHA14.2,"D. A. Sverjensky et al.",2014,"Geochim. Cosmochim. Acta 129, 125-145","revisions for BO(OH) and BO<sub>2</sub><sup>-</sup>",https://doi.org/10.1016/j.gca.2013.12.019
Modified: pkg/CHNOSZ/demo/gold.R
===================================================================
--- pkg/CHNOSZ/demo/gold.R 2019-01-27 08:31:35 UTC (rev 374)
+++ pkg/CHNOSZ/demo/gold.R 2019-01-27 16:54:58 UTC (rev 375)
@@ -1,35 +1,8 @@
# CHNOSZ/demo/gold.R: Au solubility calculations
# 20181101 jmd first version
# 20181109 add calculation of K+ molality
+# 20190127 update Au species in OBIGT, not here
-## additions to OBIGT:
-# Au(HS) from Akinfiev and Zotov, 2010
-# (doi:10.1134/S0016702910070074)
-# corrected H taken from Pokrovski et al., 2014
-# (doi:10.1144/SP402.4)
-mod.obigt("Au(HS)", formula = "Au(HS)", state = "aq", ref1 = "AZ10", date = today(),
- G = 8344, H = 13193, S = 50.86, Cp = 1.8, V = 56.5,
- a1 = 9.4965, a2 = 15.4057, a3 = -0.3052, a4 = -3.1459,
- c1 = -38.1356, c2 = 19.6524, omega = 0, z = 0)
-# AuOH from Pokrovski et al., 2014
-mod.obigt("AuOH", formula = "AuOH", state = "aq", ref1 = "PAB+14", date = today(),
- G = -32716, H = -41533, S = 21.89, Cp = -11.1, V = 32.4,
- a1 = 6.1937, a2 = 7.3415, a3 = 2.8644, a4 = -3.0825,
- c1 = -3.0370, c2 = -3.9635, omega = 0, z = 0)
-
-## modifications to OBIGT:
-# AuCl2- from Akinfiev and Zotov, 2001 (reported in AZ10)
-# (http://pleiades.online/cgi-perl/search.pl/?type=abstract&name=geochem&number=10&year=1&page=990)
-mod.obigt("AuCl2-", ref1 = "AZ01", date = today(),
- G = -36795, H = -46664, S = 47.16, Cp = -26.4, V = 68.6,
- a1 = 11.4774, a2 = 20.2425, a3 = -2.2063, a4 = -3.6158,
- c1 = 27.0677, c2 = -22.240, omega = 0.8623, z = -1)
-# Au(HS)2- from Pokrovski et al., 2014
-mod.obigt("Au(HS)2-", ref1 = "PAB+14", date = today(),
- G = 3487, H = 4703, S = 77.46, Cp = 3.3, V = 75.1,
- a1 = 12.3373, a2 = 22.3421, a3 = 3.0317, a4 = -3.7026,
- c1 = -53.6010, c2 = 31.4030, omega = 0.7673, z = -1)
-
# set up system
# use H2S here: it's the predominant species at the pH of the QMK buffer -- see sulfur()
basis(c("Al2O3", "quartz", "Fe", "Au", "K+", "Cl-", "H2S", "H2O", "oxygen", "H+"))
@@ -41,7 +14,7 @@
# create a pH buffer
mod.buffer("QMK", c("quartz", "muscovite", "K-feldspar"), "cr", 0)
-# define colors for Au(HS)2-, Au(HS), AuOH, AuCl2-
+# define colors for Au(HS)2-, AuHS, AuOH, AuCl2-
# after Williams-Jones et al., 2009
# (doi:10.2113/gselements.5.5.281)
col <- c("#ED4037", "#F58645", "#0F9DE2", "#22CC88")
@@ -78,7 +51,7 @@
# log(m_Au)-pH diagram like Fig. 7 of Akinfiev and Zotov, 2001
# (http://pleiades.online/cgi-perl/search.pl/?type=abstract&name=geochem&number=10&year=1&page=990)
Au_pH1 <- function() {
- species(c("Au(HS)2-", "Au(HS)", "AuOH"))
+ species(c("Au(HS)2-", "AuHS", "AuOH"))
# apply PPM buffer for fO2 and aH2S
basis("O2", "PPM")
basis("H2S", "PPM")
@@ -103,7 +76,7 @@
# log(m_Au)-pH diagram similar to Fig. 12b of Stefansson and Seward, 2004
# (doi:10.1016/j.gca.2004.04.006)
Au_pH2 <- function() {
- species(c("Au(HS)2-", "Au(HS)", "AuOH", "AuCl2-"))
+ species(c("Au(HS)2-", "AuHS", "AuOH", "AuCl2-"))
# apply PPM buffer for fO2 and aH2S
basis("O2", "PPM")
basis("H2S", "PPM")
@@ -140,7 +113,7 @@
# log(m_Au)-T diagram like Fig. 2B of Williams-Jones et al., 2009
# (doi:10.2113/gselements.5.5.281)
Au_T1 <- function() {
- species(c("Au(HS)2-", "Au(HS)", "AuOH", "AuCl2-"))
+ species(c("Au(HS)2-", "AuHS", "AuOH", "AuCl2-"))
# apply PPM buffer for fO2 and aH2S
basis("O2", "PPM")
basis("H2S", "PPM")
@@ -170,7 +143,7 @@
# (doi:10.2113/gselements.5.5.281)
# (doi:10.1144/SP402.4)
Au_T2 <- function() {
- species(c("Au(HS)2-", "Au(HS)", "AuOH", "AuCl2-"))
+ species(c("Au(HS)2-", "AuHS", "AuOH", "AuCl2-"))
# total S = 0.01 m
basis("H2S", -2)
# apply HM buffer for fO2
@@ -201,7 +174,7 @@
}
# make plots
-opar <- par(mfrow=c(2, 2))
+opar <- par(mfrow = c(2, 2))
Au_pH1()
Au_pH2()
Au_T1()
Modified: pkg/CHNOSZ/demo/sources.R
===================================================================
--- pkg/CHNOSZ/demo/sources.R 2019-01-27 08:31:35 UTC (rev 374)
+++ pkg/CHNOSZ/demo/sources.R 2019-01-27 16:54:58 UTC (rev 375)
@@ -13,8 +13,14 @@
tdata <- read.csv(system.file("extdata/OBIGT/SUPCRTBL.csv", package="CHNOSZ"), as.is=TRUE)
os3 <- gsub("\ .*", "", tdata$ref1)
os4 <- gsub("\ .*", "", tdata$ref2)
+tdata <- read.csv(system.file("extdata/OBIGT/SUPCRT92.csv", package="CHNOSZ"), as.is=TRUE)
+os5 <- gsub("\ .*", "", tdata$ref1)
+os6 <- gsub("\ .*", "", tdata$ref2)
+tdata <- read.csv(system.file("extdata/OBIGT/SLOP98.csv", package="CHNOSZ"), as.is=TRUE)
+os7 <- gsub("\ .*", "", tdata$ref1)
+os8 <- gsub("\ .*", "", tdata$ref2)
# all of the thermodynamic data sources - some of them might be NA
-obigt.source <- unique(c(ps1, ps2, os1, os2, os3, os4))
+obigt.source <- unique(c(ps1, ps2, os1, os2, os3, os4, os5, os6, os7, os8))
obigt.source <- obigt.source[!is.na(obigt.source)]
# these all produce character(0) if the sources are all accounted for
print("missing these sources for thermodynamic properties:")
Modified: pkg/CHNOSZ/inst/NEWS
===================================================================
--- pkg/CHNOSZ/inst/NEWS 2019-01-27 08:31:35 UTC (rev 374)
+++ pkg/CHNOSZ/inst/NEWS 2019-01-27 16:54:58 UTC (rev 375)
@@ -1,4 +1,4 @@
-CHANGES IN CHNOSZ 1.1.3-81 (2019-01-27)
+CHANGES IN CHNOSZ 1.1.3-83 (2019-01-27)
---------------------------------------
BUG FIXES
@@ -149,6 +149,11 @@
- Add scheelite (CaWO4) and ferberite (FeWO4) using data adopted by
Wood and Samson, 2000.
+- Update aqueous Au species with data from Akinfiev and Zotov, 2001
+ and 2010, and Pokrovski et al., 2014.
+
+- Move superseded data for aqueous Au species to SLOP98.csv.
+
DIAGRAMS
- Lines in 1-D diagram()s can optionally be drawn as splines using the
Added: pkg/CHNOSZ/inst/extdata/OBIGT/SLOP98.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/SLOP98.csv (rev 0)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/SLOP98.csv 2019-01-27 16:54:58 UTC (rev 375)
@@ -0,0 +1,10 @@
+name,abbrv,formula,state,ref1,ref2,date,G,H,S,Cp,V,a1.a,a2.b,a3.c,a4.d,c1.e,c2.f,omega.lambda,z.T
+AuCl,AuCl,AuCl,aq,"SSH97.1 [S98]",NA,2.Oct.97,-3184,-2140,41.47,-9.83,38.61,7.0357,9.4008,2.0481,-3.1676,0.0551,-5.0371,-0.038,0
+AuCl2-,AuCl2-,AuCl2-,aq,"SSH97.1 [S98]",NA,2.Oct.97,-36781,-44725,53.6,-24.52,69.26,11.5192,20.3482,-2.2547,-3.6201,-0.6764,-8.03,0.8173,-1
+AuCl3-2,AuCl3-2,AuCl3-2,aq,"SSH97.1 [S98]",NA,2.Oct.97,-67811,-86023,61.39,-43.48,103.42,16.6878,32.9687,-7.2151,-4.1419,1.7155,-11.891,2.2827,-2
+AuCl4-3,AuCl4-3,AuCl4-3,aq,"SSH97.1 [S98]",CHNOSZ.5,2.Oct.97,-35332,23573,-32.72,-1.36,-20.66,-0.5361,-9.0876,9.3148,-2.4033,19.7251,-3.3107,1.5579,-3
+Au(HS)2-,Au(HS)2-,Au(HS)2-,aq,"SSH97.1 [S98]",NA,9.Oct.97,2429,-2509,56.77,6.06,75.39,12.342,22.3572,-3.0443,-3.7032,16.8038,-1.8007,0.7693,-1
+Au+,Au+,Au+,aq,"SSWS97.2 [S98]",NA,13.Nov.97,39000,47900,25.6,-0.3,12.5,3.5312,0.8428,5.4139,-2.8137,7.5089,-3.0956,0.1648,1
+Au+3,Au+3,Au+3,aq,"SSWS97.2 [S98]",NA,13.Nov.97,103600,97800,-54.8,-8.2,-31.4,-1.7167,-11.9654,10.4352,-2.2843,23.5775,-4.7048,2.4115,3
+Au(Ac),NA,AuCH3COO,aq,"SK93.1 [S98]",NA,10.Sep.92,-49870,-68310,48,56.1,61.8,10.213,17.1576,-0.9969,-3.4882,38.7432,8.3843,-0.03,0
+Au(Ac)2-,NA,Au(CH3COO)2-,aq,"SK93.1 [S98]",NA,10.Sep.92,-138240,-186750,61.3,132.8,118.3,18.1917,36.6392,-8.6534,-4.2936,90.461,24.0193,0.701,-1
Modified: pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_aq.csv.xz
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_aq.csv.xz 2019-01-27 08:31:35 UTC (rev 374)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_aq.csv.xz 2019-01-27 16:54:58 UTC (rev 375)
@@ -1,4 +1,4 @@
-ý7zXZ æÖ´F ! t/å£á¾)q] 7Iýúb¿ñ9²¶Ë¦¨TB;qý"½qù¦cL;ù"ß<²ëbï¨gò;ø¥Kä¥f1Æw?ozÆCþaì]IبÝ5i÷§mgàöYã¨b[*·Ïâ\%©°gÍ]:å
+ý7zXZ æÖ´F ! t/å£á½³] 7Iýúb¿ñ9²¶Ë¦¨TB;qý"½qù¦cL;ù"ß<²ëbï¨gò;ø¥Kä¥f1Æw?ozÆCþaì]IبÝ5i÷§mgàöYã¨b[*·Ïâ\%©°gÍ]:å
ðDÁ¨Nâªg5qàêZ«Ì!^Kþ\1,»ßÂ"±æCç
L4)Gìúɯ¦mLø¾ðÒUVÉäôCC¤ÍÚMwÄNe %EBs
3_HͪK7O"L»Ù!+6Ë:lµ`³pÈþ
þ}²ÍõÞao"æv¢9AÆ÷~
I}¾¢ÞÏÞ.QäÏ/gc+ñf$E»)ÉLaÕ|«!«×R_T".ƱãÆ« LVêYÈjWÀ¢Ð
£pë3?7¡t¡
ê
@@ -123,132 +123,148 @@
Í(ÑväÆé#`*}û+è]Åuðù®<32èöÎÉþþR÷æª U`tèH5ós )¸Þ²P>
L6ÓÒú Vz º¾É<Áó.öºì4
~¯;×<D1¤Mþs³½éÜ<@À£ncN{:ºýz7ÄC¾ éL| !ÖPÓ»ÏDg?·c ø~8&¢½®Í´:ȹs>°GpÈ ü<;dMR¡½
EG´ìçåªá0ËñÛµ'ÜôOâS8NÏ«2rÍ<ì}®2·'¡!ã Ùp¼Ê+éÔ8ªÎ¢·ÓíW'G¹ü¶®bèyõ¿vÛ'þ_=-§>TÓè<®lÝlo?úÛ)ÎÌÅQmôÖïÔ#b±y:ZùÃL
ÞÛe·hñÝ÷+"ëeÑJ©$eW§lbÌ:
-ëI½£þZê7Z½%dûKàLòddM&U!õD¨³ýÆq2v©fTfðÛU9d¥kK¦yÞ~bX:QÌ:·ÂúwbPçIekòipV5ß¼¸£÷ÚY»_tÁ~"æËq·v CÀ±e§LmÚÝ »uˬëåi0¤®ºïy¡f {êÒ#àH2!ÄäJOuÔ`$H=çNú=¹]Ègyëk~pû@Xã
->uò¸tÐ6rLºv±¸"îCMßàJ¨(¼AOøc9Ôi3f»T>ÿIGéÙ³AÜí*îÊ©N+D.;PqmèIñÇh÷Ñ
-.òê¼I 8MÉC²TÛ×,cRÜí⨨á]ñ={eù& E;k-D|츥ðôDì7ómqfGK¯t;»-Õ$é{¥`¿^xj
-¬¸Aê¶qÊ
- À²¬Qü¿cKÍgâw6^f<£üBqcÜ(¬¢,¯Æ[íýC P9Ñ°ù´fÅüÊ9a·-îEñHAᲩ«zGÿKG±)¿ø
-ZÊýë%Nó£À¹$¬ÌíH
hצ²]!g¿ª¸eüHBع·¸RUÝcçâÒð+v&*Ú0
-}/CÆöPÿ¥üo2"¡Ìbâ)}1¥mt<sÍ¡ÿÊáèúzGúÜÒvx#X¯\@#°,©V¨ µâR{3U¾ú&ý"]]¤Öû×ÀoôíKQv¶*-Gth-7^¼"Æç'ix<ùj
-ÖÿRç=rUBl¹ `èæ¦âlJÏ"v¼Hò:QÌ:å# õÇ#¾ËéÙ¤ÜL`N,çÓ¡µóß,§±ÐꥢqS7ýâG9eH=u!ô--aÞ Ôko(O~P{ëq9ßA^®
-»WÎæÐ;êhWámÅ3TÇ]»£È)Â1eðéç%Yþ:ÔG
-°Çã·[ËÒQCi(Ý%\lÌH7ó|xòÅvÊÆKÄÞ*ß|¢Uj¥&A·=Õ¼ðû¾ìdÁbx»RÎÿ ³û;ìöb$m~ÄÍ#uëÈEúëؾ+ÆRRww!±ï'\ ½I$+Ji·ì3 ò
-:7rõôÅ#UVå>¼u}yrkærªWOð¡C¾¨8ì_UÈÐhmIþ Ò°a}KZ0A/4-(h9Î x?ɶ^¶Iïõ"<T^¢Eåìák¬oyÃ?©úÙ\fAÝÒc4÷äf"þ:ûR}i ¯ß
íÌz/í'vuvy°@ìítt#úÍ Z1þ@)#2òÏ·0 Hé»r>´÷¸;ËOÈ^#âlmXïÑ7°¥²ùôÂï
-Qb5Ä1èFVr$BÜ
;_+¸
-*¨poL§Ã`©ÉBVµÞãÂ
5lnf»åÆ:ÿg]³÷õoÄ]æ^ uuG>*]Ö
-d@8 49)uUÛMý9ZÀ?Óتò*_ÂÜÜÏDÅ(íYg*X ¨Äè§@ºà¸2ûj¡É»úU×!HcóÕ¯+Vûç¶ÿa+î^U´¬ËzÏ9Ý øb\Í MqGì©újªÁs¹;P5¬=æóF6ySó7
-C~á¹Ëék+"brûh%°~³m_¦§´CS4¾Ôg1vqf|ò½¨ÝÍCsRîfų&9ìYßm{K6aì¾ô»Ðí¼ÖAdª_J!Ncmý·2f9Tu×T õIb§¢ qòeð·¢ÑªßLPótÓ?÷¶Gæ'âåi5ETüßê˶¨á{ïPnULO·½@Vß5âßq'«»®©ò\ót[¯;¬þ×£4|ùÆCxv7bûÑ%CïÓÛ<
Ýê©iﹸq1Ì
-Ä£ÁÆr÷ßsÍjÊg®WÓUú«!âJ\µ
6³$è&-+B®«\hÓ#ÝgôUg²=ÖÖ'òßCQ¤ÌÆGßÌËöãó÷äN3Ô1tÿU`ãzí¦3ÙàÂM ½2^÷Æ{?ÓÈàVì¯ã"~gJèקô\PÙxËLøa\QÇóoIgõ/_üuÍ(¶Cpv±*\F,¯Äoö ðÖ%µ/`KJÞ©}f]ëÈzTn°gõéק»PúlËj ? ¹Þ{R¢Æ]ìêÙa²2Óý^8/;×ÐUZå1×PCVïÏÍ"
-T yÛtÉ0©XÒ#ì
-I8ÉB~¡î"ÈfÊoTííò5å_¡õjõ ?Iȱ
vô80TïÛ A6w
-ÄF·Ë4Ú1ë®åP¹]2qù¡@Â'¶VÔ»v)ØCPØÄé6ÓCô¶ily@.»©#Ur"mUy® T$"'Ä#¥C}=~Ð/ õÓÒûàÁ¥Ý.ÑɺpØóÊI±È_@Í;vô1(2u®ù{@`6¬Y¶k»VYÎ',ô¡|ÒwkQHöPÿõ%,CÙKéÀ(§
-ýv·±òtßL´¦Dí÷Ku¤Í"wO¼¸ìÞд R¿ª"R¿¸G®n__<í°ñê|6gx!EQwôN,øcAx0%få)ÖÖC«÷õõ¡÷9rWé?®¨+² ýâÛ÷¼~cóáKtò"iÅNPQ_¬:;Ë
¯>åîvæ´q¤í}ÙÃ-\÷êG°}KDh¹³®
-Ô.8Ï,npàü7½u>uHj,¬SÉ}ájܵA¢kË;r¼ mQΧýtc»@£ eèÚSOÉÓÿê¶s©ÈèÄ&{ ÎNÇß9Ä9ð>9P64^bÒÀ1b4ýÃe´f]ÓNº[± _{]>£Ñ"ÅMoÛ
-¶·£q/:Ò"ÜäÝÈq HGµ ]JܶLâSèåõðIq=Éâò5´'û+b¼8Àk>ÛÖKªÁèÝÏb2Ô¤¤µ<x?BÕªLÃeÁWÞàþôÇVù¥ÑãÃA°'Þñ0uà3n¶£ÍÆSm´¶/Êá¡»ô@¾¥ÅÑØè@Dp ^Ôc©0iÿK×s4×1÷×ú^QÀöó1ðïC Âj}¾
ÝÍÁÖç¶zyndæµ6cP|\®ëMQÞg{Î_Å¢²½Þ1à¸h}ðÝü.2dK¹¨ ¹:òût»å1¯Ó!%ÝÞ àeL̼¨ÓðÑMqäÎìÚ+<¬ G%lÈn-4Ñ£=* ¸ñûìH²£µrè¤ãÀQ,åÕ×TH&Îå1jI2òQ¬|Më.øâ.«s¸
-ÕÞ¼¯ß¬¾®cFuv!çÇ1B£|-kÄ£ÓYá WÕlPµB¨¤
-±[}zWL`ƾûP¢Nµ4(p&ù ÖAzm¬pÆ[¢që9Öõ¬ýJ
â:¼3öö0J*UA)ã¦ZÌÕ³p×Mmu³üªË/ÐeXÇNE«±,ï²\fܶßCÑvúØÿùÓM®
-â@ßI×ßøàA|Ý}»Ò÷ãÖ; :±ûàÇ*}õ©!Èܾg7Ñ÷pE_ÔÒäÞÊ&ðÞá=jã2
$Ê·',ú$±§XäÖVgqæïë
-&¼73Szn/f±á£mâ-³£_e'Æö´"¿þ
W³´år"êÄó³£³ã`cnÉ^ghY~´-=æÌW½h?ãØdãr¦¾Ë.|<T¾Ê´ß,;4²~ÿàá¸épSOü~òùg¦ºx(
>"ÊL4 oµHaQ$ÂÿábXBfSsÿ\Y] ¡sÉÂìÅ®$:È
-*îÉu¸ØNók2 -ò [¯<trêäÍfÄDZ á-}Q^,¸Çt»+¬]#¨¡òIúT9Ck
§-£k«´H yÒX`q9Ò2Î=;¡â'y#¨¤©qVê'R-lÎÊkwCËZJôþ¬EZ£Û`ûé5ð3ÛØ
ùlñ¹0EÊy¨ZøDa!½óv^â< ²Î{¶§rÆ&V>Ù+«Tp5nbk'_¶dôFg§$Ê<ä°gV.LÏ,²½qOóçbzh0Úë\h©@½feã]sjÁ°UmWº×ø^·
å^I§Òùë5ÜHns¸©Sr)àÁ9ûxEpsë]6÷XÏx0òfuSÃB¤¦};@ÖÈ($Ï6:&XCE"bÕEmiLnP"L°.ËÁß/ø sß`gêíÂRÜ ;F(g3³}ïO§k53ø¶r4áë_)ÒÆvè>P6Xá,¾y
-¥lZäßs?{jºb ãÇYX÷+üi½Oú=~M"½Õ¥GéÑ7äDZ_Kw±UÅsåhgp_cO©°À½²¹>Q>üÑqÒèWm8s#Ü4ºZËÙ¸pTåèÂ=Ø!êá%Q±ÁwÒØDáW¿
-U~º¡EÈ}ì¸W_Æl¶ïºEg 4Üõ%ËGcìÂÕÞ»f|$å
-^þ>¾þóÇ4[úãÜêÍ÷ æi
-nJ´¼
-?ùãî»Þ?×ðüêXÍ%·$ü
¼ÂSº¨rØѳ´oRRMkíÔ3]ZÂTÎ¥Vµ
-&8 '§õ"ÚÖì{/ð%ö<¡íÏj9 Û¿IÐB/5 OtT ¤ª<Z
q.*|1¶áVO5Ûǽ+&Þr´!!Ý2SzuåuÚYC
-yY eêàG1ò+zá¸ÊâÅ:»Þ æ¿ø×\O¦´R(b¹XSÄC³ Àó°ÿb³i¡Åä´T´'-ÏíóÂ?·R`õñKB×*ÿÇ3ºïËåòϨk¼ÛPÖ·7vÃίønÙ 5BªÖ>¿Ímb&fðbåñ«H-ÃexãHl¦º>Íý.cØÚõJñ
NwüKYý@6q¢]^iy6QåtPúè²öÂ}Uéó8Á[ñ¸Î)ö^ûGNüÇô² f¾Æ d'Dù«õÒNf^nBç#´W=Û@'LºaÂQëã<dCöE9ÓW¶kWÏ_þ}$¼v¹º«ÄcÌ[+¿QüX«ÐJãhäQ%]d3t÷¸?»+À h[ã9@Ðò¾ÐÄ«1Þ¶kî}»\Àum®=(CÛjúè Ûõ×jM®M%µÉR¾jo
+g©÷¬jQ©wmÆ5«ó´¿ÉXpìJC9lSâ!atJ}¤=Þò6ñú®ªëÉ11ÝF
³äPgçÑz2«û-ǺÌFF²GÚÍIðSÅÄçEe«9øÞM82d} ð YÑñB*B`!¨Lþº±Hçã5~÷ï9N¤¢Óç'¹¼ÂB¿)%~
òó[^n£4
å½d ±+×2µ) ®ôùú¹Ãö]AæÛ>¸CIBêǪ
GçÜ-ÌÚ)\9¦¼Þ% âi»
B(fSï$+,4§Â*1·¿)Ò˳BÛ\gêåuä2½ä\é5z°Òf§#5¼rBQ8¸/zi· ¤DôSJÔW¼D7ðü¶7ªqñõ÷ÛÊÕ' çÁ.^¼]aC¯jÓ±ºÒ1
`#á´ÐK±ë8CÊëÓ´9§8tÄúý,Ùð1ãf»§C'¤¢
GªM2ù(8Ì2tqLÓaïÏgý!xvV(A@ù¼÷qYÜvùÿD»lt©z"`6.Ú1ëK³pb¨bípEã¢I¦ÇidV¤`_|Üfrç]9ºiDàýdCùÆÝ_¼I:Öï
ÜõJ8¨!AúûáÝîÁ"Ç(ìRz;ÉW} }õ"û·l±¦
?óÑÁ/ @þ¢uλÎDqÑLÏÅ«ÃCþï&±©toóÈ®Yp
-Òº±'PNõ)î4|ÐÃUS{ÆÝs5wVnÙlx4×MuÌJªÛѨ
-TÚfK£Z, íÞ²+Lí)?1Ü._oå5gEÆN7ÑàýéÛÜxýW3Öp/äL°©Ã~<rj Õ³jçÃèqá§i*õÅxª¹`%§±M ³ZÉo¶©{x>ØIVB}¹Z|_J]ʨúµ*LTÚ6ºT:M#ú;däâݸÊî\°êÖa¡*Ô¬ÜH-¹8nvó-EgHB2ïNÝ.Ê dùÅr½é£á²Sã?)í{±<Í*{6sØ
,ñ&Ö[cà@9³ã¸!Ý0}ï@þ'mà=Ò¾?JÁwv®)Ãã3XÞx
g_O×~Í3äY²poÞæ¤VðE=yäè`±Ã÷¹ü¶¢(ªÁÿif ý §ÊШUD`<Çuõ
-íÛu!Lf¶¹?{ q"÷eGê×æècè-?,$Ô£Â[¦½*fû:òNJòøд@>Áý°Àñ}9°-ºÖàdçµ.|¶¼AÔËÁin¡ZaÌ·¹¬gÉ>a! ëÊÀEiXu?ì;ÐTË?²Æªû÷åYL .dÂm{&DÐ\CíqáÆMÆ©¶´ëX0o©Q6F$³ Du:äò NLþ
-oýJ¶hIEÑgÌÏP¾`Uÿ¶ÊÒMøJÂ"NÑ=ey ).¡Á»{ ÌQ,^ ²½Ûl-¸£HÀl °É¥ÆDÃqzE 0LÃ\tüÌU¨¼ÒêRgÃP¥jâRèRt(Â$
-¸É£àFG|ùË{%]¯ µÁtèñMK°§éa®£nïVcpñü òÑåkë!KoûÐd±HÌ`Ùl×WãåpZ
-¶yZPr at EYIáE£Üb>à[lªÄÎ6tÔP9ëðä!UÝTj9É©ºÝHNù¶êÊÝ¿~n(d-§ c¬³¾[´\©%[²=Qk"¢çÈÓ
-ÙòØOÇ;ä!ød2frNkÒïõÔÆ'q@
k²ôgB1ZMæÛù¬hOv-÷=BLh¬KìôÉ!¤Ð]?£?XùÜ~uùGÂjùþVjPyìa8aòe0qÓ<Þ¯¸5ÕH´²0ÿ3#Y,f°ý¸Ã|GäÔÊ;U ~@SÎøv¿îÞ¹îÃdÙ*©)j!¬R¦ÄvÎøú8E1;
-¬øDùãÛHͳ&Õk.!<´U½Ý¾|J ì´Ps¿sKá9¦§:.pÐ6Ét×mG¬²®LxPô ¼AnëËGûSüÔÆÒòpåñþ7ýmºÍü«WÙ!ø?Épã©Ë>{Ὡd(x~t[FÍøÊòØÇ<&&R{@9.)¢·8ëGúXd wµ¹
Ñ3ÖÔ$C]@fxHçkÑÀ,ÔRv T´cÃêçPST¿y¼á«æ_fÞȽy×ØræÒãÁ.cKï
%ä|ÓÆ# r~sSÀFÆõB>"<»ásu;ºÝ83_¶]4&^²Ó¬ÈÜR¯Ë#7iµ¼ÙNÚ`éÜSvSà¬Pù>þHÍ÷
-õa
°þàüë Ü(ýrPÓ ?8Ñ^À&îþY
-Å·*!(@P[xG×êÁ¢pF$ø wÚ¹)}Éá麰¤ôÚ
-½N?¹:M`wiåÜû^KC7ÿSs
ðèâÔKh6GÜà5Øâfwp<Õ7Éýw
-붪ga«[jVAWÖ±è5Ku° ÍÙÙ
-ÃOgÒgitÅzMi77IÛn@Eò]ÿQWáKÂÆxx$!ÀNPn®ºéÝ{Õ¹¼ü]¸i_ËüaX_¥¬9Ç«¤7µÉ¹
-cTÀ×b*ì㵫wà<}y¬Bîðôº·K
-?½Zrd>ªAкðçþY5(Àò§Uesñ´ÿ·eè·G_¬/Q´ªPf
-'JÎqáÎW/"¤BÅÇý1C§ì_Îõ©Ubü»`ÿù_<ÀˤæL¶íE¤2°Aö;õYøª#Ö'pE/¾ÖÀ~~QÆÿg:ÝD2®!Ò«yÉBÎX?[\yo¡dTÕÁ1ĵÙcÕÒ4Vçàl\NìfrnãHÈþ³$*KO:§»Ò/DI0fP!ûÃcn_&»½@ô1¯ÅÀ UXõ²wø~
-| NDÂ[pñ<íå`ç«mpCü¹ÑÀºã´OЮåÁXoØõáßÞ?{;÷к²¡NUö^Íg_¸¼C«ÑàwݺTeÛ½òRÉÖYëÆE@^}Êã/@ï¬"úúÚ±Mþ~ &tUÙUâÀºµýò´Ï´"¿:Áì÷ÓÞ ÐÓfB̵?C)W+¯w¤à4\®7>! ùX·ïÄxÊTE½âZÞùOÉî3Ø(þN|4ÁüÌ(ù¯=qS÷Ø¥«ÎÊrÊð{^#Ò:9Ë×5Y®èUQª&lÒ~ØÕϲÊT@Æy7Ø0×Íò´wX6y5µ;Ä9RìÒb_2H½ðP³Ù~÷§10pg\r!º°N%á,É9Ù
-¥wÌ6 ifÉ8qÀ¥mtI Mj§¦ëLcìñ¨÷IÃýXáfýñ^°Ôù¸K£!§«]jÊfñ½wt¹Ã3Üf â@#[x6ó>õ¿NgØjû3ª÷ÑÄr/@{bíC'fÄê²Qäaud>UPT¼B×û6$Û¹]vÙ©0}X§}T÷5XMoRÌ¾Ï ÊÐíOánô Át§3'myùº9ßyà¯Ú_ÒÈ*}01ÐXúÎqYE÷Í:0ü[ïx³ý#º×wÐÌ5Ðs«WC)LN5Øÿ0¼ !ç¦ÿJÇP:·õßyaZu¯Úî&ëÚcÀ- N»,äÛ´fBÄÓì·çò8hêÝÄþÒ´¨ùZ×à"Nϳu¾ÄFUW¸¤ogÇÓY>ñÓßä½-nß',ÇyÄÊð yÁlÇú¡ÝC,ªº¼«Ì«À%6 õ¾WâåRU`êð<,/%8£ÀO·?Q´ë
-QMLv)ú´¶«ü¦ãbôJ\>D1 yuéÿw1Eñçbb±T¯çÕÁàè˧o¢bè%2õÄmÈhúñJÀ%K¹Ì>åð¿d4㪦VçÒaX>>}~MÚUà4pÁtüs*³;Cä?ZS0¸8)ýE¢âà1lÏ´Õ«{ß> ãÁFƹ»o»¾µ÷g.Çóyµ¤/Tî£ #üÃIV)Ì4
-4õéwwÈÓ«+lÝ£Âlí%å{&Þh·¤bjßû",TȱlbÊ¢2fÌÂÍXÝîý$ÎÀ-%ä¢Yµºÿ·¾>ãD0cÊý]¯0>î(¦×4±w â;è9\7»¿Fÿd¢fóQ³ùy±Z3´µ
-÷ÚYFÞFKE¤]/,´ÿ¿N6f̦¶¯Èf{áå&·j
-¯0Ò¢àóô#~58hÑiÍ
Âl"áPNÿÓMG Ùñf¼4iyÙÙ
-Ïï½°:Ç&eÁmÆ¡ÒiÎäÝne§¹´Û
-¢.v
Aiþ´ûñÐ[02àÊ_p¦Ðúد½8µòñNZ8¦5h©Ü ç4¨ËæÞ±}Y\=å»®Öä±_ÃZ1NYi£?<¼K÷wþ´w÷pß©^YÎæ7]á5Ǹôÿ-2³5E6êéöý¨}éËÉmJ^ïȬ«>÷°¼²áRC_n>èß°±ß
-zÀKù_Lº²4,3ÕY¦!HHh\Êý×SzX#P4Å
-²xÍ;;HÎÍAÊe¯þ½ æÓqKÛJa¢Ä0BÃ5è:!Áù)Ü
-~MÐ
i
°1Æm' ;EöZö
ÅuÈÂg°PWpywÒQö[D ÁOÞ,ë»^<±%håÿëWÁJÅ`ì{ÒxÔ¦;tFá!Yc½i(ÿ墵FoÓß&#bÑ3ç&tÄ_¯s/!<ÙïÚ
-í¬¾Ì °LwÝÎ×tЩMWmiGc°!ÍûïO7´¨¨¬ñ Z/(
÷+*p,pÖØ?ç¹HñÄÊgW)QÀ Â
-éíTëRµûâËwèüÉffIEbÚ/Ëxãuµà¦[Õ¤å
-¡ñö/cgQùk?tHtèáþ[ùÎnÛÐqËî×zV§V{7¦¡7GÚýI½èË\Csö13àu÷b ßeû Éò¨ãÒ
º§ÆKÚ¯WÜUlé}¯æ8Kë}ëDÛS÷5tXÂÄ|µ!pÍh] DÄuå7!ŹY´¥÷*qvtHeÊýp
-¤:S~p6}¤1ptp°Ø£qA¨lúkn>IÁ5¬Ï¥)¢Çç c7n¶XoaJñéíNp+÷O8G÷=ï~+Ķ·ÜveYµïÂ5÷ w
-/Æ Ið*¾®Îå(½äG¯ªúJÅ'-?JÔ(Ó÷ÌÁ3§RéÛîªZ!5.¤Ö\»Ò» E^"w
-,I7L#'hp
¢Í¾eyÔ{ÉS[Öd c0 Ø^¯s{erEÀ.SÔWÜÓ²7ZMÄ5þ¯<ô6¶ÁjÃLÕÜÊi5Y¯OQLõ¶m~íCY¸å@ G-cÌs²9Ïñ3_æûz¼ù8í$yÅ1W½Ñáùphêg·¹rõìäéó
p²2X°-âkÁ^¯Ùµ±÷ûÞ®h^²ö
-/f_{¥ÜÂÎ9êë´ÿ§ö'9úÂ
=vÔþãÓËNíãƼ¬åÍÍ8iÕ±ÀS6{aQR\B&éI!R ¯M/_TȲd
-l9Ý°aÛ»òDaèõ*É\µÒ;R×'ÑýÛÚA ´èg´äQÝiPsO;¥R¬¯°b\D¼ñ£ÏXÅu|Ôg¢ÍF½@Á5¥u,IzÂúBù¯×ü¡Jm*sE×¹ì'lÁ48mºhR}y¨÷+Ïn Øaõ.E½°-zõª
-¦à®;Ô>·ÀBüàüieQùdL«ëre׿оê
-y)Y2ìº=ñ4ù§Ãðg-¾^Kºz5éW»Ko1(¹ÿs.ÃeM1`dÎäî? -Ä·ièbru4Ú3ÝûÏÓÁËÎnzsJ¨MìníWú±vzõõ§Â+ߢ hj0o£×°©ã!·¹µh AzÌÖ}FRzK]¶F2Y;Q7õcñ2zÕÎ]på¶&DV3ïZ:r× Üv{[;cÚ¥ÁÆÕ÷3´ÊÔ
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/chnosz -r 375
More information about the CHNOSZ-commits
mailing list