Различия

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

--- sensors:f:elect_sfa_shikazono [2015/10/27 10:13]
admin created
+++ sensors:f:elect_sfa_shikazono [2016/02/09 14:12]
admin removed
@@ Строка 1: / Строка 1: @@
-====== Electrum – Sphalerite sensor Shikazono, 1985 ======
+====== Electrum-Sp: Shikazono, 1985 ======
+Electrum – sphalerite fugacity sensor.
 === Details ===
-^ Article | Shikazono N. A comparison of temperatures estimated from the electrum – sphalerite – pyrite – argentite assemblage and filling temperatures of fluid implications from epithermal Au – Ag  vein –type deposits in Japan  // Econ. Geol. 1985. V. 80. No 5. P. 1415 – 1424.   |
+^ Article | Shikazono N. A comparison of temperatures estimated from the electrum – sphalerite – pyrite – argentite assemblage and filling temperatures of fluid implications from epithermal Au – Ag  vein –type deposits in Japan  Econ. Geol. 1985. V. 80. No 5. P. 1415 – 1424.   |
-^ Reference |  |
+^ Reference | {{:sources:shikazono1985.pdf}} |
-^ Collibration |  |
 ^[[:ppy:mod_sensors#f_elect_sfa_shikazono|Calculate]] ^ ^
@@ Строка 12: / Строка 13: @@
 <Code linenums lang-r>
+source('sensors_t_elect_sfa_shikazono.r');
-sensors.f_elect_sfa_shikazono <- function(awt_data)
+sensors.f.elect_sfa_shikazono <- function(Elect, Sfa)
 {
-    log_f_S = (1/4.576*Temp)*(-41980 + 16.52*Temp – 18.296*log(N_Ag)+(4*(1 - N_Ag)*2*(5650 – 1600*(1 - N_Ag) – 1.375*Temp)));
+    log_f_S = sensors.t.elect_sfa_shikazono(Elect, Sfa)$log_f_S;
-    return(log_f_S);
+    return(data.frame(Name=paste0(Elect$Name,'-',Sfa$Name), log_f_S=log_f_S));
 }
+sensors.f.elect_sfa_shikazono.args <- function() {
+    ars <- list();
+    ars$minerals = c('Elect','Sfa');
+    ars$ranges = c();
+    return(ars);
+}
 </Code>