Skip to content

Commit

Permalink
fix project brazil
Browse files Browse the repository at this point in the history
  • Loading branch information
ibarraespinosa committed Jun 19, 2023
1 parent 18ac03c commit f665ae5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
Binary file modified projects/brazil.tar.gz
Binary file not shown.
Binary file modified projects/brazil/config/UFBR.tar.gz
Binary file not shown.
4 changes: 2 additions & 2 deletions projects/brazil/config/UFBR/main.R
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ language <- "portuguese" # english chinese spanish portuguese
metadata <- readRDS("config/metadata.rds")
mileage <- readRDS("config/mileage.rds")
veh <- readRDS("config/fleet_age.rds")
net <- readRDS("network/net.rds")
#net <- readRDS("network/net.rds")
pmonth <- readRDS("config/pmonth.rds")
met <- readRDS("config/met.rds")
meto <- readRDS("config/met.rds")
verbose <- FALSE
maxage <- 40
scale <- "tunnel2018"
Expand Down
17 changes: 9 additions & 8 deletions projects/brazil/config/UFBR/scripts/evaporatives.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
year_selected <- as.numeric(substr(x = getwd(), start = nchar(getwd()) - 6, stop = nchar(getwd()) - 3))
year_selected <- as.numeric(substr(x = getwd(), start = nchar(getwd()) - 6, stop = nchar(getwd()) - 3))

suppressWarnings(file.remove("emi/evaporatives.csv"))
suppressWarnings(file.remove("emi/evaporatives.csv"))

# filtrando veiculos otto
meta_ev <- metadata[metadata$fuel != "D", ]
veh_ev <- meta_ev$vehicles

# temperature
t_sc <- split(met, met$scenario)
t_sc <- split(meto, meto$scenario)
sc <- names(t_sc)

reg <- unique(met$region)
reg <- unique(meto$region)

switch (language,
"portuguese" = cat("\nEmissões evaporativas\n"),
Expand All @@ -22,9 +22,10 @@ for(tt in seq_along(t_sc)) {
met <- t_sc[[tt]]

for (rr in seq_along(reg)) {
cat("\n", reg[rr], " ")

cat("\n", reg[rr], " ")

met <- met[region == reg[rr]]
met <- meto[region == reg[rr]]

te <- met$Temperature
bb <- (0+15)/2
Expand Down Expand Up @@ -144,7 +145,7 @@ for(tt in seq_along(t_sc)) {
for(mm in 1:12) {
met <- met[Month == mm]

cat(sprintf("%02d", mm), " iom, ")
cat(sprintf("%02d", mm), " ")

for(i in seq_along(veh_ev)) {

Expand Down Expand Up @@ -188,7 +189,7 @@ for(tt in seq_along(t_sc)) {
xx[is.na(xx)] <- 0

array_x <- emis_hot_td(
veh = x*dm[eva],
veh = x*as.numeric(dm)[eva],
lkm = mileage[[veh_ev[i]]],
ef = xx,
fortran = TRUE,
Expand Down

0 comments on commit f665ae5

Please sign in to comment.