Skip to content

Commit

Permalink
Fix check issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
mengqi-z committed Oct 2, 2024
1 parent 982cff3 commit d55ceca
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/draft-pdf.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "paper"

on:
on:
push:
branches:
- main
Expand All @@ -23,10 +23,10 @@ jobs:
# This should be the path to the paper within your repo.
paper-path: paper/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
# PDF. Note, this should be the same directory as the input
# paper.md
path: paper/paper.pdf
path: paper/paper.pdf
2 changes: 1 addition & 1 deletion R/gcam_agprodchange.R
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ get_weighted_yield_impact <- function(data = NULL,

# calculate yield shocks for each GCAM commodity based on the weighted crop areas within the Region-basin intersection
yield_impact_clean <- yield_impact_clean %>%
dplyr::left_join(gcam_commod, by = 'crop') %>%
dplyr::left_join(gcam_commod, by = 'crop', relationship = 'many-to-many') %>%
dplyr::left_join(cropland_glu_region %>%
tidyr::separate(crop, into = c('irrtype', 'crop_id'), sep = '_') %>%
dplyr::left_join(crop_mirca, by = c('crop_id')) %>%
Expand Down
3 changes: 2 additions & 1 deletion R/pkg_utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@ agprodchange_ref <- function(gcam_version = 'gcam7',
gcamdata_dir = NULL)
{

year <- AgProdChange <- AgProdChange_ni <- NULL
year <- AgProdChange <- AgProdChange_ni <- region <- AgSupplySector <-
AgSupplySubsector <- AgProductionTechnology <- high <- low <- ssp4 <- ref <- NULL

if(!is.null(gcamdata_dir)){

Expand Down

0 comments on commit d55ceca

Please sign in to comment.