Различия
Здесь показаны различия между двумя версиями данной страницы.
| Следующая версия | Предыдущая версия | ||
|
spdgrams:lan_c1_chondrite_sun_wm_sun [2016/12/19 00:14] f0ma создано |
spdgrams:lan_c1_chondrite_sun_wm_sun [2018/11/12 15:07] (текущий) |
||
|---|---|---|---|
| Строка 29: | Строка 29: | ||
| cmp <- read.csv("constants_oceanic_basalts_compositions.csv", sep=";", stringsAsFactors=F); | cmp <- read.csv("constants_oceanic_basalts_compositions.csv", sep=";", stringsAsFactors=F); | ||
| - | ocean <- read.csv("oceanic_basalts_compositions.csv", sep=",", stringsAsFactors=F); | + | ocean <- read.csv("constants_oceanic_basalts_compositions.csv", sep=";", stringsAsFactors=F); |
| spdgrams.lan_c1_chondrite_sun_wm_sun <- function(ppm_data, el_order = NULL) | spdgrams.lan_c1_chondrite_sun_wm_sun <- function(ppm_data, el_order = NULL) | ||
| Строка 45: | Строка 45: | ||
| pmsc <- c(pmsc, subset(cmp, element == n)$c1_chondrite); | pmsc <- c(pmsc, subset(cmp, element == n)$c1_chondrite); | ||
| - | lcrust <- c(); | + | nmorb <- c(); |
| - | mcrust <- c(); | + | emorb <- c(); |
| - | ucrust <- c(); | + | oib <- c(); |
| for (n in ns) { | for (n in ns) { | ||
| - | if(n %in% ocean$Element) | + | if(n %in% ocean$element) |
| { | { | ||
| - | nmorb <- c(lcrust, subset(ocean, Element == n)$N_MORB); | + | nmorb <- c(nmorb, subset(ocean, element == n)$N_MORB); |
| - | emorb <- c(mcrust, subset(ocean, Element == n)$E_MORB); | + | emorb <- c(emorb, subset(ocean, element == n)$E_MORB); |
| - | oib <- c(ucrust, subset(ocean, Element == n)$OBI); | + | oib <- c(oib, subset(ocean, element == n)$OIB); |
| } | } | ||
| else | else | ||
| Строка 92: | Строка 92: | ||
| return(ret); | return(ret); | ||
| + | } | ||
| + | |||
| + | spdgrams.lan_c1_chondrite_sun_wm_sun.test <- function() | ||
| + | { | ||
| + | spdgrams.lan_c1_chondrite_sun_wm_sun(data.frame(Name=c('Test'),Eu_ppm=c(34.5))); | ||
| } | } | ||