updating subregion industry breakout

JGCRI · Jan 9, 2022 · f84274e · f84274e
1 parent 99b9df4
commit f84274e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 1 deletion.
diff --git a/R/data.R b/R/data.R
@@ -21,6 +21,17 @@
 # Replace gcamdatasystem module templates
 #---------------------------------------
 
+#' Template for template_zchunk_LA121.liquids_breakout
+#'
+#' @source created by ZK
+#' @format R script
+#' @examples
+#' \dontrun{
+#'  library(gcambreakout);
+#'  gcambreakout::template_zchunk_LA121.liquids_breakout
+#' }
+"template_zchunk_LA121.liquids_breakout"
+
 #' Template for template_zchunk_L223.electricity_breakout
 #'
 #' @source created by ZK

diff --git a/data/mapping_modules.rda b/data/mapping_modules.rda
diff --git a/data/template_zchunk_LA121.liquids_breakout.rda b/data/template_zchunk_LA121.liquids_breakout.rda
diff --git a/data/template_zchunk_X232.industry_APPEND.rda b/data/template_zchunk_X232.industry_APPEND.rda
diff --git a/inst/extras/zchunk_X232.industry_APPEND.R b/inst/extras/zchunk_X232.industry_APPEND.R
@@ -17,7 +17,8 @@
 
 module_energy_X232.industry_APPEND <- function(command, ...) {
   if(command == driver.DECLARE_INPUTS) {
-    return(c("X201.Pop_APPEND",
+    return(c(FILE = "common/GCAM_region_names",
+             "X201.Pop_APPEND",
              "X201.GDP_APPEND",
              "L232.Supplysector_ind",
              "L232.SubsectorLogit_ind",
@@ -108,6 +109,7 @@ module_energy_X232.industry_APPEND <- function(command, ...) {
     all_data <- list(...)[[1]]
 
     # Load required inputs
+    GCAM_region_names <- get_data(all_data, "common/GCAM_region_names")
     X201.Pop_APPEND <- get_data(all_data, "X201.Pop_APPEND")
     X201.GDP_APPEND <- get_data(all_data, "X201.GDP_APPEND")
     L232.Supplysector_ind <- get_data(all_data, "L232.Supplysector_ind", strip_attributes = TRUE)

diff --git a/man/template_zchunk_LA121.liquids_breakout.Rd b/man/template_zchunk_LA121.liquids_breakout.Rd