Change order of 562000 detail disagg model with 2017 schema to allow …

…continuation of USEEIOv2.2 detail and summary model builds

tests/test_model_build.R

@@ -36,6 +36,18 @@ cfg <- paste0("modelspecs/", m, ".yml")
 model <- buildModel(m, configpaths = file.path(cfg))
 printValidationResults(model)
 
+## USEEIOv2.2-s-GHG Summary, commodity model (2017 Schema)
+model <- useeior:::initializeModel(m, configpaths = file.path(cfg))
+model$specs$Model <- "USEEIOv2.2-s-GHG"
+model$specs$BaseIOLevel <- "Summary"
+model$crosswalk <- useeior:::getModelCrosswalk(model) # reassign for summary model
+model <- useeior:::loadIOData(model)
+model <- useeior:::loadandbuildSatelliteTables(model)
+model <- useeior:::loadandbuildIndicators(model)
+model <- useeior:::loadDemandVectors(model)
+model <- useeior:::constructEEIOMatrices(model)
+printValidationResults(model)
+
 
 ### NEW
 ## USEEIOv2.2.1-408-GHG Detail, commodity model (2017 Schema)
@@ -53,18 +65,6 @@ printValidationResults(model)
 ###
 
 
-## USEEIOv2.2-s-GHG Summary, commodity model (2017 Schema)
-model <- useeior:::initializeModel(m, configpaths = file.path(cfg))
-model$specs$Model <- "USEEIOv2.2-s-GHG"
-model$specs$BaseIOLevel <- "Summary"
-model$crosswalk <- useeior:::getModelCrosswalk(model) # reassign for summary model
-model <- useeior:::loadIOData(model)
-model <- useeior:::loadandbuildSatelliteTables(model)
-model <- useeior:::loadandbuildIndicators(model)
-model <- useeior:::loadDemandVectors(model)
-model <- useeior:::constructEEIOMatrices(model)
-printValidationResults(model)
-
 ## USEEIOv2 - integrated hybrid
 m <- "USEEIOv2.0-GHG-NGCombustion"
 cfg <- c(paste0("modelspecs/", m, ".yml"),