-
Notifications
You must be signed in to change notification settings - Fork 12
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
Adds disaggregation of two-region model objects #46
Draft
bl-young
wants to merge
131
commits into
dev
Choose a base branch
from
disagg
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ctions specific for stateior
…within assembleTwoRegionIO.r
…the stateDisaggFunctions.R script
… to match the actual names of the files included in the disaggspecs folder
…needs to be fixed for using useeior Disaggregation functions in stateior
Moved get disagg specs for state models from BuildModel.R to StateDisaggFunctions.R
…ter disaggregation
…e, Commodity and IndustryOUtput model objects
… object into the distinct objects required for disaggregation in USEEIOr
…ateior objects (e.g. State_Make_ls)
-calculate disaggregated state industry and commodity output totals -assemble full use table after disaggregating the individual components (UseTransactions, FinalDemand, UseValueAdded)
…to enable the disaggregation of the Use table elements when domestic flag is true
… of non-state Make and Use tables (i.e., US_Make and US_DomesticUse objects)
disaggregateStateSectorLists function for disaggregating the commodity and industry lists disaggregateNationalObjectsInStateModel function to organize the disaggregation flow for objects that only have to be disaggregated once
…only have to be disaggregated once
…into disagg_state_data
…from useeior instead of stateior
… of schema in useeior #280
Minor updates to support disaggregation
@jvendries before setting this as ready to review, we need to identify the spots, mostly in the ICF functions, where we make adjustments which assume the disagg is for utilities. This needs to be more dynamic. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Disaggregation is applied during the final model object build,
assembleTwoRegionIO()
Some disaggregation model data stored in useeior only to reduce duplication. See USEPA/useeior#328
Introduces model specs, specifically
StateIOv1.2-shoofly
(base model) andStateIOv1.2-milkbar
(disaggregation of 22: Utilities). See the revised USEEIO model schema.As of v0.3.0, Two Region model objects will include the model alias to differentiate model builds.