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.

Sign up for GitHub

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

Jump to bottom

Update from master #161

Merged
merged 56 commits into from
Sep 13, 2021
Merged

Update from master #161

merged 56 commits into from
Sep 13, 2021

Conversation

bl-young
Copy link
Collaborator

No description provided.

bl-young and others added 30 commits May 19, 2021 11:35
@bl-young
add functions to support results analysis
59928fc
@bl-young
pass crosswalk as parameter to aggregateResults functions
88428e9
@bl-young
rename function to calculateConsumptionContributiontoImpact
7705e1a
@bl-young
Merge branch 'calc_functions' into calc_functions-1
595493f
@bl-young
Merge pull request #146 from USEPA/calc_functions-1
5c42fdb 
update calc_functions from master
@MoLi7
Update README.md
7899825
@MoLi7
Fix link in README
d4d7641
@MoLi7
Modify validation function to be more flexible
048dcd7
@MoLi7
Add writeMetadatatoJSON function
5eb70c2
@MoLi7
Add writeDatatoRDA function
4e1fbc0
@MoLi7
Refactor getData functions in BEAData.R
f708011
@MoLi7
Update external data
8cb8bfa
@MoLi7
Modify code in DataDocumentation.R and CensusData.R
4f32099
@MoLi7
Add metadata of external data
e62e4d9
@MoLi7
Modify prepareWriteDirs function
db70466
@MoLi7
Modify writeModeltoXLSX function, fix #149
444e8eb
@WesIngwersen
Add category, subcategory, description to USEEIO_commodity_code. Add …
cee0227 
…v1.1 data to existing codes
@MoLi7
Revert "Update external data"
a912d19 
This reverts commit 8cb8bfa.
@MoLi7
Add two additional external datasets
51c4a41
@MoLi7
Merge pull request #152 from USEPA/data_refac
e01d189 
Refactor external data and add metadata
@MoLi7
Modify MasterCrosswalk loading in initializeModel
7534af0
@bl-young
Merge pull request #151 from USEPA/calc_functions
d508a4a 
additional calculation functions for viewing and manipulating results matrix
@bl-young
rename to USEEIO_Commodity_Meta.csv
50b8c0b
@bl-young
update commodity metadata for new sectors in 2.0
1f13d8e
@bl-young
add back Code_loc to margins table
e54aa40
@bl-young
maintain description, category, and subcategory in sectors meta export
586b4cf
@MoLi7
Fix directory error in writeModeltoXLSX
3cbb2d8
@MoLi7
Merge branch 'master' of https://github.com/USEPA/useeior
ec0f448
@bl-young
Merge pull request #153 from USEPA/master
e08a3d5 
update from master
@bl-young
sectors fields have increased; "Category" and "Subcategory" do not ap…
875f98b 
…ply to the final demand or value added
bl-young and others added 26 commits August 18, 2021 14:48
@bl-young
fix issue #150
7b75689
@bl-young
Merge pull request #155 from USEPA/issue_150
7dfe5b6 
fix issue #150
@bl-young
Concatenate category and subcategory for metadata export
d3cdeda
@bl-young
Merge pull request #156 from USEPA/master
38e88c3 
update from master
@bl-young
Merge branch 'write_sector_metadata' of https://github.com/USEPA/useeior
40aaf3d 
 into write_sector_metadata
@bl-young
maintain UUID in satellite tables when aggregating
5718f9a
@bl-young
When creating model flows, for now need to not assess duplicate flow …
1654ba1 
…UUIDs as some flows do not yet have UUID (and thus will result in duplicates)
@bl-young
update fields for disaggregation metadata
38b2357
@bl-young
update for disaggregation of commodity metadata cont.
9338530
@bl-young
add model spec for v2.0.1 which will point to updated satellite table…
ce4b3b0 
…s with UUIDs
@jvendries
added descriptions for 42X sectors
ba38bf8
@jvendries
Added descriptions for disaggregated waste industries
4d16e78
@jvendries
added " to line 286 so code would run
92366b2
@jvendries
removed commas from description
b17e804
@bl-young
fix field break, quotation mark placement
e12dfa4
@bl-young
combine descriptions so that they are all the same for each USEEIO se…
0286b9c 
…ctor
@bl-young
update sat tables to versions with UUID
2dca015
@bl-young
update industry categorys to align with FLCAC
5528d5d
@bl-young
fix load error caused by apostraphe in Drugs and Druggists
2e90b11
@bl-young
update waste disagg categories to FLCAC
65cd338
@bl-young
resolve #159 by better aligning codes in disaggregation specs and fil…
b5d1817 
…es with satellite tables
@MoLi7
Remove BEA import matrix from extdata/
353f319
@MoLi7
Update version and datein DESCRIPTION
cad8f86
@bl-young
Merge pull request #158 from USEPA/write_sector_metadata
042d6d4 
Write sector metadata to support json export
@bl-young
Merge pull request #160 from USEPA/issue_159
5bb4c12 
fix to satellite tables for waste disaggregation
@bl-young
Merge branch 'electricity_disagg' into electricity_disagg1
2151a24
@bl-young bl-young merged commit 987b211 into electricity_disagg Sep 13, 2021
@bl-young bl-young deleted the electricity_disagg1 branch September 13, 2021 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bl-young @jvendries @MoLi7 @WesIngwersen