Различия

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

--- sensors:t:cpx_opx_fonarev_graphchikov_1982 [2017/05/23 22:49]
admin
+++ sensors:t:cpx_opx_fonarev_graphchikov_1982 [2018/11/12 15:07] (текущий)
@@ Строка 1: / Строка 1: @@
 ====== Cpx-Opx: Fonarev, Graphchikov, 1982 ======
+IS NOT TO BE USED FOR (AL2O3+TIO2+MNO+NA2O) IN CPX >5 W.
+IS NOT TO BE USED FOR P>20 KBAR
 === Details ===
@@ Строка 7: / Строка 11: @@
 </WRAP>
-^ Article |  |
+^ Article | Fonarev V.I., Graphchikov A.A. //Two-pyroxene geo-thermometer// Mineral. zhurnal, v. 4, N 5, p. 3-12, 1982. (in Russian) |
-^ Collibration |  |
+^ Callibration |  |
 ^ Precision |  |
-^ Ranges | T from 600 to 820 °C  |
+^ Ranges | 600-820 °C  |
 ^ Renew sensors |  |
-IS NOT TO BE USED FOR (AL2O3+TIO2+MNO+NA2O) IN CPX >5 W.
-IS NOT TO BE USED FOR P>20 KBAR
 <use:sensors.t.cpx_opx_fonarev_graphchikov_1982>
@@ Строка 52: / Строка 54: @@
     T <- (2 * G * 1000 / ( - B + sqrt(B^2 - 4 * A * G))) - 273.15;
-    T<-ifelse(T>820,T,NA);
+    T<-ifelse(T>820,T,'T too high');
-    T<-ifelse(T<600,T,NA);
+    T<-ifelse(T<600,T,'T too low');
-    T<-ifelse(Z>5.0,T,NA);
+    T<-ifelse(Z>5.0,T,'Composition out of bounds');
-    T<-ifelse(X<0.1,T,NA);
+    T<-ifelse(X<0.1,T,'Composition out of bounds');
-    T<-ifelse(P<20,T,NA);
+    T<-ifelse(P<20,T,'P too high');
     return(data.frame(Name=row_names,P=P,T_calc=T));
@@ Строка 75: / Строка 77: @@
 </Code>
-{{tag> tpf Cpx Opx AP_igroup}}
+{{tag> tpf Cpx Opx AP_igroup fixed}}