find stateior objects via alias

R/StateiorFunctions.R

@@ -12,14 +12,15 @@
 #' @return A list of two-region IO data of model iolevel and year.
 getTwoRegionIOData <- function(model, dataname) {
   # Define state, year and iolevel
+  alias <- ifelse(!is.na(model$specs$alias), model$specs$alias, NULL)
   if(!"US-DC" %in% model$specs$ModelRegionAcronyms) {
     state <- state.name[state.abb == gsub(".*-", "", model$specs$ModelRegionAcronyms[1])]
   } else {
     state <- "District of Columbia"
   }
   # Define data file name
   filename <- paste(lapply(c("TwoRegion", model$specs$BaseIOLevel, dataname,
-                              model$specs$DisaggregationSpecs, model$specs$IOYear,
+                              alias, model$specs$IOYear,
                               model$specs$IODataVersion),  
                   function(x) x[!is.na(x)]), collapse = "_")
   # Adjust filename to fit what is on the Data Commons
@@ -33,6 +34,7 @@ getTwoRegionIOData <- function(model, dataname) {
     filename <- gsub(dataname, "UsewithTrade", filename)
   }
   # Load data
+  logging::loginfo(paste0("Loading ", filename))
   TwoRegionIOData <- readRDS(loadDataCommonsfile(paste0("stateio/", filename, ".rds")))
   # Keep SoI and RoUS only
   TwoRegionIOData <- TwoRegionIOData[[state]]

tests/test_model_build.R

@@ -163,10 +163,11 @@ printValidationResults(model)
 testCalculationFunctions(model)
 testVisualizationFunctions(model)
 
-# ## StateEEIOv1.0 Two-region Summary model with "standard" Utility disaggregation
-# model <- useeior:::initializeModel(m, configpaths = file.path(cfg))
-# model$specs$Model <- "GAEEIOv1.0-75-GHG-19"
+# ## StateEEIOv1.2 Two-region Summary model with "standard" Utility disaggregation
+# model <- useeior:::initializeModel(m)
+# model$specs$Model <- "GAEEIOv1.2-milkbar-19"
 # model$specs$IODataVersion <- "0.3.0" # required for disaggregation
+# model$specs$alias <- "milkbar"
 # model$specs$DisaggregationSpecs <- "UtilityDisaggregation"
 # model <- useeior:::loadIOData(model, file.path(cfg))
 # model <- useeior:::loadandbuildSatelliteTables(model)