Skip to content

Commit

Permalink
Data updates to 2022 FAOSTAT along with BYU and PCe processing updates (
Browse files Browse the repository at this point in the history
  • Loading branch information
realxinzhao authored Oct 17, 2024
1 parent 1870dac commit 24a8d58
Show file tree
Hide file tree
Showing 240 changed files with 24,443 additions and 10,162 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/draft-pdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
# This should be the path to the paper within your repo.
paper-path: paper.md
- name: Upload
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: paper
# This is the output path where Pandoc will write the compiled
Expand Down
18 changes: 15 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Rplots.pdf
# Vignette files
inst/doc

# Proprietary files
# Potential proprietary files
IEA_EnergyBalances_2019.csv.gz
*CEDS_emissions.csv

Expand All @@ -33,8 +33,20 @@ IEA_EnergyBalances_2019.csv.gz


# FAOSTATA raw zip
inst/extdata/aglu/FAO/FAOSTAT/*.zip
inst/extdata/aglu/FAO/FAOSTAT_Archive/*
inst/extdata/FAOSTAT/*.zip
inst/extdata/FAOSTAT_Archive*/*

# Model-specific gcamfaostat output files
gcamfaostat*/

# Model-specific input files
inst/extdata/GCAM/mi_headers
inst/extdata/GCAM/ModelInterface
inst/extdata/GCAM/aglu/FAO/GCAMFAOSTAT*


# Developer
paper
developertemp

#docs
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: gcamfaostat
Type: Package
Title: Prepare, process, and synthesize FAOSTAT data for global agroeconomic and multisector dynamic modeling
Version: 1.0.0
Date: 2023-05-06
Version: 1.0.1
Date: 2024-10-17
Authors@R: c(person("Xin", "Zhao", email = "[email protected]", role = c("cre", "aut"), comment = c(ORCID = "0000-0002-1801-4393")),
person("Maksym", "Chepeliev", role = "aut", comment = c(ORCID = "0000-0001-8585-2314")),
person("Pralit", "Patel", role = "aut", comment = c(ORCID = "0000-0003-3992-1061")),
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export(approx_fun)
export(approx_fun_constant)
export(assert_FBS_balance)
export(change_iso_code)
export(chord_wrapper)
export(chunk_inputs)
export(chunk_outputs)
export(chunk_readylist)
Expand Down
Loading

0 comments on commit 24a8d58

Please sign in to comment.