Различия

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

--- spdgrams:lan_c1_chondrite_sun_wm_taylor [2016/12/15 19:30]
f0ma
+++ spdgrams:lan_c1_chondrite_sun_wm_taylor [2018/11/12 15:07] (текущий)
@@ Строка 1: / Строка 1: @@
-====== C1 Chondrite, Sun McDonough, 1989 + Mantle Taylor, McLennan, 1985 ======
+====== C1 Chondrite, Sun McDonough, 1989 + Crust, Taylor, McLennan, 1985 ======
-C1 Chondrite + Mantle (3 ex)
+C1 Chondrite + Crust (3 ex)
 === Details ===
@@ Строка 29: / Строка 29: @@
 cmp <- read.csv("constants_oceanic_basalts_compositions.csv", sep=";", stringsAsFactors=F);
-curst <- read.csv("constants_continental_curst_taylor1985.csv", sep=",", stringsAsFactors=F);
+crust <- read.csv("constants_continental_curst_taylor1985.csv", sep=",", stringsAsFactors=F);
 spdgrams.lan_c1_chondrite_sun_wm_taylor <- function(ppm_data, el_order = NULL)
@@ Строка 45: / Строка 45: @@
   pmsc <- c(pmsc, subset(cmp, element == n)$c1_chondrite);
-cn <- curst$Element;
+lcrust <- c();
+mcrust <- c();
+ucrust <- c();
-tcurst <- data.frame(t(curst));
+for (n in ns) {
-tcurst <- tcurst[-c(1,5),];
+  if(n %in% crust$Element)
+  {
+    lcrust <- c(lcrust, subset(crust, Element == n)$lower_crust);
+    mcrust <- c(mcrust, subset(crust, Element == n)$middle_crust);
+    ucrust <- c(ucrust, subset(crust, Element == n)$upper_crust);
+  }
+  else
+  {
+    lcrust <- c(lcrust,0.0);
+    mcrust <- c(mcrust,0.0);
+    ucrust <- c(ucrust,0.0);
+  }
+}
-names(tcurst) <- cn;
+cr <- data.frame(rbind(lcrust,mcrust,ucrust));
-tcurst <- cbind(
+names(cr) <- c(paste0(ns,'_ppm'));
-              data.frame(Name=c('Lower','Middle','Upper')),
-              tcurst
-              );
-print(ppm_data);
+print(cr);
-print(tcurst);
 ds <- selectNames(ppm_data,c(paste0(ns,'_ppm')));
-print(tcurst$Eu);
+print(ds);
-ds_curst <- selectNames(tcurst, ns);
-ds <-rbind(ds,ds_curst);
+ds <-rbind(ds,cr);
 names(ds) <- ns;
+print(ds);
 ret <- c();
-values <- cbind(ppm_data$Name, rowApply(`/`,ds,pmsc));
+values <- cbind(c(ppm_data$Name, "Lower Crust", "Middle Crust", "Upper Crust"), rowApply(`/`,ds,pmsc));
 names(values)[1] <- 'Name';
+print(values);
 ret$values <- values;