[CHNOSZ-commits] r233 - in pkg/CHNOSZ: . R data demo inst inst/extdata/OBIGT man

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Sun Oct 1 10:40:38 CEST 2017 

Author: jedick
Date: 2017-10-01 10:40:37 +0200 (Sun, 01 Oct 2017)
New Revision: 233

Added:
   pkg/CHNOSZ/inst/extdata/OBIGT/Berman_cr.csv.xz
Modified:
   pkg/CHNOSZ/DESCRIPTION
   pkg/CHNOSZ/R/info.R
   pkg/CHNOSZ/R/subcrt.R
   pkg/CHNOSZ/data/thermo.R
   pkg/CHNOSZ/demo/activity_ratios.R
   pkg/CHNOSZ/inst/NEWS
   pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_cr.csv.xz
   pkg/CHNOSZ/man/subcrt.Rd
Log:
add Berman_cr.csv


Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION	2017-10-01 03:39:25 UTC (rev 232)
+++ pkg/CHNOSZ/DESCRIPTION	2017-10-01 08:40:37 UTC (rev 233)
@@ -1,6 +1,6 @@
-Date: 2017-09-30
+Date: 2017-10-01
 Package: CHNOSZ
-Version: 1.1.0-31
+Version: 1.1.0-32
 Title: Thermodynamic Calculations for Geobiochemistry
 Author: Jeffrey Dick
 Maintainer: Jeffrey Dick <j3ffdick at gmail.com>

Modified: pkg/CHNOSZ/R/info.R
===================================================================
--- pkg/CHNOSZ/R/info.R	2017-10-01 03:39:25 UTC (rev 232)
+++ pkg/CHNOSZ/R/info.R	2017-10-01 08:40:37 UTC (rev 233)
@@ -73,7 +73,7 @@
   return(out)
 }
 
