Skip to content

Commit 02e8b4e

Browse files
author
jvendries
committed
UPdate spec file names to v2.4.1
1 parent 9849fa9 commit 02e8b4e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

tests/modelspecs/USEEIOv2.2.1-408-GHG.yml renamed to tests/modelspecs/USEEIOv2.4.1-408-GHG.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Model: "USEEIOv2.2.1-408-GHG" # 2017 Detail, Commodity
1+
Model: "USEEIOv2.4.1-408-GHG" # 2017 Detail, Commodity
22
BaseIOSchema: 2017
33
BaseIOLevel: "Detail"
44
IOYear: 2017 # Year for IO data

tests/test_model_build.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ model <- useeior:::constructEEIOMatrices(model)
4949
printValidationResults(model)
5050

5151

52-
### NEW
53-
## USEEIOv2.2.1-408-GHG Detail, commodity model (2017 Schema) with disaggregation
54-
m <- "USEEIOv2.2.1-408-GHG"
52+
### NEW - Need to an an alias as per https://github.com/USEPA/USEEIO/blob/master/versioning/aliases.csv
53+
## USEEIOv2.4.1-408-GHG Detail, commodity model (2017 Schema) with disaggregation
54+
m <- "USEEIOv2.4.1-408-GHG"
5555
cfg <- c(paste0("modelspecs/", m, ".yml"),
5656
"disaggspecs/WasteDisaggregationDetail2017.yml",
5757
"disaggspecs/WasteDisaggregationDetail2017_Make.csv",
@@ -62,8 +62,8 @@ cfg <- c(paste0("modelspecs/", m, ".yml"),
6262
model <- buildModel(m, configpaths = file.path(cfg))
6363
printValidationResults(model)
6464

65-
## USEEIOv2.2-s-GHG Summary, commodity model (2017 Schema)
66-
m <- "USEEIOv2.2.1-408-GHG"
65+
## USEEIOv2.4-s-GHG Summary, commodity model (2017 Schema)
66+
m <- "USEEIOv2.4.1-408-GHG"
6767
cfg <- c(paste0("modelspecs/", m, ".yml"),
6868
"disaggspecs/WasteDisaggregationSummary2017.yml",
6969
"disaggspecs/WasteDisaggregationSummary2017_Make.csv",
@@ -72,7 +72,7 @@ cfg <- c(paste0("modelspecs/", m, ".yml"),
7272
)
7373

7474
model <- useeior:::initializeModel(m, configpaths = file.path(cfg))
75-
model$specs$Model <- "USEEIOv2.2.1-s-GHG"
75+
model$specs$Model <- "USEEIOv2.4.1-s-GHG"
7676
model$specs$BaseIOLevel <- "Summary"
7777
model$crosswalk <- useeior:::getModelCrosswalk(model) # reassign for summary model
7878
model$specs$DisaggregationSpecs <- "WasteDisaggregationSummary2017"

0 commit comments

Comments
 (0)