Различия
Здесь показаны различия между двумя версиями данной страницы.
| Следующая версия | Предыдущая версия | ||
|
sensors:t:au_sph_py_arg_shikazono_1985_a [2016/08/12 07:53] 127.0.0.1 внешнее изменение |
sensors:t:au_sph_py_arg_shikazono_1985_a [2018/11/12 15:07] (текущий) |
||
|---|---|---|---|
| Строка 9: | Строка 9: | ||
| ^ Article | | | ^ Article | | | ||
| ^ Collibration | | | ^ Collibration | | | ||
| - | ^ Presition | | | + | ^ Precision | | |
| ^ Ranges | | | ^ Ranges | | | ||
| ^ Renew sensors | | | ^ Renew sensors | | | ||
| Строка 31: | Строка 31: | ||
| source("utilities_tpf.r"); | source("utilities_tpf.r"); | ||
| - | #main code | ||
| sensors.t.au_sph_py_arg_shikazono_1985_a <- function(Au, Sph, Py, Arg, ...){ | sensors.t.au_sph_py_arg_shikazono_1985_a <- function(Au, Sph, Py, Arg, ...){ | ||
| Au <- tpf.recalc_minaral("AU",Au); | Au <- tpf.recalc_minaral("AU",Au); | ||
| Sph <- tpf.recalc_minaral("SPH",Sph); | Sph <- tpf.recalc_minaral("SPH",Sph); | ||
| - | N <- AG / (Au$Fe_pfu + CO + NI + CU + ZN + MO + AG + CD + SN + AU + HG + PB + AS + SB + S); | + | N <- Au$Ag_pfu / (Au$Fe_pfu + Au$Co_pfu + Au$Ni_pfu + Au$Cu_pfu + Au$Zn_pfu + Au$Mo_pfu + Au$Ag_pfu + Au$Cd_pfu + Au$Sn_pfu + Au$Au_pfu + Au$Hg_pfu + Au$Pb_pfu + Au$As_pfu + Au$Sb_pfu + S); |
| - | X <- Sph$Fe_pfu / (Sph$Fe_pfu + CO + NI + CU + ZN + MO + AG + CD + SN + AU + HG + PB + AS + SB + S); | + | X <- Sph$Fe_pfu / (Sph$Fe_pfu + Sph$Co_pfu + Sph$Ni_pfu + Sph$Cu_pfu + Sph$Zn_pfu + Sph$Mo_pfu + Sph$Ag_pfu + Sph$Cd_pfu + Sph$Sn_pfu + Sph$Au_pfu + Sph$Hg_pfu + Sph$Pb_pfu + Sph$As_pfu + Sph$Sb_pfu + S); |
| T <- (28765 + 22600 * (1 - N)^2 - 6400 * (1 - N)^3) / (49.008 - 9.152 * log(X) + 18.2961 * log(N) + 5.5 * (1 - N)^2) - 273.15; | T <- (28765 + 22600 * (1 - N)^2 - 6400 * (1 - N)^3) / (49.008 - 9.152 * log(X) + 18.2961 * log(N) + 5.5 * (1 - N)^2) - 273.15; | ||
| warning(" EQUATION (6)"); | warning(" EQUATION (6)"); | ||
| - | return(data.frame(Name=paste0(Au$Name,"-", Sph$Name),T_calc=T)); | + | return(data.frame(Name=paste0(Sph$Name,"-", Au$Name),T_calc=T)); |
| } | } | ||
| Строка 50: | Строка 49: | ||
| } | } | ||
| - | #test stub | ||
| #sensors.t.au_sph_py_arg_shikazono_1985_a.test <- function(){ | #sensors.t.au_sph_py_arg_shikazono_1985_a.test <- function(){ | ||
| + | # | ||
| #} | #} | ||
| </Code> | </Code> | ||
| - | {{tag> tpf Au Sph }} | + | {{tag> tpf Sph Au }} |