Различия
Здесь показаны различия между двумя версиями данной страницы.
|
sensors:p:grt_bt_ms_pl_avchenko_kuznetsova_1988 [2018/11/12 15:08] 127.0.0.1 внешнее изменение |
sensors:p:grt_bt_ms_pl_avchenko_kuznetsova_1988 [2020/02/19 13:19] (текущий) f0ma |
||
|---|---|---|---|
| Строка 32: | Строка 32: | ||
| sensors.p.grt_bt_ms_pl_avchenko_kuznetsova_1988 <- function(Grt, Bt, Ms, Pl, Temp, ...){ | sensors.p.grt_bt_ms_pl_avchenko_kuznetsova_1988 <- function(Grt, Bt, Ms, Pl, Temp, ...){ | ||
| - | T <- Temp; | + | Name <- paste0(Ms$Name,"-", Pl$Name,"-", Grt$Name,"-", Bt$Name); |
| + | T <- Temp; | ||
| Pl <- tpf.recalc_minaral("PL",Pl); | Pl <- tpf.recalc_minaral("PL",Pl); | ||
| Bt <- tpf.recalc_minaral("BT",Bt); | Bt <- tpf.recalc_minaral("BT",Bt); | ||
| Строка 72: | Строка 73: | ||
| warning(" IS NOT TO BE USED FOR T>750 C"); | warning(" IS NOT TO BE USED FOR T>750 C"); | ||
| } | } | ||
| - | return(data.frame(Name=paste0(Ms$Name,"-", Pl$Name,"-", Grt$Name,"-", Bt$Name),Temp=Temp,P_calc=P)); | + | return(data.frame(Name=Name,Temp=Temp,P_calc=P)); |
| } | } | ||