Различия
Здесь показаны различия между двумя версиями данной страницы.
| Следующая версия | Предыдущая версия | ||
|
sensors:t:cpx_opx_sen_jones_1989 [2017/05/18 13:27] admin создано |
sensors:t:cpx_opx_sen_jones_1989 [2018/11/12 15:08] (текущий) |
||
|---|---|---|---|
| Строка 1: | Строка 1: | ||
| ====== Cpx-Opx: Sen, Jones, 1989 ====== | ====== Cpx-Opx: Sen, Jones, 1989 ====== | ||
| + | |||
| + | Pyroxenes in the spinel peridotite field. | ||
| === Details === | === Details === | ||
| Строка 8: | Строка 10: | ||
| ^ Article | <ref:sen1989> | | ^ Article | <ref:sen1989> | | ||
| - | ^ Callibration | | | + | ^ Callibration | 8 experiments | |
| - | ^ Precision | | | + | ^ Precision | T = ±50° | |
| - | ^ Ranges | | | + | ^ Ranges | P = 10 - 15 kBar, T = 925 - 1150 | |
| - | ^ Renew sensors | | | + | ^ Renew sensors | Wells, Nikel et al., Bertrand-Mercier | |
| <use:sensors.t.cpx_opx_sen_jones_1989> | <use:sensors.t.cpx_opx_sen_jones_1989> | ||
| Строка 18: | Строка 20: | ||
| <WRAP center round todo 60%> | <WRAP center round todo 60%> | ||
| * <del>заголовок</del> | * <del>заголовок</del> | ||
| - | * краткое описание | + | * <del>краткое описание</del> |
| * <del>статья</del> | * <del>статья</del> | ||
| * <del>ссылка</del> | * <del>ссылка</del> | ||
| - | * карточка | + | * <del>карточка</del> |
| * подробное описание | * подробное описание | ||
| * <del>код</del> | * <del>код</del> | ||
| - | * тест | + | * <del>тест</del> |
| </WRAP> | </WRAP> | ||
| Строка 32: | Строка 34: | ||
| source("utilities_tpf.r"); | source("utilities_tpf.r"); | ||
| - | sensors.t.cpx_opx_sen_jones <- function(Cpx, Opx, usePFU=FALSE, ...){ | + | sensors.t.cpx_opx_sen_jones_1989 <- function(Cpx, Opx, usePFU=FALSE, ...){ |
| row_names = paste0(Cpx$Name,"-", Opx$Name); | row_names = paste0(Cpx$Name,"-", Opx$Name); | ||
| if(!usePFU) { | if(!usePFU) { | ||
| - | Opx <- tpf.recalc_minaral("OPX",Opx); | ||
| Cpx <- tpf.recalc_minaral("CPX",Cpx); | Cpx <- tpf.recalc_minaral("CPX",Cpx); | ||
| + | Opx <- tpf.recalc_minaral("OPX",Opx); | ||
| } | } | ||
| Строка 52: | Строка 54: | ||
| B <- B1 / B2 * B3 / B4; | B <- B1 / B2 * B3 / B4; | ||
| T_eq3 <- 4900 / (1.807 - log(A / B)) - 273; | T_eq3 <- 4900 / (1.807 - log(A / B)) - 273; | ||
| - | |||
| A <- (1 - (Cpx$Al_c6_pfu) - Cpx$Ti_pfu - Cpx$Cr_pfu - Cpx$Fe_p3_pfu) * Cpx$Mg_pfu / (Cpx$Mg_pfu + Cpx$Fe_p2_pfu) * Cpx$Ca_pfu; | A <- (1 - (Cpx$Al_c6_pfu) - Cpx$Ti_pfu - Cpx$Cr_pfu - Cpx$Fe_p3_pfu) * Cpx$Mg_pfu / (Cpx$Mg_pfu + Cpx$Fe_p2_pfu) * Cpx$Ca_pfu; | ||
| Строка 61: | Строка 62: | ||
| } | } | ||
| - | sensors.t.cpx_opx_sen_jones.args <- function(){ | + | sensors.t.cpx_opx_sen_jones_1989.args <- function(){ |
| ars <- list(); | ars <- list(); | ||
| ars$minerals <- c("Cpx", "Opx"); | ars$minerals <- c("Cpx", "Opx"); | ||
| Строка 68: | Строка 69: | ||
| } | } | ||
| - | #sensors.t.cpx_opx_sen_jones.test <- function(){ | + | sensors.t.cpx_opx_sen_jones_1989.test <- function(){ |
| - | # | + | |
| - | #} | + | cpx <- data.frame(Name=c('Cpx'), SiO2_wtp=c(55.65), TiO2_wtp=c(0.06), Al2O3_wtp=c(0.59), Cr2O3_wtp=c(0.08), |
| + | FeO_wtp=c(1.53), MgO_wtp=c(19.85), CaO_wtp=c(22.27), MnO_wtp=c(0.00), Na2O_wtp=c(0.26)); | ||
| + | |||
| + | opx <- data.frame(Name=c('Opx'), SiO2_wtp=c(55.16), TiO2_wtp=c(0.08), Al2O3_wtp=c(4.16), Cr2O3_wtp=c(0.38), | ||
| + | FeO_wtp=c(5.00), MgO_wtp=c(34.87), CaO_wtp=c(1.21), MnO_wtp=c(0.11), Na2O_wtp=c(0.09)); | ||
| + | |||
| + | |||
| + | res <- sensors.t.cpx_opx_sen_jones_1989(cpx,opx); | ||
| + | |||
| + | expect_equal(object = res[1,]$T_calc_eq3, 1040, tolerance = 1); | ||
| + | expect_equal(object = res[1,]$T_calc_eq4, 1006, tolerance = 1); | ||
| + | } | ||
| </Code> | </Code> | ||
| - | {{tag> tpf Cpx Opx AP_igroup}} | + | {{tag> tpf Cpx Opx AP_igroup fixed}} |