Различия
Здесь показаны различия между двумя версиями данной страницы.
Предыдущая версия справа и слева Предыдущая версия Следующая версия | Предыдущая версия | ||
recalc:bt_tindle [2015/10/02 11:49] admin |
recalc:bt_tindle [2018/11/12 15:08] (текущий) |
||
---|---|---|---|
Строка 1: | Строка 1: | ||
- | ====== Bt: Tindle method ====== | + | ====== Bt: Tindle, 1990 ====== |
- | Recalculation to 22 ox with F,Cl correction. Li2O and H2O calculations after Tindle and Webb (1990) European Journal of Mineralogy, vol. 2, pgs. 595-610. | + | Recalculation to 22 ox with F,Cl correction. Li2O and H2O calculations after Tindle and Webb, 1990. |
=== Details === | === Details === | ||
- | ^ Article | Tindle and Webb (1990) European Journal of Mineralogy, vol. 2, pgs. 595-610. | | + | ^ Reference | <ref:tindle1990> | |
- | ^ Reference | http://www.open.ac.uk/earth-research/tindle/AGTWebPages/AGTSoft.html | | + | ^ Input | SiO2_wtp, TiO2_wtp, Al2O3_wtp, FeO_wtp, MnO_wtp, MgO_wtp, CaO_wtp, Na2O_wtp, K2O_wtp, SrO_wtp, BaO_wtp, Rb2O_wtp, Cs2O_wtp, ZnO_wtp, SnO2_wtp, Ga2O3_wtp, F_wtp, Cl_wtp, Cr2O3_wtp, NiO_wtp, CuO_wtp | |
- | ^ Input components | SiO2_wtp, Al2O3_wtp, TiO2_wtp, Cr2O3_wtp, Fe2O3_wtp, FeO_wtp, MnO_wtp, MgO_wtp, CaO_wtp, Na2O_wtp, K2O_wtp, BaO_wtp, NiO_wtp, ZnO_wtp, BeO_wtp, P2O5_wtp, V2O5_wtp, CoO_wtp, GeO2_wtp, ZrO2_wtp, Cs2O_wtp, PbO_wtp, SO3_wtp, CO2_wtp, F_wtp, Cl_wtp | | + | ^ Results | pfu, Al_c4_pfu, Al_c6_pfu, Li_pfu, OH_pfu | |
- | ^ Calculated components | Al_c4_pfu, Al_c6_pfu, Li_pfu, OH_pfu | | + | |
- | ^[[:ppy:mod_recalc#bt_tindle |Calculate]] ^ ^ | + | |
- | === Код === | + | <use:recalc.bt_tindle> |
+ | <test:recalc.bt_tindle> | ||
+ | |||
+ | <WRAP center round todo 60%> | ||
+ | * <del>заголовок</del> | ||
+ | * <del>краткое описание</del> | ||
+ | * статья | ||
+ | * <del>ссылка</del> | ||
+ | * <del>карточка</del> | ||
+ | * подробное описание | ||
+ | * код | ||
+ | * тест | ||
+ | </WRAP> | ||
+ | |||
+ | === Source === | ||
<Code linenums lang-r> | <Code linenums lang-r> | ||
Строка 48: | Строка 60: | ||
names(step3_data) <- pfu_names; | names(step3_data) <- pfu_names; | ||
- | step3_data$Al_c4_pfu <- ifelse(step3_data$Al_pfu > 8-Si_pfu,8-step3_data$Si_pfu,step3_data$Al_pfu); | + | step3_data$Al_c4_pfu <- ifelse(step3_data$Al_pfu > 8-step3_data$Si_pfu,8-step3_data$Si_pfu,step3_data$Al_pfu); |
step3_data$Al_c4_pfu <- ifelse(step3_data$Si_pfu>8,0,step3_data$Al_c4_pfu); | step3_data$Al_c4_pfu <- ifelse(step3_data$Si_pfu>8,0,step3_data$Al_c4_pfu); | ||
step3_data$Al_c6_pfu <- ifelse(step3_data$Si_pfu+step3_data$Al_pfu<8,0,step3_data$Al_pfu-step3_data$Al_c4_pfu); | step3_data$Al_c6_pfu <- ifelse(step3_data$Si_pfu+step3_data$Al_pfu<8,0,step3_data$Al_pfu-step3_data$Al_c4_pfu); | ||
Строка 55: | Строка 67: | ||
step3_data$ОН_pfu <- ifelse(step3_data$ОН_pfu < 0, 0 , step3_data$ОН_pfu); | step3_data$ОН_pfu <- ifelse(step3_data$ОН_pfu < 0, 0 , step3_data$ОН_pfu); | ||
- | return(cbind(wtp_data$Name,step3_data)); | + | step3_data$Name <- wtp_data$Name; |
+ | |||
+ | return(step3_data[,c('Name',pfu_names,'Al_c4_pfu','Al_c6_pfu','ОН_pfu')]); | ||
+ | } | ||
+ | |||
+ | recalc.bt_tindle.test <- function () { | ||
+ | src <- data.frame(Name='test',Na2O_wtp=0.28, MgO_wtp=9.31, | ||
+ | Al2O3_wtp=19.56, SiO2_wtp=34.25, Cl_wtp = 0.07, K2O_wtp=9.43, CaO_wtp=0.02, | ||
+ | TiO2_wtp=2.3,Cr2O3_wtp=0.06,FeO_wtp =20.36); | ||
+ | |||
+ | result <- recalc.bt_tindle (src); | ||
+ | |||
+ | expect_equal(object = result$Al_c4_pfu,2.781, tolerance = 0.005); | ||
+ | expect_equal(object = result$Al_c6_pfu,0.732, tolerance = 0.005); | ||
+ | expect_equal(object = result$Li_pfu,0.17, tolerance = 0.005); | ||
+ | expect_equal(object = result$Mg_pfu,2.115, tolerance = 0.005); | ||
+ | expect_equal(object = result$OH_pfu,3.982, tolerance = 0.005); | ||
} | } | ||
</Code> | </Code> |