Skip to content

Commit

Permalink
Update site and create a release
Browse files Browse the repository at this point in the history
  • Loading branch information
realxinzhao committed Jan 28, 2024
1 parent 7f952e6 commit 36a52cc
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 7 deletions.
17 changes: 16 additions & 1 deletion docs/articles/vignette_news.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions docs/articles/vignette_visualization.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions vignettes/vignette_news.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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**
Expand All @@ -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!
Expand Down
4 changes: 2 additions & 2 deletions vignettes/vignette_visualization.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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%}

***

Expand Down Expand Up @@ -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") %>%
Expand Down

0 comments on commit 36a52cc

Please sign in to comment.