From 36a52ccd61910b6a636570e4d2de5755366a22d2 Mon Sep 17 00:00:00 2001 From: "Zhao, Xin" Date: Sun, 28 Jan 2024 09:04:18 -0500 Subject: [PATCH] Update site and create a release --- docs/articles/vignette_news.html | 17 ++++++++++++++++- docs/articles/vignette_visualization.html | 8 ++++---- vignettes/vignette_news.Rmd | 10 ++++++++++ vignettes/vignette_visualization.Rmd | 4 ++-- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/docs/articles/vignette_news.html b/docs/articles/vignette_news.html index c3437571..0b0c0277 100644 --- a/docs/articles/vignette_news.html +++ b/docs/articles/vignette_news.html @@ -112,7 +112,7 @@

News

-

2023-11-10

+

2024-01-28

Source: vignettes/vignette_news.Rmd @@ -121,6 +121,21 @@

2023-11-10

+

2023-1-28

+

November 2023 updates

diff --git a/docs/articles/vignette_visualization.html b/docs/articles/vignette_visualization.html index 937b7d12..465464de 100644 --- a/docs/articles/vignette_visualization.html +++ b/docs/articles/vignette_visualization.html @@ -112,7 +112,7 @@

Visualization

-

2023-11-10

+

2024-01-28

Source: vignettes/vignette_visualization.Rmd @@ -163,8 +163,8 @@

Harvested areaYield growth

-Surprisingly, oil palm fruit yield did grow at regional levels (boxplot) in the past 30 years. But world yield increased by ~50% due to the production shift to high-yielding regions. The opposite is true for root and tuber crops
Surprisingly, oil palm fruit yield did grow at -regional levels (boxplot) in the past 30 years. But world yield +Surprisingly, oil palm fruit yield did not grow at regional levels (boxplot) in the past 30 years. But world yield increased by ~50% due to the production shift to high-yielding regions. The opposite is true for root and tuber crops
Surprisingly, oil palm fruit yield did not grow +at regional levels (boxplot) in the past 30 years. But world yield increased by ~50% due to the production shift to high-yielding regions. The opposite is true for root and tuber crops
@@ -264,7 +264,7 @@

1. Population
 # simplify population data
 OA %>% filter(element_code == 511, item_code == 3010) %>%
-  transmute(area, area_code, year, pop = value) %>% 
+  transmute(area, area_code, year, value = value / length(BaseYear)) %>% 
   filter(year %in% BaseYear) %>% 
   gcamdata::left_join_error_no_match(AGLU_ctry %>% select(area = FAO_country, iso), by = "area") %>%
   gcamdata::left_join_error_no_match(iso_GCAM_regID %>% select(iso, GCAM_region_ID), by = "iso") %>%
diff --git a/vignettes/vignette_news.Rmd b/vignettes/vignette_news.Rmd
index a58b8510..f30064d8 100644
--- a/vignettes/vignette_news.Rmd
+++ b/vignettes/vignette_news.Rmd
@@ -15,6 +15,15 @@ knitr::opts_chunk$set(
 )
 ```
 
+2023-1-28
+
+* The first version of gcamfaostat is still being processed/reviewed at JOSS
+* We now create a release version to have a snapshot of this version (replicating the processing for GCAM v7.0 AgLU in data)
+* Next stages of development:
+  (1) BYU: GCAM base year update to 2021 and 
+  (2) PCE: primary commodity equivalent processing and method documentation
+* Possibly adding IFPRI SPAM data in the processing chain  
+
 # November 2023 updates
 
 # **JOSS submission**
@@ -29,6 +38,7 @@ knitr::opts_chunk$set(
 # We will now update gcamfaostat to include the latest data and for GCAM BYU
 # A new **BYU branch** is created for this task
 
+
 2023-11-08
 
 * All Github Action test passed. Badges added!
diff --git a/vignettes/vignette_visualization.Rmd b/vignettes/vignette_visualization.Rmd
index 912f6129..439ffef2 100644
--- a/vignettes/vignette_visualization.Rmd
+++ b/vignettes/vignette_visualization.Rmd
@@ -43,7 +43,7 @@ Food calories availability per capita per day grouped by GCAM regions and commod
 ***
 ## Yield growth
 
-![Surprisingly, oil palm fruit yield did grow at regional levels (boxplot) in the past 30 years. But world yield increased by ~50% due to the production shift to high-yielding regions. The opposite is true for root and tuber crops](../man/figures/Fig_WorldYield.png){width=100%}
+![Surprisingly, oil palm fruit yield did not grow at regional levels (boxplot) in the past 30 years. But world yield increased by ~50% due to the production shift to high-yielding regions. The opposite is true for root and tuber crops](../man/figures/Fig_WorldYield.png){width=100%}
 
 ***
 
@@ -122,7 +122,7 @@ BaseYear <- c(2013:2017)
 ``` {r, eval =FALSE}
 # simplify population data
 OA %>% filter(element_code == 511, item_code == 3010) %>%
-  transmute(area, area_code, year, pop = value) %>% 
+  transmute(area, area_code, year, value = value / length(BaseYear)) %>% 
   filter(year %in% BaseYear) %>% 
   gcamdata::left_join_error_no_match(AGLU_ctry %>% select(area = FAO_country, iso), by = "area") %>%
   gcamdata::left_join_error_no_match(iso_GCAM_regID %>% select(iso, GCAM_region_ID), by = "iso") %>%