Различия
Здесь показаны различия между двумя версиями данной страницы.
| Предыдущая версия справа и слева Предыдущая версия Следующая версия | Предыдущая версия | ||
|
recalc:grt_nm [2017/03/06 23:25] admin |
recalc:grt_nm [2018/11/12 15:08] (текущий) |
||
|---|---|---|---|
| Строка 1: | Строка 1: | ||
| ====== Grt: Normalization.Minerals ====== | ====== Grt: Normalization.Minerals ====== | ||
| - | Calculation form Excel table. To 3 cations with optional Fe_p3_pfu calculation from charge balance. | + | Calculation form Excel table. To 8 cations with optional Fe_p3_pfu calculation from charge balance. |
| === Details === | === Details === | ||
| Строка 7: | Строка 7: | ||
| ^ Reference | | | ^ Reference | | | ||
| ^ Input | SiO2_wtp, TiO2_wtp, Al2O3_wtp, Cr2O3_wtp, Fe2O3_wtp, FeO_wtp, MnO_wtp, MgO_wtp, CaO_wtp | | ^ Input | SiO2_wtp, TiO2_wtp, Al2O3_wtp, Cr2O3_wtp, Fe2O3_wtp, FeO_wtp, MnO_wtp, MgO_wtp, CaO_wtp | | ||
| - | ^ Output | Si_pfu, Ti_pfu, Al_pfu, Cr_pfu, Fe_pfu, Fe_p2_wtp, Fe_p3_wtp, Mn_pfu, Mg_pfu, CaO_pfu | | + | ^ Output | Si_pfu, Ti_pfu, Al_pfu, Cr_pfu, Fe_pfu, Fe_p2_wtp, Fe_p3_wtp, Mn_pfu, Mg_pfu, Ca_pfu | |
| <use:recalc.grt_nm> | <use:recalc.grt_nm> | ||
| Строка 69: | Строка 69: | ||
| pfu_units <- norm_cations; | pfu_units <- norm_cations; | ||
| - | fecharge <- ifelse(22-charge>0,22-charge,0); | + | fecharge <- ifelse(24-charge>0,24-charge,0); |
| pfu_units$Fe_p3_pfu <- ifelse(pfu_units$Fe_p3_pfu > 0, pfu_units$Fe_p3_pfu, fecharge); | pfu_units$Fe_p3_pfu <- ifelse(pfu_units$Fe_p3_pfu > 0, pfu_units$Fe_p3_pfu, fecharge); | ||
| pfu_units$Fe_p2_pfu <- ifelse(norm_cations$Fe_p3_pfu > 0, pfu_units$Fe_p2_pfu, norm_cations$Fe_p2_pfu - pfu_units$Fe_p3_pfu); | pfu_units$Fe_p2_pfu <- ifelse(norm_cations$Fe_p3_pfu > 0, pfu_units$Fe_p2_pfu, norm_cations$Fe_p2_pfu - pfu_units$Fe_p3_pfu); | ||
| Строка 77: | Строка 77: | ||
| 2*(pfu_units$Fe_p2_pfu+pfu_units$Mn_pfu+pfu_units$Mg_pfu+pfu_units$Ca_pfu); | 2*(pfu_units$Fe_p2_pfu+pfu_units$Mn_pfu+pfu_units$Mg_pfu+pfu_units$Ca_pfu); | ||
| - | endcharge<- 22-endcharge; | + | endcharge<- 24-endcharge; |
| rownames <- data.frame(Name = wtp_data$Name); | rownames <- data.frame(Name = wtp_data$Name); | ||
| Строка 86: | Строка 86: | ||
| recalc.grt_nm.test <- function () { | recalc.grt_nm.test <- function () { | ||
| - | test <- data.frame(Name=c("Sp1","Sp2"), SiO2_wtp=c(38.48,38.48), TiO2_wtp=c(0.1, 0.1), Al2O3_wtp=c(0.13,0.13), FeO_wtp=c(20.99, 20.99), Fe2O3_wtp=c(0, 1), MnO_wtp=c(0.33, 0.33), MgO_wtp=c(40.45, 40.45), CaO_wtp=c(0.02, 0.02)); | + | test <- data.frame(Name=c("Sp1","Sp2"), SiO2_wtp=c(37.39,37.39), TiO2_wtp=c(0.28, 0.28), Al2O3_wtp=c(10.08,10.08), FeO_wtp=c(19.35, 19.35), Fe2O3_wtp=c(1, 0), MnO_wtp=c(0.14, 0.14), MgO_wtp=c(1.55, 1.55), CaO_wtp=c(29.63, 29.63)); |
| - | result <- recalc.ol_nm(test); | + | result <- recalc.grt_nm(test); |
| - | expect_equal(object = result[1,]$Fe_p2_pfu, 0.432, tolerance = 0.005); | + | expect_equal(object = result[1,]$Fe_p2_pfu, 1.344, tolerance = 0.005); |
| - | expect_equal(object = result[2,]$Si_pfu, 0.984, tolerance = 0.005); | + | expect_equal(object = result[2,]$Si_pfu, 2.996, tolerance = 0.005); |
| } | } | ||
| </Code> | </Code> | ||