Различия

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

--- recalc:amp_holland_blundy [2015/10/20 08:18]
admin
+++ recalc:amp_holland_blundy [2018/11/12 15:08] (текущий)
@@ Строка 1: / Строка 1: @@
-====== Amp: Holland Blundy, 1995 ======
+====== Amp: Holland, 1995 ======
 Formula per 23 Oxygens with Fe2+ <-> Fe3+ calculation by max-min averege. Involved components: SiO2_wtp, TiO2_wtp, Al2O3_wtp, FeO_wtp, MgO_wtp, MnO_wtp, CaO_wtp, Na2O_wtp, K2O_wtp, F_wtp, Cl_wtp.
-=== Подробнее ===
+=== Details ===
-^ Article | Tim Holland, Jon Blundy Non-ideal interactions in calcic amphiboles and their bearing on amphibole-plagioclase thermometry, Contrib Mineral Petrol (1994) 116:433~447 |
+^ Reference | <ref:holland1994> |
-^ Reference | {{:sources:holland1994.pdf}} |
+^ Input | SiO2_wtp, TiO2_wtp, Al2O3_wtp, FeO_wtp, MgO_wtp, MnO_wtp, CaO_wtp, Na2O_wtp, K2O_wtp, F_wtp, Cl_wtp |
-^ Учитываемые компоненты | SiO2_wtp, TiO2_wtp, Al2O3_wtp, FeO_wtp, MgO_wtp, MnO_wtp, CaO_wtp, Na2O_wtp, K2O_wtp, F_wtp, Cl_wtp |
+^ Results | Al_c4_pfu, Al_c6_pfu, Fe_p2_M123_pfu, Fe_p3_pfu , Fe_p2_M4_pfu, Fe_p2_pfu, Ca_M123_pfu, Ca_M4_pfu, Ca_A_pfu, Na_M4_pfu, Na_A_pfu,OH_pfu|
-^ Выводимые компоненты | Al_c4_pfu, Al_c6_pfu, Fe_p2_M123_pfu, Fe_p3_pfu , Fe_p2_M4_pfu, Fe_p2_pfu, Ca_M123_pfu, Ca_M4_pfu, Ca_A_pfu, Na_M4_pfu, Na_A_pfu,OH_pfu|
-^ [[:ppy:mod_recalc#amph_holland_blundy|Calculate]] |  |
-=== Код ===
+<use:recalc.amp_holland_blundy>
+<test:recalc.amp_holland_blundy>
+<WRAP center round todo 60%>
+  * <del>заголовок</del>
+  * <del>краткое описание</del>
+  * <del>статья</del>
+  * <del>ссылка</del>
+  * <del>карточка</del>
+  * подробное описание
+  * <del>код</del>
+  * <del>тест</del>
+</WRAP>
+=== Source ===
 <Code linenums lang-r>
-recalc.amp_holland_blundy <- function (wtp_data, ...)
+recalc.amp_holland_blundy <- function (wtp_data, ...){
-{
     ox_group <-c('SiO2_wtp','TiO2_wtp', 'Al2O3_wtp', 'FeO_wtp', 'MgO_wtp', 'MnO_wtp', 'CaO_wtp', 'Na2O_wtp', 'K2O_wtp', 'F_wtp', 'Cl_wtp');
@@ Строка 120: / Строка 131: @@
 }
-recalc.amp_holland_blundy.test <- function ()
+recalc.amp_holland_blundy.test <- function (){
-{
   src <- data.frame(Name='test', SiO2_wtp=46.42, TiO2_wtp=1.27, Al2O3_wtp=6.81, FeO_wtp=14.21,
                     MgO_wtp=16.67, MnO_wtp=0.76, CaO_wtp=11.59, Na2O_wtp=1.36, K2O_wtp=0.90, F_wtp = 0.0, Cl_wtp = 0.0);
-  r <- recalc.amp_holland_blundy (src);
+  result <- recalc.amp_holland_blundy (src);
+  print(result);
-  expect_equal(object = result$Na_A_pfu,0.290, tolerance = 0.005);
+  expect_equal(object = result$Na_A_pfu,0.290, tolerance = 0.05);
-  expect_equal(object = result$Fe_p2_pfu,1.258, tolerance = 0.005);
+  expect_equal(object = result$Fe_p2_pfu,1.258, tolerance = 0.05);
-  expect_equal(object = result$Ti_pfu,0.141, tolerance = 0.005);
+  expect_equal(object = result$Ti_pfu,0.141, tolerance = 0.05);
 }
 </Code>