Различия
Здесь показаны различия между двумя версиями данной страницы.
sensors:p:grt_cpx_pl_qtz_fonarev_1994 [2018/11/12 15:08] 127.0.0.1 внешнее изменение |
sensors:p:grt_cpx_pl_qtz_fonarev_1994 [2020/02/19 13:21] (текущий) f0ma |
||
---|---|---|---|
Строка 31: | Строка 31: | ||
source("utilities_tpf.r"); | source("utilities_tpf.r"); | ||
- | sensors.p.grt_cpx_pl_qtz_fonarev_1994 <- function(Grt, Cpx, Pl, Qtz, Temp, ...){ | + | sensors.p.grt_cpx_pl_qtz_fonarev_1994 <- function(Grt, Cpx, Pl, Temp, ...){ |
- | T <- Temp; | + | |
+ | Name <- paste0(Pl$Name,"-", Cpx$Name,"-", Grt$Name); | ||
+ | T <- Temp; | ||
Grt <- tpf.recalc_minaral("GRT2",Grt); | Grt <- tpf.recalc_minaral("GRT2",Grt); | ||
Pl <- tpf.recalc_minaral("PL",Pl); | Pl <- tpf.recalc_minaral("PL",Pl); | ||
Строка 56: | Строка 58: | ||
warning(" CANNOT BE USED FOR (TIO2+MNO+NA2O+K2O+CR2O3+AL2O3) IN CPX >5 WT."); | warning(" CANNOT BE USED FOR (TIO2+MNO+NA2O+K2O+CR2O3+AL2O3) IN CPX >5 WT."); | ||
} | } | ||
- | return(data.frame(Name=paste0(Pl$Name,"-", Cpx$Name,"-", Grt$Name),Temp=Temp,P_calc=P)); | + | return(data.frame(Name=Name,Temp=Temp,P_calc=P)); |
} | } | ||
sensors.p.grt_cpx_pl_qtz_fonarev_1994.args <- function(){ | sensors.p.grt_cpx_pl_qtz_fonarev_1994.args <- function(){ | ||
ars <- list(); | ars <- list(); | ||
- | ars$minerals <- c("Grt", "Cpx", "Pl", "Qtz"); | + | ars$minerals <- c("Grt", "Cpx", "Pl"); |
ars$ranges <- c("Temp"); | ars$ranges <- c("Temp"); | ||
return(ars); | return(ars); |