[CHNOSZ-commits] r439 - in pkg/CHNOSZ: . inst inst/extdata/OBIGT inst/extdata/adds inst/extdata/thermo tests/testthat vignettes
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Apr 14 05:43:01 CEST 2019
Author: jedick
Date: 2019-04-14 05:42:58 +0200 (Sun, 14 Apr 2019)
New Revision: 439
Modified:
pkg/CHNOSZ/DESCRIPTION
pkg/CHNOSZ/inst/NEWS
pkg/CHNOSZ/inst/extdata/OBIGT/SLOP98.csv
pkg/CHNOSZ/inst/extdata/OBIGT/SUPCRT92.csv
pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_aq.csv.xz
pkg/CHNOSZ/inst/extdata/OBIGT/organic_aq.csv.xz
pkg/CHNOSZ/inst/extdata/OBIGT/refs.csv
pkg/CHNOSZ/inst/extdata/adds/obigt_check.csv
pkg/CHNOSZ/inst/extdata/thermo/stoich.csv.xz
pkg/CHNOSZ/tests/testthat/test-info.R
pkg/CHNOSZ/vignettes/obigt.Rmd
Log:
move transuranic actinide complexes to SLOP98.csv
Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION 2019-04-13 14:46:44 UTC (rev 438)
+++ pkg/CHNOSZ/DESCRIPTION 2019-04-14 03:42:58 UTC (rev 439)
@@ -1,6 +1,6 @@
Date: 2019-04-13
Package: CHNOSZ
-Version: 1.3.1-19
+Version: 1.3.1-20
Title: Thermodynamic Calculations and Diagrams for Geochemistry
Authors at R: c(
person("Jeffrey", "Dick", , "j3ffdick at gmail.com", role = c("aut", "cre"),
Modified: pkg/CHNOSZ/inst/NEWS
===================================================================
--- pkg/CHNOSZ/inst/NEWS 2019-04-13 14:46:44 UTC (rev 438)
+++ pkg/CHNOSZ/inst/NEWS 2019-04-14 03:42:58 UTC (rev 439)
@@ -1,4 +1,4 @@
-CHANGES IN CHNOSZ 1.3.1-12 (2019-04-11)
+CHANGES IN CHNOSZ 1.3.1-20 (2019-04-14)
---------------------------------------
- Add thermo/stoich.csv.xz (loaded as thermo()$stoich), containing a
@@ -25,6 +25,10 @@
- diagram(): Starting with R version 3.6.0, 'fill' can be the name of
any available HCL-based color palette (see hcl.pals() for a list).
+- Move transuranic actinide complexes to optional data (SLOP98), as
+ entropies of the elements at 298.15 K are not available to check the
+ self-consistency of the GHS values for the complexes.
+
CHANGES IN CHNOSZ 1.3.1 (2019-03-02)
------------------------------------
Modified: pkg/CHNOSZ/inst/extdata/OBIGT/SLOP98.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/SLOP98.csv 2019-04-13 14:46:44 UTC (rev 438)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/SLOP98.csv 2019-04-14 03:42:58 UTC (rev 439)
@@ -1,4 +1,5 @@
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
+H2AsO3-,H2AsO3-,H2AsO3-,aq,"SH88.2 [S92]",NA,3.Jul.87,-140330,-170840,26.4,-2.9,26.4,5.7934,6.3646,3.2485,-3.0421,15.8032,-3.6253,1.2305,-1
Ag(Ac),NA,AgCH3COO,aq,"SK93.1 [S98]",NA,17.Aug.92,-70840,-91650,38.9,72.5,48.6,8.3987,12.7257,0.7485,-3.305,48.3694,11.73,-0.03,0
Ag(Ac)2-,NA,Ag(CH3COO)2-,aq,"SK93.1 [S98]",NA,17.Aug.92,-158990,-210560,49.9,164.9,103.5,16.2287,31.8418,-6.7592,-4.0952,110.8373,30.5473,0.8741,-1
Cu(Ac),NA,CuCH3COO,aq,"SK93.1 [S98]",NA,19.Aug.92,-76770,-99970,28.7,85.5,40.5,7.3009,10.0483,1.7946,-3.1943,56.0175,14.3883,-0.03,0
@@ -57,11 +58,58 @@
ZnO,ZnO,ZnO,aq,"SSWS97.5 [S98]",NA,14.Nov.97,-67420,-78290,-2,-10,-21.9,-1.2418,-10.8072,9.9819,-2.3321,0.0295,-5.0715,-0.03,0
HZnO2-,HZnO2-,HZnO2-1,aq,"SSWS97.5 [S98]",NA,14.Nov.97,-110720,-142370,-16,20,-13.4,0.5623,-6.4047,8.2588,-2.5141,35.0874,1.0394,1.8669,-1
ZnO2-2,ZnO2-2,ZnO2-2,aq,"SSWS97.5 [S98]",NA,14.Nov.97,-93290,-132100,-40,-15,-26.4,-0.5559,-9.1347,9.3301,-2.4013,32.5837,-6.09,3.8216,-2
+Am+3,Am+3,Am+3,aq,"MS99 [S07]",NA,11.Feb.98,-142900,-147400,-48.9,NA,NA,-2.9531,-14.9848,11.6223,-2.1594,6.5235,-10.327,2.3161,3
+AmOH+2,AmOH+2,AmOH+2,aq,"MS99 [S07]",NA,11.Feb.98,-190845,-186550,-2.5,NA,NA,2.7959,-0.9559,6.128,-2.7394,-4.8573,-10.0418,1.0929,2
+AmO+,AmO+,AmO+,aq,"MS99 [S07]",NA,27.Jun.98,-180340,-171250,13.6,NA,NA,2.8674,-0.7813,6.0593,-2.7466,-35.6706,-18.5768,0.3444,1
+HAmO2,HAmO2,HAmO2,aq,"MS99 [S07]",NA,27.Jun.98,-221190,-206620,48.7,NA,NA,5.0241,4.4881,3.981,-2.9644,-73.2025,-30.534,-0.03,0
+AmF+2,AmF+2,AmF+2,aq,"MS99 [S07]",NA,11.Feb.98,-214880,-220920,-14.2,NA,NA,-2.8891,-14.828,11.5598,-2.1659,19.5254,-2.4822,1.2776,2
+AmF2+,AmF2+,AmF2+,aq,"MS99 [S07]",NA,11.Feb.98,-285490,-302130,-10,NA,NA,-2.6218,-14.1804,11.3162,-2.1927,16.1668,-1.8012,0.7003,1
+AmF3,AmF3(AQ),AmF3,aq,"MS99 [S07]",NA,14.Jan.99,-355030,-386410,-19.6,NA,NA,-2.3562,-13.5317,11.0616,-2.2196,-9.286,-8.2838,-0.03,0
+AmF4-,AmF4-,AmF4-,aq,"MS99 [S07]",NA,14.Jan.99,-423020,-474140,-46,NA,NA,-0.9839,-10.1809,9.7446,-2.3581,-26.7871,-21.93,2.3239,-1
+AmCl+2,AmCl+2,AmCl+2,aq,"MS99 [S07]",NA,27.Jun.98,-175710,-184780,-22,NA,NA,-0.2357,-8.3539,9.0265,-2.4336,18.1703,-3.3178,1.3914,2
+AmCl2+,AmCl2+,AmCl2+,aq,"MS99 [S07]",NA,14.Jan.99,-207730,-224330,-5,NA,NA,2.8832,-0.7385,6.0333,-2.7484,9.7834,-3.7964,0.6305,1
+AmCl3,AmCl3(AQ),AmCl3,aq,"MS99 [S07]",NA,18.Jan.99,-237720,-264600,2.8,NA,NA,6.4188,7.8944,2.6402,-3.1053,-19.2952,-11.7628,-0.03,0
+AmCl4-,AmCl4-,AmCl4-,aq,"MS99 [S07]",NA,18.Jan.99,-268230,-308380,0.5,NA,NA,11.1715,19.4992,-1.921,-3.585,-48.4478,-27.2169,1.6238,-1
+AmNO3+2,AmNO3+2,AmNO3+2,aq,"MS99 [S07]",NA,27.Jun.98,-171220,-204070,-32,NA,NA,1.3476,-4.4881,7.507,-2.5934,33.6975,1.6122,1.5372,2
+Am(NO3)2+,Am(NO3)2+,Am(NO3)2+,aq,"MS99 [S07]",NA,18.Jan.99,-198330,-256390,-4.6,NA,NA,6.1236,7.1736,2.9235,-3.0755,43.5785,7.9761,0.6223,1
+AmNO2+2,AmNO2+2,AmNO2+2,aq,"MS99 [S07]",NA,27.Jun.98,-153470,-178190,-29.3,NA,NA,0.7899,-5.8466,8.0341,-2.5372,25.9108,-0.9964,1.5067,2
+AmH2PO4+2,AmH2PO4+2,AmH2PO4+2,aq,"MS99 [S07]",NA,27.Jun.98,-417130,-460840,-25.7,NA,NA,1.632,-3.7971,7.2436,-2.6219,43.0978,5.166,1.4477,2
+AmSCN+2,AmSCN+2,AmSCN+2,aq,"MS99 [S07]",NA,27.Jun.98,-122510,-136050,-31.7,NA,NA,2.2644,-2.2529,6.636,-2.6858,41.0941,4.183,1.5372,2
+Am(SCN)2+,Am(SCN)2+,Am(SCN)2+,aq,"MS99 [S07]",NA,22.Jan.99,-100420,-120030,-4.5,NA,NA,8.0619,11.9065,1.0633,-3.2712,61.241,14.1151,0.6223,1
+Am(SCN)3,Am(SCN)3(AQ),Am(SCN)3,aq,"MS99 [S07]",NA,22.Jan.99,-78480,-104000,23.2,NA,NA,14.6427,27.9751,-5.2524,-3.9354,70.5618,19.4692,-0.03,0
+Am(HCO3)+2,Am(HCO3)+2,Am(HCO3)+2,aq,"MS99 [S07]",NA,22.Jan.99,-286460,-315940,-26.6,NA,NA,0.7185,-6.0241,8.1108,-2.5299,41.5986,4.614,1.4574,2
+Am(ClO4)+2,Am(ClO4)+2,Am(ClO4)+2,aq,"MS99 [S07]",NA,22.Jan.99,-147420,-189870,-35.8,NA,NA,3.4489,0.6429,5.4904,-2.8055,45.5927,5.5441,1.6005,2
+AmCO3+,AmCO3+,AmCO3+,aq,"MS99 [S07]",NA,19.Jul.98,-279730,-280130,103.7,NA,NA,-1.7286,-11.9966,10.4522,-2.283,-38.6375,-15.6435,-1.0199,1
+Am(CO3)2-,Am(CO3)2-,Am(CO3)2-,aq,"MS99 [S07]",NA,19.Jul.98,-412070,-370270,84.7,NA,NA,0,0,0,0,60.6334,14.891,0.3461,-1
+AmSO4+,AmSO4+,AmSO4+,aq,"MS99 [S07]",NA,19.Jul.98,-326080,-314020,-12.4,NA,NA,1.5392,-4.0158,7.3119,-2.6129,-20.9484,-14.6047,0.7384,1
+Am(SO4)2-,Am(SO4)2-,Am(SO4)2-,aq,"MS99 [S07]",NA,19.Jul.98,-506130,-485990,-4.5,NA,NA,4.6821,3.6494,4.3193,-2.9298,-25.2191,-18.8824,1.6997,-1
+Am(Ac)+2,Am(Ac)+2,AmCH3COO+2,aq,"MS99 [S07]",NA,22.Jan.99,-235220,-266700,-25.2,NA,NA,2.8878,-0.7273,6.0289,-2.7489,57.3678,10.1565,1.4382,2
+Am(Ac)2+,Am(Ac)2+,Am(CH3COO)2+,aq,"MS99 [S07]",NA,22.Jan.99,-326360,-385560,-4.1,NA,NA,9.4478,15.2906,-0.2668,-3.4111,102.206,28.3793,0.6143,1
+Am(Ac)3,Am(Ac)3(AQ),Am(CH3COO)3,aq,"MS99 [S07]",NA,22.Jan.99,-416630,-505490,10.6,NA,NA,16.8468,33.3569,-7.3677,-4.1579,142.1213,44.3415,-0.03,0
+Am(Lac)+2,Am(Lac)+2,AmCH3CH2OCO2+2,aq,"MS99 [S07]",NA,25.Jan.99,-269140,-319200,-30.5,NA,NA,5.0696,4.6,3.935,-2.9691,80.3905,17.9069,1.5168,2
+Am(Lac)2+,Am(Lac)2+,Am(CH3CH2OCO2)2+,aq,"MS99 [S07]",NA,25.Jan.99,-396460,-489730,-4.2,NA,NA,14.0044,26.4165,-4.6398,-3.871,155.4532,46.8867,0.6143,1
+Am(For)+2,Am(For)+2,AmCHO2+2,aq,"MS99 [S07]",NA,25.Jan.99,-230530,-252410,-25.8,NA,NA,0.9287,-5.5108,7.909,-2.5511,26.7819,-0.505,1.4477,2
+Am(For)2+,Am(For)2+,Am(CHO2)2+,aq,"MS99 [S07]",NA,25.Jan.99,-317720,-357420,-4,NA,NA,5.2992,5.1607,3.7147,-2.9923,28.9586,2.9204,0.6143,1
+Am(Prop)+2,Am(Prop)+2,AmCH3CH2CO2+2,aq,"MS99 [S07]",NA,25.Jan.99,-233450,-275460,-28,NA,NA,4.8782,4.1327,4.1187,-2.9498,84.5913,19.4948,1.4769,2
+Am(Prop)2+,Am(Prop)2+,Am(CH3CH2CO2)2+,aq,"MS99 [S07]",NA,25.Jan.99,-322480,-401070,-3.9,NA,NA,13.6283,25.4982,-4.2788,-3.833,166.3624,50.6784,0.6143,1
+Am(But)+2,Am(But)+2,AmCH3(CH2)2CO2+2,aq,"MS99 [S07]",NA,25.Jan.99,-231320,-283770,-30.4,NA,NA,6.9922,9.2945,2.0899,-3.1632,99.7521,24.6365,1.5168,2
+Am(But)2+,Am(But)2+,Am(CH3CH2CH2CO2)2+,aq,"MS99 [S07]",NA,25.Jan.99,-318540,-416630,-4.2,NA,NA,18.0692,36.3415,-8.5407,-4.2813,201.6874,62.9565,0.6143,1
+Am(Glyc)+2,Am(Glyc)+2,AmCH3OCO2+2,aq,"MS99 [S07]",NA,25.Jan.99,-267840,-307400,-27.8,NA,NA,2.8119,-0.9126,6.1017,-2.7412,58.0507,10.2699,1.4769,2
+Am(Glyc)2+,Am(Glyc)2+,Am(CH3OCO2)2+,aq,"MS99 [S07]",NA,25.Jan.99,-391490,-465260,-3.9,NA,NA,9.2598,14.8314,-0.0864,-3.3921,102.9852,28.6502,0.6143,1
Al(Ac)+2,NA,AlCH3COO+2,aq,"SK93.1 [S98]",NA,5.Apr.93,-207630,-249130,-66.1,72.2,-0.03,2.4411,-1.8235,6.4722,-2.7035,67.0012,11.6689,2.0115,2
Al(Ac)2+,NA,Al(CH3COO)2+,aq,"SK93.1 [S98]",NA,5.Apr.93,-298430,-372080,-59.8,168.7,49.4,8.9971,14.1844,0.1805,-3.3653,117.86,31.3303,1.3918,1
Al(Ac)3,NA,Al(CH3COO)3,aq,"SK93.1 [S98]",NA,5.Apr.93,-391100,-498280,-57,NA,NA,16.0545,31.4184,-6.597,-4.0777,156.5453,49.3293,-0.03,0
Al(Mal)+,NA,AlC3H2O4+,aq,"PSK99.1 [S07]",NA,24.Aug.06,-289589,-331497,-16,-17.9,0,0,0,0,0,2.2763,-6.6807,0.7895,1
Al(Oxal)+,NA,AlC2O4+,aq,"PSK99.1 [S07]",NA,24.Aug.06,-286615,-321675,-25.6,-25.8,0,0,0,0,0,-1.0645,-8.29,0.9437,1
+PuO2(Oxal),NA,PuO2C2O4,aq,"PSK99 [S07]",NA,24.Aug.06,-347049,-388846,12.9,15.8,0,0,0,0,0,16.6355,0.1839,0.1446,0
+Pu(Oxal)+2,NA,PuC2O4+2,aq,"PSK99 [S07]",SLOP07.1,24.Aug.06,-285533,-322634,-36,7.1,0,0,0,0,0,23.7073,-1.5882,1.6004,2
+PuO2(Succ),NA,PuO2C4H4O4,aq,"PSK99 [S07]",NA,24.Aug.06,-352253,-410929,21.5,38.6,0,0,0,0,0,28.909,4.8282,0.0144,0
+Am(Oxal)+,NA,AmC2O4+,aq,"PSK99 [S07]",NA,24.Aug.06,-313961,-342092,-6.1,-28.9,0,0,0,0,0,-5.36,-8.9214,0.6472,1
+Cm(Oxal)+,NA,CmC2O4+,aq,"PSK99 [S07]",NA,24.Aug.06,-311797,-340287,-6.3,-28.8,0,0,0,0,0,-5.3012,-8.9011,0.6472,1
+Np(Oxal)+2,NA,NpC2O4+2,aq,"PSK99 [S07]",NA,24.Aug.06,-290553,-324602,-41.8,6.8,0,0,0,0,0,24.2778,-1.6493,1.6897,2
+NpO2(Oxal),NA,NpO2C2O4,aq,"PSK99 [S07]",CHNOSZ.4,24.Aug.06,-327304,-365780,23.7,17.8,0,0,0,0,0,22.4362,0.5913,0.6983,0
+NpO2(Succ),NA,NpO2C4H4O4,aq,"PSK99 [S07]",CHNOSZ.4,24.Aug.06,-334413,-389768,32.3,40.6,0,0,0,0,0,39.4934,5.2356,1.1402,0
+NpO2(Glut),NA,NpO2C5H6O4,aq,"PSK99 [S07]",NA,24.Aug.06,-356890,-419969,39,51.4,0,0,0,0,0,34.195,7.4356,-0.2506,0
NaH2AsO4,NA,NaH2AsO4,aq,MA07,MA10,12.Sep.07,-240179,-272608,41.2,37.8,41.1,7.3772,10.2352,1.1421,-3.2022,27.9202,4.6622,-0.038,0
KH2AsO4,NA,KH2AsO4,aq,MA07,MA10,12.Sep.07,-244935,-274352,54.5,21.9,52.4,8.9277,14.0226,-0.484,-3.3587,18.6125,1.4173,-0.038,0
MgH2AsO4+,NA,MgH2AsO4+,aq,MA07,MA10,12.Sep.07,-290910,-332717,-10.4,50.7,18.3,4.5105,3.2335,4.1483,-2.9127,42.265,7.2899,0.7009,1
@@ -114,6 +162,8 @@
PbH2AsO3+,NA,PbH2AsO3+,aq,MA07,MA10,12.Sep.07,-153138,-174063,42.8,24.7,16.5,3.9918,1.9667,4.6922,-2.8603,19.6811,2.0039,-0.1047,1
AlH2AsO3+2,NA,AlH2AsO3+2,aq,MA07,MA10,12.Sep.07,-266611,-309612,-55.5,25.5,-15.6,0.2882,-7.0795,8.5761,-2.4864,38.8545,2.1567,1.929,2
FeH2AsO3+2,NA,FeH2AsO3+2,aq,MA07,MA10,12.Sep.07,-154392,-192413,-39.1,56.8,-7.3,1.3321,-4.5295,7.4813,-2.5918,54.8314,8.5274,1.6797,2
+NpCrO4+2,NA,NpCrO4+2,aq,AML10.1,NA,03.Jul.10,-308402,-340807,-24.124,69.28,-8.1,1.1484,-4.9783,7.674,-2.5732,60.0623,11.0783,1.4532,2
+AmCrO4+2,NA,AmCrO4+2,aq,AML10.1,NA,03.Jul.10,-327893,-348491,32.276,-31.77,3.75,2.297,-2.1728,6.4695,-2.6892,-11.8592,-9.5056,0.0552,2
PdCl+,PdCl+,PdCl+,aq,"SS98a.3 [S98]",NA,16.Aug.15,3310,-3820,-3.9,21,5.1,2.6729,-1.2577,6.2503,-2.7269,24.1532,1.2501,0.6143,1
PdCl2,PdCl2,PdCl2,aq,"SS98a.3 [S98]",NA,16.Aug.15,-34080,-51390,4.2,37.8,32.4,6.1933,7.3404,2.8664,-3.0824,28.0429,4.665,-0.03,0
PdCl3-,PdCl3-,PdCl3-,aq,"SS98a.3 [S98]",NA,16.Aug.15,-68390,-98890,2.5,44.6,62.9,10.9057,18.8497,-1.6645,-3.5581,46.9452,6.0491,1.5895,-1
Modified: pkg/CHNOSZ/inst/extdata/OBIGT/SUPCRT92.csv
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/SUPCRT92.csv 2019-04-13 14:46:44 UTC (rev 438)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/SUPCRT92.csv 2019-04-14 03:42:58 UTC (rev 439)
@@ -178,7 +178,6 @@
stilbite,Stb,NaCa2(Al5Si13)O36*14H2O,cr,"HDNB78 [S92]",NA,5.May.78,NA,NA,399.3,NA,649.91,390.55,137.68,-49.84,0,0,0,0,848
stilbite,Stb,NaCa2(Al5Si13)O36*14H2O,cr2,"HDNB78 [S92]",CHNOSZ.1,5.May.78,-11.741,NA,395.63,NA,649.91,400.12,118.9,-41.74,0,0,0,0,1000
talc,Tcl,Mg3Si4O10(OH)2,cr,"HDNB78 [S92]",NA,5.May.78,-1320188,-1410920,62.34,NA,136.25,82.482,41.614,-13.342,0,0,0,0,800
-H2AsO3-,H2AsO3-,H2AsO3-,aq,"SH88.2 [S92]",NA,3.Jul.87,-140330,-170840,26.4,-2.9,26.4,5.7934,6.3646,3.2485,-3.0421,15.8032,-3.6253,1.2305,-1
tremolite,Tr,(Ca2Mg5)Si8O22(OH)2,cr,"HDNB78 [S92]",SPRONS92.2,15.Mar.90,-2770245,-2944038,131.19,NA,272.92,188.222,57.294,-44.822,0,0,0,0,800
wairakite,Wai,Ca(Al2Si4)O12*2H2O,cr,"HDNB78 [S92]",SPRONS92.2,15.Mar.90,-1477432,-1579333,105.1,NA,186.87,100.4,44.47,-16.43,0,0,0,0,1000
wollastonite,Wo,CaSiO3,cr,"HDNB78 [S92]",SPRONS92.2,15.Mar.90,-369225,-389590,19.6,NA,39.93,26.64,3.6,-6.52,0,0,0,0,1400
Modified: pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_aq.csv.xz
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_aq.csv.xz 2019-04-13 14:46:44 UTC (rev 438)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_aq.csv.xz 2019-04-14 03:42:58 UTC (rev 439)
@@ -1,4 +1,4 @@
-ý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¡
ê
@@ -221,59 +221,47 @@
m ßéjÒÑUNñB4èqf6{TÏ82ô\ùòxÂ[SÔnXzvmõÔ¹Oól-AùÚ©i=ÙþÑ*ª Lof>R ÉÎöo>¹êV`ü¤KDí$ï0C¡ÞJhÆWÇÉéÌ>è²¾:Ûj-»xëR¯SU¯ÌR«Hµßk<e<{© ¦0+j#¹^idë9yvºésq ºº3T+·axÓ¦ò6ÊCçÌêܾÒÃC+>Íu}¦ÒR9"Ì0®0SôRÑ ¯(èVióAiPÀ±Á<j¾Í:¥VdC&ÿ7 ¡üRò ÚØ:9`àyLýÂOçÁÉ¥³@Öw.
#J}
ݱ;ÁºîM~ómZù½@DÅäõf*!è\<Í GöR ®V
Þ<Khyñòçe®WIdXÚQªãFçA¾Ke:ªt´ÏÏ-¦&ÞÇR.ëþloѤãþæ,V
ÊùùQTÓ_ì1Âo¿ýP_姻:åEÐÞ;iðûÄuÂþÃþ±Rì¿'7q9ä&Ô{ñe§Ú)ß9£ -ËCíR$zaw]élÝ( VËÀfOâSFJ{Ãd̸a
-:;=?¡¹ÆØô{p´FÝ-,}ÈÄkÐî[Â?âWkÞSÍcbÒxBåp~«-Zp)s73Ëv¼ÆZоcoç÷»E¸04Ijª¼½½`äÛýáÔ\ÉÞGîûfy1î/wÿh\H·bÆÍÈe^{aåÊÆ)>5e\km"áóà¥5´ --9apë¬5ÜöycÚï¼¾ÅÓÖ K·µ4¢;Ôëzlë¦y£@&.IPOø07±éÌÌ©¬Gó»)í~ÚÍ_³ê*!Ö?¤¯hfhÃ_kzÖåÆ0%SFh/vKÌ]?º[LüviCÜ Eï5©i/µ#ð,x:M©²gÎ˲lkìé×ð24ìõø%eJìókmç²èâ¿6DRQ\sö¿û{B´£HÕv¹¿8BÜõ}/&!h³èºçø6PO =0@Å¥ê{"Õª¡¦ÎT}F=«T®ÆÕô }äbáª`/Ok~Ôöúú®âU¹¸¨ñدd«ì`ç³ Ø-"ÍÔ2º|^OÁæ6Áhï!½
-où⬸ó©¢/Ä ØT%a
¤'.Ræ¢ä.DS&
- màc=Áòèà«í.=3}`Aä=óÇ_6ÀÞì-Ë_é ìF¦EÈÓÙåj{këm>yÚÀRü)¢ÐxnâQ8ÍòQ¦Z¹M@ø
- á Yò÷Zhàk»ÊV÷5Wà h®ýpjÚH3ùíËÕbx°
[Þãýô×?ú ÅìÖe ¡ëPòÅzÝiû Øý8.ÈþbºÕBªÂu,t*¯twW«åÖBù
a£:ÍZ·[ïѵ.kTÆG:rÎn½C´õû1 b!
- ¶£;BZR¹`jôÙäÍÆÌ@zz
-ĸ°Õ_6µZ³·§ he¤úlgúeÊ
-EÃæ]"¢/â+v<öÌHÞªpÒÉ ®µOÝË"ôѹïv×OuiÁ¨$»klenf+RÄÖγº_°ÓèñL®ìY¹!
-xë}ô± ºÔ¶ÍqÚ±%|SøíLehê+?à& ȬÓì«$öt)7ý3Ó¡EgnA9Uh4uÆhQqêóáN-·Lªó¨ßƧæóQ%¨>_Úðöb餮«Î^x\^D<ÎGÉÛC~ᥧÚXöröèCäá©óDãËÍ{m¥Hãõ¦õûtÐÐoéÍ^Å`{E1ô(}c¿G®¶n]©Vpë1z+û öigÀ÷s/.Q0×IŪ)ñÇãõ½
- o}#WÿêD~1¾þvjÔa[ÎØ/|é«ÓÇ~YJÒ%Ú§:¤®¹L¯ðpcÉ嶹-µÝcþ«fQ§þé÷Åh#
-¼Þ9ÔÑ8d/S=3¤èJ
ÄöQH}VÀféâsþÚBd\}Õl
-YDhÝÍLïÚZu-Û^1ÙºOÃ!½ª+
-2Q<FçÑGö3ºÅ²£FÙ4ëݾ±¥Ð¶{¹þÜÍ_$ÞÙÿɱÂÞ9i;O6ZxDýàÚ¿]ëe]OÉ÷ðäp¾º%É¥s®&lê/)0²Y¼ÎÍÎÿrbÀ+4g±^²+;i?WENýlµ|Ù@G}LøT°cäc2Ñê84w0zæ!¶åT ÎûµÜf9[ºåÀjñA7ÆÐܺVÙØ° oÒ§v@ó<4Ã@ÌüE½0³¥JĪÞädÞßp:kzd\rÓ§Ò-JÝB-ö3%
Ng8-0G¤°ô§ÜV¸Hº¾áb+av5@eeVïCÙc@´ÓŽâôüdaN3ÇSﶸQûz¹#Ñ
-£é;û©ö/0x1õZ±âä¥ÃsPÑ»øðDø¡ÅbL¸£0§×ÝsÄÀy±}ó
î¤7-¨¯-ÕèÖãÅiyÿ-~Ê<ùsãÉ2Ð;п°º¤ÿ êgA"ëQ7T8jä¨ÎßÞÚnT±Úù·`½Oô2àFÜà /ÒbtÔù¶W
-&ÊTÓ¤r¬û#Y&¥1]Í Ã
-Dö_»¿¸Î"=È}CÖÌ×Û~úu
>bB¹
¿5ì@x6,ÔIÒ ·µD;¡kTvÌëï³æN´x 00Û`¶ ðíÁ UCTMÁKdÏ%²¹cw)¬ëÄWIÖèî´÷×µÙzBª2ò&¥.l¯Ç¼Æ4xݹÎ__Ûã|h¢>áÍ_l,è#t½[®R:®Xúï2ÛäVÀÞ;!%ØZÁÁ´cÂ,bQ1 #
-,t´;ÙÊQãQ^úóÉëЫ
-yiH+Êüîpë¸Ó>æû¸¾s`}Ör¡Ëö!7;§-Ene}Ä_ç½¾½¶=ÝÑÜx~G²1ðËécïi9jQÀ8® ظFÛSÂZÝÑm¹×ØÿQ¦)_ü|áæT±3§,VJõúI~/(!ß2r¤þîwåö)§dsvtV¢»´«VùÉ<äÝÔ.Ç{ØÑe¬P¹$å,bb×´
"j7+Ú
-±Lm9.»ÀGBfeN^ÌS ô3ùáE7çî¿ýøÙõåD}&Fã£ÐéæZIVxGD<Ü.OÒÈ=oÚiéÿ=Ù)¼õÖW×6iÊoi±AÖ0,ÃXNuÌßLEÓrû¼®´ü+©ZsÔ¢ØÒò¤ ]âlÕXl3ÃÎ( À¸F[.¥øâF&«äiÌ<èÖ bk£@p¦1X1³²9ô.Oc® O[.°tbynÔº%ÏÓùbs}þ.eE÷v©s[Æø_Gìãí¤¯
C(Â4(Wé»7h¦ii ãDí§eå¦Ø±¸æUáïÒ#j¿Å²Gýô<y§XM Ó÷ïhÊé F´¢p}0T/íÁ
-kA¼:Ý¿È
UÛ)r
-ÇPä
Q7å¢ûO:k¾/úþÁ®À`/»Öü¢ ViÔZAOÃiªyôFáI8/ã
- Ë6êÕà ½¦hnõMΩ²J
-BIýÅ3Y0âX#b çÚ¿-Ê}¬U©ÿ!CnE¢×q¾¨«Bõ(* ÍAES$ô+Ö j¯¯©*UåuVô<VsçÂyµGõ×
-¦
-¬ZÇr5(û`RÆløc¼zÉ«Öõÿ_SoÒwFÃà1úñ0F~ ² ®»Å~Øn~#s¶å'ê
-|c{mY
-k9¥#ø%84ôIî[fÅ\ââkp×AB¤a0/äN(uÀ¯ë¯õ«&±íÛÔ.i^ÒáWu# ½á°Yá;ÜQ´¼@cÆmÀ?e)ÁUxûjpAÖX¯hQÝF°uUº,~jÒPóbÃÒ_ß_#ÖÜqíCf`s¦$¡£¥uhOpC³&Bû7XX7Ö{Â,kiãý9©:°N)ëvòö¡¹Qýë« +Víò
(gbÎu7Z|ø]¥#¨SÂVpE
®<&Öï5*©LÖë5ÆÊûÜõQ/®×Hôд]~
-hÉ×£øfMd¬?üPËÓNÌôL(ûá10+33¬G
-#ˤèß;×+Á2L¯}ºªØËÂÿ7[ë-&ã¯7áL[5y¾ÃkæÌüêWM«=
-Ωq~Ëêòè§ZkZa÷ûêæ6*(_Æè-}¼äxÝ7/Á°®yÅZ¤<Md²+~:/öåúú<Í`.GïJ7W£g° eûÞÐèÞ8>-N0?´ò.6¯'çÀA¹(íy×è<ëàLÐÅ-»Lú¼OuD7SS¥
N!Ç4R)¡zJüY®´¨?:TQÖsJ¡}"9 ¯í¶Æ©ì½
-tfÊ£ón¾~9¯kwcÈx&Ën'/bÅKð>:+dJÇykÐçÂ%ÎHž7B£V,óêúÏÐTN·ÚÂIê¿ÐÕZ
vnS#Ü<]¸&¬ñX~tÐDÏÜßç-ÇÎØw6Ø×@nÚ>Ú¹^Ñ@Cð²´¡8¬N{¢hÿ3näçÓE¬°³0=âeèt³
-ä!Ð>í vG9~·ãZ(ÔÇ,6¥×ºälHñ<y=§ 1³Ë"]¸{âh±
-Ý+fAÝ2;?måwVH)¿oabOCÔ´ÊcÝ@¶y¸b±7'JøØDËuݹFHú¬(²&b ²yUÏßßtqcêå/¹6#ÝZBÈ>+?U.¿+àú¡¬½Ié¯O¡Z@)?Òª6¾Ý~HÊW±0æZ¬´¾Ö=ë·j¯r?â'ÔÞëæ&t{¶¦|ó
-ȽÍåwhY·3oL¤ÒsC´C£\i«>fJà,uLjò"g=¼,&ÒëüKz© EÞÏâÙKùÖ
-*ÜÇ:ýÚ¬ö.h]eTÛóüÉÚôÜ¡qrmõ{²å£zÓ¢À{`±&?µÖÈô{Æ$;¶Â[¨ðLãA^Øé¨Ñõ+ê¦V®Oæâ`tÛõu^£Þ=è@-Áp~Ú§jó¥¥RQúìqîÕ&ÅÐPu¶M¼À&Ù3Ê:=ûI,óÑUÌ\D$ò¢!V`ÒF:óícwÓ(½#R6KSÃÅcJ´9ÛØk7aïþ÷·|B¿/mÀi[[A×ÎJÊáHù [ûAÁP;eyÝËc "ïGZ3§Áö3Ç.£
yã^ÓUë9K/µØu{îãÊÉÆÄû ã]¦e9À w¤ÝºÿÈôݼtA{É°®ª
-ÊaâªúÉhÓ5<`§Æ +|ûÑ[aÜ\µvýËN\í§Ùá}BàÊòE©Ò~¦%Í>3¹X)t0Ü%ììÑÒao¹¹#L>°gn^^lwÆfÑöÄyþX%iliÂx:ÜfS492:Ñú»ÑoèÝÁú3c¸\ö\!í={oÿÙâ¡>/°ã§sAÁ¸èúÔ:Ï]4¼Wªðäe (9ÕÉ"Þ7zæ¿<vÈ;³RçgÒh/}ðe¾'ú«÷
9Õò|ð<3 âÀ²¥Ü¯1B1ÆX
-@ÿ
-¦
-zd¨Û«ÔU[NJô
´xí²©ñ`»X)_KØÉÌ¿eÝmBÙª~ðDêV¦júh" q^?½®0UT|¢SBYxp¦wºse{ô>×ê®ñtW9nÛQD´H.âí&ÓSÙSÒÕRð&.ÄÃi(ï¶÷àx=ÂGGÃ[s²©À"@ÿH·ë/Aæ¹ÝnïØOì}a4¿ÞdtÌoJJ7ÇÜ9ïaú\·Ùïv6Ãü>U¯kפjlá7.ÅY JÉZ³!Kê
-òÔs(Ò£èÅÖ )ȦÕ(E p¤ûOâñ¸GÏÅ×iòJe;y§A95±4±£ðù#$?ÜÃ/1ï¡"UGAäðþµW+sá×KÞ¬Xô
-±67yYÛa|«uZëI;p_ £Q¬Ml<á@ã+òsPû00îäwÝsÇÏ^óÑÔ^nq&}!áÅÁ l2¬è-=À.Á¡
kS¤ë7~Z
JðqØj¶Áv£vyl-³HükoNmÚ?gþ$,Åt
íÕ[Ùh[Õg2#¥]èkëwþëÞ¶ÀcúÕIùÊÉíoácY÷Z/ñkvKKâ;× Ðd{G<=ríb |±ûh_¿_ Yø+¶F¾Yì£Ø1I|WëO½«uÌ%ð¬ jÚ{ÕÕw'¥ûߦYHÍ^êº.U§ö¾
-õ&ïçÞÄA'À´ü¿UÓ<Æð(Üh¸Uó(D»]=ûlV@ÔåGµ¥@¼îHÌgt¡©rw¬<×?1ûü´ë^W~ÃÊ* Ò
-ì¦Â0úSX'øK+-Úl`ª#+õ¸ó3(ÖÊ;mjkykÅ¢ØM
-î7}#fÉ'å'<û*Îã¢þîôÈ¥ÁûKÊ2Í|ÆÇï+
-ÌFΫ»bh2ÖT?zênÝÿkéBÁZQýÀd%
-ÓÅYÄ`wÍß(®*ÉH#%å1Úm÷)Á×s`wqLÇlÍo»x®
-d¶q#¥JÇ^¾ë)ð|¦Øe®W$!Ó¢jü'u¯Â'lËiIaßÆb¦Â½þÍvÓ
-¾µ°L,@ÝCøÁÔd&r¿g8vVÛd害:Q5É °d¶¨{6|¥Æ¡^Ç;U¡©!ÎÝÚ\
-]{(ÏI¾NI<¶(jSÅJf¯aÉʾnßM5²$æb'_
,°ÊWàîÁë°6/u\
-- ltï¼QéíÍ{Õ_jÝYéßÑs`mãH)Àh$¥âñô$·«I¾ùsHÝݨ@Àhj° ±ûÖ$½zñ®Ç»{rBZpwµ;Þë87iM¦D+&j*Ù47¿¹÷Ò±)°É_{á²üj[ØH\@Î¥©íYÄ)Ü'7 t[~fÜXÓdàV3)Òæaé äW¤üP©[óÖ¸¼?×ï+PÓÖ>ÜÏÜwj4Ñ.
-2N ¢=¶x¥ëÇ6»ªmsjK®p ª-bÂcò+åÏuXw){faZ¾JÄm:|Õ¿`ðÆal¢ÿ§2Ö¯¼?áËÉ\5 EæRmh+AâòKµGxtý¬êHÚ_Ö«\íÒÿ<ôT
-.b+©9O@ eÙ:õ¡Oß]ºCùìþã~EìçÕ³Ù̼ªËÌÔ4ºÌ]öÕq«Ø0¯l#ñÑ#¡
sÁªèøî :R´õ4üD)±$8ÓÖ#9ÿmcÜ6õúÊ°Í»µ;ä398³.N.^`¢ÚèµDõ¶ÏNMÜñ¬èI*ìa¢å;üàí©%jYOúg²;@gðO'B>#ù^Ê+Y¨?õ§rJbuÆSñvÈ|r¥¤Qv)ãhJ5R"
-)HÈ\÷§9ÜøùÆA0Ñ>RÑM ^Õ$lî`LÉ.Jl(O½é%\c9&ÈôncwRQªÏç-?OÆêÀ©·Å ¬
-Ñ} èb9'° ûèw5»qk>àÒÇÈg~pùãç#ô
7ÂÜ ±QèG3! D;MÀæ\ÌÃz/ÙÈ:Â1ÝîôchD÷ëùùñ»ªjò¢Y>AáokiãÎࣴÊDzËg?Â:ȯ(Þ¸K¦<nÚË,¦â8¸|/MQË2øèL/'Ê0WIÔX Å7~gjQkfÝâ{_6Ó2´$N¡DCá´Ae¨?îiæcêݸÉû*Ö´SyNR
-î7ètØÖ¶*Ýævò4aX2úö°¢õû@ú&_!æ±Ú¦;;aÕÐî/çüîíåìhè[áGí<»äûa1±¬3Õ&ÈmÒíNÄv¾l([ÁóÄ°¬éTvzXÙÓ:`:EíD"°zq:rÆKj5Wd¸ÓÍBQK{|â«NH×ásgX·ÞAFû|ªL.Ächp
(ôVè;mîr¥$.âÄi(ÿM63ë8§½u1èféS÷ÛÖI.ú
-åVÍ)Uz
ò3¯rhà¢âWEX÷u.Ä2äfÓRýjâ¯0ëc®³és¸;°áùÐjçælâÁQXWrVÃ"<° °8={Îj_LÇ!ß¡Ì´Àú]ø©©õb£}÷¹¨3J¶ÃVfØíYÙxhokøêI\ù,÷O3 Ês~5B<µô´³vÈó2Uè>EÜ
-:ú!dÛÂ3½7JÔ¡¾A¯ÊEò]Ö~õ4©õ´º¯¯úráº<¾UèñæF<©)d²jhV³_ÙÝ'¢ôJñ.µá4ðâ=ÿ³ñ×Vüpï"åø.cóüZxíÝ#:Ã@¶qo¢+iýÅeµ8às®ÁéÅ !`òÄ6¤Ç àÀS§®±Ägû YZ
\ No newline at end of file
+:;=?¡¹ÆØô{p´FÝ-,}
+.ê"»èÙâ&bpºå¯LANsTkÂ[µsÙD¦ØØÝÛ#z'æ,*{Yûø|ÓëaäóÀÈ®½`óÕÖ\µ¬¼öÀZÃ¥SÛrï'±@þ©Û ½LÓL÷ªW4&0¨Ö~ì ÚçÖn<49PNÃgK¯º¸ ·a¬åÐíÑBô¬
+¬?X5ãÎfuøA#Âí{óDãæý¬2yô;ó=¥]î*¥ViÌðÚ
+i¸ã8÷
+%SØ[Ãöu·èØÂup}ÕýßÐì\w¿ÄxÀOåá«(±'ýÌ~ÀÁ=x²f5|¸ ÀÄ9äFé¿Ú¸m2<?áafµÖa°bËäÓÒºÜÈI©ËþF}fÆÅÐky rxvWÖ[©}6~ÝWÓAͯ" ïþ´¿ñóìÕ@%MÚ¬ì¬ÅÍ8û7} Br+ á`¡¢+"ãN°Qá/7`VÓ¼àPBȵÂSµøÛn~ò:¦F²MÌa<ÇDìgê\˸3D,ÌëÿG]ÔC×ûS.+8Õ-~µÝ·¥¤¨Ç{½[RO2>&~TïÎ\BÖà¬Ïr\_áô6ú£côUTãÑÈ6¨ßVQ2M_²!|þí8ô ÇÎ3¨í ù£ó~ú¨ÿævoµÕ5enN÷2ÂÌ×
+4ÞZ7EÑY=¾®O
+NnÙµ×ÚèÍ==°0c×Dè)N§¿g=
+Ë·:'»¼4z$u" *±t&î %ĽMÛò~ï_ÍQ
êþ0J3 8ôÞçê)C{Ñ5°ýmýÇC)Fú
+ÜSèò¥>tî;M®Ü}ûÿض§ÓKA§äÐysý6/z@GeTp
ß=Bgå=ßü ]úÎëpÀ{3_U)[ñ¨~µó¼3Pÿó¢×©çcOåiáJ \æküÅ»£j¢Ïg<º¢D´úÛö'æk`X2Ô&Ý{ÉH¡b¬ËîÿÜM,º` ÍWfµ
(£ú·ÔW§OÆqbé¾:¡Äþ¨·<×êã^´¢&ç^ñu^i÷4ó¨XÆãl^å9ëÀf· ß óíÿa±4¹
+æ ÄÿÔÉ4¢àM¢?&ª87ámbð2Ù»ÕÜR4ù³³ÉÈÍiXö|ù¶-uaËu¤ã·ÓÏ%Á|n¼Æ'É@µQcIóN"{We³T;¾.4xÅ8 ¿/ # ¶MÕh²·)äÖg´³ìq-¬Òeï
+ò§øGÎ:)nñå¥êDÄÿ²ÄHztøIP+bzäÚ¾96{2©Á¬N¨rϲºtbÉuï=ò;Ì=ðó»yöq(j?h&çé8jgU¿1FpÆv8þñ #á Q¼æûÅ:t0õåYr7Wàz¦ê\÷ý¯(Q·tGìrÞ}y»= yÖr-E½|ôøñû;õwÔÕ?
<À${ÂÆEÀÁw~ÿMνLy¥Hk"Tò¶1ÈYx&àð¬þëîOL_NM|ËdÜzbÐ"ÏZå.gü¹Z²në¸{¢Ìl
3
vùÊý÷õ¡k«»ê 4ÈVøW§â`¯¼b'´ß
+b\EóÈËÝÕöÀ°¬bym@½hóÒV¿äqÏBu¥¯n>áÛòÓ3C)Ó¾oz;J¤ôHÂðú½Ayh^v]§7ê
+Nk4§ÿîÎuwöÔä6ñw®TÕÊ·Ë_î@ aQËRö|,îóH§Y·BM?kUJî.wmÝÐBs¥cÑ~sÑkñ1ùÉfí×ÆÜbÏÛsbtÙ>*HNúÎÓ¾_qs}ï×æ,×ÊýJeP觵^¹V8ò¹Uöt*KäFrkÜ0OR|õÅ( ª1mç8ù"å¾äJx¤*Ø{æåßÇòß/ã:J©,;Xï>
++Ûøí®XMy¡yêÄzôßË_GZ CÙ¶<¥ &Ü ßøõºß×ÔÅþÆ.ÛÀK9¥àçóoà<ËAÐͳe ¹å´N^Y¥VlìwØú¼ú_æ×T½'¨ÑÊßÄ¢3æÕb>gqJ>qÆ~ú2õÛ×Ç>¦ÑÇe1]øbò¦ ñØ%¬Ç¬¬5µþÑ_$Qã´[¢9Tüb5ìæ
+Õ>'Ðiì:,_V1e.ðÛé}Hı3.ð;¬BÑî¨gpDG¦I NáÙõqh~Ç
+ýu
+·Y=Ø}fÌ|VZ«,DBN_Ò¾,À[®Åÿ´,RZËöUZ²/ã¢0Ep9Û;CƽåS<élÞqCÓþþÑv Å'2ôYcâKÝ¢[óí0ëH«Ó*|ñC/ç·ÇⲡPhþ!xÓWc館â,Æouý}.¸
+ohB\ì«ÎO^¼T`Ù#º®D°Ô²ìs)EDü!´¹¾?²4lq%tÓ(Y¿Þ<B»ÿ5Bu~z¶.y[\´$åøg¦&¤8EÌ&3S
Ñ«¡¡±ê³ÿ.ÿ>
+âéÒ̽LÝxOüwLvHaEZôý¹?£Í¨GÑ
+kÒûùvˤ+d¸ö@ ä¼W3ðÎû×;û1¡|"Ö'áç?d@ÓÈß p.¬6ìP·ËÃi!òø¤CD[Ý×5)=qè9ZüÎÑ'9·Âõ$OÀS8~Kg¤®-{O¦·\aèGLâ'9-`¯*TJÙ¨]¶À\xX}~þx½ýØ®{Ö½ÿÎçzg±>_HZÒÃSÜÛ`Òö²4Ý/þÊühU%'¦Ü
+JñEsû;acaj[ ¾ÿ¶÷spCóf*Mü@ZøÍlÉÚ{×9¨èÝ:YàD ©ê,8"B$¤³Q`ã:4⯠¹%ôú¼å¶åÇ"¤'ËÆòßÿ\ÁiÒ¤£rѨ}KeKPsôØlçvWPcækÕM(ÄSA£[=ݲb ¯P4î¡×²³WÂß-ÆNè/WÝXY:V}
@b5ж:ñÚú¤Åþ1´ÛgA#º ÔXøÕ ôãÉÂF£oÞQÓ(pc88Õ,ÍÙÇûhät/èø76~7Â\AÀp|Øß©0¶þ¥HϯúVdä8ÏU+ÊT÷ZÈMïÀ®·xúþi½»±+oTòùC*c/YÉwÓø|ýÓ_¹£fV_wÈ"NÖmÌ¿%ÄZÍ.Õ¦íûßY¯ çP*$¤B8=è[Lìé)Ã/h¢êé:¢6ºSêÖ"E±:kðða9³øxùÁU³l~#
+S%o?àÙñk¬Ç ÑTÐr$xð¿
+Â
+ÔõùD=tÆJæڵòÖÛgب5ùsjY¡K$Ò4©u6mn²ejºÅ-IÕ6N»*cÒ,$õ~÷WGkQÙãoâ~¡¿«w¤õTÌõÆXvϺ÷v=f,¯ç¯Y ´U0:p]üZÈáB¸|·t>Q¿|*¸è ês*:0±¨§Vk«§å
+t¥~Ö\DÇMÂ4½ÿ?\ða)Æfçóröÿ/Àºô¯V¤W±C!Aiðâºâxô'Ó¨ô6¯J®'´§Ê¯!éè(®°La0F y§JnZ*x69Y©ò:>ø»ÀÙëiº½x'ÉaÆßè³lú_·¨çGé1À57N|ùZ<ogzgâ´½yÍoÖÒ¯²ì^BuE4Öèç SìÏÈ$h·àX<WÉnùqx ìýÁÊ$úÖ@Ou:ÿÓ^û4
+)æX(·ê¤e#}iò,ëõru½PÓ°ýg§ú(Ù¶
]§Ç'Cÿ0O1EÛýÂk6Ò±8
+[zôúð¥éX{׬n3ó±@xïöÒ5â´ïí&Xºó°#¹¦·2#h;¢b¯;Ô¾%[](»dÂ3Ó»Ér B*by[(a1
Ú10¶ò£õÃÊõE}8ÇÝáM*ø ¿ægìDÌ(ruå;ÿÁT±ThLániä«ãÖLÙéæ`Cùd.ôPða·¨ÁÔÅ]äÛ¶å=V´s<hQç
Ë·Fm)hî>;8`f6¢a¸a<'sH¡Ô4:¾Ø²°;÷® ýrÝ#rtúÝ>~4#ÃàU4õÙrPö¼ù\ ¡'LToáù&ÀÓ
+ðú2Hç êô01
¬ðdÆ%°8g¸¿lÍõ~ÓͪÅEH'ñ³fueúëUAß\¤÷ÐJI: íÂ`bÑkÐn§é3MMáÖ_ge¸Zt§ÓÅ+¸PÒ~?à¯Æ.p®_]üdX§/Aó9-Á*âÓÝðG¥ô
+Ñ«Mðä¦ú/;ýj¿Ö×à±"ésE9ä.v®JjK¤!½täõPLµÛgµÞ´äÏÒ¥&Ko(¤Ç6ºÎR<óS[p¶÷
+¤kùðÞ¹M®ã»*@î§1éþ½³%
+3xUÈà/1
ý¾Ð¦ÆkQç91YM
+âm1Nx7I2E/¤¢±Z«Åh
+tÔÄÄ×ÁçAÜ4O09¦_.R¥N&pMH%'öH«ÜÜÍãÙìùIK²Ê1Öédd6|r² ÿ«È³>ßÖãJåæ§2ïÍN¢@´¦(ê9Ù
Ñüó£íé¸ä
+_PmÝÏò`ëå¡Ïû.pæRE½vPZÆñ¬øâH*9gFyÞ
+±C´,Ï÷ybÉ{ö5kÑ##~É&´aÌ¿ÑU<~äwHóCø@ì®zj3÷iµV7»rID&÷I6=-!LÛrO*Á\Ù¸ïàòoPÙ"2ǦîXÉ߬«tSi>] Ì9*¢o~HÚ°ø1
+O~`òÒK=³ Ý
+t
+< ôÌò¿§ yDÀ¨~Ãÿïÿ4Ë·Ó¿0³ç¦`4cOnC? Lë
+î8»(:MÀÆÅaçÂ6p£ySÒ6ÄX(÷-ÈËPaq× «nT&g{0èM"eçÍàW\ñ
+qøä«J*8Î#QÕ@Úq~¢löð5ÌÆ?Á$(¥4ÐLæ¡qf:-}Æ¿a*~%Ë9 ¸°(ÂvQIöÎܧemÌ$ôà4M Êÿ®ÉäðL48Õ´V[}ø@X/(Çë«´ÀM?Rö¼ÛË`¼ÊÓLâÚɹ !j£²3d:d«Ðæ°ÁYHýxt9H¡MÝEC'AxQ\[Q°[Nòw|EÀlÝ2ö{(ÅNj¹g×E~·ë«G9c5ÕDiþ
ئõ|ÎÝd¤ÃN"Ð}®këd¨þU9æht½ä
+MD¢ý³òg!èrº<
+Hb|ÕWdBÀôÁîÖÒ@Éú·¨r#&¦ô¾¬½Å¥ÌÒ5ß>:äg~Û¢fát«ö¦²dQ§6ÿe=n!!k.+gå®EÉ#.Ú| UÕI Iq?R)úë@ÂP>
R M²ÿ¨¬BªÍÂ):#ÍkÔ ÿäÅ7ÆÚ"8²îù;)l>SØk+ÇNc6Ï<<Ũ ØYÞa|oÑÛºUcµ Sð{òp0TpºÉ³S?ì®ièE¹VdôR߬Flè7ð<e(«Êâg*¨/á`M>`=[ôÞFv»8³2£{¿~»KÞk%Í»
+½pq}u<
+tCaùÄkoÌÖÓ³ª°9$éP§·Õ´H±¿¦c¤=Pmú¾6¼í[êßw.7åpÒ¯ûâX@Ì«3ÍÊÄcûcïëw)1Ø}á×Á=JäÄèb/¢;ñê.="¶i ÈÒfÐh¬};NÔf¨Äí"ºyƲuMOÏÙq^NdêQ)¨tgp¯LÖß?ÞÊ÷DkÞ}u¶Áø&kßÜÌê6)þ½Ì«ù»Áòf DlªtpAÂèÕòÅú<õÿÃØWLkÄÚ.ø_ bÓ¤=¨·¨ ¾á}vu¾±Ägû YZ
\ No newline at end of file
Modified: pkg/CHNOSZ/inst/extdata/OBIGT/organic_aq.csv.xz
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/organic_aq.csv.xz 2019-04-13 14:46:44 UTC (rev 438)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/organic_aq.csv.xz 2019-04-14 03:42:58 UTC (rev 439)
@@ -1,4 +1,4 @@
-ý7zXZ æÖ´F ! t/å£áhxhS] 7Iýúb¿ñ9²¶Ë¦¨TB;qý"½qù¦cL;ù"ß<²ëbï¨gò;ø¥Kä¥f1Æw?ozÆCþaì]IبÝ5i¢ñü<ó¾Ã!A êeôC;иMÜ'ö~1ëÝhJOÙq=Ñ{
+ý7zXZ æÖ´F ! t/å£ádlgv] 7Iýúb¿ñ9²¶Ë¦¨TB;qý"½qù¦cL;ù"ß<²ëbï¨gò;ø¥Kä¥f1Æw?ozÆCþaì]IبÝ5i¢ñü<ó¾Ã!A êeôC;иMÜ'ö~1ëÝhJOÙq=Ñ{
!Sá¡l®J0woÖ±Ó¢VÏ)*+Fº·~ p60p¤¼
%ñ¹údôH4Z¼Äÿës÷9ð¨låuA at +ômÌGá]#ú|AnÂØcB½°.*ãÎöÐi¶6Y6½lÊ×>ò x!#×ï0Nïûéþ®øVqËëP×@oî*å~ç!Á~&¸Æüð§xú{;Å ÏQ(T{ÁµÜê~W¹ÿUÏ@Ñ»
rà&3¨íf1(\F¶^è=W<϶OöN ³È߶ãD?|ùï}É%¬biΰ6¨¹÷N_[6¦³çD *Þ¢üÍåÿd1*÷|ÕøÔQUè1õö¬³uüPúµ/aËvT¯¢ºÜö"Jþ.!f³Ò§ìt
@@ -176,32 +176,32 @@
7[]̼#WÂë¹TH·Ñ£`©·¼ Îk)[ÉLo÷Y Í@óî^Ø9
O¢c<³'u o^´m
9{رoQèpF÷íÏ"ð5µ.äeßG%ì¸&ϳDkUQðû:Ä7Ï´q0yûPªº>
ÎÕJëÃeáægµÚÀZ±ÞéíhÈ5_}Ýüì9GÊ® ª`~tËKÔ
-+AÌn ¼¹[ªH±ÕBÞ?Xf¯-â+¬â%W×è\Û,5YªQ´ËÌÂ:OÕ'9cÊâ+kªÄ×,{ùÃRiCb@3á»9I5Ô%H
-¢¥+$U/æ&`ÝþUt± »Øåàµ}ìú[»ìI1^¿tÊÔ§@ë©(Jy©§!.«éWøÚq=O¿ÕÃÔË-ÈÁI¼ýhÓ6n"$qz04hL8Ä+.¡#àÕ"V®?¸<4ÅeêHÉÛÛ\£^FPÙ49x»yöÄîÐcOÅw=ûÿMEïÿI#îãPméEzjPøª® ð~Å^k`BGÎ^Ú+eð^¬Ü²Wiçf²¥OT+>jýY°u/«ù÷ÿ&LÌ}å[úv³Ås*+Ðû:ȼüû¢MeÎvuÜ¡çz¤ÿ&é½h³ßepêÁ¡ qÔ·~ÝQðm öo,G{Ö+DAÈÑØÍÖï~îÀ1jÊʲÿ-¨#´L1Wteõ·Á¥i
ÈHÃÎÞÙ#0<|uH,RÂ̳µ}ý¶Ü0¿«¾H§éb¤úÉüاfLú8ÑðáÅ;|hÑû»4loµËì/r§ã;ºÖÉÆë¬`¼m2<Ý=d:4
-Æ¡
-WÕªÿýNHøs1I[9Ü&åLÒaèR
-o'áxã6Ät3ËÑõ1FÀÛJnÄ{äúl¥XoKG>èK:¼a!ôgx?m øn¾5vqB_Ëîf!L! 9wIjÈÐqukÑT;.m©â:È·{§¤4íí³ø{èüo±¡ ÂtQ·ÐãÄÆ'a¥ûoÞpèRµPáÙg&U£4ÃLö·X,b¾ü µkvõhîÛÈAz©»¨DÜzÕ`µ< £ ãtn9R×÷%¿rðÏHÚçÂPVYÞ® ;ôo´r6×É@5§ÇÀÓÖ5ß+ºe?ñYûHºe"éF£*ÆøÊoǸwúÀóºBѪoT0/¨°â" Ч-ò÷õì[ÚzB bjUྤGWmZ|Âׯ¦<õU
-µÎÝ9Él¦øCçý0ô³®ÐdýV6iV«Ì÷Výl>ð¶þ~Oo$ûp~zjMr6\Aq
-H1¸æPÔ9[7ÉSÏ!r°:J;ÁøO\!×ĸZåtgYÐæ!uåÞ>ÛyJ[S=_Kg|T at 5>
Vt¢Þhî'_Ây3ºÉL9½WÔK"Á ë1²HcÆgèjpùÌ4¼BîVyáYf±A(U6߶Ñl9p\÷¾ü_죿bòpiÿ8çÃ÷µÁa¤Å ,cõõüù©õSºá»)Üc`]¯ql¬Ú¿Ý¹ nºrð@ïy«¼:Â3mºE{Õ§¸Ý®N÷þfèþL¤[û.k¿xá,©ÚM4mÕÇoµÝ£óýóE4ì]é®csmLgt7§£*ÐtäÉOÑjJ°:λi;ÿþb}âKÉtÄ÷ÊäÙ¶#-Àê¹kù¬SD¥U2¼+PXh$@©¸sÀá×
-ÙÕO´¨Vm\s ñ®¦û2·¤|CUÁÂ%¶M7kòh¥ä=àÐuázÌN=½^!T?å²DQvJ8r~
ºîqë¡òµÁS5,°ôs±îUu¸÷Õ<ßzÍ_gj/òæbä!êÚ]v"ϧ-?H] ÍÖt.9âÝ%s¡z^diÔ ÊVC¢ÇÇ
B/ËB·¤'`Ì*ÇA{ «ÈÌ cdyc_ºÐi>®H^¿ö«}KdÃHÌ£µþ
-eÿE¼ÜøW³ÜÞØ£+XTÕøFÖ/Ù|)+vÝ {½Õ¤ÉbÏ
ó83©hk/¨à6Ztdw²òv`ݳôÞæL6 éÁX>1êS³øi
-qWòQveöñ³é°ÄB,*ÐeýÐ#]32ô}Èb
-b|ÚÁÓ¼à0té:¨blçe ,Û sâ1ÉþÏ£ù°fá#Ää{;ÆüQ'ȲQùÞCf³@baÍ£ £ûÕü½³¡¨òRðzÞ-êþJç0Û£±Û\k-ϳ$\
-"Ec_i~+Ñ®rÖòôä=wÇTY½ØK;Í)¥ÕNé=sóYºë(ÑÔK1FFôJòCÔRÛ6SÏ4¶EÂrÙ»/Ï\Ä&lV®XsÄÏÁGSÏ·jH»_^Ȧ^Ü&ãcÑ#ÆäQ¬ýIpó"ÊT(ß}ç Bm/æé+¥è.¸ ÇYItd[J»6-Rgàzd7maN*E D%²ì$ÿ<,£þW/KJõïiÓÓòµåøqÐ0ù=®Üû¢mÃ:Ø&%NPjµa¸ë_´R)üéÏqwAà}Ö[=áÀ+R.(á âU'.g+xIº+¹aâ~Ï^£Tâ-ót fgÚ÷¬-äÆÝW³Mæ`;>æß=#§5¯<&
D
µÜ¦-«±â×ÐD;î§Cº;^Ëyª£9Þ³
-9{¸ÀߨEQ»Ï_XúÕPØTM¼íf"ØJP{\À(°ÑéðA÷G'12N\©üë°Ò_pé*Ä)nèÈÍWeýåÖÏYsWá'¡r_T_:ø|,°g~òâàxÊl«6°ó¸fBïQS2úM·o¯ä®êT°Ä£lwímÇjMƾA¼~¸ÓǨ¸LÜ~ÞÌ.ï7NîU¡¸7°8 Ü¡#§ µàþ0¾6¹^®Ù§c<Öôx3k=Qn²Eí¬®4|^.ÿáÁÄÝÑÙ{cÄKrJ£æZ¼¥Mþ¼ë£"ÕõµÇɼÇbPä\×fj}Æ°$ɶNa÷µ[sݬ7OÝðG#Bg ãQà (,IjPb]7ÿõÂÉDc¬oX ¾kqÙ*Ðϲ&lcikæCh=/eÓ¿}é¾I>JLaì+vØvþ
-Ó¦F³aT7¼õ¤÷ éòÅyOø<3®ÁYa~¬+µD©_&æÌ--}äMQ ?¯òMzÊî#m=WÁÈL+ã§@#õ@¶P
-åcgB+!¤x6 ¿#Àÿ·ö"¬rÙàêV@:ØÃòf§WCRaÔ9\å'Ñ(äV`ßqy}S.sÿûöÂëyØ}Mnl} ¨ÿÌØö<+ÒÑú/
-£$¶FuBÔ~ÐxØtA(âõ()3;,~92<(
&± V~|4i-Ó8fºÿ¿JgÃÙxØKÎ}}Ñô5]5a8fEªçâ)ÊÚQã
ö¬djÍT8FwÊÛ]ºV+H1º{ª9ï®ØM¦N£Õ÷RæùëKÿ©¦l%诸¹ÿfðvvžYùt§1Knìøh 8@3£ëYeê/WF@,iÀ:AïÇk̺ å\gÙ mÔÊÑ~¶ð©;¹iÒ´9ç0L?Èè. qî(;ÕÕÞNÜ©½<:° 4û) s¡ =¯g¾ÅkIýôß7l+ª0-ÜPG³
FÊp¦>,H?ø *@½û´¿Ùjß:r]y"п2¶Úr*B°R
-^Î:£\ryÄxbB®6
-Èõ%«ñhµ
-ÁPþ
-óDãÿç¶6¨s¦ù ·ÚY`¢qD©
-N|=¤ñVþfMsYLQw¯ÊßÀiÚxÉlëg\æVNmé®ú0ÀÏÄõ
-9U$ùéÁ;ñ,3·©²¡cYïH¶\{Úª7òsÞkÃ=]ÞÍâ®Y>¨¨²¼þ®ÖOîe˶.©LûrªYJbzéýÂ!T/³ë"y¶Z]gJ´TE1¸Úoµ Ýøñª»zr½÷nï5+þ£Ðw
-I[e^}©ìbÙ¶Î;2.Y¢8khî¥Å%º=EÑƴ£¾ÆN82ã;
wÛþáê)zåä,ÈNþ¤8õ×s(¦$¤\Ò}+¸,14mÕ8E}Çô®Ë*ÝØä{ÒÀv7ÀßÙ £¿ü¹¸:!êóóR8nwyR ¨*pL8Hsn6Å2C
AØâ³Ð©±·,'ĸ÷h©AJÎv«
-SÚ×=¾Tøb÷¦YHÿ|B/¿;Ö²ÿÿ[ÿCC ¡¤iº,²[ºBÖì8q
-¿KâÏ4ð¢Oý`#]·g¢x?yÑÿÅõú,¯oO¹ÁcÔAP8Ù¬ã&`÷HýK¬|
- äñðË1øN;^âÛ^ba$bl¸Ká»5©Ix@[!±ºTÅaá}W
-å2dÅÚ+lðàMãð9ü§ÊXÀ *nÿ)H8gô¶ãèjÖ è½J¨ #ÂþW;öðدÒÙO2u¸¶?ûÌNKzý÷Ç Ë¶×ìmºä`Ìp"2VVió2çéÇ#=aÄÛsi©^¦¼~Wµ´ÉÞøýª§²ýÝÈëÍ%ÚTž r·¢Rò®?&ã~´@Ë[éûö^ÂOÙå_îXÓWS:MÈæµÆÇiÒ)U+w¢S×°í\xÅÊgÓgj/`#ysâ:µÈ_üa PZGCëæT¸ËÍVu´2Ò}ÒÛé¯ýÀ!@/ SÕ|Ò
ýªÅý
-]Ó
-Â@÷B»Îû{IïÚ!Äq.G]CP>Z x[¬×ºo+ÛÌ
vèP·ÞìèÖ:à<¼^ÓWܼ0ÿû¨°xÖæ*j|~i^÷¨,H£¹ÕGªÅ¥uÄÆé>ùÞBüJ£ìP<óx!ÊѾÑéúICücàâ ¿`=çE¶¡2LLRª/oÊYød n ²8ÜÆð ïÐùÐyI^±Ägû YZ
\ No newline at end of file
++AÌn ¼¹[ªH±ÕBÞ?Xf¯-â+¬â%W×è\Û,5YªQ´ËÌÂ:OÕ'9cÊâ+kªÄ×,{ùÃÕpÏ-llÈØ3qVî@*UYY¡déíÓDUò7"x£ºù@÷¤®Ë¡HÃD= IMÖ/ÈN$Ì0ñ>u쬫¼Gs1s)λâkC¦|:©7ñÀ¹Ó°#'ø{}³jyE9ëN$ÞúîÕ´#×ÛQÉÅzMmîïÃ_Þñ$Âl s-ÀÌÛHMÊüB¨u10eÂ
+¾[¬C>+ÑUíoùoý@¨Æß< >ÚC¯.©aGA,k»!¦PÕ+ AS¨ÂfÞW;Ç÷`o9ªÈ(ÅF1JNùn ºÚaX¸á«ï¥´HCñp-MËÉ.K>oK'*´}´~!PÄÇ;e !8ÃÀç8ôÃN
¬ÁôÒ®Á )[j{Qoth×=iަϴ5é ño&L-HÏuZôäS(§°j©Ç°ÿ\·±m"*ÖJcãiwRÀçl¾4'¶ô²½ÜÍPZµ§#°»d~áû<W9(8|8ëR%:Âjã.uþ£®Ùåb$îü`èFÝÃÌ ¡Ý÷$p>bn·àt¤ªÞÑZNèQ.ÍפÕÏùS3ïF_mæÍ&Ô èá{Ëm\¢ìÂi<æ!yê27ß=qÿöõ
+q8ÃmÌoT¶á°fÍÒ
+ì
äûû÷)¶PAãи*¨cùå ²;sB['<â*LÔO³Ê¿Éç?ÒÅ^xG×)~ü-WÒhx<o+ Ʀg²Sdfì]^8Åþ£;ti^º³:ãóRâÇ;K
+çÒb¦|=DQ°Äõ×rTfô0p´Gã*Ê1ß-;äÒ¾ÌÝ¡¼¢DakEoùU¸º Ë|Î Òý»Ü
+× v}ý÷×læQõ±ù´ë8_"d{5ÁxèÝ.Î|¼m2Îéñ£jâ@NÒêí#|ÓÁQy¬6!ÑQ À³suíD½«bç³u¶¤®4m6ªú"J^tr»Wy¨¿¦ÐâÉð Jj³S$K¨HnÌû>?¶@|hã?¥åö´ôO2vú|DgÞ5¡×þK?m»F&AÎ'Ñ1×Ø"°6`ÌÅùÛÊ´Í%I
+|9ª,Z¥ú __=fVMc¯dïKôf$ÌuÞÓéò4ÈEcǻҿ8¨Úé T'ZTP@ï!NHÂ^CT%®¨©ÕvHtþ)U6ázÂOQA_ÔÜÄ|òE³×)JTô@ç+õMoI·Öĵð%ÎÝû"¯Õ,úZ
+TðÔë2å¨#ñr[½
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/chnosz -r 439
More information about the CHNOSZ-commits
mailing list