[CHNOSZ-commits] r385 - in pkg/CHNOSZ: . data inst inst/extdata/OBIGT tests/testthat vignettes
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Feb 8 04:57:39 CET 2019
Author: jedick
Date: 2019-02-08 04:57:38 +0100 (Fri, 08 Feb 2019)
New Revision: 385
Modified:
pkg/CHNOSZ/DESCRIPTION
pkg/CHNOSZ/data/refs.csv
pkg/CHNOSZ/inst/CHECKLIST
pkg/CHNOSZ/inst/NEWS
pkg/CHNOSZ/inst/extdata/OBIGT/SLOP98.csv
pkg/CHNOSZ/inst/extdata/OBIGT/biotic_aq.csv.xz
pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_aq.csv.xz
pkg/CHNOSZ/tests/testthat/test-recalculate.R
pkg/CHNOSZ/tests/testthat/test-revisit.R
pkg/CHNOSZ/vignettes/obigt.bib
Log:
OBIGT: recalculate GHS of HSiO3-
Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION 2019-02-07 06:43:08 UTC (rev 384)
+++ pkg/CHNOSZ/DESCRIPTION 2019-02-08 03:57:38 UTC (rev 385)
@@ -1,6 +1,6 @@
-Date: 2019-02-07
+Date: 2019-02-08
Package: CHNOSZ
-Version: 1.1.3-92
+Version: 1.1.3-93
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-02-07 06:43:08 UTC (rev 384)
+++ pkg/CHNOSZ/data/refs.csv 2019-02-08 03:57:38 UTC (rev 385)
@@ -43,6 +43,7 @@
SPRONS92.1,"H. C. Helgeson et al.",1992,"sprons92.dat computer data file","titanite: @BH83 + "Gibbs free energies and enthalpies were corrected to be consistent with updated values of Gibbs free energies of Ca<sup>2+</sup> and CO<sub>3</sub><sup>2-</sup> [@SH88] together with the solubilities of calcite and aragonite reported by @PB82 "",
SPRONS92.2,"H. C. Helgeson et al.",1992,"sprons92.dat computer data file","Ca-bearing minerals; "Gibbs free energies and enthalpies were corrected to be consistent with updated values of Gibbs free energies of Ca<sup>2+</sup> and CO<sub>3</sub><sup>2-</sup> [@SH88] together with the solubilities of calcite and aragonite reported by @PB82 "",
Sho92,"E. L. Shock",1992,"Geochim. Cosmochim. Acta 56, 3481-3491","diglycine, alanylglycine, leucylglycine, and diketopiperazine; not present in slop files after slop98.dat",https://doi.org/10.1016/0016-7037(92)90392-V
+Sho92.1,"E. L. Shock",1992,"Geochim. Cosmochim. Acta 56, 3481-3491","diketopiperazine GHS",https://doi.org/10.1016/0016-7037(92)90392-V
ZS92,"C. Zhu and D. A. Sverjensky",1982,"Geochim. Cosmochim. Acta 56, 3435-3467","F,Cl,OH biotite and apatite endmembers. GHS and V were taken from Table 6 of @ZS92; heat capacity and volume parameters from `berman.dat`.",https://doi.org/10.1016/0016-7037(92)90390-5
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
@@ -122,10 +123,10 @@
LH06b.1,"D. E. LaRowe and H. C. Helgeson",2006,"Thermochim. Acta 448, 82-106","pyridine and piperidine",https://doi.org/10.1016/j.tca.2006.06.008
DLH06,"J. M. Dick, D. E. LaRowe and H. C. Helgeson",2006,"Biogeosciences 3, 311-336","amino acid, protein, and organic groups",https://doi.org/10.5194/bg-3-311-2006
DLH06.1,"J. M. Dick, D. E. LaRowe and H. C. Helgeson",2006,"Biogeosciences 3, 311-336","amino acids HKF parameters",https://doi.org/10.5194/bg-3-311-2006
-DLH06.2,"J. M. Dick, D. E. LaRowe and H. C. Helgeson",2006,"Biogeosciences 3, 311-336","Gly-X-Gly tripeptides Cp, V, and HKF c1, c2, omega parameters",https://doi.org/10.5194/bg-3-311-2006
+DLH06.2,"J. M. Dick, D. E. LaRowe and H. C. Helgeson",2006,"Biogeosciences 3, 311-336","Gly-X-Gly tripeptides Cp, V, and HKF c<sub>1</sub>, c<sub>2</sub>, ω parameters",https://doi.org/10.5194/bg-3-311-2006
DLH06.3,"J. M. Dick, D. E. LaRowe and H. C. Helgeson",2006,"Biogeosciences 3, 311-336","glycine, [Gly], and [UPBB] HKF parameters",https://doi.org/10.5194/bg-3-311-2006
DLH06.4,"J. M. Dick, D. E. LaRowe and H. C. Helgeson",2006,"Biogeosciences 3, 311-336","methionine HKF parameters",https://doi.org/10.5194/bg-3-311-2006
-DLH06.5,"J. M. Dick, D. E. LaRowe and H. C. Helgeson",2006,"Biogeosciences 3, 311-336","triglycine Cp, V, and HKF c1, c2, omega parameters",https://doi.org/10.5194/bg-3-311-2006
+DLH06.5,"J. M. Dick, D. E. LaRowe and H. C. Helgeson",2006,"Biogeosciences 3, 311-336","triglycine Cp, V, and HKF c<sub>1</sub>, c<sub>2</sub>, ω parameters",https://doi.org/10.5194/bg-3-311-2006
DLH06.6,"J. M. Dick, D. E. LaRowe and H. C. Helgeson",2006,"Biogeosciences 3, 311-336","[Gly], [Met], and [UPBB]",https://doi.org/10.5194/bg-3-311-2006
LMR06,"D. Langmuir et al.",2006,"Geochim. Cosmochim. Acta 70, 2942-2956","scorodite and amorphous ferric arsenate: G",https://doi.org/10.1016/j.gca.2006.03.006
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
@@ -162,7 +163,7 @@
SLOP15.4,"E. L. Shock et al.",2015,"slop15.dat computer data file","adipic acid and n-dodecanoate: "Gibbs free energy corrected to be compatible with the equation ΔG=ΔH-TΔS for the formation reaction from elements. See footnote y in table 4 of @Sho95."",http://geopig.asu.edu/?q=tools
SLOP15.5,"E. L. Shock et al.",2015,"slop15.dat computer data file","n-octanoate: "Enthalpy corrected to be compatible with the equation ΔG=ΔH-TΔS for the formation reaction from elements. See footnote ab in table 4 of @Sho95."",http://geopig.asu.edu/?q=tools
SLOP15.6,"E. L. Shock et al.",2015,"slop15.dat computer data file",""Enthalpy corrected to be compatible with the equation ΔG=ΔH-TΔS for the formation reaction from elements."",http://geopig.asu.edu/?q=tools
-SLOP15.7,"E. L. Shock et al.",2015,"slop15.dat computer data file","hexanol, heptanol, and octanol: "Minor differences in Gibbs energy, entropy, omega, a<sub>1</sub>, a<sub>2</sub>, a<sub>3</sub>, a<sub>4</sub> and c<sub>1</sub> values compared to @SH90."",http://geopig.asu.edu/?q=tools
+SLOP15.7,"E. L. Shock et al.",2015,"slop15.dat computer data file","hexanol, heptanol, and octanol: "Minor differences in Gibbs energy, entropy, ω, a<sub>1</sub>, a<sub>2</sub>, a<sub>3</sub>, a<sub>4</sub> and c<sub>1</sub> values compared to @SH90."",http://geopig.asu.edu/?q=tools
CS16,"P. A. Canovas III and E. L. Shock",2016,"Geochim. Cosmochim. Acta 195, 293-322","citric acid cycle metabolites",https://doi.org/10.1016/j.gca.2016.08.028
CS16.1,"P. A. Canovas III and E. L. Shock",2016,"Geochim. Cosmochim. Acta 195, 293-322","citric acid species HKF a<sub>1</sub>--a<sub>4</sub> parameters",https://doi.org/10.1016/j.gca.2016.08.028
ZZL+16,"K. Zimmer et al.",2016,"Comp. Geosci. 90, 97-111","data listed in spronsbl.dat",https://doi.org/10.1016/j.cageo.2016.02.013
@@ -176,6 +177,7 @@
CHNOSZ.8,"J. M. Dick",2017,"CHNOSZ package documentation","Incorrect values of HKF a<sub>1</sub>--a<sub>4</sub> parameters for [-CH2NH2] were printed in Table 6 of @DLH06; corrected values are used here.",http://chnosz.net
CHNOSZ.9,"J. M. Dick",2019,"CHNOSZ package documentation","recalculated values of Cp (those in @AKAE19 appear to be calculated using wrong sign on ω) and enthalpy (using ΔG=ΔH-TΔS and the entropies of the elements)",http://chnosz.net
CHNOSZ.10,"J. M. Dick",2019,"CHNOSZ package documentation","Tl(Gly) and Tl(Gly)<sub>2</sub><sup>-</sup>: replace Ti with Tl",http://chnosz.net
+CHNOSZ.11,"J. M. Dick",2019,"CHNOSZ package documentation","HSiO<sub>3</sub><sup>-</sup>: GHS recalculated by adding difference from SiO<sub>2</sub> [@SSH97] to updated values for SiO<sub>2</sub> [@AS04]",http://chnosz.net
LCT17,"A. R. Lowe, J. S. Cox and P. R. Tremaine",2017,"J. Chem. Thermodynamics 112, 129-145","adenine HKF parameters",https://doi.org/10.1016/j.jct.2017.04.005
DEW17,"D. A. Sverjensky et al.",2017,"Deep Earth Water (DEW) spreadsheet","other data from Aqueous Species Table in spreadsheet (see detailed references there)",http://www.dewcommunity.org
DEW17.1,"D. A. Sverjensky et al.",2017,"Deep Earth Water (DEW) spreadsheet","revised with new predicted a1 for ions",http://www.dewcommunity.org
Modified: pkg/CHNOSZ/inst/CHECKLIST
===================================================================
--- pkg/CHNOSZ/inst/CHECKLIST 2019-02-07 06:43:08 UTC (rev 384)
+++ pkg/CHNOSZ/inst/CHECKLIST 2019-02-08 03:57:38 UTC (rev 385)
@@ -26,6 +26,8 @@
- check reverse dependencies: ecipex and canprot packages
+- vignettes/obigt.bib: check correct year for CHNOSZ reference
+
- documentation links: after installation, run doc/mklinks.sh
and insert the modified anintro.html in the package
Modified: pkg/CHNOSZ/inst/NEWS
===================================================================
--- pkg/CHNOSZ/inst/NEWS 2019-02-07 06:43:08 UTC (rev 384)
+++ pkg/CHNOSZ/inst/NEWS 2019-02-08 03:57:38 UTC (rev 385)
@@ -1,4 +1,4 @@
-CHANGES IN CHNOSZ 1.1.3-92 (2019-02-07)
+CHANGES IN CHNOSZ 1.1.3-93 (2019-02-08)
---------------------------------------
BUG FIXES
@@ -162,13 +162,21 @@
- 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.
+- Move SUPCRTBL updates (As and Al minerals and aqueous species and
+ SiO2(aq)) into default database.
-- Move SUPCRTBL updates into default database.
+- Values for SiO2(aq) are taken from Apps and Spycher, 2004. Thanks
+ to John Apps for providing the document.
-- Add test-recalculate.R to check that some recalculated values are
- correctly entered in OBIGT.
+- Recalculate GHS for HSiO3- by adding difference from SiO2(aq)
+ (Sverjensky et al., 1997) to updated values for SiO2(aq).
+- Add test-recalculate.R to check that recalculated values are correctly
+ entered in OBIGT.
+
+- Move superseded data for aqueous Au, As, and Al species, SiO2 and
+ HSiO3- to OBIGT/SLOP98.csv.
+
- Add or update glycine, diglycine, and triglycine (zwitterions and
ions), and diketopiperazine, [Gly] and [UPBB] groups from Kitadai,
2014.
Modified: pkg/CHNOSZ/inst/extdata/OBIGT/SLOP98.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/SLOP98.csv 2019-02-07 06:43:08 UTC (rev 384)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/SLOP98.csv 2019-02-08 03:57:38 UTC (rev 385)
@@ -16,6 +16,7 @@
AsO2-,AsO2-,AsO2-,aq,"SSWS97.3 [S98]",NA,11.Nov.97,-83650,-102540,9.7,-28,6.9,3.2101,0.0554,5.7305,-2.7812,3.4104,-8.7381,1.482,-1
HAsO2,HAsO2,HAsO2,aq,"SSWS97.3 [S98]",NA,11.Nov.97,-96240,-109110,30.1,2.9,28.3,5.5984,5.8913,3.428,-3.0224,6.799,-2.4438,-0.1158,0
SiO2,NA,SiO2,aq,"SHS89.1 [S92]",NA,13.Jan.89,-199190,-209775,18,-76.1,16.1,1.9,1.7,20,-2.7,29.1,-51.2,0.1291,0
+HSiO3-,HSiO3-,HSiO3-,aq,"SSH97 [S98]",NA,18.Sep.97,-242801,-273872,5,-21,5,2.9735,-0.5158,5.9467,-2.7575,8.1489,-7.3123,1.5511,-1
AlO2-,AlO2-,AlO2-1,aq,"SSWS97.4 [S98]",NA,07.Nov.97,-198693,-222125,-7.22,-11.9,10,3.7221,3.9954,-1.5879,-2.9441,15.2391,-5.4585,1.7418,-1
Al+3,Al+3,Al+3,aq,"SSWS97.4 [S98]",NA,07.Nov.97,-115609,-126834,-77.7,-32.5,-44.4,-3.3802,-17.0071,14.5185,-2.0758,10.7,-8.06,2.753,3
AlOH+2,AlOH+2,AlOH+2,aq,"SSWS97.4 [S98]",NA,13.Nov.97,-165475,-183300,-44.2,13.2,-2.2,2.0469,-2.7813,6.8376,-2.6639,29.7923,-0.3457,1.7247,2
Modified: pkg/CHNOSZ/inst/extdata/OBIGT/biotic_aq.csv.xz
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/biotic_aq.csv.xz 2019-02-07 06:43:08 UTC (rev 384)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/biotic_aq.csv.xz 2019-02-08 03:57:38 UTC (rev 385)
@@ -1,4 +1,4 @@
-ý7zXZ æÖ´F ! t/å£à¯u4] 7Iýúb¿ñ9²¶Ë¦¨TB;qý"½qù¦cL;ù"ß<²ëbï¨gò;ø¥Kä¥f1Æw?ozÆCþaì]IبÝ5i*U9X×0wã±tGØꪥáýA¢æYo|Û¥XQ${ÃÏ16¦\O¯]x¡t% È~A2Ké¹¾2õ
+ý7zXZ æÖ´F ! t/å£à¯z4] 7Iýúb¿ñ9²¶Ë¦¨TB;qý"½qù¦cL;ù"ß<²ëbï¨gò;ø¥Kä¥f1Æw?ozÆCþaì]IبÝ5i*U9X×0wã±tGØꪥáýA¢æYo|Û¥XQ${ÃÏ16¦\O¯]x¡t% È~A2Ké¹¾2õ
MöÜØëÏuÛ2CûÄíl,ÚóÌßÿß ðõë>I,t¿bßPKä7t(emA-PÄQÀ]Æå ·8Ó.fø|öÛ©V[ÖÎè=ÍñK¸®ÿVTmÚ~vwÓ
æ2/ ѺWaÓás¼-×ú¢Îp÷lVsýáêÕH¬ßuÔÑÍ ´%²XFöîk#ÅéêÁ£èÿ»+ÒÇ(ë¬m5St5FaÉajNÑ8®à>zÄÑ°3MwS%Ò°ÛÚøî+Ú3x¨Ù`cw`¤; $(ú¼ýP>ºµ>ò1b¿ºòQAÊáîÈç?>6o©=Ñ-¥((äpNÚÊÄiéä¹ÒVOL·A®ï9 c»E3ñÂXP¸¾¼kjsÌóíÔ¢Y!&oÀªw(Ò3³+"îÕÖÈò; ±£R6eWëÎ![˼îör¿O>O»<¹ÕÆË&ÔºYÙ²r|¸¡àkzí:$6"&x´½{D71t\Z²8dwï>*h\t½tyï)BÿîêÂn<ç9lÓN!3ÏÙz ' ú}Üí±nVº,0uVeåÈܼ¤
jò×Þ|B´d^7&KK¾-
@@ -88,11 +88,9 @@
úÚ±^Vö¤4-o¬½K{¸´ÚÝÅ÷1<7É
cO_´®2Á¾&r.w
ü ÷³èÀ#F5ÕV<ùËzñ\>¶v}8
â@òt·é°§a
±Ñ¿Ò'@½µ;å÷?e3¬ÂF±@m}Æ+/¦ºu*
|0Õ]ãM×=Õ¾Ù;eu+Ë]åÔ%âÞÙü®!d"ý϶¶À.Ëúô8
înÒè)«®DÀMñ?
-D×EÓ;y9ÔË.¡Å¹Üäo;[Ùì¹5KäVæÜÍ4Y (å^|
È`¦Á¡`å¢Æö3ë{IÓ¹ú,Î:©½w?WÈOpÈ÷Ì-1Æøb^¬½ü×Å=úÔ²áOÈ*YmEUu§ãÿ«ýÝÝ\ EÁ`¾ÁZt8g¿5nåÒ×1ýò Mg#·lÅ .ÉnëÐÈ+ pOYEâvàÅf°íu4uV}Ji×èE¹w¼y`ömß÷Ã9ma¢iø½ÄÐÝo¾R»>¤&f7Ö¼;»úЬÉå=lïHØ¡³&E
Ò&L(ľËûL4É¡½»(¦d£½IºÎN-/Eïb9Ý:ôädÑ6Dl ÊóØÓ"_;os¦wq½vµ0_Û¥Cm{ßê¶)PiTë
-UÃÍ°-*˧]Ãd]=ù¶WP
-«#§½Í5}x$®?£bûAkòÞæ9±êÈ4ýͪµôsä§GbAióͼ²Å Im»to±ñsQú3~$Ñ?²½tOä+Øu#Fk:¥áÝé<0jXÒóÉP(ùØý2fõþ½!FåÊß!äÅÏñáÇ»âÁ֪ܯ½lƸtE¬Æ\¯¾¯%Ø©Ç]ÿÁ[fa¾wûsì}]tù5zwtªV?åäNÅ-ÄÊ¿8ØT;Eõo/R¢|Iyó¯Oßö¾å6Y°Äf?þgÏÅ%JjÕyýËжö°IÄ®{(1FÛª§×p_p8iyEÐgõ&¨u_³2²³Ç}Ú£â.ýÀ/]¨©VÓ`DFjnÓ[ûPÅ6!YÜت³Æ,<Û_ÁxMòðª®#´;QTÍÖ¡ñY kã»Í25~-$-µSº¥
-·`ú
-¿;Ì!®zÖûò{¢çÿ>ú}C¾=¢ñ&:Õ:Âãµ}Búx²$Á¤FËèfèÆqwY¡©!ò ^çúPaÃ
-2æÈÙJö¨½HÊp¾¿ø}ölð}p¾4Pù²ÚßØî¬h,½¸VPn«i.ìÛsyM £÷@*å¤~ò¥´§ qe'½GÏã/]¼viZÖ`qð¶aC,Þµ¸tÒ[°Bg{aì-ŧÂü«B*<½ªãX) w;q1RâÊ"íSêDçÅ'O´Rj(iª¢ÌAÂÖäf¼¢æð\ĺپýÝg1|pFÎ
-¸V´äXãß³Â*ËygÔ¯/»&E\2CçûÓÂuðï
-¡BJvÊXªß ¨½ *Ⱥª|m§>_^iì¤=E÷êÎ.°LTfçV9¾ QÊò'e§[OëÁ̶ók<ÙwkZ 'õ®#ñ2*w¸_cßnè('Aè](6½ùÙå©ÞÛ¬ Tg~Ô®¸nö,0Ф¢Æ½¤66Ä!¨M FÀÈ;9L7òW£¤Eoè "3HY²ºÔtQ®Mã"&f#· \6ã±åOãYÆÕ:G=î-MÁrÿ,A¾ãA-ÍÔwV8[
pQò¶ÞR×8(ñÝÕ¥RâuÆIcLvÙ¿¸b1>x£yçÔ3Ø<$ÛÏÒf_Ê·¡Dð>k<¥ ´îªèÏ ºhöÞ ëjDZÄgû YZ
\ No newline at end of file
+D×EÓ;y9ÔË.¡Å¹Üäo;[Ùì¹5KäVæÜÍ4Y (å^|
È`¦Á¡`å¢Æö3ë{IÓ¹ú,Î:©½w?WÈOpÈ÷Ì-1Æøb^¬½ü×Å=úÔ²áOÈ*YmEUu§ãÿ«ýÝÝ\ EÁ`¾ÁZt8g¿5nåÒ×1ýò Mg#·lÅ .ÉnëÐÈ+ pOYEâvàÅf°íu4uV}Ji×èE¹w¼y`ömß÷Ã9ma¢iø½ÄÐÝo¾R»>¤&f7Ö¼;»úЬÉå=lïHØ¡³&E
Ò&L(ľËûL4É¡½»(¦d£½IºÎN-/Eïb9Ý:ôäeÕÍ-¨UÄ5\±Ú.Îí×5¦:]a&As¶y'g[ëú%ayèû³Qˤ2ªB/7¶Õìáí"L&ðÓ]Jjñ>^0ß^<i̪yÀUífè£FgaþâdaÆ°í-8xdÖ!ê¨*H 4¸ j\~÷©TH\ç.uøTÇâj-ï)ªñ;±åÐè§åÆ*6¿ÿçÅæ®À¾LÙr>Z_nù?ª·ìB
ôg2VwùsÃ$:ëþK* ®[÷#ÇbÆ7'=
+Mrvÿd^Õ¹Å%cc!2òý2_rçÜÑ=yJû?ÞÝWHÕý°!Dë5ëÓ`²8®DøH´¿»é^yJ«þèXsçQv-GÜËõ\¤ðV!K¿RøñGÓ¤½éUÉQÖÎ;9~hêóN¿kòzhjÒHÄ-^ò¦iZ³ªË/ߨ¤J@äT;¹ ¥¦72ËÛÖEU÷áÐõÄÕͯ4»P{Ö>éÓÔco#¿ßgU¡
dÆA0D[§äè·¢0ÚÛáì@_§z0Ⱦ3îNÍ©j[(
+ÖÅðãç3kïñ}r¿&j1Vgýqzÿȵ $ìñÊÇýý|c<v¿G}Â¥µQdéIà * íÕ4|¨
+÷1fÀà¡Î-¾XÌIZÈ
+;y uà\¶ZY©>¹%|M>-Y êfÏ$ê¤ 4~^:ê(Bu2IÒøÈW<Íì8vPè-ù"ík s]5§Æ!ÕªÝyZÒü×äreè&U:Ae].@÷+új÷ÀƳ»2¸çÔ³%ø vøûÃÄ4;M]ý|*Ñ{dL4¾Qjx°KjÖ kT´Ä£ÛcyRÔp®A_U¸Èó´B¼eÍOú÷Ôúô-/GÉ㸮Ùr;;¹N5ÞÑïv
+ÛüjY vÎñLBíôÀMgûhÉ>{ëeôç¿£zЫßRZƨø¢óò§íTÝßߧ/G)6Ü¿!ý]t ×$;ʤ36 TÎ6¹Ô>&uÈñ<äì@÷?$èÊk3ðdfJ^Or¾ø-eFT4ÚVtþO_å,3þ>Õ3í¹Å¿â|ÁÄ=pxÔ^y;u³Áº=ÏÐöÎëÔêBÑ}ÁTê÷ÝÇu<¹ªÉÎõV¶n4|×ÍÞã ö1µ2ôá6pó@o,TÇ+ ²Ï§ Ç«AÐ µhûÞ VıÄgû YZ
\ No newline at end of file
Modified: pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_aq.csv.xz
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_aq.csv.xz 2019-02-07 06:43:08 UTC (rev 384)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_aq.csv.xz 2019-02-08 03:57:38 UTC (rev 385)
@@ -1,4 +1,5 @@
-ý7zXZ æÖ´F ! t/å£áÞ¿ç] 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¡
ê
@@ -131,142 +132,184 @@
e?¬fêÝÃáf32Ïã,/T£)'é5)ÁPQ/¸½Í_;1¶%e/ã¯
üb$¯ä§æñ$1Wö±pÊNWþ£ÌÄÒ OY"êo)é)åÁUføíVF©?3¿Ù§ÐÇ¢
2ÂÃnP>òV¯ q
4¥CLfZÉ/ÑIÔâª:ÈtoTÇãgçÎÀi.бú4èÚÄÇxÃAýA©c²Ê[tçp¨gíêòö,ÉÌðYZR- ²%T( pÀ^¬wæÈ+ñ)BFD>+Qaõi?¼3ɼh7ÕÏÀ~4r+µ\1b²ÓÖ¹pɸ ó;7ºJ¨¥HÐëÔÈR
-ÈTI7¶4ýeâÛØü[.´V±¼ÚÏ~G?Y÷¾tAêe©G2 ©:`
JWë5.ÉjKç*xííë§7¬äÓ}ä¹^¥óí[ÿ0ÄÍ¡aw¦ù&ÅÌÁÎ/l:Ï Ó}JÓ4ºè|¼f¨ÔçbËoÀ¯¡©Ò»ÎAþøÜ.ñpwRqâYÒ÷ÐéXW@ÊÕÀ>×jÄ´ ::jZ_Ò_4%H|Ùª0/_Àä¾¾%cü,:ò¡5°sô×±$Ö&æ³¾QE2
-©
-DòkËgëHg=7:5í<M£Ü»!áÞEG;×%=P9F21U×Æ"åH(S5ºEÓè é/®Ù$i"±#hÜÕ.4èQÁ£(aήìyÖ%à:ÃÆó§xȯl¥¨PÚòâMÏQmè+¡÷§ì?qáä¸L´ç@7H;3)$K°³Ó·É.ðGA}X I4}o[R÷þõ[/TZíÖΧóvºªd8þT|²§ñ;e"Kþ¾HY篯ôh¨»sTA·Ôwíi®0é;}{ñF3k&ö4:æ6¸©Ì6¶K¤ïèøJù ÎÇHYJÞ'å¼íäéLæuHhì;öÍ©K§ùä7dIÀ!º
-M&¼R?|s¥ä5Í(tüð)ò"mdÚ9/vu]cÉß!Qd¬íçÒ]Í~ú¯¥A´zeDoû)Æüí íQâæöR"©7GþÀ'7iJør·Gì»+þÇßF`ÂÂ-˱ÖZIÖ&gG½»Tõ½K=ÎÝø)º¢kǵq/×BBº¢eerT<oä=>\Ñ!vÄ$S·ñ°ñÝIns¬ãZ9WB×È¥`crküÏ7ïØ×°ÂýéDt)QU)kðEW@ûOeOVWäWS½HÞ!Ê\¯¦ääÈ®¯Å¬æzæuUÍZ=±oE»4Z;,;å½1¶,¶»¨¢¸·tRYyzÝeUQgùwi÷Ce8[u%«ó¢Ü%Ô)¾´ãç\=sáÔOüZ#ü8,¿(}&W,ýÃýÛ Gâ[qÑXbúÀϽÐ- ²¹xóDܬ tJÚSÅb·¾:ê¿íT±ÉN9Å D[ÜSA3ÜD-ô
¯¦ÒßH±Ý7{b²·E9¡ê\ť̡ýâSRj«ÙyÀ«+¾âUëù_ebø¦ ûîLÔ¨Û±\M¬Pf_Êh^RólI2Çkj
>142Ü8ÖIyªó#$ãDÛ
-á©Åá!kyiàèOê ÿ²Ó:^Î2`dýaY'ººÎnÊ`ç®jL5ç]»vZ êKÈ·±³üþhª8:òý8Émõ'þ éÖ7
-j7q»²×ÓÌ¿ þâ~ÿU[Ï|=L~-l¸k.ySh60úRÃÌF?Ì
Q¾Ø¤Dck{
-´µ2N¢?b£V8çT_R"±EBj£ÑEE=fk_ÕðnvðÚ"K@ì9ýQÇØ£u`ÝUÒ~RG¬
Êô;+¸'ÉÆÈ®²{W'ÖCg ð3(Ó_j¸(^L1z²D3çü
- îó¶ânÙ± !;®DRçÔDjhVõÃ!ôÀV_Ò^ÄwpDôÅWõH£|3Ò7bí]ÚÓRÍ7j^c;Û îqÓw£8n¶¢·ËF^©4(ÎB`Ûî²
-7µ(-)}¬ªÁêYÃZ ÖÓæ SÍÚôQÌf¾tJ÷p[',^ÔÑJ;?u¸·7áýs½CYÖ°-. ¾_§àóþÜ5¶IÊl[ÁÄán{güí:/ DØ!ôcÎYÑ
-<÷|K;5úâÔÖÖ.nð7Afwé[ü (5 ëIã!,L ¶Éçpþ¼dU©HJ8AlV×! ´¸¯¬/R
-^õ@«8rWúÁDwmj/Fª¤óY®½ö çۼݲü× ñÒÐ%P¶¢ãL±Ábv[ALtªuüöɯQÁ']ªX¨BOù^a-î_lzíã.¥[E{ÀHõäSÀ'{
ã)î©ÕÉÓµE»ÉÄ$)R
-!¼¹½ìu±æ<$Î.D/×û¶ÐÓ(VlãþÞ8·×ÁvýT/sàk§ý«Ü!caeix¾
õ±n³éiGôXÙô>Õûû¯½½í´#®ÓqÕxðæ(EôZVL/=*/>ñU7ÿl
-P¬(§`,I߶7cWú²¡ª½ù1ÒuIOjb̹ø¢cxô´?gM_è²ì¡Õ¢0¨a³/zE&gKëa\¥M`Yæ1ýo±Ôl²nÎkþ=áHÄ ÂW¥Û-« U6ÆhSèFNW ë4§è°nÕÓW=_àãl²ÉfÔ+Anyõc¦dÝ®
-³Z åSSÅrÎN3¨`ca'åc¶ôo(.RtëlD-ãV @ó»Ê¦zt|/mB·f*¬»øn õ+S:Lãè«Ä¶vÔÈ/v®[6ɶ÷/%2çvlNûwÝ:órkì±1¥K¼=c[!gæþrBHõ¬³Cìâ
Pv졲o{ÈÔèówMÓ¡Ou]ùkijÑw
-ko¿ËWög4ÌìZ!*wÎK^¹#IT§}¶EúoÓbfå
-¸»£ÒÒô3;?"ùe6VyÔý·dw¼h°dÉø5ÑÀ\À&*%8z¯ÕP0±âì%!½µÛróMbæ¤Ë43½p}´ïοLÉáë"â¾°1¶ªtÄ~<3Ü°%a,uë^Êëu¤Ó¼S*0Â9#!2B8Aõ÷¹ß3¸ððÉr¼KòDÔ
-¸¯nLJuܼjW¤XãÍ¿+®\éõj¿T$<Íõ1hi^]Ñ´1oä8±ñí??Þ2QéME ßbî'TX«\|ÑÜÂЮòx½¹`a¢
Ù)4¤ ±³s¬hã^cýïSáÓãeWkÎUQFíqá¯\9ÚO
-=ÝÕzuîæá¢sÐÃÓÓ¡=ýooaó ú+=(Úª
-ͳ¦¼(í.ªõp:Ç+IJëu²Þ.áÐD¡«|À×,8ÉÚJ.ºP"¡Y4`T|äZø¹]/7I·ÍªïÍF_t×0fB¡mºî5_².§Ð+OÌFèu×%~v#ç+yºPk³3îBe6,?RÝѸý=Z ëµ!m.(Ú@iAÏ(ýÀ)XI*Ê^\}s ²7íÎHÌ õÂzîÕü©=n`
-ï¶â1'/eã'³øC:I§c/è{Äeà¿ t¯=OƼå̸;ÅÀ¨ÀBÒÎMqvñA®5#îà÷sBñî÷Qí¢ñí»«>Ñ#qtäMfóÏ+÷Ì
-Uàj8B$Öõ6>ïLW× Æ; e5w4:#Fç&Ã.¹ë³6b0Õ6Ìñ&¥óת¿ùÛ²éà¡9L½9Viù±Úè³ñF÷y£¯~,î_ÜnlhÓ8:$¨qxVØë]0üë8Wèß"dòÒBCVöËQUQ
-À\&pÀ祴§^ð»úÇ°ýfãà¤×?¤G£gLHC
dPígzC§kö/uÔº/2;oEæjðbSÂTý
-bYL}2ñ&ð§Ëèív:ìZ~1b"¬AßAh at iÀÎ!ñju¹2 gLä%a'çï³®°÷YÕõ4'Óa»
y¢6S£ëÓ¶À ãP]ä4ïS'áÂU¨ê°Aò0ªH_ò<ÿåç¬dÅýÇÃ8s]S¥gÖ ÷§r)=ái¶´µËö²ý@üiàlZ¥ïã!fh
ÌUÜTL@* ~ ØÒjóÐ÷k]ï(äknlÊÂVº#AZµÚ%/ëèum\¥,Kï¦)BXòËói+ùG¤t¬Dnµò
-ÀP¦ç((ýavãýiÄW©k¥:VHC§% y7¾¡ÇuUEïo
-~4DçsT^ßgr"ìÒlÌ£¥¯*iód
- Àµ.ôû«³2NZ,Éå÷ZÉYRÂÎéaöÄì²®'}ËÓ¼¶mZ7ÚTòAæwÇõÐy|iéPêÈV¸²uDE43¸OöBþ¬l^tùSÒä=Àû²XpÞKª÷ïsË[éä]òLÜà\¼f¶ÆÃ# hPBõs±ÆcIÀÕ~øÊ¥·aÞ0y¥f ¶ 8ÛTSo\þîÀ )uÕ")ÏpH<Db\¥§&;C,>ÄU<ßSïÖ¯g4²°h»L~¼
-
-Ëncè9èÍ{s4QûÒiî`«c¿ËÓÉW·ºÿhקq33tÖ
ýgÏÚmJ/p>iþÝÃq)YÓ¬µéOò;4~¨ñ¡T¿É¾¶YöÿÀlúôw&m{ªAŶGt6ÏÄÍ*l³nèö×bʸO&'ÞRæ×ÍhËi©íNÝCô»túîæ'þ[áÂ+Ûß×lÁúäöL$:<C?Õn´èð/¨Û¦3º ^Ä>=Á;»³ ¦Ì½9]\¥ÕóH³õK1Cªèïk' ºÄÒL*ÌÌüß=`4î¢îÞ_¹Âñ½gÑè7Üú°pÍ£·/®mw"zrO»p×Ô
-tb.1µ÷WlSbÎwZLuvÿinßøSV¥rââjnÚÑô ÙÞu½ß)ûåíû?4ÝQ²C|«¼
- õ|ãqÖ?ªÅw/JSзDÃgmW
-Ô ½ÒUµÉ«á˽Øü0«DU[GÙÖ~&ÓC1Ò©¬B
¸Z
-Íu, MèR&~aÄ´W³&éÃPÒa÷»qK
-¶]´óFV5ëûVº6ÍÕ°qí]AÍ«@p׸Qß-òøà=Vo¦
P¦
-ÐÉ-{Ä$Páz°é¤ %þn;O©ÞiF~CÓ ÌzÖ
Eï×ôÊg
-Ð dIâ_ñ í±cúÄ4T¶¹`°!wpB{V>Ö¬ùæ@«JÔØê1Åfq_ëÏiùáÖòô.=);9 W×PÊìb ½ì7OnM.°êÕ~PIÞmúZãÈpXR×.ÓDÎ :z`^â×`Nln×èú#ó°ñËY@ÿÎ ÎÅRIéã̶¼Xÿº§óâu
Ü9õ»ÌéDÜË\NR;÷¡Ån²z¼ªÅÌJ§ÒÉa5jpì}ÏGâpù=eË#ìíóîKCÍØ¡%¬ÿ¡«Ð°IÃ-LãЬ¿ÊUß)wÉCL¸,5KZ»5õô:u4òàÔR4£9ò2£SGãVètd¼amè&}¢;Ÿm7"¿´£ïÉÝY ý.þs3#ôϳÛû}¶\6&sÐfFà {}\²·#BCöOÂTÞªÜçRïUÄlØ à°Pàgó-»¢;à tçÑß¡áCÖ5 /IÇpȤ5oÓ½×.²Â¡>ÌFN&
-?Ì.ÊÅñÀËîÌÅ<nèµIPÜøðøR_ZH{Ü®VC Q¹ñ"¸{ÀöAD¨ÝÜÀF¬¬¬¯÷¡s5_§âDâZ(.¬÷±´ü3È.ÑCúêÅwiaiÁ±Ã/2>¥ .½Æ»(ÄT'PwÊn
-:µO@$ ot-íCAªü;&bDøé·À9Ùv!ØíB%êOl¿0íxôL¤\N_5¤f41÷k5N³\vz¥0cúp8Ç3~¸¡Í¦DÅgAä\JnÙX§sÉoDeÞ·kP§ot¸j\xõH¹áÈlo[÷½ßÈé®ÐPQ°þT"/éZ¾\íïrîï³F¦5=±/àët_`I¬Íã³aó§ñ¿/Φñ»y¥óÓð§à¢«þßlæð£7NbûO²Â8ñ¿(Mm¨0 um¿ºa±Ñ±{ÔÒYj÷¬dw¹ö¹¬áÛâ.õùó"¯ÈòSO,ÒÎÒ«¸Ng|Ä«B&ZÉkDÝÂGì©Æ.MÂ
Ñ%üêå`®Î+(hiUIJË:ó*bt$
-ÏÛ¢_9²`É«
f¦
-s¾_¡tüä9~ºX`eȵMf·@"+×Ý
-H®ffÃXM4Â|~Gµvdh¾ÃæÊÏéëòá)¾t﮿Á¦¯ö˹BàU¢\+ð°B¾ÙÏñ©÷¢
-©³ºì¾Ýí_ìM0=j§U©$}¸@^e'l½¬+µÉ+[Iãë2òZÕ§vçÜf¸e?\º\¿¿§:hù¶÷änïªry[7ÆËõßÖ/Md?A
O}ÜRÛ,ì;YQã#a÷;e<<0 ߬æ#!mÄÍ`_,Úàñ£+2Gù(Ñ<d(°K\õM²ôpö`¿ÊS½,Ë£P8Ff¸P(ëuKóÒâa©¬1¹ð`¡ºíÏô*×Nã[9±f?£D|D71ø[gÿXÃqÙÙÛxÓ¹EXê©ô
-ôÂe9ûd9ÕåÇEÛîò¹6 ÞÆ)sù·¹mNÚhÐ7hXLhOïw óFe{th·Ê]Gôd@ÌQ°¦.RîâÁüå>Ö9O^¶ÍÄe/BÒÎ;Æ65Fu¯eÂðØ88£öû.õ×õÎóPØ°{Ñ<ü
_0oß»m9'4<J¦ÀóÛç(|å¸
-RËÕîÎíÛÅÉîyJÏÊõ«"ã³h"=ÿSR,¯{½*)CÀ_Zçtl¸O ãD÷þò«%!»Ó6ÒÝý6ß LfCTbg»m.rcx>
-0R1»±ªÜXÎ
-]#4}À°0ßÈÛ×£ÔÆÂÎ /dU2¯Y½SxV|òµ9)*Vþ²Fçsü
- ~ñ
D{Cñl º6u¡}_²ÆsôóÜÊ_¥ð¾j õ>|Þ5ïÎÔ¾o¬3¬/|[g ö¢=}ç5ßä ÅiÙ¸
-ç¡Å<Â;Dø½TbCó<¸#6¿Ãlpv ÒóeRÂÆj¬nÎÝË`ýÁ3Íçü]ÿñÌöåå/0;eeóh'Ùt2µç.äl,²3÷_ê
-mKv&ç3VÁÛltÔ$é.LÕ
ÎTçßþÅG$[6ËÈTéziá>JHç
-"
-õ03XpµyÃ[ÊvBfS"¨µIøpåà˯yUUpü5ÒäcÇ}gi1ÃýPoâÝTÀûÍÿ¤ïwä%Ð9¹C9ã(èRÞ½ÿ¿M-à´#ÛHEú°w϶ÐæB¼³|/»lÛľèL7!E´§;%XíÖ¶÷ÃbßføÇÄÿ[õÕ×3KA 1̬K¼è¬Zð¬\2}k*Y´DªI25iÞföýÞ¡þÄØÀÈ Êi.½ËÍZq û¬W´T©lÔâÂeÊnbð÷ëü@.ãNý¸#Áláêxãqiáºr£Ð1oÛ£[;eêïGçckÂ]Õuyv#K/Xd±75TÚ9.³÷gÎÓùAeõ_séI7öº=+¿êz\Q¼®õiAo¾ó9¦9´UÓ
-í fïiXG éÞ¼»Vªeàªã$'!Üç ènÁ¾ý-úp=ëh¨@zëe)c"BÇÙF÷?ÞùmmÏ\5ó·ñÖ)c
-.Õ=èMç¹1yîGTÍþîÿGñU,¤Q±[gðè$Üå=õI!ý,¥ Ü{9é*X¡£kû9zúÜ:1:¤e§i'ôªaë*ÜkBB
-ùùföÀðöº9Ïm|Ô¦!d}S§Ã»ÒÃoN%Îè¼ìáÃÌmOÃås¬Á_©â}»mû_ÅÄ`åîÌD¦cOG@P{Ö´·ÿÛ3«¢.GÇÞkV_·q6ü¨p]Pa\{$'ì±k}`»Bw4|ê¯ñ¬
fì;N¨kPèÈ¡d§)³9t£d9¼äí×¹WJã;wF¤QÜqFÊ jnþI@§=dáìðá_û±æ]Ý%
-m)aÅIðð%íßBw8-8²CR<ây>ѾÊo 8à²Î®cÞ°^à~ãR6wjmp÷>áÄ7V/Ï¥a.£ê-éÛ_¿ûiç8¨êêj¿%¦ú«!³(+k'Ìò+àÞ#¾ÑQìCð ?HI=²ÝnæiÕvÒU,¤ËbåmÖHÒ4{-4P¸ (Ùâómþ,ùiÒA¿¶Æ®¶ÂKJ1 ålr¥Â
-ºª%/jó×%`ÎËæ
-x¿¡þ²1Je
-»z±ºûÍg0o9± õà§DÖ#iþâ:8hSë¼ø OÇÂ÷G[
%5ÁöWTÑ_-·¬µÁÖc÷~&ÉܸXELMëÁϾcXe''0b¢ó,Ü,¹«[s1bù5ô²«9¡Â¥x
-ºÌZø}I÷PåÙð®ÍøÓygFú@©}Rá¥n ÛÒìÒï"ÔKn&EòAoû³V\1$%IþbØ ýUCjý9*'3
~gI¨þ:áµrÈÅËü¢oËTã¼ÇÿBDë¿v-ö!Gý¹3¹©WAB§Iì!]"@t:3
-Éaþ¬] G´ÞPÀµò}ï¦yI óè¯ç: ÿJ[ÍÅrÇÜÛ._O:%2 ÿ±»µ²¹îuìíÇêDÏ´%ÚÙ£Îîf¾¢3ß²4ÝûýÙ#Ûç(bî{15!ØÇ`ÊÞI½¼\×!
-Zù¢&Ñg/u¤am«Ç
-mx¦pHª¼;p¿`<HÑÛõÀð,³W;¬xzhbsQÒ_Âb<~8ù÷÷Gà¤á§\ÄqBòClÐvS¸!÷Ü64Ek$vÂûÜÖ27²!%RrË».ÆÅn¯ÝRn0RHazéi'CwÒÀ-Û¿D6ÒÀ.âoçâs¨Ôû¾OÊæ£ÏjËØá>½ºí³Ü$rxd ÷ÔDlT 46gÀV¦ÞĨÌê<2øbÝæ¯Ì:´õɾõoYÜgdö¾K
Ájxh7
-º\<ÞûÎþ@e·,òÏd æÔê>NÂkFB;¤Ò~ú Ø0ÿÀóèëü¯«¹ î×káG;¡GR¯íí"nûÇ!6¼N^ îènéÈÙn]IõêÔÜ´ìmÕÐ"UÕëí&£0Ðæ×Àh³¹ÿÉn,i´t°µÿqúhóÊú_câç%õÖ5
-!¤5%) 7±#;¼xI}¾¨Eõæ÷·Ñ£ñÚî¥D\k°ÔÕºd8 ÏÚ«»ÙU¦#?¼ Ôî,Î7Mßz â-±°.¢A)¬YÎÑâÝ»§QÃ,Ç£VkºméW[°]$úh* mUü½Þ½Ð<F5}?ý,Ãýq¨Õų)ëw(B0Ri3¥u ÈÞUÖFláèDÒïÜF¤}z§9Aa¹oA5øë¶Ô;KôÆÊÚjd# ]²7÷îØ)ÌÝ¥ 9x¹Öè2e¥Å{yz`éñ$HÈåï<}NÚ'õZòlúä&(]YjÙ2uÒO7í4pC~#¡Û[÷gâ Å°Spè>ñuw½
gOO88ýÊ j³öÑ=6³wʵ÷rÍç(Ò¥FüÄÊEáíÚè°¶¾Çÿ²1É9Jű÷=k¬0©(¿ K*à]}p²-ûÎft:,¦¹¾Ú0ëãöø¨F¶JÓ"¸å(áö&11íJ»"Ae¦sƽY2J8â"Èptû³ÂÉ«Ò:ö1áö¤#©ªfá\âýÏ,0¤Âéjcý#½Ç.0+üȶDÇÒµãÖÚÚy© § öÃ[@»/Õ³"I+KÀßζ'è2iÖGæ8@Ø:µfÔ?huibäÜÁøá¡Óíqâ¿óR³!q&.üöõú¨éVxSbfC±
-Bý
-ñ~v¸Ï `Q(þ/8Gï_«Ö¼úUÃÖEw +#èQÙì jXPFÿ!ûäý@<-MÝGûúo0&?äMS7Z£dÓØ-G뤤ã¡á¯eìÇäȵº´âß¼¤ÅT²ú3hÌÊW¯Dnþ²£nǨëT»t÷E,ðó^¥ÖsÅS°TÂß{yGlúÍÓªÀ/&õ߬m«¼×_Kf¦a¨»¼v\æÒgæe]ïàTVÕúuf0«a¶#ý[>ywc²pTsãÕ+3ß
¢}¹FÞ×Õ6y}´Eq**r¼Ù%×Ä_èûâÄ«\È¿Ézô¿î¹¤hëAS44þ88¹æ¼©"ÕÂpjW6õZßd ͵r
ªR :&ò ïIæÀ°»¹|¬yTéª?Öjøòìýeîì©Æk0&äc¸\^½Z;ã,ÀN ¥Ú>|
aÐù«AßXeûÅúÔbK¦Ñ>ïN£ÑyóÎÌ´ây¥éqª)¬G,×`#ÕÁaäÐÌBOÝöÓwJæ5WB¢4B^B·:è¸5øÄþ
-5Á](Ò@
-ÔESóúz¨[Êå<\QþR#Båë¥wS³ùUô¬P
-ýùH%hO£\fïØõ<Ï.$ÓkHzäÔMîg /M¹³¶r L<à]ûbñæ»®Z økÂ.Õrø¥jxÂÖª°ÒbÈR8ºÁJojvdå/8°õeÓ½?¡©§dªDuH F@âZg?¥;@ãqâªE\Fñ_ n}+,õÍâbSÐFæMùs_ïzó:ÄyOOã¢+õNÒQÿ$í2(I¦¡¬U}Ê¡ÈDïÃRçn8ÅØE1þÏÇHP{E10®ªh«ó+µ;ØôSªPk[º3ÜÑtAîÏñ~"Ï´Qà÷µÑý³oɪàJÚ)2ÒÙ°Ë¿¼ ±¥dÔ|ÿÔÜ]Ä©
[¹+íe@¼ÔðFKfbLù,¦Æ.'éô0[Ð1è*<$lÜëcØ1Ìrç/ص;ÝEWè®^µÚ°ó¨RÙÅMiìÆå©I!I/í!MlµF;gÜ×~Ý_6ð&~¡{DźÞvùèa³je'ÐiF\Z$é4F[øÌÀÖ6ÞçYñBMTå27bÆ[ÆuõNÌI%{í|yÿaYzxvnë4+S|Yg8ÔeÎFE§:í3¼ù¿I DFE¬@?#ÿ oe
-l6[foCþÐEjùÈó$[Eª>,Ù{r]ÿɳÚlÂN²FàÁ"ø5Åw7<5fÊZÚ ÍËß_ ª.$2Uvõ0?®ÿ¼uÏk.<¨÷±ö¯s;Ê^¿Cýý±Âcs¿%5Þ½/¨+ϲ¢0lbòÐÊê¢Ì7tttÕ¼þªÕËý%¡0alþzÆÆ©þc>;nà&`Ï¿ëxÙêb]¬ÂÓ £<äÔ¾
5Òi.´`-Õ? &YS&ºÑ¦?jtHKq¶*¿gïòV®7hz¬VxÜ[ÚÀ5z}mn
>#èX¨vÓc?Ó
-×½²Tàç 5¨C½.ê;rR 5fC|ʨ=é=~pÐç8Ñ1¢7^¯%9<ìIÝk#x!`ðSÅ^h¤c]ëÍGÛâDL5o¯=_«ª^_:®ëU`ï<÷ä¼-eÄÑÔyLîP·§ü½(LóC³[<xìÿ%R~IzHÂq-¾ñÍ|¼åTùè_1~|ÊÙª,ÅZ¾5Í5»æPàÞdt-dçi®F ¼V.¯u;¨D/pøP´+_6¿®ë¹
9?é0©.¿u ë{{Ã-"
-9
À»èÙÀrDP"¼Kå>]ð9çÒtP¡×AÚç©ô/ºV
-å0 þðÅÏý\µ:?0ÑChp@9ÞëªkòNåïNá'Ö)9×LC¾5;æøÓB·½v_ kc,$¢ùü\Rà,4ê_ÖéûNêf;ô½9ïÚµ`OZvûF
Óµüûvö2¶6êZ5(7øpç_/ôl ÁMÓY6@JWé'}ÿ\ûY{Ö+Dth2§d¿}¡hË{Æ/Ö(GÅNrU
ß²yUª5ÓÇ-¯dÍ#¥~*éÚ¼EÖ(íSßûCßÖl¬u}´é£?ÎPã¾ÑrHèâ:¥Y´6ÚÞ¦úóßHèW» 81P¢5¦WA¨[xü0%söhÌàPÊV^<éÝ êÉÖ¤KS: m(¿ò~£Â÷Zµ@|÷ÄÔøLÖü@ß¡h{Qò²Up®§¹½nÍ+#$Q§°÷
B~[âr°g¦ ¡è .y
-47ù'¢£`R7x¯(úHËeÍôB"Ø;r·Rôû¾
ýyf $AæaÈ{'ʼi·cÁûß}r°\÷4®4]îÿZ/~Tè+§ô©#ÂFD©Jê
ìµÏwycºøÙ½{)C#Fe?Þ¢xEØì!¼b8tµ'zMòÖ¦>&§Ç×ðVá(76ÊQÑÆÐ Àè0¥"1H¸QÇr,G´ö.<ZF϶!_O¥ÕZVNÇO·&»¡X³
-Tà{msñ.«Åë"H£´ib2UçmXrská .¨¹XæÎìg*/çÓøY:>·ße¿û¹è¦g|ñÉõ
-¼eî25{ªjzaþîÐC&H©IÃ| ¢Ì.¶[~k¯ñ`9:uºÀÆEéÓŽk}óûªû #ǧ)BüSÛ9Ò(¤iè)õ>I& aÃ'§¾GêØTº³ËH_Ã6ft ØÔ?ÈMØTE±[½pîptå=ã_üáÕÞ³
-ÿb´&qxõZòvÎ{~Ï-EûkVÃ$ùÑo^ý;yºûHLùà ¥Oûs8Ó÷®êoÝ"o+CµÊ6~¸E¦ÌdD!)æZJrPõnJ8ߥ#Ù®TºQÐ1påÜ/yý»ÊW³+2åcï(aù{:è¸(K¨åÃÙ¼n
- §®ÉU´«ÂRSzÌ"wI:\âC kxQ±È3|R¯Â/b5gúûbºPB9ÝW~Àð@dópo¶=i
-Ю\¡S¡?÷x1ÌCjFµu0«kR¦è¶´§?¸êò¨«"åñâj(b|z#,/ŽnølóÏ#ÑÐÒhCLw MÝ$¥ÅëÙ%@IwBpmâø²ôw@!¿»F8ù!CËõG7 þxX¤ò²9$À->G¯Òßؾ,$©nÞ`Å@"÷Õ©ËU®#{¯¨,(bÖ
-à<~ýx@÷=pÞD=8cïGi@µ[º¬a`HpÀ¬»°é[Õ4*Zy£(UCè
-ê À-+ö%ÈýkóT!w¿ ³çÔ?Ë
ÎjøæØPtïËÀéê̸m_z¤OÔu¬{v·<m9{mùä»N3mÔÊ·i¶ºÌòå©PÑ©°#ÅUPkst õ¬ïu-<MΦXاìR¥!ð²@¤ ¸²«½ôí.VÞ"±ï®ób¥*koÿ©â¨ÛRÑMé =é4ÖOáEhæX¤,[f!(Ä=JnïDX^jòÁ \ö<"Q²â°ë¦Þ$¯nå,Ü<ßèÌZízäj? ʬ乾´Ë ]ráµ s4Nki»SLaSÓ ì¦9wÀ"ó]×u7\î¹ãçù±y½Ï@»pgÕjâü*g7©X´ÞíÄ5jäD¶«éFî%ÉÊ+Ûqîûo£òÁyCò]â!Ó@-?¦Rħ3ðí/4mÃú¤gd3¬
-EC®¨
輯ª÷d{ùÃôG§öjh1õiÆhûRÖÎÜ}Er
¤³åðEsvàÎÛ"Ë`ªyMÄcÕp,Ý:é¶q¦ý=äøí;¶ÛkÃvO®z+RÈ.g«ÈU²U<Q'n¾¿¿µ¹á±tÿ ÷^L4R²^g6~-yÝã
P1ä8õ°6¢,Ãñ-çnÌ¿oÞ|YMkgq3éè|a¾«*ju¹.xbÿ:}Ü(
%J^·®¤ÚêºÕ¿,É7}gq8Ú#Ææ¿@,¯~øÝ2båWè¬
z'_àÞÇD- gy¿\ÏgmIofùÒzüo÷OÔkù®²ÏÆá µæ-}øGh¤¸uαýKºs Qöl43Ru÷¡jÃÁÑ" +/ð#`4&£Q6p-úÆx7¹i¢zÈý˪VÎGw7Ö+n bæ]I{e¦ü{rkDåÜ·[«ÏÕ=¬µ£I\}mȹû²Ýx~«+C½´B¹²Ùc¶ú»¸VÊgî¢ànVÿÿàÄ~ç(<zMö¹Fì¡ À×
Sa; ";ë
)üÂIh$Ý4É·ïÝ£2(VÚ`2}?vj×bWé¡qD
-`Ñ{×_"IF¨KÂ@uqé¸ÓëðK,l÷Á©°VpÂï/ßZùìö]Û,hËà±a±U6ÝuÕ,±i¦WÞf° M¨
û<t[I±µRñ«ÈÁÇïòÜ
-¹V«4¾¯KYÕ®©U¶À,×n( &´-{{ÿ,1ÌÓªßÂïHIl41Q0¿+vf-QúA~h±ÝÎÝÑMÛɤQÒÛ
-*^ÑÞÈ|¬<WF} ý¼êÀ;ʽûß\®íÙè/¨q¢â³¦Ý{Rs8ûºêÎXí=
-Ó>V/(ú éìÍån/:Ak_ÅYÜÎ=êVV°(ÖFÅì ƾ̰8ÞËÀ¿pÿqóeÁLbÜæ-4$/2mÚ.äwâT±«"ÂL§Kè0û<lükàÁ ¼ã`òù`b±Þ[Õ.ÄQ?¤þT¶séÓ3HgÅ¢BÀÑÛ§×Y¦1>¿hF¨¶Z|(@· Ä]»Â9£°
¾gjѾ¨êºcT_bÛ@¶Û¼9¡¶×é%[ú=ëÃjèë£Fù
b9ßѯ®Ïü
-úÈ)ÇÆjÅsqý
-Ètÿ9¦¨zv1J¥±æ¥é\^fæ` ,H Ü´¬¡¾so¯¯\XhåR&¢ñÎ`þºø5b7î·(VƵ\÷2ïÑñRï «àñÿÌþ{ú®é
\ÏUàyeò¶#ÿö@ý´Ó8hæä%"ÅÎiçüÍ¢Úô0ËXcCÚýt¤ Ù³gÆÚ¶£&6|»Æ¢¥I»épÕ÷I(wd@òqóì©Ý#^» U3¦ëfü[%³KEhì@ö5ÀÇ»ÙûÛÞ^l¹óKMÚ`¹$©2KQá×YwÏ¡l=ê#Í\Öå)ïÑÿoÿòX\
ÄçlJ=ûöê
¨@tEìá±EYU¼g1Õ
-n·ì£çÌNØçDüå¶U®haKÑ zôÞ½à0 ÃaÕ MÙWÄNóx±¥´o?T£Û
Ú;4 ¸ÛGMÂÔ±ji!KK6PÒâ§Óú«øk)Ú<¡ÐËÑ2ÂaSàv%ìz)væ^$¶ªÒµÿ,ǻ߷à¡ksÛÚïVJzAs«Êc
-mmõi<wÎ1áÃáRÊ`ïÚf®~¹]ã+jëûåÊÅJ,¹àd)£vTgQÎÄi ¦C:mceü.µ0 ×eC`ã°@K{0!ÔÞ¯ÜzÑ´|õr¯¶>ëÜ¥ÝýF.R1Ö¯4íÞsí¤¸»ñx~Á¯Þ<à6ɦ.&«²bdè«ß9VÈ
-
-0/²¡K´ìÖä+SHqp¬H}¼±I=a7y®ói¼\z¹'%Þ<Çiq8\Èö$,G-dÒéÝÕGÉ0ôÀÿj¶®T1_qÉé½Ç~ K¥n¯XmÉb¬ëþhÌ6E½kqö,+ svÂVz碌Äý!,©É%ó@&<ç¶î¡Oâk 5«±Ýi îIvyzÕ%ßcðÌ®Î!LwLa¸ÚÌZhX-pѸjr±Õ4û_²}`5¬}Â_ ÁÀÚ¬Ý~ÝüàSºWö
ïR<@3I71ogT3½º1'ë`Ìd¦iEc9ªÜo(OvdyZÕ²Ýß·Ø¢
-eô,Ç1̬=è¶è#H~L ð´°ÚFùÔm2gÛM-xº^Ø?µ9\eN5
²ïÂiÃ3ÏÄü·×ZDòæÁ` gçöèa¬Æ=ôb¦JñãιMèÛÔèVeù;×û½EØÿh¾èþ.bþ+®Léò~Q3Ad|Ü°2gBK³¿Ú*Æ|kVoö&úÃã]¨\kj®ãðÖ«q©ÇüÃâ`G©éü¼HÍbVÞµîf§BÃj7Ô<-Úh®_¢Æ£[VO]Q]3p÷ÿ+?³Z9PP¦A×Pü)Ã~Fb¤µ@±V@åÒÎGÞûÿOòV']ú
-_Cæ¨üoÑÛ=@ó¿°Ú«p¬3¦:È0¨JÀzk\Ø|bËQÔ2ª0·F)¸ød_åI
[M&vO6Äï¬éÅË]8³ºu4'êD,\ͦYXöÛÿæ3·ÀÖ+£Sóft'ز:úz¡gíÖ§
-ÔpÂiçõ1v×õní$6^i¬6ÙaÅ(=O½R^ÿá3a¯éRU¬íéñöæÝÌ0e¨YjQLC4å0/?Ï2 at VlÆAi6× ªF*§ß¹?ïx²{ ìÙ"VÉï§g0ø°¦/´]Å-G]*âôê뺰¾ºãþIS"®çé2fÒ±hp p¤ý_ at Aûsá¢(^«l<ü¼íŽB(ÄÛ¡ÕY¯atF'ß(Ûd¬s«ØELÕ ³-rñbÑÓöo¾"äfºÃÞÞÃaÂ-Ùºíü¨dALðUa03çÁÌö®GúÅ¿eAÀàû¬¡»æêU`àû6LUò6÷¸¿ªýP(ce¤ËêñYIÚ<C4@+[¢eßl]°<dôç= À I¬üÐôËðX®\|éÉ(¦Õr5.R¦q#)«Ð¯µÎcÒöÔÃûì`G&;¢aÓʱ¨¬'K;V7/èMv*jI´¥¾ì¥ =ÌçH³u)uèQµ2áé¹,æο*&(o^!ÙÂûQNsXôp¢ É`õ´þH°Çû±ì( Ú£¥1&WLRbYdÄ>N·ýÇÔß÷ĺú0lé·'ÁÚyû ×.¡ÜrP ±²÷) ¡Î¦©.¿·.|ÁùL'BI^BZ+hýy÷òH£åܼEÈ{¦~×Q¾ö$3¯|ÎHÁ®ÃòM+Á"óÿ·Çä±AÛ|QïÂHF.<íêàpºà1OzyÆ`ÎÔ§hé MvôM¹Bܸ:Ø}\¿tÉ%J ·" tËÂäþTðÿ ¶4Þ:T´³Øf®þÎJ¬ãÊÔi1\ý!Ë å{?èP[Óéhi.QrU<µò
-åÉJÊOÜBÌ8z;úðSô¸Qï÷8ÖÒøÃòÀýi|;M9ûC(ÉÜq'tKaöåƤÚÃnüÁ
-¨{LÂÒ츧®ñ+<ih%f/â.ïx:[u«RÃmÎkÚ|c¾3Öð
-Êæ´Ë§9Ù
»Omàû.l{º¸ ðÀ/«\QÂÅà´Øƾôrh¾©E¶'ÏNÚÅÝf¬¦Ç¢ä¶sð^LGÛ(bB#uòRòaU«VtN~B»8pÒiyu¦$ÖzmW£Áâl#<o%ïÜoDbgeMPôMYïK@ùm·û#uE+pKö~½Ã heqÓãAU¤{á==~´¡½cò¼C\)ª\zSaçä
î[ãwL0@~d÷SÐòõ¼ã&Ô©(!m&g ¤a'uCLÉî+
-ñè^ÈPcâ ¢m¯æá-ñ#Ióhæ!>ÛF¯Èk*©{lap9ñ+BC
d°¼ÞþH?j¸ãŨ¨>zÿmßpéMóÿÙc,~*»ßW5 ³cPÑ£¾bALÿzÕqr>^|Òh~äêË0ñÀÑïB8ÂÔ¯Q&îzÅ[í7È£6'Cµ¹Ì><tzÐ]WH1f×s9ÅpJ Ó=äÑ·ÿ&²ófÑE
"
-ß *bXô;£QØXN-6ÀÌ5õ¹K"¼EdDFáé,7öHÉ«î%jß¿¿*Bh¶Úè
-Ó¢5ãA!'`O]PÒMÈT A,â««°qKSZ÷
-LJ¹´£ddªüÃXmxÍBøíB(ù0w±gb´Âù&Úþàߨëâú`©@OÆáA ×>©°/â
-44ù/öÍÀn˦òñ;B;»Æ.ÔðèH!×âm²Åþã'Rx§]
-ðÜwriõ0}³ÎO'çãÓ:1â¡V1õ-ÍdÎo¬§éÿ.Ðïò.¼gVðíÚ¹Z-Ús
-úɤýuÁÇq-ÎÚ¹V+,N4ÂVp¯iz.yf*¨
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/chnosz -r 385
More information about the CHNOSZ-commits
mailing list