Различия

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

--- recalc:grt_nm [2017/03/06 23:32]
admin
+++ recalc:grt_nm [2018/11/12 15:08] (текущий)
@@ Строка 1: / Строка 1: @@
 ====== 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 ===
@@ Строка 7: / Строка 7: @@
 ^ Reference |  |
 ^ 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>
@@ Строка 86: / Строка 86: @@
 recalc.grt_nm.test <- function () {
-    test <- data.frame(Name=c("Sp1","Sp2"), SiO2_wtp=c(37.93,37.93), TiO2_wtp=c(0.28, 0.28), Al2O3_wtp=c(10.08,10.08), FeO_wtp=c(19.35, 19.35), Fe2O3_wtp=c(0, 1), MnO_wtp=c(0.14, 0.14), MgO_wtp=c(1.55, 1.55), CaO_wtp=c(29.63, 29.63));
+    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, 1.344, tolerance = 0.005);