From f938989e9663a94cdd5c244ada8d5e2de00e0e18 Mon Sep 17 00:00:00 2001 From: Ben Young Date: Wed, 4 Sep 2024 10:24:16 -0400 Subject: [PATCH] drop `-s` from two region model name --- .../{GAEEIOv1.0-s-GHG-19.yml => GAEEIOv1.0-GHG-19.yml} | 2 +- tests/test_model_build.R | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename tests/modelspecs/{GAEEIOv1.0-s-GHG-19.yml => GAEEIOv1.0-GHG-19.yml} (98%) diff --git a/tests/modelspecs/GAEEIOv1.0-s-GHG-19.yml b/tests/modelspecs/GAEEIOv1.0-GHG-19.yml similarity index 98% rename from tests/modelspecs/GAEEIOv1.0-s-GHG-19.yml rename to tests/modelspecs/GAEEIOv1.0-GHG-19.yml index a11d959a..a1f5dc84 100644 --- a/tests/modelspecs/GAEEIOv1.0-s-GHG-19.yml +++ b/tests/modelspecs/GAEEIOv1.0-GHG-19.yml @@ -1,4 +1,4 @@ -Model: "GAEEIOv1.0-s-GHG-19" +Model: "GAEEIOv1.0-GHG-19" BaseIOSchema: 2012 BaseIOLevel: "Summary" IOYear: 2019 # Year for IO data diff --git a/tests/test_model_build.R b/tests/test_model_build.R index 3784d030..3f5b3d2f 100644 --- a/tests/test_model_build.R +++ b/tests/test_model_build.R @@ -130,7 +130,7 @@ model <- buildModel(m) printValidationResults(model) ## StateEEIOv1.0 Two-region Summary model -m <- "GAEEIOv1.0-s-GHG-19" +m <- "GAEEIOv1.0-GHG-19" cfg <- paste0("modelspecs/", m, ".yml") model <- buildModel(m, configpaths = file.path(cfg)) printValidationResults(model) @@ -141,12 +141,12 @@ model <- buildIOModel(m, configpaths = file.path(cfg)) printValidationResults(model) writeModeltoXLSX(model, ".") -## StateEEIOv1.0 Two-region Summary model with Import Factors +## StateEEIOv1.1 Two-region Summary model with Import Factors cfg <- c(paste0("modelspecs/", m, ".yml"), "US_summary_import_factors_exio_2019_17sch.csv" ) model <- useeior:::initializeModel(m, configpaths = file.path(cfg)) -model$specs$Model <- "GAEEIOv1.0-s-GHG-19-IF" +model$specs$Model <- "GAEEIOv1.1-GHG-19-IF" model$specs$ExternalImportFactors <- TRUE model$specs$ImportFactors <- list() model$specs$ImportFactors$StaticFile <- "useeior/US_summary_import_factors_exio_2019_17sch.csv"