Updating demeter quereis

JGCRI · Jun 21, 2023 · 17f8726 · 17f8726
1 parent b2c429c
commit 17f8726
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/R/readgcam.R b/R/readgcam.R
@@ -3250,7 +3250,7 @@ readgcam <- function(gcamdatabase = NULL,
                       origX = year,
                       scenario = scenNewNames,
                       value = value,
-                      units = "Ag Production (billion m3)",
+                      units = "Forest Production (billion m3)",
                       vintage = paste("Vint_", year, sep = ""),
                       x = year,
                       xLabel = "Year",
@@ -3260,7 +3260,8 @@ readgcam <- function(gcamdatabase = NULL,
                       classPalette1 = "pal_all",
                       class2 = "class2",
                       classLabel2 = "classLabel2",
-                      classPalette2 = "classPalette2")%>%
+                      classPalette2 = "classPalette2",
+                      subRegion= region)%>%
         dplyr::select(origScen,origQuery, origValue, origUnits, origX, region, subRegion,    param, scenario,
                       value, units, vintage, x, xLabel, aggregate, class1, classLabel1, classPalette1,
                       class2, classLabel2, classPalette2)%>%dplyr::filter(!is.na(value))

diff --git a/data/map_param_query.rda b/data/map_param_query.rda
diff --git a/data/params.rda b/data/params.rda
diff --git a/data/queries.rda b/data/queries.rda
diff --git a/inst/extdata/devTests.R b/inst/extdata/devTests.R
@@ -147,7 +147,7 @@ params <- gcamextractor::params; params %>% sort()
 gcamdatabase_i = "C:/Z/projects/current/00_IM3/pic_checks/database_rcp45cooler_ssp5"
 #gcamdata_folder_i = "C:/Z/models/gcamextractor/tests/testthat/im3_test_data/gcamdata"
 rgcam::localDBConn("C:/Z/projects/current/00_IM3/pic_checks/","database_rcp45cooler_ssp5")
-reReadData_i = T
+reReadData_i = F
 dataProjFile_i = "dataProj_demeter.proj"
 regionsSelect_i = c("Global","USA",gcamextractor::map_state_to_gridregion$state%>%unique(),"PR","Alaska grid","California grid","Central East grid","Central Northeast grid",
                     "Central Northwest grid", "Central Southwest grid","Florida grid","Hawaii grid",
@@ -176,6 +176,7 @@ df1$param%>%unique()
 df1 %>% dplyr::filter(param=="agProdByCrop")
 df1 %>% dplyr::filter(param=="landAllocDetail")
 df1 %>% dplyr::filter(param=="fertConsByAgTech")
+df1 %>% dplyr::filter(param=="agProdForest")
 
 #----------------------------------------
 

diff --git a/inst/extdata/saveDataFiles.R b/inst/extdata/saveDataFiles.R
@@ -88,6 +88,7 @@ map_param_query <- tibble::tribble(
   "demeter","landAllocDetail","detailed land allocation","pal_green","no",
   "demeter","agProdByCrop", "ag production by tech","pal_green","no",
   "demeter","fertConsByAgTech", "fertilizer consumption by ag tech","pal_green","no",
+  "demeter","agProdForest", "ag production by tech","pal_green","no",
   # Energy
   "energy","energyPrimaryByFuelEJ","primary energy consumption by region (direct equivalent)","pal_hot","no",
   "energy","energyPrimaryRefLiqProdEJ", "refined liquids production by subsector","pal_hot","no",