Merge branch 'master' of https://github.com/atmoschem/vein

atmoschem · Aug 2, 2023 · 1b26cb8 · 1b26cb8
2 parents 1f55646 + c930aa9
commit 1b26cb8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/R/Speed.R b/R/Speed.R
@@ -148,7 +148,7 @@ plot.Speed <- function(x,
                     z = t(as.matrix(x))[, nrow(x):1],
                     xlab = "",
                     ylab = paste0("Speed by streets [",as.character(units(x[[1]])), "]"),
-                    col = col,
+                    col = rev(col),
                     axe = FALSE)
     axis(2)
     addscale(t(as.matrix(x))[, nrow(x):1], col = col)

diff --git a/R/speciate.R b/R/speciate.R
@@ -593,18 +593,18 @@ speciate <- function(x = 1,
           e_eci = 0,
           e_ecj = 0.056 + 0.024#,h2o = 0.277
         )
-      } else if (spec == "pm2023") {
+      } else if (spec == "pm20232") {
         df <- data.frame(
-          e_so4i = 0.003672,
-          e_so4j = 0.023328,
-          e_no3i = 0.00345,
-          e_no3j = 0.01155,
-          e_pm25i = 0.04825,
-          e_pm25j = 0.14475,
-          e_orgi = 0.08284,
-          e_orgj = 0.35316,
-          e_eci = 0.30926,
-          e_ecj = 0.01974#,h2o = 0.277
+          e_so4i = 0.00646,
+          e_so4j = 0.04104,
+          e_no3i = 0.004025,
+          e_no3j = 0.013475,
+          e_pm25i = 0.114,
+          e_pm25j = 0.342,
+          e_orgi = 0.041515,
+          e_orgj = 0.176985,
+          e_eci = 0.24487,
+          e_ecj = 0.01563#,h2o = 0.277
         )
       } else if (spec == "pmneu2") {
         df <- data.frame(