[CHNOSZ-commits] r505 - in pkg/CHNOSZ: . inst inst/extdata/OBIGT

[noreply at r-forge.r-project.org]

Author: jedick
Date: 2019-09-03 06:33:08 +0200 (Tue, 03 Sep 2019)
New Revision: 505

Modified:
   pkg/CHNOSZ/DESCRIPTION
   pkg/CHNOSZ/inst/NEWS
   pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_cr.csv.xz
Log:
OBIGT: change units of dawsonite, scheelite, and ferberite to J


Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION	2019-08-17 17:01:58 UTC (rev 504)
+++ pkg/CHNOSZ/DESCRIPTION	2019-09-03 04:33:08 UTC (rev 505)
@@ -1,6 +1,6 @@
-Date: 2019-08-17
+Date: 2019-09-03
 Package: CHNOSZ
-Version: 1.3.3-1
+Version: 1.3.3-2
 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-08-17 17:01:58 UTC (rev 504)
+++ pkg/CHNOSZ/inst/NEWS	2019-09-03 04:33:08 UTC (rev 505)
@@ -1,9 +1,12 @@
-CHANGES IN CHNOSZ 1.3.3-1 (2019-08-17)
+CHANGES IN CHNOSZ 1.3.3-2 (2019-09-03)
 --------------------------------------
 
 - describe.reaction(): revert the change of using a double arrow. The
   equals sign is much more portable.
 
+- OBIGT: Change data for dawsonite, scheelite, and ferberite to Joules
+  (original values).
+
 CHANGES IN CHNOSZ 1.3.3 (2019-08-02)
 ------------------------------------
 

Modified: pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_cr.csv.xz
===================================================================
--- pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_cr.csv.xz	2019-08-17 17:01:58 UTC (rev 504)
+++ pkg/CHNOSZ/inst/extdata/OBIGT/inorganic_cr.csv.xz	2019-09-03 04:33:08 UTC (rev 505)
@@ -1,4 +1,4 @@
-ý7zXZ  æÖ´F !
   t/å£à:Å;] 7Iýúb‹¿ñ9²¶Ë¦¨•TB;qý"½qù¦cL;õJT&ŸÝ´V±ë\‚Œ¦Øº7š[JÍ“û5Aç±^iKde³/ñQWs™Ì8 f3s´}OÅÕÐ×Wh 1è@,O՝ÄØñ4̪ÙI¸”
+ý7zXZ  æÖ´F !
   t/å£à:À:] 7Iýúb‹¿ñ9²¶Ë¦¨•TB;qý"½qù¦cL;õJT&ŸÝ´V±ë\‚Œ¦Øº7š[JÍ“û5Aç±^iKde³/ñQWs™Ì8 f3s´}OÅÕÐ×Wh 1è@,O՝ÄØñ4̪ÙI¸”
 k×&ªßóƒ™Ôi×øtÍsiÛ¢©¯óóª]1û¹ËÿÔC)9$~6Ӎd‡VìGêÐèp1®¹ Ãw\â,Ðþ0×<§wý¹á,ÑË|ñƒ3H€AÃXvÔŒÿÞ?g
²øÐD•'b¹ªbØè)BÐw 1E¨È T—!®„JuqM†dk¿¢.I¾óÒOKZ"c‘)…9©1c*7hö?d€Ì_Òì`¹}-bgÊ‹aË©+Z«€…Gç†0P'¿¬YÚ×ö"¾aZ·ù4Uaf(LjÚSÞ‡òÔ&áIyۍí|ûQ Uˆ:,)•/K4dJûíb&Ĩ˜¸c]ÿ©mÅî—&«Õ,ÑÒ#œr@ñq(K¹±í–Ðcu?ð!ï™+ü¬5òðÍ+šwY`ôv317Ç
 YÌûºî"r•Ÿ†t(¹Vxƒ.”Ù[Òqý¦cYûg›,A¦Zׁý<ô=ø4™!ï>f”à˜œ!uˆ÷áj®THºE¨#ÿ®\’fÁS{1h›‘níèÞèr{v~É‚ÖÉgÚ`“!•âÔº$çÂ<§æTš¡#çY;0…šæ)~z‰™í{±øÙ{Qi¬sÄe~Ç3Û ¼¢Áý{cM˜%_9Lv-ò/ürŒì<ˆaOq
ó‚÷¸9f•<p¤‘È­k[±¤FB´"Æà&›pÒ
 ÷Ï{$gÑ®—h•l7P&Ö§DÒm<:Œr" ÞÔðNbk-±yuÏÈgq£I×¢w7dã¯Ã:÷âxûÓmZOâƒ÷g2®Ñ–)ôy
@@ -41,5 +41,4 @@
 Ñ=È‘z:¢c9ñ%Ž¦T
 ѼQÉùľoÚbjФî£@Lººâª2ᨓ­«wØU>æS»‹`!5
 @4ž¯ª6$¢iœ
-·òÃI_í¬H¦ž¹¿@2½ Š{”¿¨UŠ}§Ÿ·~Åu¨öbö‘>
-dWðV*oà@£ëRy°Cú>†wjˆaž¨øoŠz­Gò¦Â¶5¸¹ÿ\ë¯Azº£ÌÜæÒ]ñÑ;=o&.ÛŠÓ’Ÿðâ   'RvL- 
×$Æu  ïj3ù±Ägû    YZ
\ No newline at end of file
+·òÂ*(ÕBÎãĪ@‰±Žœm)J«™U<_ЩØ:\ùùÉj˜	YŸcÖ俸õû¶‘mܐƒ“9äš/¬Òyö8YÆ°ßÖh¦2Ô+#X¯­¨$äA-öàåâºk¸óvìy:_§´Ç¶kÐLNtž,   úÑg,ñn¥Ÿ 
Ö$Áu  󁸯±Ägû    YZ
\ No newline at end of file