Различия
Здесь показаны различия между двумя версиями данной страницы.
| Следующая версия | Предыдущая версия | ||
|
interpmin:amp_holland_blundy [2015/10/20 08:42] admin created |
interpmin:amp_holland_blundy [2018/11/12 15:07] (текущий) |
||
|---|---|---|---|
| Строка 1: | Строка 1: | ||
| - | ====== Amp: Holland-Blundy, 1995 ====== | + | ====== Amp: Holland-Blundy, 1994 ====== |
| Formula per 23 Oxygens with Fe2+ <-> Fe3+ calculation by max-min averege. Involved components: SiO2_wtp, TiO2_wtp, Al2O3_wtp, FeO_wtp, MgO_wtp, MnO_wtp, CaO_wtp, Na2O_wtp, K2O_wtp, F_wtp, Cl_wtp. | Formula per 23 Oxygens with Fe2+ <-> Fe3+ calculation by max-min averege. Involved components: SiO2_wtp, TiO2_wtp, Al2O3_wtp, FeO_wtp, MgO_wtp, MnO_wtp, CaO_wtp, Na2O_wtp, K2O_wtp, F_wtp, Cl_wtp. | ||
| Строка 5: | Строка 5: | ||
| === Details === | === Details === | ||
| - | ^ Article | | | + | ^ Reference | <ref:holland1994> | |
| - | ^ Recalc method | [[recalc:amp_holland_blundy]] | | + | ^ Recalc | [[recalc:amp_holland_blundy]] | |
| - | ^ Calculated components | cm, X_Si_T1, X_Al_T1, X_Al_M2, X_vac_A, X_Na_A, X_Na_M4, X_Ca_M4, X_K_A, X_ed_tr | | + | ^ Results | cm, X_Si_T1, X_Al_T1, X_Al_M2, X_vac_A, X_Na_A, X_Na_M4, X_Ca_M4, X_K_A | |
| - | ^[[:ppy:mod_interpmin#amp_holland_blundy |Calculate]] ^ ^ | + | |
| + | <use:interpmin.amp_holland_blundy> | ||
| + | <test:interpmin.amp_holland_blundy> | ||
| + | |||
| + | <WRAP center round todo 60%> | ||
| + | * <del>заголовок</del> | ||
| + | * <del>краткое описание</del> | ||
| + | * <del>статья</del> | ||
| + | * <del>ссылка</del> | ||
| + | * <del>карточка</del> | ||
| + | * подробное описание | ||
| + | * <del>код</del> | ||
| + | * тест | ||
| + | </WRAP> | ||
| <Code linenums lang-r> | <Code linenums lang-r> | ||
| source('recalc_amp_holland_blundy.r'); | source('recalc_amp_holland_blundy.r'); | ||
| - | interpmin.amp_holland_blundy <- function (wtp_data, ...) | + | |
| - | { | + | interpmin.amp_holland_blundy <- function (wtp_data, ...) { |
| p <- recalc.amp_holland_blundy(wtp_data); | p <- recalc.amp_holland_blundy(wtp_data); | ||
| res <- data.frame(Name=p$Name); | res <- data.frame(Name=p$Name); | ||
| res$cm <- (p$Si_pfu+p$Al_pfu+p$Ti_pfu+p$Fe_pfu+p$Mg_pfu+p$Mn_pfu)-13; | res$cm <- (p$Si_pfu+p$Al_pfu+p$Ti_pfu+p$Fe_pfu+p$Mg_pfu+p$Mn_pfu)-13; | ||
| res$X_Si_T1 <- (p$Si_pfu-4)/4; | res$X_Si_T1 <- (p$Si_pfu-4)/4; | ||
| - | res$X_Al_T1 <- (8-p$Al_pfu)/4; | + | res$X_Al_T1 <- (8-p$Si_pfu)/4; |
| res$X_Al_M2 <- (p$Si_pfu+p$Al_pfu-8)/2; | res$X_Al_M2 <- (p$Si_pfu+p$Al_pfu-8)/2; | ||
| res$X_vac_A <- 3-p$K_pfu-p$Na_pfu-p$Ca_pfu-res$cm; | res$X_vac_A <- 3-p$K_pfu-p$Na_pfu-p$Ca_pfu-res$cm; | ||
| - | res$X_Na_A <- p$Ca_pfu+p$Na_pfu+res$cm + 2; | + | res$X_Na_A <- p$Ca_pfu+p$Na_pfu+res$cm - 2; |
| res$X_Na_M4 <- (2-p$Ca_pfu-res$cm)/2; | res$X_Na_M4 <- (2-p$Ca_pfu-res$cm)/2; | ||
| res$X_Ca_M4 <- p$Ca_pfu / 2; | res$X_Ca_M4 <- p$Ca_pfu / 2; | ||
| Строка 27: | Строка 41: | ||
| return(res); | return(res); | ||
| + | } | ||
| + | |||
| + | interpmin.amp_holland_blundy.test <- function (){ | ||
| + | warning("No test routine!"); | ||
| } | } | ||
| </Code> | </Code> | ||