move disaggregation specs from stateior to useeior

USEPA · Feb 29, 2024 · 4b8f119 · 4b8f119 · bl-young · Feb 29, 2024
1 parent 1703d2e
commit 4b8f119
Show file tree

Hide file tree

Showing 5 changed files with 470 additions and 1 deletion.
diff --git a/R/DisaggregateFunctions.R b/R/DisaggregateFunctions.R
@@ -105,7 +105,9 @@ disaggregateSetup <- function (model, configpaths = NULL){
 
   for (disagg in model$DisaggregationSpecs){  
     if(is.null(disagg$package)){
-      disagg$package = "useeior"
+      disagg$package <- "useeior"
+    } else if(disagg$package == "useeior") {
+      configpaths <- NULL
     }
     filename <- getInputFilePath(configpaths, "extdata/disaggspecs", disagg$SectorFile,
                                  package = disagg$package)

diff --git a/inst/extdata/disaggspecs/UtilityDisaggregation.yml b/inst/extdata/disaggspecs/UtilityDisaggregation.yml
@@ -0,0 +1,9 @@
+Disaggregation:
+  22/US:
+    OriginalSectorCode: "22/US"
+    OriginalSectorName: "Utilities"
+    DisaggregationType: "Userdefined"
+    SectorFile: UtilityDisaggregation_Sectors.csv
+    MakeFile: UtilityDisaggregationSummary_Make.csv # Ratios from 2012 US Make table
+    UseFile: UtilityDisaggregationSummary_Use.csv # Ratios from 2012 US Use table
+    package: "useeior"
diff --git a/inst/extdata/disaggspecs/UtilityDisaggregationSummary_Make.csv b/inst/extdata/disaggspecs/UtilityDisaggregationSummary_Make.csv
@@ -0,0 +1,46 @@
+"IndustryCode","CommodityCode","PercentMake","Note"
+"221100/US","221100/US",0.781090503048714,"IntersectionDisagg"
+"221200/US","221100/US",0.000439612613365103,"IntersectionDisagg"
+"221300/US","221100/US",0.00055830801897368,"IntersectionDisagg"
+"221100/US","221200/US",0.0170679597139001,"IntersectionDisagg"
+"221200/US","221200/US",0.174154734847652,"IntersectionDisagg"
+"221300/US","221200/US",0.000153864414677786,"IntersectionDisagg"
+"221100/US","221300/US",0.00225521270656298,"IntersectionDisagg"
+"221200/US","221300/US",0,"IntersectionDisagg"
+"221300/US","221300/US",0.0242798046361546,"IntersectionDisagg"
+"486/US","221100/US",0,"CommodityDisagg"
+"486/US","221200/US",1,"CommodityDisagg"
+"486/US","221300/US",0,"CommodityDisagg"
+"GFE/US","221100/US",1,"CommodityDisagg"
+"GFE/US","221200/US",0,"CommodityDisagg"
+"GFE/US","221300/US",0,"CommodityDisagg"
+"GSLG/US","221100/US",0,"CommodityDisagg"
+"GSLG/US","221200/US",0,"CommodityDisagg"
+"GSLG/US","221300/US",1,"CommodityDisagg"
+"GSLE/US","221100/US",0.485727541327864,"CommodityDisagg"
+"GSLE/US","221200/US",0.0557712499694772,"CommodityDisagg"
+"GSLE/US","221300/US",0.458501208702659,"CommodityDisagg"
+"GFGN/US","221100/US",0,"CommodityDisagg"
+"GFGN/US","221200/US",0,"CommodityDisagg"
+"GFGN/US","221300/US",1,"CommodityDisagg"
+"221100/US","211/US",0,"IndustryDisagg"
+"221200/US","211/US",1,"IndustryDisagg"
+"221300/US","211/US",0,"IndustryDisagg"
+"221100/US","23/US",0.86417221937468,"IndustryDisagg"
+"221200/US","23/US",0.13070220399795,"IndustryDisagg"
+"221300/US","23/US",0.00512557662737058,"IndustryDisagg"
+"221100/US","4A0/US",0.722222222222222,"IndustryDisagg"
+"221200/US","4A0/US",0.222222222222222,"IndustryDisagg"
+"221300/US","4A0/US",0.0555555555555556,"IndustryDisagg"
+"221100/US","486/US",0.281609195402299,"IndustryDisagg"
+"221200/US","486/US",0.718390804597701,"IndustryDisagg"
+"221300/US","486/US",0,"IndustryDisagg"
+"221100/US","5412OP/US",0.811023622047244,"IndustryDisagg"
+"221200/US","5412OP/US",0.165354330708661,"IndustryDisagg"
+"221300/US","5412OP/US",0.0236220472440945,"IndustryDisagg"
+"221100/US","5415/US",0.748815165876777,"IndustryDisagg"
+"221200/US","5415/US",0.23696682464455,"IndustryDisagg"
+"221300/US","5415/US",0.014218009478673,"IndustryDisagg"
+"221100/US","GSLE/US",0,"IndustryDisagg"
+"221200/US","GSLE/US",0,"IndustryDisagg"
+"221300/US","GSLE/US",1,"IndustryDisagg"