Различия

Здесь показаны различия между двумя версиями данной страницы.

--- sensors:t:electrum_sp_shikazono [2016/05/13 14:03]
admin
+++ sensors:t:electrum_sp_shikazono [2018/11/12 15:08] (текущий)
@@ Строка 7: / Строка 7: @@
 ^ Article | <ref:shikazono1985> |
 ^ Collibration | In this study, sphalerite and electrum from Sanru, Chitose, Sado, Takatama, Seigoshi, Yugashima, Toi, Nebazawa, Takeno, and Kushikino were analyzed by an electron microprobe analyzer  |
+^ Ranges | N_Ag > 0.3 |
+^ Input | atomic wtp |
 ^ Accuracy | T ±20 °C (for T > 300 °C)  |
 <use:sensors.t.electrum_sp_shikazono>
@@ Строка 20: / Строка 22: @@
 <Code linenums lang-r>
+source('recalc_wtp_at_to_atp.r')
 sensors.t.electrum_sp_shikazono <- function(Elect, Spf)
 {
-    dElect <- selectNames(Elect,c('Au_wtp','Ag_wtp')) / 100;
+    aElect <- recalc.wtp_at_to_atp(Elect);
-    dSpf <- selectNames(Spf,c('Fe_wtp')) / 100;
+    aSpf <- recalc.wtp_at_to_atp(Spf);
-    dElect <- rowApply('/',dElect,c(196.96657,107.8682));
-    names(dElect) <- c('Au_moles','Ag_moles');
-    dSpf <- dSpf / 55.845;
-    N_Ag = dElect$Ag_moles/(dElect$Ag_moles+dElect$Au_moles);
+    dElect <- selectNames(aElect,c('Au_atp','Ag_atp'));
-    X_FeS = dSpf;
+    dSpf <- selectNames(aSpf,c('Fe_atp','Zn_atp'));
+    N_Ag = dElect$Ag_atp/(dElect$Ag_atp+dElect$Au_atp);
+    X_FeS = dSpf$Fe_atp/(dSpf$Fe_atp+dSpf$Zn_atp);
     N = 28765 + 22600*(1 - N_Ag)^2 - 6400*(1 - N_Ag)^3;
@@ Строка 46: / Строка 49: @@
               (4*(1 - N_Ag)^2*(5650 - 1600*(1 - N_Ag) - 1.375*Temp)));
-    return(data.frame(Name=paste0(Elect$Name,'-',Spf$Name), N_Ag=N_Ag,X_FeS =X_FeS, T_calc_ElectSp_Shikazono_eq6 = Tcalc6, T_calc_ElectSp_Shikazono_eq7 = Tcalc7,log_f_S=log_f_S));
+    return(data.frame(Name=paste0(Elect$Name,'-',Spf$Name), N_Ag=N_Ag, X_FeS =X_FeS,
+           T_calc_ElectSp_Shikazono_eq6 = Tcalc6,
+           T_calc_ElectSp_Shikazono_eq7 = Tcalc7,
+           log_f_S=log_f_S));
 }
-sensors.t.elect_spf_shikazono.args <- function() {
+sensors.t.electrum_sp_shikazono.args <- function() {
     ars <- list();
     ars$minerals = c('Elect','Sp');
@@ Строка 59: / Строка 65: @@
   Elect <- data.frame(Name='Elect',Au_wtp=2, Ag_wtp=8);
-  Spf <- data.frame(Name='Sp',Fe_wtp=21.23);
+  Spf <- data.frame(Name='Sp',Fe_wtp=21.23,Zn_wtp=21.23);
-  result <- sensors.t.elect_sp_shikazono(Elect, Spf);
+  result <- sensors.t.electrum_sp_shikazono(Elect, Spf);
   expect_equal(result$T_calc_ElectSp_Shikazono_eq6, 312, tolerance = 3);