Skip to content

Adjust consumption vectors for 2R models to address #13 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WesIngwersen merged 4 commits into from
Nov 19, 2025
Merged

Adjust consumption vectors for 2R models to address #13 #18

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1565a70
Merge pull request #346 from USEPA/release_v1.7.2
bl-young Jul 28, 2025
f47fcec
Edit prepare2RDemand function to match consumption demand calculation…
Nov 5, 2025
5b8acd2
Fix typo in else if statement
Nov 5, 2025
86d8453
Use y instead of y_p. Drop production from comments when not applicab…
WesIngwersen Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 33 additions & 42 deletions R/StateiorFunctions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,65 +140,56 @@ prepare2RDemand <- function(model, location, domestic, demand_type = "Production
state_abb <- sub(".*/","",model$FinalDemandMeta$Code_Loc) ## Extract characters after /
state_abb <- unique(state_abb)
iolevel <- model$specs$BaseIOLevel

ita_column <- ifelse(iolevel == "Detail", "F05100", "F051")

if(domestic) {
# TODO: CHANGE domestic FROM BOOLEAN TO STRING WITH VALUES 'domestic', 'production',
# TODO: CHANGE domestic FROM BOOLEAN TO STRING WITH VALUES 'domestic', 'production',
# and 'import', so we can calculate the import matrix in the following if else if else block
use_table <- model$DomesticUseTransactionswithTrade
use_table <- model$DomesticUseTransactionswithTrade
} else {
use_table <- model$UseTransactionswithTrade
}
# Getting list of final demand columns used for the appropriate demand
if(demand_type == "Production") {
FD_columns <- unlist(sapply(list("HouseholdDemand", "InvestmentDemand",
FD_columns <- unlist(sapply(list("HouseholdDemand", "InvestmentDemand",
"ChangeInventories", "Export", "Import",
"GovernmentDemand"),
getVectorOfCodes, ioschema = model$specs$BaseIOSchema,
iolevel = iolevel))
FD_columns <- FD_columns[FD_columns %in% gsub("/.*", "", model$FinalDemandMeta$Code_Loc)]
# Calculate production demand for both regions
ita_column <- ifelse(iolevel == "Detail", "F05100", "F051")
if(location == state_abb[1]) {
# calculate production final demand for SoI
if(domestic) {
SoI2SoI_y <- rowSums(use_table[["SoI2SoI"]][, c(FD_columns, ita_column, "ExportResidual")])
} else {
SoI2SoI_y <- rowSums(use_table[["SoI2SoI"]][, c(FD_columns, "ExportResidual")])
}
RoUS2SoI_y <- rowSums(use_table[["RoUS2SoI"]][, c(FD_columns, ita_column)])
y_p <- c(SoI2SoI_y, RoUS2SoI_y)

} else if(location == state_abb[2]) {
# calculate production final demand for RoUS
if(domestic) {
RoUS2RoUS_y <- rowSums(use_table[["RoUS2RoUS"]][, c(FD_columns, ita_column, "ExportResidual")])
} else {
RoUS2RoUS_y <- rowSums(use_table[["RoUS2RoUS"]][, c(FD_columns, "ExportResidual")])
}
SoI2RoUS_y <- rowSums(use_table[["SoI2RoUS"]][, c(FD_columns, ita_column)])
y_p <- c(SoI2RoUS_y, RoUS2RoUS_y)
}

} else if(demand_type == "Consumption") {
}
else if(demand_type == "Consumption") {
# Includes only household, investment, and government consumption as per Ingwersen et al. 2022 (USEEIOv2.0 paper)
FD_columns <- unlist(sapply(list("HouseholdDemand", "InvestmentDemand", "GovernmentDemand"),
getVectorOfCodes, ioschema = model$specs$BaseIOSchema, iolevel = iolevel))

# Calculate consumption demand for both regions
if(location == state_abb[1]) {
# calculate consumption final demand for SoI
SoI2SoI_y <- rowSums(use_table[["SoI2SoI"]][, c(FD_columns)])
RoUS2SoI_y <- rowSums(use_table[["RoUS2SoI"]][, c(FD_columns)])
y_p <- c(SoI2SoI_y, RoUS2SoI_y)
} else if(location == state_abb[2]) {
# calculate consumption final demand for RoUS
SoI2RoUS_y <- rowSums(use_table[["SoI2RoUS"]][, c(FD_columns)])
RoUS2RoUS_y <- rowSums(use_table[["RoUS2RoUS"]][, c(FD_columns)])
y_p <- c(SoI2RoUS_y, RoUS2RoUS_y)
}

# Prepare demand for state models which have additional fields for ITA and Export Residual
# State with SoI
if(location == state_abb[1]) {
# calculate final demand for SoI
if(domestic) {
SoI2SoI_y <- rowSums(use_table[["SoI2SoI"]][, c(FD_columns, ita_column, "ExportResidual")])
} else {
SoI2SoI_y <- rowSums(use_table[["SoI2SoI"]][, c(FD_columns, "ExportResidual")])
}
RoUS2SoI_y <- rowSums(use_table[["RoUS2SoI"]][, c(FD_columns, ita_column)])
y <- c(SoI2SoI_y, RoUS2SoI_y)

# For RoUS
} else if(location == state_abb[2]) {
# calculate final demand for RoUS
if(domestic) {
RoUS2RoUS_y <- rowSums(use_table[["RoUS2RoUS"]][, c(FD_columns, ita_column, "ExportResidual")])
} else {
RoUS2RoUS_y <- rowSums(use_table[["RoUS2RoUS"]][, c(FD_columns, "ExportResidual")])
}
SoI2RoUS_y <- rowSums(use_table[["SoI2RoUS"]][, c(FD_columns, ita_column)])
y <- c(SoI2RoUS_y, RoUS2RoUS_y)
}
names(y_p) <- model$Commodities$Code_Loc
return(y_p)

names(y) <- model$Commodities$Code_Loc
return(y)
}


Expand Down