Skip to content

Commit

Permalink
change model spec from 3.0 to 2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
bl-young committed May 16, 2024
1 parent 9a4cde0 commit 210b1cf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Model: "USEEIOv3.0-GHG" # 2017 Detail, Commodity
Model: "USEEIOv2.2-GHG" # 2017 Detail, Commodity
BaseIOSchema: 2017
BaseIOLevel: "Detail"
IOYear: 2017 # Year for IO data
Expand Down Expand Up @@ -43,17 +43,17 @@ Indicators:
SimpleUnit: "Kilograms Carbon Dioxide (CO2)"
SimpleName: "Greenhouse Gases"
StaticSource: TRUE
StaticFile: "lciafmt/traci/TRACI_2.1_v1.0.0_5555779.parquet"
StaticFile: "lciafmt/ipcc/IPCC_v1.1.1_27ba917.parquet"
FileLocation: "DataCommons"
ScriptFunctionCall: "getImpactMethod" #function to call for script
ScriptFunctionParameters:
indicators: ["Global warming"]
indicators: ["AR5-100"]
DataSources:
USEPA_TRACI_2.1:
Title: "TRACI 2.1"
Author: "USEPA"
DataYear: NA
URL: "https://www.epa.gov/chemical-research/tool-reduction-and-assessment-chemicals-and-other-environmental-impacts-traci"
IPCC_AR5:
Title: "IPCC Fifth Assessment Report: Direct Global Warming Potentials for 100 year time horizon"
Author: "IPCC"
DataYear: 2017
URL: ""
Primary: TRUE

DemandVectors:
Expand Down
8 changes: 4 additions & 4 deletions tests/test_model_build.R
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ model <- useeior:::loadDemandVectors(model)
model <- useeior:::constructEEIOMatrices(model)
printValidationResults(model)

## USEEIOv3.0-GHG Detail, commodity model (2017 Schema)
m <- "USEEIOv3.0-GHG"
## USEEIOv2.2-GHG Detail, commodity model (2017 Schema)
m <- "USEEIOv2.2-GHG"
cfg <- paste0("modelspecs/", m, ".yml")
model <- buildModel(m, configpaths = file.path(cfg))
printValidationResults(model)

## USEEIOv3.0-s-GHG Summary, commodity model (2017 Schema)
## USEEIOv2.2-s-GHG Summary, commodity model (2017 Schema)
model <- useeior:::initializeModel(m, configpaths = file.path(cfg))
model$specs$Model <- "USEEIOv3.0-s-GHG"
model$specs$Model <- "USEEIOv2.2-s-GHG"
model$specs$BaseIOLevel <- "Summary"
model$crosswalk <- useeior:::getModelCrosswalk(model) # reassign for summary model
model <- useeior:::loadIOData(model)
Expand Down

0 comments on commit 210b1cf

Please sign in to comment.