Различия
Здесь показаны различия между двумя версиями данной страницы.
Предыдущая версия справа и слева Предыдущая версия Следующая версия | Предыдущая версия | ||
recalc:amp_13ecnk [2017/03/21 14:01] admin |
recalc:amp_13ecnk [2018/11/12 15:08] (текущий) |
||
---|---|---|---|
Строка 1: | Строка 1: | ||
- | ====== Amp: 13eCNK Method ====== | + | ====== Amp: 13eCNK ====== |
Droop equation No 6 assuming 13 cations excluding Ca,Na & K and with ZrO2. | Droop equation No 6 assuming 13 cations excluding Ca,Na & K and with ZrO2. | ||
Строка 14: | Строка 14: | ||
<WRAP center round todo 60%> | <WRAP center round todo 60%> | ||
- | * заголовок | + | * <del>заголовок</del> |
* <del>краткое описание</del> | * <del>краткое описание</del> | ||
* статья | * статья | ||
Строка 20: | Строка 20: | ||
* <del>карточка</del> | * <del>карточка</del> | ||
* подробное описание | * подробное описание | ||
- | * код | + | * <del>код</del> |
- | * тест | + | * <del>тест</del> |
</WRAP> | </WRAP> | ||
Строка 62: | Строка 62: | ||
rformula <- formula[0, ]; | rformula <- formula[0, ]; | ||
- | |||
- | print(cationCNK); | ||
for(i in 1:nrow(formula)){ | for(i in 1:nrow(formula)){ | ||
- | if (cationCNK[i]<13) { | + | if (cationCNK[i]<13) { |
- | rformula <- rbind(rformula, formula[i,]); | + | rformula <- rbind(rformula, formula[i,]); |
- | } else { | + | } else { |
- | rformula <- rbind(rformula, fnorm[i,]); | + | rformula <- rbind(rformula, fnorm[i,]); |
- | } | + | } |
} | } | ||
Строка 81: | Строка 79: | ||
rformula$Si_T_pfu <- rformula$Si_pfu; | rformula$Si_T_pfu <- rformula$Si_pfu; | ||
- | rformula$Al_c4_T_pfu <- ifelse(rformula$Al_pfu<Si_8m,rformula$Al_pfu,Si_8m); | + | rformula$Al_T_pfu <- ifelse(rformula$Al_pfu<Si_8m,rformula$Al_pfu,Si_8m); |
- | rformula$Al_c4_pfu <- rformula$Al_c4_T_pfu; | + | rformula$Al_c4_pfu <- rformula$Al_T_pfu; |
- | rformula$Sum_T <- rformula$Si_T_pfu + rformula$Al_c4_T_pfu; | + | rformula$Sum_T <- rformula$Si_T_pfu + rformula$Al_T_pfu; |
- | rformula$Al_c6_C_pfu <- ifelse(rformula$Al_pfu<Si_8m,0,Al_mSi_8m); | + | rformula$Al_C_pfu <- ifelse(rformula$Al_pfu<Si_8m,0,Al_mSi_8m); |
- | rformula$Al_c6_pfu <- rformula$Al_c6_C_pfu; | + | rformula$Al_c6_pfu <- rformula$Al_C_pfu; |
rformula$Ti_C_pfu <- rformula$Ti_pfu; | rformula$Ti_C_pfu <- rformula$Ti_pfu; | ||
rformula$Cr_C_pfu <- rformula$Cr_pfu; | rformula$Cr_C_pfu <- rformula$Cr_pfu; | ||
rformula$Fe_p2_C_pfu <- rformula$Fe_p2_pfu; | rformula$Fe_p2_C_pfu <- rformula$Fe_p2_pfu; | ||
rformula$Fe_p3_C_pfu <- rformula$Fe_p3_pfu; | rformula$Fe_p3_C_pfu <- rformula$Fe_p3_pfu; | ||
+ | rformula$Fe_C_pfu <- rformula$Fe_pfu; | ||
rformula$Mn_C_pfu <- rformula$Mn_pfu; | rformula$Mn_C_pfu <- rformula$Mn_pfu; | ||
rformula$Mg_C_pfu <- rformula$Mg_pfu; | rformula$Mg_C_pfu <- rformula$Mg_pfu; | ||
- | rformula$Sum_C <- rformula$Al_c6_C_pfu+rformula$Ti_C_pfu+rformula$Cr_C_pfu+rformula$Fe_p2_C_pfu+rformula$Fe_p3_C_pfu+rformula$Mn_C_pfu+rformula$Mg_C_pfu; | + | rformula$Sum_C <- rformula$Al_C_pfu+rformula$Ti_C_pfu+rformula$Cr_C_pfu+rformula$Fe_pfu+rformula$Mn_C_pfu+rformula$Mg_C_pfu; |
rformula$Ca_B_pfu <- rformula$Ca_pfu; | rformula$Ca_B_pfu <- rformula$Ca_pfu; | ||
Строка 106: | Строка 105: | ||
return(result); | return(result); | ||
} | } | ||
+ | # избыточная выдача; невозможно прочитать всю строку | ||
+ | # или удвоить строку или вывести необходимые величины вперед | ||
+ | # достаточно SiT/ AlT/ Al6/ Fe3/ Ti/ Cr/ Fe2/ Mn/ Mg/ Ca/ Na/ K/ TOTAL | ||
recalc.amp_13ecnk.test <- function (){ | recalc.amp_13ecnk.test <- function (){ |