-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge Staging to Master #28
base: master
Are you sure you want to change the base?
Conversation
Edited ge_intake in on line 100 to be (ge_intake/365), we think there is a bug and this should be daily not annual ge_intake
Return tabular data instead of saving graphs PNGs
adapt the output functions to the iCLEANED shiny app
…st/cleaned into dev/ahmed/tags/v0.6.0 Update ghg_emission.R
Update ghg_emission.R
Merge branch 'cleaned_v0.6.0' into staging # Conflicts: # R/compare_scenario.R # R/merge_outputs.R
Merge 'Cleaned_dev_ps' into staging
Please ignore the input_mappings.R file, it is something under development and isn't linked to the CLEANED package at the moment. Could you please provide more details on the new error message in the nitrogen_balance function? I think this is what Stephen addressed last time. Happy to jump on a call. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would approve this given there's an upcoming training that will rely on these changes. Otherwise it would make sense to address the nitrogen_balance in the next commit. Hopefully you have tested this locally and everything seems to work except the above?
How high can you jump @M-Emmanuel? Great to see the work going on here anyways! |
Please find the error message below for reference.
|
Great
Great, I'll probe this. |
debug when fertilizer exists
Update README.md
I reviewed the R Package GitHub Repository management and made the following updates:
Created a staging branch (https://github.com/CIAT/cleaned/tree/staging) from master, merged it with cleaned_v0.6.0, and resolved some conflicts (conflicts were limited to the visualization files, which I manage, so I was confident in resolving them)
Merged changes from cleaned_dev_prs into staging without conflicts
Staging now contains all recent changes and is functioning smoothly
However, I noticed two issues:
1. Compilation Issue: The package fails to compile due to the
input_mappings.R
file (commited previously in the cleaned_dev_prs). I removed it in staging. It doesn't seem core to CLEANED, but if it's important, you may want to investigate the issue (remotes::install_github("CIAT/cleaned@cleaned_dev_prs")
). Error looks to something like this: Error : cannot create dir 'data\mappings', reason 'No such file or directory' -- lexical error: invalid char in json text. data/qt_example.json2. Nitrogen Balance Error: After merging the fertilizer issue fix, the previous error no longer occurs, but there's a new error message in the nitrogen_balance function, when the fertilizer is missing.