Различия
Здесь показаны различия между двумя версиями данной страницы.
| Следующая версия | Предыдущая версия | ||
|
sensors:t:opx_cpx_mori_green_1978 [2017/01/17 13:44] 127.0.0.1 внешнее изменение |
sensors:t:opx_cpx_mori_green_1978 [2018/11/12 15:07] (текущий) |
||
|---|---|---|---|
| Строка 1: | Строка 1: | ||
| ====== Opx-Cpx: Mori, Green, 1978 ====== | ====== Opx-Cpx: Mori, Green, 1978 ====== | ||
| - | + | ||
| + | IS NOT TO BE USED FOR FE/(FE+MG) IN OPX >0.2 | ||
| === Details === | === Details === | ||
| Строка 7: | Строка 9: | ||
| </WRAP> | </WRAP> | ||
| - | ^ Article | | | + | ^ Article | <ref:mori1978> | |
| - | ^ Collibration | | | + | ^ Callibration | | |
| ^ Precision | | | ^ Precision | | | ||
| ^ Ranges | | | ^ Ranges | | | ||
| Строка 31: | Строка 33: | ||
| source("utilities_tpf.r"); | source("utilities_tpf.r"); | ||
| - | sensors.t.opx_cpx_mori_green_1978 <- function(Opx, Cpx, ...){ | + | sensors.t.opx_cpx_mori_green_1978 <- function(Opx, Cpx, usePFU=FALSE, ...){ |
| - | Opx <- tpf.recalc_minaral("OPX",Opx); | + | |
| - | Cpx <- tpf.recalc_minaral("CPX",Cpx); | + | row_names <- paste0(Opx$Name,"-",Cpx$Name); |
| + | |||
| + | if(!usePFU) { | ||
| + | Opx <- tpf.recalc_minaral("OPX",Opx); | ||
| + | Cpx <- tpf.recalc_minaral("CPX",Cpx); | ||
| + | } | ||
| Z <- (Cpx$Fe_p2_pfu + Cpx$Fe_p3_pfu) / (Cpx$Mg_pfu); | Z <- (Cpx$Fe_p2_pfu + Cpx$Fe_p3_pfu) / (Cpx$Mg_pfu); | ||
| M <- (Opx$Fe_p2_pfu + Opx$Fe_p3_pfu) / (Opx$Mg_pfu); | M <- (Opx$Fe_p2_pfu + Opx$Fe_p3_pfu) / (Opx$Mg_pfu); | ||
| X <- (Opx$Fe_p2_pfu + Opx$Fe_p3_pfu) / (Opx$Fe_p2_pfu + Opx$Fe_p3_pfu + Opx$Mg_pfu); | X <- (Opx$Fe_p2_pfu + Opx$Fe_p3_pfu) / (Opx$Fe_p2_pfu + Opx$Fe_p3_pfu + Opx$Mg_pfu); | ||
| - | if (X<0.2) { | + | |
| T <- 1500 / (log(M / Z) + 1.07) - 273; | T <- 1500 / (log(M / Z) + 1.07) - 273; | ||
| - | } | + | |
| - | if (X>0.2) { | + | T <- ifelse(X<0.2,T,NA) |
| - | warning(" IS NOT TO BE USED FOR FE/(FE+MG) IN OPX >0.2"); | + | |
| - | } | + | return(data.frame(Name=row_names,T_calc=T)); |
| - | return(data.frame(Name=paste0(Cpx$Name,"-", Opx$Name),T_calc=T)); | + | |
| } | } | ||
| Строка 59: | Строка 65: | ||
| </Code> | </Code> | ||
| - | {{tag> tpf Cpx Opx }} | + | {{tag> tpf Cpx Opx AP_igroup fixed}} |