Различия
Здесь показаны различия между двумя версиями данной страницы.
sensors:p:grt_crd_sil_qtz_hutcheon_froese_gordon_1974_b [2018/11/12 15:08] 127.0.0.1 внешнее изменение |
sensors:p:grt_crd_sil_qtz_hutcheon_froese_gordon_1974_b [2020/02/19 13:24] (текущий) f0ma |
||
---|---|---|---|
Строка 31: | Строка 31: | ||
source("utilities_tpf.r"); | source("utilities_tpf.r"); | ||
- | sensors.p.grt_crd_sil_qtz_hutcheon_froese_gordon_1974_b <- function(Grt, Crd, Sil, Qtz, ...){ | + | sensors.p.grt_crd_sil_qtz_hutcheon_froese_gordon_1974_b <- function(Grt, Crd, ...){ |
+ | Name <- paste0(Crd$Name,"-", Grt$Name); | ||
Grt <- tpf.recalc_minaral("GRT",Grt); | Grt <- tpf.recalc_minaral("GRT",Grt); | ||
Crd <- tpf.recalc_minaral("CRD",Crd); | Crd <- tpf.recalc_minaral("CRD",Crd); | ||
Строка 42: | Строка 44: | ||
L <- 6 * log(Y / B) * 1.9872 - 18; | L <- 6 * log(Y / B) * 1.9872 - 18; | ||
P <- (6582.352 * K + 9035.7252 * L) / ( - 3.6480 * K + 3.8252 * L) / 1000; | P <- (6582.352 * K + 9035.7252 * L) / ( - 3.6480 * K + 3.8252 * L) / 1000; | ||
- | return(data.frame(Name=paste0(Crd$Name,"-", Grt$Name),P_calc=P)); | + | return(data.frame(Name=Name,P_calc=P)); |
} | } | ||
sensors.p.grt_crd_sil_qtz_hutcheon_froese_gordon_1974_b.args <- function(){ | sensors.p.grt_crd_sil_qtz_hutcheon_froese_gordon_1974_b.args <- function(){ | ||
ars <- list(); | ars <- list(); | ||
- | ars$minerals <- c("Grt", "Crd", "Sil", "Qtz"); | + | ars$minerals <- c("Grt", "Crd"); |
ars$ranges <- c(); | ars$ranges <- c(); | ||
return(ars); | return(ars); |