Различия

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

--- spdgrams:lan_c1_chondrite_sun_wm_taylor [2016/12/15 19:53]
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 ===
@@ Строка 50: / Строка 50: @@
 for (n in ns) {
-  lcrust <- c(lcrust, subset(crust, Element == n)$lower_crust);
+  if(n %in% crust$Element)
-  mcrust <- c(mcrust, subset(crust, Element == n)$middle_crust);
+  {
-  ucrust <- c(ucrust, subset(crust, Element == n)$upper_crust);
+    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);
+  }
 }
 cr <- data.frame(rbind(lcrust,mcrust,ucrust));
-names(cr) <- ns;
+names(cr) <- c(paste0(ns,'_ppm'));
+print(cr);
 ds <- selectNames(ppm_data,c(paste0(ns,'_ppm')));
-print(cr);
 print(ds);
@@ Строка 67: / Строка 77: @@
 names(ds) <- ns;
+print(ds);
 ret <- c();
@@ Строка 72: / Строка 84: @@
 values <- cbind(c(ppm_data$Name, "Lower Crust", "Middle Crust", "Upper Crust"), rowApply(`/`,ds,pmsc));
 names(values)[1] <- 'Name';
+print(values);
 ret$values <- values;