Skip to content
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

Incorporation of import factors for one and two-region models #288

Merged
merged 220 commits into from
May 16, 2024

Conversation

bl-young
Copy link
Collaborator

@bl-young bl-young commented May 7, 2024

Also includes calculations of household emissions

jvendries and others added 30 commits June 6, 2023 19:33
…ignate whether external import factors are used
…ames from io_table_names, and added them in the if statement for stateior only models
…to avoid errors when the parameter is not specified
compare2RCommodityTotals to
compare2RVectorTotals
to make it more broadly useful
…F values generated using the Swedish calculation method
…e variable name for imported M matrix for clarity.
# Conflicts:
#	R/BuildModel.R
#	R/IOFunctions.R
…idateIMportA function as that is not a model object that
@bl-young bl-young added this to the v1.6 - Import factors milestone May 7, 2024
@bl-young bl-young requested a review from jvendries May 7, 2024 02:51
R/StateiorFunctions.R Outdated Show resolved Hide resolved
Copy link
Collaborator

@jvendries jvendries left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made a few edits to clarify code related to 2R disaggregation but looks good to pull in.

R/StateiorFunctions.R Outdated Show resolved Hide resolved
@bl-young bl-young merged commit eee9807 into develop May 16, 2024
6 checks passed
@bl-young bl-young deleted the linkstateiorImportF branch May 17, 2024 02:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants