Различия

Здесь показаны различия между двумя версиями данной страницы.

--- recalc:amp_tindle [2015/11/17 16:16]
admin created
+++ recalc:amp_tindle [2018/11/12 15:08] (текущий)
@@ Строка 1: / Строка 1: @@
 ====== Amp: Tindle Probe-Amph ======
-Formula per 23 Oxygens. 13eCK (15eN). Involved components: SiO2_wtp, TiO2_wtp, Al2O3_wtp, FeO_wtp, MgO_wtp, MnO_wtp, CaO_wtp, Na2O_wtp, K2O_wtp, F_wtp, Cl_wtp, BaO_wtp, SrO_wtp, PbO_wtp, ZnO_wtp, Cr2O3_wtp, NiO_wtp.
+Formula per 23 Oxygens. 13eCK (15eN).
 === Подробнее ===
-^ Article |  |
 ^ Reference |  |
-^ Учитываемые компоненты | SiO2_wtp, TiO2_wtp, Al2O3_wtp, FeO_wtp, MgO_wtp, MnO_wtp, CaO_wtp, Na2O_wtp, K2O_wtp, F_wtp, Cl_wtp, BaO_wtp, SrO_wtp, PbO_wtp, ZnO_wtp, Cr2O3_wtp, NiO_wtp |
+^ Input | SiO2_wtp, TiO2_wtp, Al2O3_wtp, FeO_wtp, MgO_wtp, MnO_wtp, CaO_wtp, Na2O_wtp, K2O_wtp, F_wtp, Cl_wtp, BaO_wtp, SrO_wtp, PbO_wtp, ZnO_wtp, Cr2O3_wtp, NiO_wtp |
-^ Выводимые компоненты | |
+^ Results | pfu  |
-^ [[:ppy:mod_recalc#amp_tindle|Calculate]] |  |
-=== Код ===
+<use:recalc.amp_tindle>
+<test:recalc.amp_tindle>
+<WRAP center round todo 60%>
+  * заголовок
+  * <del>краткое описание</del>
+  * статья
+  * ссылка
+  * <del>карточка</del>
+  * подробное описание
+  * код
+  * тест
+</WRAP>
+=== Source ===
 <Code linenums lang-r>
@@ Строка 35: / Строка 47: @@
 raw_anp$Ni_pfu = wtp$NiO_wtp * 1/74.4894
 raw_anp$Zn_pfu = wtp$ZnO_wtp * 1/81.3794
-raw_anp$Li_pfu = 0 * 2/29.8814
+raw_anp$Li_pfu = 0
 raw_anp$Ca_pfu = wtp$CaO_wtp * 1/56.0794
-raw_anp$Na_pfu = wtp$Na2O_wtp * 2/61.9774
+raw_anp$Na_pfu = wtp$Na2O_wtp * 1/61.9774
-raw_anp$K_pfu = wtp$K2O_wtp * 2/94.196
+raw_anp$K_pfu = wtp$K2O_wtp * 1/94.196
 raw_anp$Ba_pfu = wtp$BaO_wtp * 1/153.3294
 raw_anp$Sr_pfu = wtp$SrO_wtp * 1/103.6194
 raw_anp$Pb_pfu = wtp$PbO_wtp * 1/223.1994
-raw_anp$F_pfu = wtp$F_wtp * 1/18.998
+raw_anp$F_pfu = wtp$F_wtp * 0.5/18.998
-raw_anp$Cl_pfu = wtp$Cl_wtp * 1/35.453
+raw_anp$Cl_pfu = wtp$Cl_wtp * 0.5/35.453
 raw_anp.sum_wo_F_Cl = rowSums(raw_anp[,c(-1,-19,-20)])
-raw_anp.sum_Si_to_Ca = rowSums(raw_anp[,c(2,3,4,5,6,7,8,9,10,11,12,13,17)])
+raw_cat = data.frame(Name=wtp_data$Name)
-raw_anp.sum_Si_to_Li = rowSums(raw_anp[,c(2,3,4,5,6,7,8,9,10,11,12)])
+raw_cat$Si_pfu = wtp$SiO2_wtp * 1/60.0843
+raw_cat$Ti_pfu = wtp$TiO2_wtp * 1/79.8788
+raw_cat$Al_pfu = wtp$Al2O3_wtp * 2/101.9602
+raw_cat$Cr_pfu = wtp$Cr2O3_wtp * 2/151.9902
+raw_cat$Fe_p2_pfu = 0
+raw_cat$Fe_p3_pfu = wtp$FeO_wtp * 1/71.8464
+raw_cat$Mn_pfu = wtp$MnO_wtp * 1/70.9374
+raw_cat$Mg_pfu = wtp$MgO_wtp * 1/40.3044
+raw_cat$Ni_pfu = wtp$NiO_wtp * 1/74.4894
+raw_cat$Zn_pfu = wtp$ZnO_wtp * 1/81.3794
+raw_cat$Li_pfu = 0
+raw_cat$Ca_pfu = wtp$CaO_wtp * 1/56.0794
+raw_cat$Na_pfu = wtp$Na2O_wtp * 2/61.9774
+raw_cat$K_pfu = wtp$K2O_wtp * 2/94.196
+raw_cat$Ba_pfu = wtp$BaO_wtp * 1/153.3294
+raw_cat$Sr_pfu = wtp$SrO_wtp * 1/103.6194
+raw_cat$Pb_pfu = wtp$PbO_wtp * 1/223.1994
+raw_cat$F_pfu = wtp$F_wtp * 1/18.998
+raw_cat$Cl_pfu = wtp$Cl_wtp * 1/35.453
+raw_cat.sum_wo_F_Cl = rowSums(raw_anp[,c(-1,-19,-20)])
+raw_cat.sum_Si_to_Ca = rowSums(raw_anp[,c(2,3,4,5,6,7,8,9,10,11,12,13,17)])
+raw_cat.sum_Si_to_Li = rowSums(raw_anp[,c(2,3,4,5,6,7,8,9,10,11,12)])
+}
+recalc.amp_tindle.test <- function (){
+warning("No test routine!");
 }
 </Code>