Skip to content

Commit

Permalink
drop -s from two region model name
Browse files Browse the repository at this point in the history
  • Loading branch information
bl-young committed Sep 4, 2024
1 parent 5cc4f0e commit f938989
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions tests/test_model_build.R
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"
Expand Down

0 comments on commit f938989

Please sign in to comment.