Различия
Здесь показаны различия между двумя версиями данной страницы.
| Предыдущая версия справа и слева Предыдущая версия Следующая версия | Предыдущая версия | ||
|
sensors:pt:amp_pl_holland_blundy [2015/10/20 12:40] admin |
sensors:pt:amp_pl_holland_blundy [2018/11/12 15:07] (текущий) |
||
|---|---|---|---|
| Строка 5: | Строка 5: | ||
| === Details === | === Details === | ||
| - | ^ Article | Holland, T. , Blundy, J. Non-ideal interactions in calcic amphiboles and their bearing on amphibole-plagioclase thermometry | | + | ^ Article | <ref:holland1994> | |
| - | ^ Reference | {{:sources:holland1994.pdf}} | | + | |
| ^ Accuracy | ± 50 °C | | ^ Accuracy | ± 50 °C | | ||
| ^ Ranges | 1 < P < 16 kbar, 400 °C < T < 1100 °C | | ^ Ranges | 1 < P < 16 kbar, 400 °C < T < 1100 °C | | ||
| ^ Renew sensors | Blundy and Holland (1990), Kohn and Spear (1989, 1990). | | ^ Renew sensors | Blundy and Holland (1990), Kohn and Spear (1989, 1990). | | ||
| - | ^[[:ppy:mod_sensors#pt_amp_pl_holland_blundy|Calculate]] ^ ^ | + | <use:sensors.pt.amp_pl_holland_blundy> |
| + | <test:sensors.pt.amp_pl_holland_blundy> | ||
| + | |||
| + | <WRAP center round todo 60%> | ||
| + | Для улучшения этой статьи следует: | ||
| + | * Добавить подробное описание | ||
| + | * Добавить тест | ||
| + | </WRAP> | ||
| Строка 16: | Строка 22: | ||
| <Code linenums lang-r> | <Code linenums lang-r> | ||
| - | source('sensor_p_amp_pl_holland_blundy.r'); | + | source('sensors_p_amp_pl_holland_blundy.r'); |
| - | source('sensor_t_amp_pl_holland_blundy.r'); | + | source('sensors_t_amp_pl_holland_blundy.r'); |
| sensors.pt.amp_pl_holland_blundy <- function(Amp, Pl, Temp, usePFU = FALSE, ...){ | sensors.pt.amp_pl_holland_blundy <- function(Amp, Pl, Temp, usePFU = FALSE, ...){ | ||
| Строка 47: | Строка 53: | ||
| } | } | ||
| - | return (data.frame(Name=paste0(Opx$Name,'-',Cpx$Name),P_calc_Holland_Blundy_A=P_A,T_calc_Holland_Blundy_A=Temp_A,P_calc_Holland_Blundy_B=P_B,T_calc_Holland_Blundy_B=Temp_B)); | + | return (data.frame(Name=paste0(Amp$Name,'-',Pl$Name),P_calc_Holland_Blundy_A=P_A,T_calc_Holland_Blundy_A=Temp_A,P_calc_Holland_Blundy_B=P_B,T_calc_Holland_Blundy_B=Temp_B)); |
| } | } | ||
| - | sensors.p.amp_pl_holland_blundy.args <- function() { | + | sensors.pt.amp_pl_holland_blundy.args <- function() { |
| ars <- list(); | ars <- list(); | ||
| ars$minerals = c('Amp','Pl'); | ars$minerals = c('Amp','Pl'); | ||
| - | ars$ranges = c('Temp'); | + | ars$ranges = c(); |
| return(ars); | return(ars); | ||
| } | } | ||
| </Code> | </Code> | ||