Merge pull request #341 from USEPA/release_v1.7.1

Release v1.7.1

Author: bl-young

.github/workflows/generate-2R-model.yaml

@@ -8,7 +8,7 @@ on:
         model:
             description: "Model"
             required: true
-            default: "GAEEIOv1.0-s-WAT-12"
+            default: "GAEEIOv1.0-GHG-19"
 
 jobs:
   build:
@@ -21,7 +21,7 @@ jobs:
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -52,14 +52,14 @@ jobs:
 
       - name: Upload check results
         if: failure()  # if any of the previous steps fail, export a log
-        uses: actions/upload-artifact@main
+        uses: actions/upload-artifact@v4
         with:
           name: results
           path: check
 
       - name: Upload files
         if: always()
-        uses: actions/upload-artifact@v3.1.1
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ github.event.inputs.model }}"
           path: | # uses local user data dir for ubuntu

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: useeior
 Type: Package
 Title: USEEIO R modeling software
-Version: 1.7.0
-Date: 2025-3-3
+Version: 1.7.1
+Date: 2025-4-28
 Authors@R: c(
   person("Ben","Young", email="[email protected]", role="aut"),
   person("Jorge","Vendries", email="[email protected]", role="aut"),

R/BuildModel.R

@@ -334,7 +334,7 @@ buildTwoRegionModels <- function(modelname, configpaths = NULL, validate = FALSE
         model <- loadDemandVectors(model)
         model <- constructEEIOMatrices(model)
         if (validate) {
-          print2RValidationResults(model)
+          printValidationResults(model)
         }
         model_ls[[state]] <- model
       },

R/LoadIOTables.R

@@ -380,7 +380,11 @@ loadCommodityandIndustryOutput <- function(model) {
     model$IndustryOutput <- getTwoRegionIOData(model, "IndustryOutput")
     model$CommodityOutput <- getTwoRegionIOData(model, "CommodityOutput")
     # Load multi-year industry and commodity output
-    years <- as.character(2012:2020)
+    if(model$specs$BaseIOSchema == 2017) {
+      years <- as.character(2017:2023)
+    } else {
+      years <- as.character(2012:2020)
+    }
     tmpmodel <- model
     model$MultiYearIndustryOutput <- as.data.frame(model$IndustryOutput)[, FALSE]
     model$MultiYearCommodityOutput <- as.data.frame(model$CommodityOutput)[, FALSE]

README.md

@@ -2,7 +2,7 @@
 <!-- badges: start -->
 [![R CI/CD test](https://github.com/USEPA/useeior/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/USEPA/useeior/actions/workflows/R-CMD-check.yaml)
 [![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html)
-[![useeior v1.0.0](http://img.shields.io/badge/useeior%20v1.0.0-10.5281/zenodo.6370101-blue.svg)](https://doi.org/10.5281/zenodo.6370101)
+[![useeior DOI](http://img.shields.io/badge/useeior%20DOI-10.5281/zenodo.7020213-blue.svg)](https://doi.org/10.5281/zenodo.7020213)
 [![useeior paper](http://img.shields.io/badge/useeior%20paper-10.3390/app12094469-blue.svg)](https://doi.org/10.3390/app12094469)
 <!-- badges: end -->
 

inst/extdata/modelspecs/GAEEIOv1.3-pecan-22.yml

@@ -0,0 +1,67 @@
+Model: "GAEEIOv1.3-pecan-22"
+BaseIOSchema: 2017
+BaseIOLevel: "Summary"
+Alias: "pecan"
+IOYear: 2022 # Year for IO data
+ModelRegionAcronyms: ["US-GA", "RoUS"]
+ModelType: "EEIO"
+IODataSource: "stateior"
+IODataVersion: "0.4.0"
+BasePriceType: "PRO" #producer
+BasewithRedefinitions: FALSE
+CommodityorIndustryType: "Commodity"
+ScrapIncluded: FALSE
+DisaggregationSpecs: null
+ExternalImportFactors: TRUE
+
+SatelliteTable:
+  GHG:
+    FullName: "Greenhouse Gases"
+    Abbreviation: "GHG"
+    StaticSource: TRUE
+    StaticFile: "flowsa/FlowBySector/GHG_state_2022_m1_v2.0.5_5baf11c.parquet"
+    FileLocation: "DataCommons"
+    DataYears: [2022]
+    Locations: ["US"]
+    SectorListSource: "NAICS"
+    SectorListYear: 2017
+    SectorListLevel: "6"
+    OriginalFlowSource: "FEDEFLv1.3.0"
+    ScriptFunctionCall: "getFlowbySectorCollapsed" #function to call for script
+    ScriptFunctionParameters: null
+    DataSources:
+      USEPA_GHG_2024:
+        Title: "GHG Inventory"
+        Author: "USEPA"
+        DataYear: 2022
+        URL: "https://www.epa.gov/ghgemissions/inventory-us-greenhouse-gas-emissions-and-sinks-1990-2022"
+        Primary: TRUE
+
+Indicators:
+  GreenhouseGases:
+    Name: "Greenhouse Gases"
+    Code: "GHG"
+    Group: "Impact Potential"
+    Unit: "kg CO2 eq"
+    SimpleUnit: "Kilograms Carbon Dioxide (CO2)"
+    SimpleName: "Greenhouse Gases"
+    StaticSource: TRUE
+    StaticFile: "lciafmt/ipcc/IPCC_v1.1.1_27ba917.parquet"
+    FileLocation: "DataCommons"
+    ScriptFunctionCall: "getImpactMethod" #function to call for script
+    ScriptFunctionParameters: 
+      indicators: ["AR6-100"]
+    DataSources:
+      IPCC_AR6:
+        Title: "IPCC Sixth Assessment Report: Direct Global Warming Potentials for 100 year time horizon"
+        Author: "IPCC"
+        DataYear: 2021
+        URL: ""
+        Primary: TRUE
+
+DemandVectors:
+    DefaultDemand: "DefaultDemandVectors" # Name of default demand vectors yml file
+
+ImportFactors:
+  StaticFile: "useeior/US_summary_import_factors_exio_2022_17sch.csv"
+  FileLocation: "DataCommons"

tests/test_model_build.R

@@ -167,7 +167,7 @@ testVisualizationFunctions(model)
 # 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$Alias <- "milkbar"
 # model$specs$DisaggregationSpecs <- "UtilityDisaggregation"
 # model <- useeior:::loadIOData(model, file.path(cfg))
 # model <- useeior:::loadandbuildSatelliteTables(model)
@@ -176,16 +176,7 @@ testVisualizationFunctions(model)
 # model <- useeior:::constructEEIOMatrices(model)
 # printValidationResults(model)
 
-# ## StateEEIOv1.0 Two-region Summary model with Utility disaggregation by Proxy
-# ## I.e., using employment values by detail-level industries to inform disaggregation
-# model <- useeior:::initializeModel(m, configpaths = file.path(cfg))
-# model$specs$Model <- "GAEEIOv1.0-75-Proxy-GHG-19"
-# model$specs$IODataVersion <- "0.3.0" # required for disaggregation
-# model$specs$DisaggregationSpecs <- "UtilityDisaggByProxy"
-# model <- useeior:::loadIOData(model, file.path(cfg))
-# model <- useeior:::loadandbuildSatelliteTables(model)
-# model <- useeior:::loadandbuildIndicators(model)
-# model <- useeior:::loadDemandVectors(model)
-# model <- useeior:::constructEEIOMatrices(model)
-# printValidationResults(model)
-
+## StateEEIOv1.3 Two-region Summary model, 2017 schema
+m <- "GAEEIOv1.3-pecan-22"
+model <- buildModel(m)
+printValidationResults(model)