-info.character <- function(species, state=NULL, check.protein=TRUE) {
+info.character <- function(species, state=NULL, check.protein=TRUE, grep.state=FALSE) {
   # returns the rownumbers of thermo$obigt having an exact match of 'species' to
   # thermo$obigt$[species|abbrv|formula] or NA otherwise
   # a match to thermo$obigt$state is also required if 'state' is not NULL
@@ -113,7 +113,8 @@
     # special treatment for H2O: aq retrieves the liq
     if(species %in% c("H2O", "water") & state=="aq") state <- "liq"
     # the matches for both species and state
-    matches.state <- matches.species & grepl(state, get("thermo")$obigt$state)
+    if(grep.state) matches.state <- matches.species & grepl(state, thermo$obigt$state)
+    else matches.state <- matches.species & state == thermo$obigt$state
     if(!any(matches.state)) {
       # the requested state is not available for this species
       available.states <- thermo$obigt$state[matches.species]
@@ -160,19 +161,19 @@
   # use new obigt2eos function here
   this <- obigt2eos(this, this$state)
   # identify any missing GHS values
-  naGHS <- which(is.na(this[8:10]))
+  naGHS <- is.na(this[8:10])
   # a missing one of G, H or S can cause problems for subcrt calculations at high T
-  if(length(naGHS)==1) {
+  if(sum(naGHS)==1) {
     # calculate a single missing one of G, H, or S from the others
     GHS <- as.numeric(GHS(as.character(this$formula), G=this[,8], H=this[,9], S=this[,10]))
     message("info.numeric: ", colnames(this)[8:10][naGHS], " of ",
       this$name, "(", this$state, ") is NA; set to ", round(GHS[naGHS],2))
-    this[, naGHS+7] <- GHS[naGHS]
+    this[, which(naGHS)+7] <- GHS[naGHS]
   } 
   # now perform consistency checks for GHS and EOS parameters if check.it=TRUE
   if(check.it) {
     # check GHS if they were all present
-    if(length(naGHS)==0) calcG <- checkGHS(this)
+    if(sum(naGHS)==0) calcG <- checkGHS(this)
     # check tabulated heat capacities against EOS parameters
     calcCp <- checkEOS(this, this$state, "Cp")
     # fill in NA heat capacity

Modified: pkg/CHNOSZ/R/subcrt.R
===================================================================
--- pkg/CHNOSZ/R/subcrt.R	2017-10-01 03:39:25 UTC (rev 232)
+++ pkg/CHNOSZ/R/subcrt.R	2017-10-01 08:40:37 UTC (rev 233)
@@ -122,7 +122,7 @@
     for(i in 1:length(species)) {
       mysearch <- species[i]
       if(can.be.numeric(mysearch)) mysearch <- thermo$obigt$name[as.numeric(mysearch)]
-      si <- info.character(mysearch, state[i])
+      si <- info.character(mysearch, state[i], grep.state=TRUE)
       # that could have the side-effect of adding a protein; re-read thermo
       thermo <- get("thermo", "CHNOSZ")
       if(is.na(si[1])) stop('no info found for ',species[i],' ',state[i])

Modified: pkg/CHNOSZ/data/thermo.R
===================================================================
--- pkg/CHNOSZ/data/thermo.R	2017-10-01 03:39:25 UTC (rev 232)
+++ pkg/CHNOSZ/data/thermo.R	2017-10-01 08:40:37 UTC (rev 233)
@@ -10,7 +10,7 @@
 local({
   # create obigt data frame
   sources_aq <- paste0(c("H2O", "inorganic", "organic", "biotic"), "_aq")
-  sources_cr <- paste0(c("inorganic", "organic"), "_cr")
+  sources_cr <- paste0(c("inorganic", "organic", "Berman"), "_cr")
   sources_liq <- paste0(c("organic"), "_liq")
   sources_gas <- paste0(c("inorganic", "organic"), "_gas")
   OBIGTdir <- system.file("extdata/OBIGT/", package="CHNOSZ")

Modified: pkg/CHNOSZ/demo/activity_ratios.R
===================================================================
--- pkg/CHNOSZ/demo/activity_ratios.R	2017-10-01 03:39:25 UTC (rev 232)
+++ pkg/CHNOSZ/demo/activity_ratios.R	2017-10-01 08:40:37 UTC (rev 233)
@@ -13,7 +13,7 @@
 # make the pseudospecies H4SiO4 available for use as a basis species
 add.obigt("CHNOSZ_aq", "pseudo-H4SiO4")
 basis(c("Al+3", "pseudo-H4SiO4", "K+", "H2O", "H+", "O2"))
-species(c("gibbsite", "muscovite", "kaolinite", "pyrophyllite", "k-feldspar"))
+species(c("gibbsite", "muscovite", "kaolinite", "pyrophyllite", "K-feldspar"))
 a <- affinity(H4SiO4 = c(-6, -2, res), `K+` = c(-3, 6, res))
 diagram(a, ylab = ratlab("K+"), fill = fill, yline = 1.7)
 title(main = syslab(c("K2O", "Al2O3", "SiO2", "H2O")))

Modified: pkg/CHNOSZ/inst/NEWS
===================================================================
--- pkg/CHNOSZ/inst/NEWS	2017-10-01 03:39:25 UTC (rev 232)
+++ pkg/CHNOSZ/inst/NEWS	2017-10-01 08:40:37 UTC (rev 233)
@@ -1,4 +1,4 @@
-CHANGES IN CHNOSZ 1.1.0-30 (2017-09-30)
+CHANGES IN CHNOSZ 1.1.0-32 (2017-10-01)
 ---------------------------------------
 
 MAJOR CHANGES:
@@ -26,6 +26,12 @@
   species) to their defaults. data(thermo) is still used to reset
   *everything* (the database and all computational and system settings).
 
+- In add.obigt(), using 'file' without a file suffix now can be used to
+  locate corresponding files (such as CHNOSZ_aq.csv or DEW_aq.csv) in
+  the extdata/OBIGT package directory.
+
+- add.obigt() gets new argument 'species' for selecting species to add.
+
 DATABASE UPDATES:
 
 - Add DEW_aq.csv with aqueous species data from the DEW spreadsheet
@@ -33,12 +39,11 @@
   database in CHNOSZ are not included. For the time being, only
   selected species are fully referenced.
 
-- In add.obigt(), using 'file' without a file suffix now can be used to
-  locate corresponding files (such as CHNOSZ_aq.csv or DEW_aq.csv) in
-  the extdata/OBIGT package directory.
+- Add Berman_cr.csv with names and formulas for minerals whose
+  thermodynamic properties are calculated using the Berman (1988)
+  formulation. The state "cr_Berman" is used to distinguish these
+  minerals from the Helgeson data.
 
-- add.obigt() gets new argument 'species' for selecting species to add.
-
 - Data file CHNOSZ_aq.csv is no longer added to the database by default.
   It is now intended to hold provisional updates. Updated heat capacity
   and volume HKF parameters for adenine (Lowe et al., 2017) have been

Added: pkg/CHNOSZ/inst/extdata/OBIGT/Berman_cr.csv.xz
===================================================================
(Binary files differ)


Property changes on: pkg/CHNOSZ/inst/extdata/OBIGT/Berman_cr.csv.xz
___________________________________________________________________
Added: svn:mime-type
   + application/x-xz

Modified: pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_cr.csv.xz
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_cr.csv.xz	2017-10-01 03:39:25 UTC (rev 232)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_cr.csv.xz	2017-10-01 08:40:37 UTC (rev 233)
@@ -1,66 +1,58 @@
-ý7zXZ  æÖ´F !   t/å£àŠ«&[] 7Iýúb‹¿ñ9²¶Ë¦¨•TB;qý"½qù¦cL;ù"ß“<²ëbï¨gò;ø¥Kä‡¥Šfœ‘1Æw?oz†ÆCþ­aì]IØŽ¨Ý5i‡* p0n¥z†Çj€„Öz‡—Ý»ÖpUÊhÄÛñlrO`©Æû´Y!hA‡Üµ‹îð!¨©n»äü¡¢ì˜JqÆíTHÞ1Êí!Ù(@¬EÉåR(ß±i¡0DíÎò›hŸÏ9rQAee1¾½rƬ$£Ÿ(6/¼ËP†:¢	ð´»Jbtp,B1iúK‚\ê]€ô2}·ïSƒ«éî0w³”ý!Š³
-$×bIžù8ÃOÕÅ'š·åÉ2lÂSéÕÃ	‘c§1Žº’IÃ$ê&%ŽIm§tØ£E¼‘Û\p‚–×3âA¥W€&XŽ9rQî9ݶŠ|å;уãËZÅ~øk8kÈå:¿䃛øú¿‚¢ÞË(I‰¥ QÜõ®†ÏáP•n—DçM³‹ÿÍX?EGâMX nJˆrH&Þ
-![8ÉÙzg”ô´ïÍ$´¯Éµ_S«?”êI´àÆ8¤£ý)ke=îÿⵏmen¨Óþäºãæ¾8ÐÓß>&Kæ0¡©u´`iBÀÞÌêûAs¢ûL#ÈS…+Wssu祌fýÕWë¤ 	M6Ñ—bŸ,"/âu¦²NO­ú_Ýw»ýºd§$ó4ÍÕ'Úcdv±þL:†°¤/7§Øô¾Hãí¹)@wÄ-Õ¥³‹ |¯‡Ç/ôôä(#bgZ,ëöM‚÷þNK¬rÀ"><n°ù£×pBÎ5<–Aù ”Qt›éw tÿ¥qëîºB¿JÜru؃ރÌý¿Wšù ð1`TºØÌ(£Õoy;Ž'ÂÕÒ-tÌ›ôb¾lÔàqe#yd²FEõ†UØm$H?mÆRôw#Zý¢‰Þ䁋\ð²Å&Ú¾d΀í†c×à7ª 1ìR´¤hÒ’½Lׯԅ²œ·;	é]©Q£[[)-{W5•ûÌljûˆÉª+tÛÝÓü+ÃZ´c€õáÙmÄúCËb,U äMý÷ƒËÊ¡sdz1{13¯Å~BÙž½¥8cÇÈŠíRµEdŠ%c‘B')s¯Þ|b²
-*‚ý‹æÅÐÑg%åíÝ•îbÑ E¼¤þ"rí%ÀŽ>:Ä)O¹vH	6vBª)iÖs|‘,ÓåHÄ)ˆ¤øÈ%	ö‚(ò¦A¾	-اhP°7¼ïqïßúAÞÉZÖã þ-ð-·zãÞ#
->¿40rw‡RJŒâ§	‹Éjð×ݨ•gSŽŽêNÄc¾LøÕe©BèWìÏ µ¾M¾Ž¤ÏzR3WÊMàÙb$)‹ªS£×Äþw{G3·Åi'}„øŽƒÃ"ñ6¶Á5—åQHNõ5]d¯Iøê¯ú½ùo£˜rù—÷—Ô‘1-e¾BËÀ„ÑQ  åNƒñƒÒó­PçŽ"ÁcPéå/ú[_bŽýBËaÀÈKb[yyí7f½ûóÅ%v!"­ÒF¿ú¦
-²Ø†¬ï)Â&15Í3Õ·,s¥Šq„sLHUß'¿o:„1ï”$Oé†tdãÙsa¿^W—ÞÓÚ®«ŽçCpHnA¯)D5Ažò:A0!™AùÀ¤zÉöga’Ùf}û DöצGRUZM²Û9…J~Z¾…Üöåý‡b¾…£ƒqפÄÖÆ©yܶ, íLBDTfRCÿ°¹þ‚¶9m“'iY :æpKi_]XJâdÿžþ â¢RƧ(T¼“šƒN÷î»j™§ •‚†9-³2=,oå/ƒ»™:„9›éŠãœÁSºÌ32 EQ³ðû^¾áßu8àh)êûÅy®ˆ®ù±=*ÅžÅ6Þ!<óˆñvÀq39OMp53¢šÞ%Mx4`œ2å`£9ªýA§KÀ*d(/» #¾?öæˆÞAz—çÅqlgæ²­Ëì؉2…F®83ßAÒn¦sØ÷ U„	Æq›"Ʋæjo³¦Ôv/²àÌèH¨äÅå<ñ‰yY`™â¿(O%\4,.×ò§”"ÿ &¡_nì%Ÿq «‹dGOV»–lvç‰;^™xåóñD¼odæaµ¦åÌË¥¤Ðà{cþ¯ È&è<ƒHìÏ'JùŠ·çm e=ÓÞÛÈoìœð¥_%>º [—Á~ÄÏLÞm¾è»-i«ü:¹ynÆjxÉ“¢:»Bœ4í¢cx‚©ÉÙ}q‡P36Lî_V Ú´ïïèD
-éóü6aÝtoÌàYžî„*•Ÿ	Lg°îI5P16ؘC¦¼åè–þ•O`Wž1nS€Ã±iÖ˜ñÏ©—€ˆ·ø3¤ZóES«ÔŸ$z
-}-ç³P.ªªLñ9‚ýå?vrPöÁ0„n/Ô– ½5õÔ´„‹\T„ä¤À¥×§žQs§*¤/2œMMŸKm/ÖD;îÈøܱ£wQîÍÍïn±g"ÿȹ5þ¿ÿ¹eÚ¥cî:Ñ”à­îXCËœ*G,Ù÷w€‚7Û[ÿQ6IèµH<ÝT!»6ÿö
-Žv`$ñ®aoå?hlÀ«r8@ìÓwÉRRAžN’>>½\uç¬Js¶ÄP_JŽñeúöE8ì${öRP
-ÌÁÖ©*º6ÃKbÙ<Ÿò÷;¡ªžÞ@F·üAˆ½bÒd7«Y—Ø|Éçð¤5éÀað@›²­óª¡Ö Ç#ÛÆŸkÈçVház¾°DÅübÿ)@d¹*$^Û`,ÝD+_?	L²9Õò_¼ò/-\¨dDÀôEšó!šŸÞµ‡E©u玾ÁÇåšm܇(¯
-,6»+lçÆû]3(ÇU¢×Øâ8s›(*ÍÅ2ÿˆ¨~%±_hí0‡ó”ùÇx7ÔnªMжIŽ7ó¨dMá³ñ2È„}_]¾W$l†ð%`€ô²æ<j™yÚ‘»P´¡g_Z!ˆÔ½8ìù©€vÛmßôBûÚªo¦ç'Xþ0š1÷ú´w™v¢«R0Ü•Fi
-?»øèkØ"Ý\y”=uŸyS'a›x¯Xy)=!‚åér&‚YÒþõ#|–8LGóC~*Z‡HÚ
- ªÀ3ãKiXKg¿y=ﲓŠ>“ŽÆæV ¦¦"­éÀ£s¸8Š"Tù'4hW%øú.>G5@ó¢úîM©&#Ã/‡y—Ù¯¨AŽãÓeëÛþëGå°™
-úX´šAp°ér
-»`ÐnÆC!rAD¿Ôøô"p§ÃWÿ@æ¦c¿Æs=Œ;Á×YSÝħ,ÛÈ™±“¨ñ)I<4n0öÚØAß8Ð{/¥˜¥lr´æÿè²h³Ñf+<‘•¨I
- «åÞ’fOË" 7ZÂf÷± .q¥ê|ž5*§2Ì)„_œ©%‚;ߊR2?²ñ×jÙ ü»%býi†3;«ÈY\o¼05ö¼JÔ»ñÈŸßHiêLÒ%(&â
-KY¦\<~P6‡r›(Ä~‚w
-Ax	H•uv,Fb¼Í€puR‚)Ü
-¡ênÇB"Óô
- 0ˆk’Š{h<úØU˜ÜøÎ[̧>×éL¦MÄØZ&’¡xM={˜[¡ñ¨õÖ˜ÂÒHS£¥söîã“`ì@Б˜“k9|›ñ&”I6¢²ÓqœXj³“	lµþ¼-›í±ë?^vÛó“³	%GߊjÆe…§Jy¼-Œö$ÆÕ¾%x¼oeÂuäÐR'+9Ïá¼ërÌ.)’áÞ¸XýŽc@ê•e#Ù˜ÿë–Ã)€;MVöQ.“+àö¡p㱄?ý»ÉûÎÒàM¬¶z˜”%ipaÿG$ã²î¤DØåd&Dj¬Á° \}*X+YIUòvw¨æ–j„ë xàE at s/¦éAž“ÊÃØÎB¾¡ÜCN a_w¯ûäCºáD.Ãè”°]\¼ù à-u÷kTFé“1H„Ð{þÃA©(˜Þõä=2$Ô„1ÓÄÙs®0 ãlAC{»fâ®ÙC‹´7p
-*¸í§ÓaŽ$“}	!à³µ@ ?ñ‘ËÝ×î‹‚•2•ˆçïÚ¯_]+I“¶ÉXnÎùÍæ6ùéèG¥TVñrùï$·bp[«‹ÀðÙ³ÿ†{¥>(Ó
-¤ÁžJgÀ×â®sR™iiU°¯.³ã¢Ñ*C
-”
-ò¿9b
-žn­íCmC;:1šq†iY¦©°=aÀÏ£…“86rÈÕäí•ÏvüRæZË"L·‘ŸéZ©óú°Þ4…=^Ö®ho>»¯«V[õ°˜\hÅò_»wqHD‰žˆžÎjÖ¸\ÊRS_lA|õ*sŽSØc0a;æ#étrêKpÌŒ{¦A4B²ûÿjú«ËŒôªL#Û§°åšç7 ïo:ÒWð;÷QüBeç17ÂÁàøÖÒZÖ¡Ó¯ÕŠMy–¨ÂÜì~o;8ÑKTÉ%46ˆ%4A–4Ë\ÁHšâ„Å©zùqLÞ.Ã[±"²2$óÐÿÙHüå•Ä·£•®jÑtçmÖÅþs…ªRE-CkRzØ>ß-ž4M¢n\‘šB¡ƒ ‡ªh([kÅ
-jÆ;’Ö•lW'ý¯¸`(¬”íJéi¹ûýxJºk€ˆ²R½h¦}np}Jq`b¦ßÓ²¼­™Œ!Ð4ð¢M›†b`x£ üdÕÁ›'c5¸4 Q¹mù¶$B9Va™Õ;o«ã2a)gR"±Û,_¨„|þß>R„³XµJIBªJ­zµQ~uÿì7 U놫Á_Çkg¤=3O4_͵…O¹Óµà óâ3qÖŒ a#ÍÓ•a¿yey%¨cY¿¶/N]×!ù¦–Ua¦…ù«ï¬AàGùá'¤¸·ÁÄž©wö5fDЄá6l7*Àìº:ÐÓ}¶ÒK"’±î
-aª]š§ç`Ûu
-€¥MQ*:ΰ««òg¸±s
-èÎàâò•ÖÅÆŠAí”P}0.àNŠŸ&¹^Á½R]ŸÏÄmêˆ׿ҝþ%Ö&‹~ÚŒþS¤ò5¯¨dT€ñï¶$!áG-ŽlR	ciCJ©ãÃÞìØÔÇJ‡-&æiã4‚ÛcWίYP9Œz#))ª£‚ì@„¸oÞ2C'/‡1°£ÚnéFï‡\:§™.ò@`ñ(,V„61Ë;wfÞ;á¢É!ËeÙL”@ö@5!2¹ïÿ¥¡£Sèî,¥¹M…ñ!à HÂè·_\ìîàhËP=‡ØeDC&
-=R1®Ó$¹¼mvt'ŒÐŒjL¢¨ÿzªÒ±ƒ(?ÃXÃЗQ%#$”ä8žFì– ”Û?÷OIeoªNy»bz¡	ÆhÇ"§%ס yâçŠBÙuvßrÏZ×ìs!ShçЃëÀe7>L’Bv.Ë;W¢Â¹Žuôž,™·çl};®+–{âîRþ;‘2Z‰ãR‰^–E	Xr-L˜¼Ã9‰CžòŠ”"{02D#r3ÇÑÉÁásR	Ù+„_q²š°fê6à£nô\!œµÍúá#ÕÕOwn¶Ÿ^Ï˜ú>gµÙñ—ì1ý4<<ß`ÊæúžÈÅe„£Ar'íÅ¡C¡¸õxZC;LžÚ79è6DõÎÔì÷Ê 1@)IC*F!—²×+×ÏY Æzkì,Ã<1wͯ4È•¸uvÜ´ÄÃEUcžëšŽ+,ÿ‘ÿRDÆýÀŸÔûˆèÁìy¢tˆ÷¥P‰	|†w è6þµˆ#ŠKðp NFùo™¾Ã4’· Á³pÕ­
-Á+¯+­á¿HÌeΉ‰›9ȉófõ†Mæ`ßkÁ`“'âØ7¾!Åhy—Õ›¡V¼oܱ˜Ú@*ÜÜkÏm7˜¶"Ûqjç9JÊýë…Å;ÊÜóËñï 
-¿KÓ®£Ü3D³ªHó›«Œ<NÁ@VFX3¤…£Òt!qÝýÕ™‰),¢Ê«üC}Òˇö³7ÒP?àª1‚Cw pX™ˆJü¤øÍjÔSJD³¢7Ó7‚“—ð$9gÒRpKÔårùâwp”ÚMjŸ‰ô ÑôÂnŠ‹±Ë7ä0šr»q³¹¢ÏHÚ)øn}M§³ŸÿþÙGÙfÿ©Ç9«3å­{Èçô%9æöŸùü"_%€ÄûJU×Ý;EÔÁ¶¨5$¯óç±AŽñ ÈáÓט	é˜/½k1p>Ùõ»blÆŸ+á”ë¬Ëª˜üŽ¿¿ìÎø…0¾lMm¾C?-‡a
-! ¬¬¦Kײ4&ÑÒhÆg"WÆÔ5ÇfÉÌ"_›øÛ¤’?Þ1< GP½²)"Â\Ð.Z[Aó*þâáæi¤8*;î_wAw$.@2ïέËÎv\èÌÂI®d³±âCrýÓ›|j×z\5.¥l‰¦ÒÐRóÓ“ÖÛZBLËÓhVÒ÷l+œŸ5sªãbÕ؝S@'"᎜p¥˜¸þÌÊ‹HB¿–,<߈²o¢‡6¾÷5ŽÆQÈÄÇõɺk<3ŠÆ›ëÚÀ5¸Ô&䢒ÊjC,‡ˆ\Ú—ãaU?i¡\”ʲf…å³*ÀQ8Œ®³â:W&0ü•&C÷ôͱ_×hÅ3æ4¾{f$á͵ŮLpeÀß÷Ÿ«‡‡Õò€`EÒ0Í;q‰!$CãcÅÚP¦]Ž_ÛõƦwrfChFŸnK(W•™+èúiÌ*s‰öKKöámPæI¢\o}/° –®%ÊḊ
-ôgïû)0~ÚQWÚ]qí›}7W>åž)–¿Å‹…Â@Sþ„kŽkʆÁÏÁˆÚ™Áp'‹¸¥@p¸ÅàÅQÌÏ—Tç«^%.™æPüp;.Z‘àxT€îAÖýwáCõ–ø :#s$FMä=ãA9ŠßΝ>t!öÉìÍb1f{‡ä}0•×ÓÚ60—Ì£Á¹rv´Ùœ]ŽàLdŠ]^ÙsÊ‹ðÕú]rzé3õÈswnžJçAŠÁÑûÝÑvèz÷²­· ~ÜWøêx˜r#;–/¼šãÍ`ŠÒ¼›O VR­Ÿ&Â%>=k³Žh°ƒÓuXýw¥µ¢uî„ÊaØú«’ƒÎî‡ £¯Z¯m›^÷xKäÒ(Oí&L at Fճ鲪$RKK,l³£²5;Ûd;Œ€ý=J3”¨¬Î#Â!G&¤a»^«ÍÆ¥ƒsI²·zÇ)íÀ¤¤^ëÙÓéŸ<žWQKµ2ƒMÈZ¥ul_i5¶ô¤´P¼7»¿r¯4ª	 ïÎî¿tÚÖ¼ŒIþ¯ÞþD3J1Æ;z©Å‰I\DžÚÇ™n_—bXw`Æ•CÇÐøí²Ä ‹±6é$G=%E"8¦Úy>T“;ºx¯;ºlZßã<ËÅ·™Ý™Í¾š¬aFÅLaùnÅ°®%¸0pG]RŒ%ä³› «
-Ã`ok_Ùa>uSÔæa•³kå ñ[OgU‡LTî;^¹aƒÃüU*ñâµÐÙç5«äÈgy¹/«Uu¢ôq(ë
-u<ZÄqû—ýxlÑÅ…mP9)a30ž%—Š[Žö;謡{r —þŸ:„|©<$¤H>é",&ý«îÏ,¯¨$pæ’š­'‰TÉóëhaP&u•óÌ"þòIÌÂ3]Eõìýh¡Èð?ÝSaçò:1Púì9¼jvvAFî:ãi%1ÃÙmœ6žw)O!ëÉfàCx‘¿nRƒLV‹S‹cXpBbÆîDðÎãF}÷°Ûÿúp¬Ö25Í·H›Ñ>8Žyí7ó#ô4’]îÛ¨$W{
-Ðy‚Å»S`!aÁ£´gjCHoz±1~æûQÜŽþðڤ剄¯Ü”/FûU!ŽJb5®Kćf/Åï1yP1ÄÑ•±ãz¦Y J”Üó;S¿ø+Cí#Æ…¬yÆ%tsöX‘bTs©)³ìÂ*²kâ·ØAi¥ìôò¶×ˆâ´ý	$:œË¥ÔÒ¢1Õwš^f­Í^nm½³r”úK÷”HÞRú~ì鬴b…C;€,eAÌ^™öÃj:DR˜È1EŽ²{WŸa¸§MC½’+¡\‚ÖÄ;ÛÝÍáêmOˆ<Á£kF-R-ƒ_ÇÅLÌWeyÄZ+q«û*Põ;wš`Q—ƪ~cQ‰ï›”Ë%nry%ïÃçÈÚ<±ã‡fš	‚\DSg(4¼¨bTŃž·&‡äÜ«<ký	â¹öÇJξYD0jµ:È?ÓÇåÌfõ/ „ÈZ¦íŒ0sÒc’y㩶D¼XZÁ@qéĘ©xTè&X¼J´€õcKy>
-;“j÷Ógn¤çâˆØC™_;«!Ü úZrdô5»\ôE
-ß(7	\Ìú&+ÅQ¢éÀäèK™:Ö¤³,¥r’+Ýc„G*9MαH	±iëÌtª½}sÐS«é=üø²Ìº7›Ù{Û¶Õ[V×¹œB:8Kn–jc„
-ºÄ®T¥æúí¯4ÖŸ"uæ3@/Z@®T\ëíf½vp'¶º¤»
-a~†Â÷{e’XX@9’ƒ;¬G1|¾¢FÔ.u9±†“i³ ÔªVƒö2, ÒîS­R)ùú:¡^C:yæ<4؝sŽül¸1š= ¶—ã4úÅ"šEÏgÑdz"@käšgXf¤ 4qO¸cÌû_ùù¢àŽµÇ/C—ZGâXºÌû	ɸØC¾ô¥âú‹!‘!êÀ±8ê.†,+ èg¥¬6Þ
-&k+óFDë‹OPíüY6ƒë†j6A5µ²åtÂ+üÄæÉ$â¬ßà–;œf–ÚLv“€ºS‰þ»-´¾uÄšÎ¯¿Ì1ÀÆÑ3…`ê™׋ˆr9jT·²£ÐÆ#¥Ù,u| «úD'ssfø­«‚ÏÎèù7G"˜zóFÁ ÛÎ]¶VܘÁ1Ý${4+ùJW_çhâðIna)iMB6‘´dÒßÁ
-HÙ9?¥÷mpÓÐ`€|nG7óþ'zF"‹åòƒh\ñŸ¬—¬aë5°úG[ÔçŒ1Yè&|iâ©jÙ	¥÷ky;K’ÐxœÐXcÍНú–WÎÛ8öLåÎü@,Çð”+Y-^áÐljÃ+“"εN]ØZOqûb˜éÃ:J›²(6W8‚íîW‹eýö†)©–WNËÎ4ŸâšD|¤ÒuláÕAútÙ@$	ö–Ä	ÚA=£aˆá.'kLý»|‹þ<·ÙðâÐA	G ò=EN‚`þ‘
-vÒ
-Ñiº®‹8'@ì‘Dê— ß9’å’³ê&÷ˆ¢Àâ0*·Í±KmtM%F&
-	çN8/žvJ‚ð
-‹÷ØkxI1ߦ,®§ˆØý!ðÓ"ij¬çÝ)þ‹wýÔz¨Ú87 :;—eÈmô\Ði¥×€ìÔ>$1Ž¦«Ð£¢¾tål±b»á°>':
-nãfÒn±9i³ÅÀ
-Ç
- at c¥ÁŸ‹¿RXŸRß¼óë~פ˜½Õ¢öŸ(Ff„W9"¨î+MÞV]¶ÜùãÍÂ\OÙ-fgù^pÕ±ó#pêgîlE¼lú·:0Dó{ïáÆÃI1!¼¿K”ØÙö ØYRYc”Ґ2œŸtÎ^2f¶ˆEç¥T+
-íõÉøŽÆz.^#úŦ¬Y j
-æN×ÄptÚÇBºå¦îïù‰ÅñD|ʆog¸7æ›tÅëÈ"Tð%ÞkÞV„e$3Š´v;ÎX½¼:óÆjàÍQedòB¨®ºSÈ-}…¸šòôµÌaLß
-àøNê=s‰rÑ.mSñ…$…/£éÀÏ\‡BqѤSE~,w Of
-ø|¹“ý„qg`ðSpa€œ
-/Kƒˆ ·àòÉ)˜Äª£Ö¾¹nhμÿ¹ÞBP¬#‡_ÊÓøÝ;âmDÌ’×Îý«õ3ts°Iløl[âþj“ð+„·ª7Ù^`¸¶¯z¶,œ&þ~•õþljiµìa‚÷ž
-ó¢€	õ~€z³.ñFõƒìÓ+. )”ÚmªÒ$erá‡È]Ú{âRìGw[4¬„y'vè3‚ú„ïY^ݾÄÁd	àóW#æc0š4ù9HŽOŒØ Þ%þ=j(`&|S³:KA‚ÊÏ`êY#Ë+>¶†µ[7(ww!)3xØxþ¯LÿôºòаC&,nlž8p1_?	[&nµ5rNÿ¬ulŠµ Caq^"‡ùÔ;”®GxÖѶ,[îDHžNš‚^-Y¦xF?ë˜ÖEoÉ™ûÆÖ)Âý›OG
-bN÷óáÔ!jPf)ôŽ%óñ;|\¡pˆªVÚ™}½þ£o:æÀ.H•BïK}A|5 <Úƒ4qŽé @|{QXÈZh¨ô|ÐQ´ú}À±vk
-!TlÕå·‰Æb"™A›Ÿˆ»¹¤/1Gowjn€›/´5+Rž±û08SïÁº†Ñäýw¹ýŠÓ—±g’y	03W¥#Õ’¡&œÿÊW¥ßíLXÃsmCNÍqlãKeé„Aá°}<€ÀA€ˆÚ‹Ë
-!J§]Ü\E•_Ø–Äpõý§ñT•i$6KËènÒ@•WùÔÜ€¶ê‡{nÿM9súR¸7IúS,µPâ/lbýãtCY³ÿó2[9	Ô˨ 3©¿ÍZ‡]–­`:Þ&ðÌ›R8CE 0$sbúZ©EÀó³œS臿Í&@<°Ë4‡xÍú·åŽ6ÌsLGEûÌÛ9ÔÒ?†E’é×™Ž»1ò9DòÙ3úc|ç5õÖ§€ÎW³'WI³Ln«¿*W‚Ã<±/ÜûKsì®dò¯hÑ:ööšª@ãœüÅ&Kà ðZbé‚lß, &ÃÁ2Õñó"°wªNƒ‹X–¥Rškt®™„2vö1® ßI¿^
-ÂÀ8Y‰ÓP>”EÝw§²¤JJá§ng‘#ØL2½UØ¥ªÌ@+á1§qAÙ¹ÅY*ÝСvX4–âx·ã•}? ½_5nSX²ßºˆC§¤—d/þá¿	0ÌòlöÄ–hϾRtôeòõ>Ëê#—DñÝ×zŸb6•	Å-X¡ óU“üšùöº¶¿…£ðAvG£/øsxäxßÖ.±Z«ËëÿTzg#Y+¯ð1d–Ôûæ“x‡†j©`J}þŽË’€ÕûL|ôxÆst§R…¹mÂ?}T2½H÷x~f~zfJ!"€}†™ŸÆJ7Ð&ë!l$f£´ýLU	KLhT7o:Hùé©"ê¾Þã4cä£ð;u¯Ž8ɍ‚Å5™~Æo‘“kç8z6N¿äèD
-Í:ÜšßÔûáɆ(ä+Š^ré¹Z(Sç¨åÎÕñéRÇÇÌ^›äp×ù¦Ikk“€È/ª„i)’|SÜ®tØŠýð×Wé“ÃC[ØÓŠÂøuÖà½ÒIλzc³+Š‚XèÁkÿž:a'§ÏÚíbÛ;jÁñÄF5 Ã|Fkhœ¡Rîçó%k”~#ȃÙFÝ
-ÓUÏÂà<íC_.É,åæÅñ£hT2›ñÐêëG,÷%Ù\7Q†YñÿÑ—7=o°1Z!B¨˜(@
-[¹±¹ÍN܍Ðínüû«¶ °§‡ÞÀúÆ[“úCñ€%dÓÈ47ËgÇ$_é¾¹0FH>˜R0{r¹Æ£–Nª¾(bßý®v–©2‚îßv„cZ;¨>M½ÒF§p¼53é'…–v~£JöNOy¤9½cG°Ž¬ß•e±¼B_Ôè:Ü@>)qÛðêC§Ë5b`ŸZn7;ŒA€Ò9—ÔÆs祊ØX_·J“+pɃ Þð•4-ûJåÝû&¡ž»­Ë˜—¥òÍ6—5‹L#S×Q%.A¡Á_Åõʾ¨Rõ3%ã®È™ÒlI'ÊJÄ£WL27FE°5!­âbàîuºßÆšD©)W=ø„,8¼tí£yÀkíÝßM°b,¡(_- ú•b™°Z†ã¥¯þ©fFð¾D«4¢¦9øÆc%Ųí
-S®\ó‡2@ÒÚ¿Cöð3,êWF”1 M)£ùMëÄ©p.øš/Ýóky¥=g‰ö}` Ù8{ðþ¹j`¬È¼zÁ|ªÄÝA4Z{«ã>¯òÄ÷_*‡KÅÞü,¯ kˆYzÇr±£-cØf¡Zñ¡iUW„º¤N¸²Kš¢XN:µ×ō›â†‚:ù)ÜÝ^ð£Ï[$GÃÙkð‹I6È—©oyÑA»ñöý»o#üZ³O6+B_|I
-R’+8ˆ?Ñ=Ðn¬áíGÓ‚¢Æ„Ù§ª¯ÎLNœ†¦XÞ;Ví3õÓYM‚ySÇtÈ£!?	WKùwû¯Ð'áUô{¹¹»MÃþzoŒ€ÕYPYþ¶ƒ‡w¦'ÓñMsùñ™²vC6»é†zº›Kfág⌵Q;XVð~΁ÝûOž¶Üo(ÐË—H…JͨܕU¸
-V\9+à‚8tF¼¥Û»éæ UDYÃ-»ªz7âénPêèé/e¶”Ö9ÎÄ8èÆ%À\ÜpeËAtrp}ô“8óÁ³êÅö₾pÛÇNM³ÌÉaçÊ*\   ˆ—›ª†ˆ` ÷L¬• ö’˜±Ägû    YZ
\ No newline at end of file
+ý7zXZ  æÖ´F !   t/å£àŠ‰&S] 7Iýúb‹¿ñ9²¶Ë¦¨•TB;qý"½qù¦cL;ù"ß“<²ëbï¨gò;ø¥Kä‡¥Šfœ‘1Æw?oz†ÆCþ­aì]IØŽ¨Ý5i‡* p0n¥z†Çj€„Öz‡—Ý»ÖpUÊhÄÛñlrO`©Æû´Y!hA‡Üµ‹îð!¨©n»äü¡¢ì˜JqÆíTHÞ1Êí!Ù(@¬EÉåR(ß±i¡0DíÎò›hŸÏ9rQAee1¾½rƬ$£Ÿ(6/¼ËP†:¢	ð´»Jbtp,B1iúK‚\ê]€ô2}·ïSƒ«éî0w³”ý!Š³
+$×bIžù8ÃOÕÅ'š·åÉ2lÂSéÕÃ	‘c§1Žº’IÃ$ê&%ŽIm§tØ£E¼‘Û\p‚–×3âA¥W€&XŽ9rQî9ݶŠ|å;уãËZÅ~øk8kÈå:¿䃛øú¿‚¢ÞË(S¨µìÃ,®‹T(ä”ï°
+2 5]zÞ"su{¦±Û[sYù”ïÆ>B¨â.ƒ=²å±c;á5o²-W°Òêx1}ÿ×Q^Y^5´‚ ?›ÓÎ^wŒOAqx]s"¦ŒÀ!Ñ…j†@v	#Œ¾Ý7?’â>3¼È)O2™ÆdÜÐlÛÀCEe9áùÖ¢Pðæ‚r)2–õD¥”¼ƒù„²’µËKMŠ=_5ƒE:Å-™OÌF?ØbºSäæÇI~R³iÜ õoŽ	ó!Õ—wO0<D–Ê„°aAÏbÿŠæô€±ì…‹]’ZYœxúúÆCåZñ(vÁ¦Öo±Â¶)NÅÆÃdZÖÿÊnWd‡&©˜‡÷Lìå[jm]¨	Îr͆¯:a	¢bþ0ÍëZΏþ$ĝêOlÄö1N +à²7ã9NçZšî’p¬]e”ªÄk)–sf­XA	‚BeX—&#C]Ç Æþ‹Åk]^*e~úšX0¥‚ϔPon/­P½€J*zƒum3žrÙ‚äâ¼Ô¢ÛchTyR€¼V[™*Vì¥Æ|Z²ª»(&FÓ}ñ”¼Ò'ØÕbÙßÓ¢ÃñVY¸TsPöY3wWÁ<öÛSIbÀ椚…§"ëN2 ï
+©;Õ)tq/¡“¯ß]ŠŠÎy¾ø³s+†ßçÈŒ¬ïúmíÉñPþÜ¥tòIýQTÿÃzJ5“·çøÉ5u]CKò÷ss0Õ¤À~±í­ï	÷É9>jÿ!3¿hÇÞýä%CظU« kq!”°œ6eÿÅšÓûZyë@%MåÒ¶œî‹ìÛ½X¨,SÜó©‹s¶Tc7ÍxðtW¢˜¥2CªÅaV•gÆö{ Í ¢EŒ|wË&¾úO€U°T©Ŭ ŸÂŽº`¤ºµ•²¦r ›´3DÞ „¤¯–íµF¢ÒW nªYØ¡â0ßî_<9XoN‰2—*i÷¨‚¬
+î ä$ÏB`à™×–¾ˆW«è5R§xÜêóEXX¯
+J©àŸü?ï6TüJ–٫ჩR¢YZŠü±¶z<õãç€6ì²ëüª._ ¡¶(¡Áç‡éjNRû1¼3@‚Ç5‰àœ:Ôóp/âìmÖ+Áj䃴*™5DÊ…A¸5mSó×õa¤ô`x^/Þ2ÊÅfó‹ýG+±ægýqWXÒOæFaâã¦ë9·bä¥N2âTö-+"ê%êTtü/bÄÕ6oŒ9MÜ™:˜c6Q2ؽ‘Ìò×r+ªE9$ðA7B;v§{φ)küÜTX¶¤øxä2Ù¢?Ûþ¢=2:À$®/,ÆŸ½’”¼B¡läˆÝ•Ø¬s=
+ïö£›lMt®Ä\J5èSó´²Ô)'¸çAáõªÁikyœ|±ÉÚn‘[87ªqŸ@rƹÍY1wXDX‚o5èá=‡¼qsà™…xÛÿ¯Lan•ÆwbB(3ߍžûXð®V@!’d¨ã	ÓDîdÇæY¸™’åJüFÍÊ­îXÇA7í(¼,ÐQã-säòŸÌ¤¯š}¸ö#Ø鑐mkZq ~+2;WË Õ'–Üi•¬öÖ¶¶6>p%cïÓìÑ®íR›xÓ»[Dw«èä€v-ãÓOìºéìÏÉjüÅíim,ªŒRΣ  ooœÅí/)E¯;2æú-Dgñʱ`ýß:u7„B5Àw‘ik3\Z.P«¨4
+!9ô Œ|’Ä@"µ-rÒ‚ðc%Ÿ;Û¼ÍQVTT}Ò'uö£ ©¥Äú€ö3™ªØ'ê³jïÝ|Û-€'—É!Íîõûµ(B \k~íŽÇêüb§rs@¸Éð_%T„_6Ã2OéH~~³ã ÷&)‡,Ã%®"õF^T´“IJÿ',µÍ1€^*|qL)d>~–hìž“`‡¿äåƒoˆ&°4Îhc+
+ÅF& `QÎ/T'cFýâŸh),ž}C‘zd"l?±à7Iðî]›*|a¹`(–…NŒm¦ki\ VS Òœëצ¼d‡fz×GT²‚âô"Z—p`éaÝ?Ògë ik¤9ïÙ9âðuÄàB*ÏN)E‘"ˆtÛRÁu37Õ¡¯U
+é5}#[9ÿ‘!È#þx¼ñ?²ôÉNZ¢-ÂÒùP‹=‡ÿµ{$èB•Ûj~ù}˜öæ…ÓJ·RGz.W1Xcmä©ÍþIÕŽ;Üg%w¿)»çc’Þ²ZSå>‚ú!0=:+ÊÏÌñö¥
+Mi r7í‚!îà"KBWæÖ`TÅcqy•Ò°
+Ë?ƒ*<EÊ*çW ¿äfoÇEÒÓÔ‡}ëe(ªÐ[“qØùBµx3®Â”ì~D:ãggOsÅ
+íîKf¾–z–„ï<rÃ2 Ö–º,ªhÝáÛ¶"eË<hHµPJì•eyùÍð¸Cü¼º
+)!çÅ€ 2#âH>ÐÊÝŸ <£;
+…ëŽÀ0>šr@¿Ça„øùzüŽvE7ËVè|µŽó_­Ü¹Øˆä@³Ø×[“góKH›ð>Š©M IæëjfK·ŽÎ++@"®xËÂÉzr
+þƒª#M.×“„¼‘~]¤Žý:”Ÿºl%¹™‰$Ž¥œåßH¸„ß–@$hŒO²u 8èÑÜøS/3'›1ó¤ù#¬3nu¹#ŠáªÙ>ÅÐÁ5zÑH§O®‘bìò¤®J2jŒjÙ#kY Þo&pqaµŽ:	Jü4ú«ú§ŸGi24w×h‚x`×öªùÊ1͸Û'½ÞŸ±|f*¨…ZÒ™°u+¥ó#9M%½½Ýyk!À0dlõb4ço?,•9’f(‰0Û:ïŒPµJcÑU¶ÙÒaL–¸(ÊÍî@Aù)LÅ;àà,wþ"N˜^aY'šZóS3ß…k+ûBÞ™ªÌúò‹`
+€äòb
+®w¹(Ö;¸}UÚãË€Ä×ȇ\12ôZD!±"¬üÇ‹Þð)žÎ÷t"Ç—ÇIËÞÌ…îuçéZ°3qƒZt SU^6F.˜,4¸E±3›É%”`à cnÿ*ßvÎf½ò
+εöÀ9P3ùâb³ 1§•üî×d¸,È¿Ï]nÀb-M.^8^Ô/:UEIz…EZ:†š~¹Óšå§×¬ixA¤üåóÈôäð&Êq?bÜ'äÄÈéÆÓàKñÙÌØ°i·£;OVœꥦÞlç¸PR­ògæT;5AzçÌ’”8Zi¿7†µJrý(PœþéWýôè4OLÃHôÔ ‚ˆfV …šËèñCˆüÂ
+l!¶&‒Q„àÈÈͺ•rÃaå WXf´ãø’[.a¬È]SGvÞ4FšÚÕ[hô°OhÂ)=¡6ë6×P·áÃ’\#¬†útõÝ]­+R¡éwny3ō€Є΁ÛW\4ù%Gï}"ŒP¦V§žÿ0W1d5FÍœj¨ÎŸ†#$ÙÂßçBßî•bL¾zö«ù¯¡{ÛkQÿÁ%B$“ûXXrAHëx')¥IçžUˆ&¥øÕ³P{+즢„í‹š‰·"uÚSÜ'ϲ-îX#óö¾òõ{=ñ—Ú$Òy+^|÷/ñ¢m+úM6YVÁRÀƒDå…B>‘Ä;5æXG’V¹Ê®]óÍO‘˜š³¿Wµ‚\K_$>V=ÃŽÂþ
+øÝ¿î³É;êcͯ¹cbÇü[&Ù‹{qõ®HÖÕG IŒ‹AœÍòøV¦“gƒËõÏ´W?N:Y2›zrˆévÚ7út~2-ºá1/“Þö!¤†ÓKŠú3xþHi3Ú]C«ùÏôhÂN‰Gi»ã³‚Dâ ¬Ø§k“gS½#5õrD”ø³Hó>f²f&‚{˘{ª(p0|µúÊÌWTj¬íêQÂp[Sbkp,»}ž Ú(ÍòYžkŠY¿ÊyGü=Pê´‚†Ù6œŠLb^EŠ÷Ù¼àgN î¯eHÿ•Ûû:T‡>0`ûu9…­".RSâü¼pŠÅæÈŠ#y´qB=
+p)dÏOõ!ï?›k<
+Ý6Pöc6œ(~3“š™!0>¶etY×2ÝU¬ÒûΣbÕÞ ç]0Ãú}„ˆ-p2‹ïúÄDÌ†×Zgþœ¬nwÛYa ïSÏI|/™«äÙÛæp/“ܩqlÞ.|%t¥ç…‘u˜RºBIÒ†»Â
+†_äòÖ°°ÝvωN‡ïËàEÂÞG\‚f–"Áâ}aWC0Š'œÆ,§_tÐÀÀ£à°’UWÜ ˜šõ¦è#K:>, ×xŽoQÑÊ Ã y5ôˆÁÖ8½”³¢µ°jDúü–Þ]Juy¿°†<tT«Écãªg¶h™®Á²û~ZYðS™$Ôœ1ͲÊr™'¶ùOVï‚hd¢ü]¤šï(&›âVªrI%#ë¬ôžìÍuñÝ´´‡ÍC+ÿ^±ðÒû¡X´êôEAì&| hWRƒo‚ª’7``ŒÝÒX›äÖ‡-ì³®":AâXÒÔÌŠwlÉ™Áq¹›kÂ@Ôrãwü0veǨ
+†’tE6€[ñðDêBu*vD ˆÅ3nkY|Ió¨žñŽ‡™œXÞLÕ 9‚vцY )AÁ¾Ðå» áŸ>«³»ì3|tåK’Æþ'Ki˜_ vÊ„Ú½>–	¾Âß¾Tª= ¬Øh³>×/{‹*û+*yïweù±!吸9_R±
+ˆ‹e¸:¶ë¥¨ˆF&D~ýUª'Rp½•_ra%AÜÓ•o“"j®×¶,p¾Á¹ÔÕ%†»ÁÂPí‚ueÜ£æ}·éã:¦XÇ—»#g'GY\¸¸gÔÊñ:Ôù`Ì/«g+Iâ6ö‚üµô‚ÇGyäDs¯	éæ`¸*ådý’éløî``¹åÔ{¾È¹ò-G!Ô
+ǘu2ëèDô	ÿÁÛ‹P}
+ŠOéçHp9wk˜Ä ;aŠÙ­¬ƒá˘Ò[rÙž£ŽÞˆE±ˆÊò›žï•U“x_4¡Åº
+àÈÀæLÓ*±|¤	ôhÿĸÀÚEœT°÷%0`›´–Ûz¿ñ’?Ë_ü?Jä0 YœÈî<°ñ,0‡,¶drʪ]VMœ°Bô’
+Ë>餩ðÂu/( e0¹±P¥Þô¬C¡ò›%·Lî4E˜ò+V nžâ{Aÿ«.ÃÈ©hƝ$/9óñ—¯]gS»Ì䤌@)R!ðq^ó@%Œ„Y¹"ØeÎHûZBZ?lƒ'õÆ-Æ™·rq^àœž3]¥Þž~h‘\9³$ᮈæÙ<TsDºÁ>˜äÓ½ƒ"ÌݏòiqðPúYøpœRÁ¼5“БllmYÇ Ê­dNÇ« [So,ÎlÇ”¸tâû®¥Óaaú„SŒßç'+¨yâÓØ›k5ë…J”y0ÆSÙ`)4ï›n)Ÿ
+‹ÍÕõ	Ez#*Z(lmž0€D)nun‹Vu}|%²“ÙßÁ¬x÷½†äSMÀ–kÙ8r'Ü=;·ÀŒ^mÇhq{•¢çYaXyq±GÂ÷Î¥¸Ýq¹Zú6Y¿…ĉÇûDÅ„
+ e âClCc Ë€DÊ•ßÜß_jò·Å;Æ*%ø€&²9š‰A…òÌE'%‹ÄxÈÄÕñ`WŸñ;óbßÁ0#´cÎqWÇ+ï„6[]f¡Zˆ'Dˆ†Xáë[Òs3f×FèÛŽ‹ý~úãEJªT[oó;¬©ÎÙˆú6¨V‚žZ£OŽÅ ð´øÜãÀ½÷‘Tft²i!S†6kª„?È»…q†PyXÍŠºð†/ÐœO¼€aŠu*Â)ž‹Âc‘dt&²ì«ž¡óÇð{·¿±fànyáòñá‘°G/å«BÁw(fi_ Ÿ«n ÇvÎU¢s³j(ZË ëƒâ -ä<'é‚wwXŸŽ$ck§îŠT£1*òv~&Óú>ŠïæNˆØ'ÇÜ3ýÛ2™ù˜5vRÙýec®B8=u‘WI¹û`FØW,	£:&2@Ô¸_}5‘5x¡µ8×LOq=Ê%Øq¥hJ(Æ+Y¸‹ÜM©SSUÛæä™/²Ê'Ž;)ïºé•Ï½z¹‹Èù•ê6  _-¨%@	×çøƒ:ØÔH…þgŠ¶Þ~^r&šœ'Ë	ƒôXçÈOK«Ì‘¢D! p¿¿ä½HCÇhÈ0ÏӀÖX²fݸÆ;/Í•m²…R›6øI›³ù
+²\ùËI !æ;ÙJô†Mg¡ãœ4‡÷Ä"a;VnŽ±¢‡–ååÞØ·¢©ÛÒq¤•§R¬×и'žþ&T•xë|ˆŠÙoÏ£&`	›ó7_‚!-ÿ8"ú£ŠÌ3/™»Ö6†4Q5A¼6¡÷Í]¥DÀŸ5SΣpÉÖ6‰šþQžÃMd5rÓ|ü\®á'Ãéy¼ÀìûŒJŒŒ·°šãìÃH$ëÏ »N0ç?µºT€m¬ÆT\PDXuIÅ Õ¦9¨xšhTzpIœ3.ªÜ¡˜_±:F	“ËÊÿ)Mçã¦U—	ðˆ†›J=|«2“I¥Œ“¿¹Á‡ö<Ä í;žtS€å÷—uº|À¿‚®ÙÚ=Í>Ó“Ùd±Â²®®Rnh¨ÀëÇÞÔó±“Æ+Rªÿž¾Ù õʺuÙK çÕ#=…†ì!jZçV6Ö¢ïÃgzùþ€o-Ø›då9ï_Øž6²hP¬3?ÁûxöÝ4s$x(MÑ]…b/®=N®H4DPŽ¨Ð0«p8kB[ËEpÛ
+“tôv¥1å‘Õ	»É€µò"áäÜR(Ù1*†ePÆw<(èH÷׆r¯¤£µCýô/§åÎM™C—ŒúZÀX³ñêTæi:’=ps¢ø·Ì -“½ŠåÏ$ÄžÉRóóü$S^ïHuÎó÷?îHë¸@Í\~°u±}²üÝ«`º.~
+}“SÓ¢Et Ä·Ó›\Ò`×=<ÇÁ—x¢¶r¿O¢à©Ñf!3¥ÎšàÉ¡WÖ—sÌT«§.fš`ÅÔØÎïsó·ö|øíêáʵpqªÛ«M}1gÆ:>\PÀÀT(A>ò<Är}ê<ljSàÂ?sÁ÷‘ÒßÜU,˜]¤ïÏ׌ЧÜdû
+–HRwj~j„8©y@ƒ–¨dö…·n þšU³qxÀ5vÇW˜cŒM*¿H±PÒy½¼PL÷ï¥#Ÿé‰]àÊZ»'¦ãül˜µÅ¦lµÄJ{2©½ŸOøˆ= ÇjŽ2y»0¹Ãç¬,nÈЍell}˜õi[£çxKƒ²Ï†ÅØ£‹„Þ»ÜgR¥&¬ŸPìNF½V-±éfúèâèžÉ„kŒ¿´¹æOL”‚ù‘îl`i¾Ú@èÃ7RD1ÑwÀijO	ªö£Ž™/¼Ç=ðoÝêàyá‡^œÖ×ûä±-ò‘×ÐírätA³¹Ú.`øv.yT "þ,Bmx°âÛÐc¢˜@+rÊÙðmºÁGÄ'#†ózæßؐnAµ£1Õ±nt#õ´ÃؐÓ6p]ÉW´MÀ{°lÏU/šÔ’”MÄôÎ$N½¸CaõFÒ돼ù?>~ÉJF™a¥G`…N‡Ïjí<y	FÀ
+øÙVÏÑò#<µ¯q-*´uû+Ÿð¹`‚¡DÑÑ뽂ºbBR•JæWÀµÉbâ1fzÆb¬˜p*F€­_›É²ÂÆ°…	ŠlHpKë‚Ê¿ZèžÆév\8Ôˆï3¢(ZÍ÷Iê{¹Ö‘MAì%CGãš¿tô£‹uÊi#yôÏî<·ÙýÚä:ö3Ïœ*üÜÞcPtA¢iJ­sæÐ\™õGÕ>÷Ç—¶j;7ÌÑ·ÑöCƒ‡P ¯“ŒeàDj(Ìî·X­
+u
+«P÷nðŒªÉM•4Y€ÑbHi¯xbÚ&«å‘XìÅTUª#)}â%âkB©E)Î)Dö¦‘•æ{Í°Ö\˜ÃtŸIPÕÿù
+¨ÙKa`]îÂKóPÍõg¿Šb¨iSç¤É*¡h«™T‡S@œÇÖ>ºÃ¬}ô/ØΉ­ÑѨ˜Ë³8ú˜ÊžNùg’ÝÙá­ |'ÑKVBd.œD79Œì»—h˜£a!A‹{±•½NÒWÇ×£™Šk±<”¸°&¶¹«
+¨”Ú?JÕdÇ9ÔÊL·7þG¦Ýup1ã_ç|ó ¹Ħ6pR6x¨úó+ášvž¾LL²} K#“ÑßØ‹#ýZ©RÑ-®ç'0Èè|è§×¶“8ÂvTlˆà™µ@¬!½lâ¿$áÅö2,2“§Ò'Wk¡q‰L- rJšo`7ÉÎI„â„óvšÐ 0l×gîåÊ@@YçÚþBþxLÆØÆ‚ƒÐƒÆÄzÈ¢‚ƃðKŸ¼¸Ž&Ò´ÂËS@®òJqBÞíAvÆ[îÐñä\I~µúŸS¬RòXürû3ÀÝ»Ùþ}à õ½~ouu³ÃìS4B²q
+ ¡Tføeë+ ^R—p¶ÎäX"Þž |tÕßâH‡yè—‡cXýèÃEKÖ~¼¡>ÏZÝÁ”ÙÈÐE¯þ†ˆºbËû-p´%ÊÊ]<-JÝ^¨ÓŸŒH´	eŸ`÷Ø#¿n^oÆ	ƒ¥|ØÆy}M<:í®-%5^êÜ—ý‚ )þQ¯ô\oâ’~t/{÷-3g0˜cëÄþfô’ì¿<3ÀˆE÷j¡—™ï;ÕhÝ,Ãԍs¯úІ‡™«JÞµ «¸è§zyý¯èÈ°_n­‘c
+QŠ¶Ïåþ?Ö›¸?<Spo’Dbe¬Ä¹—‹rÛïj!Kù!°®iͲl¬W§ÿ(wÙ!flt¥¡}´qí&€û~ø`.ñ¹:#3â^
+T —¿F!^0$ƒ³ÿÇuA?]iøÛÊÿFR¦>Ìé(ŽÄC%1{“ºGʧu7ߪè«#Ðþaßé³CR=Y´2âQâ84=XúÊ*ót h(øúY¿=@„Pê»Ó«qŒŽÐµïc嚁K…Ô“èìPñuT0iU·¦^ø±¶H
+ɉ[1›u	ƒÁ† þ¦ªˆ¢,æÙ¾¤S¦B^&Ö8~8‚ ÅNƒ#_ë—:àçz0rÖR;™@kƒ1.xgØðCì@·ìëÚëßù€Sëeˆá7¯¡Úþ>%q	¦1:¨3Íd HٝØÙÚý何P,“ƍý«ü'äAYõcÅfÂjqK+¶®GE
+Ì[T§¿‚¬f‹	H\!9¡²Ñ¬_©!zù¯B$²£pÄ4ÃÕ‡ÉXCw@‹1xyQ^E}E¥mƒ9ØèO	\N·ëdõÚT<Ý{ WkW.¦‡Ò‹TÓÅ{z*éÄwRX@^Ta=7›X$™¾UœšÊºô -æ<$B5¹ø¾„+Ä'>gk­:vŠ¸k©mV2óÌØ“DÕ¯ÜÑUaöÁF±Œ–
+ïÃÂoh¤gÏŠ¥4C®I2çnpÞŽPV;¾aóM—\e¤
+,¶]{G2ð.ɾìs¦„œ;BŠ
+Mñs[¥ÜSèßÙ´†H@CàV£õ‹7Æ‹I…ÜS“mZýʽY[¯[Ibf~J89”¤“Ã~#}¸4»îúÉgEÀÄ„fêÕ`€<b²lǁ(•Kxÿ)QJ½í,‰Ý_£—Z,L«òé‚©ròqþân¥ÁC&žÓ/}ŒžÊŠÀæ¡ŽÍ&ã}'³âbÆ,Êp9;}ˆJdHz³Ø¬8ºX¼–MÅ”ƒ3„Íø)­×¦Òõ-½8¥,6´ˆ÷úõ‰‹OÕQîØÂ!°g•çž/³YÝqë£U{sK¶B00}stˆM£gG,ó^3;\]x®˜2Õº§_FÌíi¦šKË'íy—1™}!Ž˜óp¼x›3Û–O¾ôÇævö^Ó#qŠÝE{˜ Ä`H¯`§apêK†U£Íq",§#¾@ËÌ£fÄJþãvö¾ßºýÔ"æu at V~õ”õñ“l­£}µŽÆ§ ‚[¨ùáézÖ+ÀQ?Mñ8QpÕŠÐ’]pJ[ìñZþ
+ãÍ“´þ–ër§Á¦I‹N:7c^\Ípçû*‡q»àG3¤]Ë=pe°,AH>Znå=ªk†…©c,d<ôä€FV½òŒ¡*Á@ï¡*ò0d!·|qÞZ«/¬l¶BwVŠ˜KåAy/*¹À˜Åzù¸"VÖ¹h¥³Ëž–_óLn}¢ï™ úˆ2Õøǘ%ØůÛ;8sŽs*ìè?~°Ÿ¡ƒ,+ië@ÅœæAšÕ½îEN´¶°E…ÏÀ•¾¨ð^ZÚÝÝ¥—3çO)UpÕkXI°Ë3g©ômyÌD„á
+5#·)×ôK³Õe6äZhWÓìn¯ã¡Üƒz,ëYì=ú͏nqª©¯"üÀ
+L2ÐõÝ›9ÂZ½¾-œWUÝÀ˜¥î˜š”Gú7Pñ¾Õyøõ*¤M>˜ëí1ÎâÑßsc›b	j|óSÁ—Yòv¨p$@$²Ÿ¥|B"»ÖtµåVή¼ãlï”qeCñ[÷Ïx@\‰|byW›gÚ(¨ñž'Ä>j
+)ˆJ„¿8jT Ï8œ84ÊYs‡òŠe¬Ge8BHýf3õ‰ž4`âV9Fܦˁ®¸âcÓwY~dîA‰3°Ï—.ò<ÇçûKùÉäGwGס¹/“ÆŸjahÍ;@‘*\®š°di½\󟞺ñy3ëͨfä¯÷SfJ*Àtƒå+™ñ‚Zø’&š&;„IyÖ#ÄÒtZOjUKܹiε™yBÓ~UgKô[DPH%\ñ·#nÝ/FúÓr·EËÍ Ë¦áˆ$ Á±°¢NyùlÆ¡0ÿä1 “´éD“éòJ†J£êI"°™îôÑ¢ðÝ6tkbB`B~Sƒ’¸ŒÇ‡V+JB#-&¤PlØ7•·L¼Ý\I!ØCY«M<ªÂïðjJÜ6Œê7qLÎ5-T_¤Æ;¿Öû¨#"Ló¿Èª\¥àò?ºS¾3ÏܝN;:´çš9\z¬OcWQ7ƒSçů¥–\“Ü(õöy3~Ž’èT“S¨æÞ.AÍ¿¦œøö_EŸkÞ³ú¯|KSO	ÇŠø7ÜóáÍX cMÇõH)­œ¥O|@-¦ÅT©óû§öQªw[»AþÝÕ	:ÆœQ
+B2z/OßÙ‹P—!Y2A“* ñ¿RÍZ±$®/ÖþQve‹°¸¯Gü|øš4×`Ñ:^Fù‘•aB Ø¦@åiø‚Z¼>S"ñVèÒªÒ,“\)®j¿•ÓÜú}‡‡écHoÊsUœü‡ÀŸ³d¸+í>7@°Ü‰Ü>A3NÔ_íN„æ̱±·3C£šÓî²q„3}kù =ͯí ÑeH†¨¡lý`æDë–Ûü
+¢üç-Úh%³Ü	E¨™tJþ‘±ì6±FÀÏ×L¤ÜÀMsf‰DWÛ$¶àsz÷n-ýæò[Œ-B9éBm÷[È¥õ­ÀÄÄnwáîǁ+*;ÑÔ¹/•&ðu~ÒŠŸéZ«„Þ&Åōy´iÿX€"®²¯’•W `¨ÉK(_À=Qíþ›ß4ãÕ_ah¨Q^Lï£@»‚Ò„2…[]BŠ5jakÈhFi­J£]p,'v+¦As¶röiÎxùõQäLäeÜ[æ«5Rþæç:–«Së{È
+ôHÂ!0âßiUÌ€«¤ç:»tY;M‚[iÓîÒhq@…j7•jr–*b³_³qÏѾŒ–káŽÃ,=R_YÉ+%ÚãÆ{÷ÌM½éS<—׳˜N…0éGôsH.¹"ì¯á,UíÅ¡Õ<¡“
+­÷^½"ù¡‡tóN:©ÚnIŠöêOáty¬tðÝ
+­Ž²…&Êò+Ìù>OÞØ64 Ö`x¼öìZšðU"‡6l£<$(9ÞuÓM)Ÿ+£pþ°9¹³2®¦ÇÁìÝ]Žªcv¦2[¶þ’Ͳª}FìØêyøÝÍj¬r³BÊL˜‡¦  ‡{–ÃSÕ^ ïLŠ• †Nò±Ägû    YZ
\ No newline at end of file

Modified: pkg/CHNOSZ/man/subcrt.Rd
===================================================================
--- pkg/CHNOSZ/man/subcrt.Rd	2017-10-01 03:39:25 UTC (rev 232)
+++ pkg/CHNOSZ/man/subcrt.Rd	2017-10-01 08:40:37 UTC (rev 233)
@@ -132,7 +132,7 @@
 subcrt(c("glucose", "ethanol", "CO2"))
 
 ## properties of reactions
-subcrt(c("H2O", "H+", "k-feldspar", "kaolinite", "K+", "SiO2"),
+subcrt(c("H2O", "H+", "K-feldspar", "kaolinite", "K+", "SiO2"),
   c(-1, -2, -2, 1, 2, 4))
 subcrt(c("glucose", "ethanol", "CO2"), c(-1, 2, 2))
 # to specify the states

More information about the CHNOSZ-commits mailing list