From 210b1cfd6e75730bf9fee6b313aa278f5ea80da8 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Wed, 15 May 2024 21:33:37 -0400 Subject: [PATCH] change model spec from 3.0 to 2.2 --- .../{USEEIOv3.0-GHG.yml => USEEIOv2.2-GHG.yml} | 16 ++++++++-------- tests/test_model_build.R | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) rename tests/modelspecs/{USEEIOv3.0-GHG.yml => USEEIOv2.2-GHG.yml} (80%) diff --git a/tests/modelspecs/USEEIOv3.0-GHG.yml b/tests/modelspecs/USEEIOv2.2-GHG.yml similarity index 80% rename from tests/modelspecs/USEEIOv3.0-GHG.yml rename to tests/modelspecs/USEEIOv2.2-GHG.yml index ab921ab9..98570315 100644 --- a/tests/modelspecs/USEEIOv3.0-GHG.yml +++ b/tests/modelspecs/USEEIOv2.2-GHG.yml @@ -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 @@ -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: diff --git a/tests/test_model_build.R b/tests/test_model_build.R index d57abc9b..962c725f 100644 --- a/tests/test_model_build.R +++ b/tests/test_model_build.R @@ -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)