8000 Merge develop to master by MoLi7 · Pull Request #172 · USEPA/useeior · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Merge develop to master #172

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
Merged
merged 344 commits into from
Dec 29, 2021
Merged

Merge develop to master #172

merged 344 commits into from
Dec 29, 2021

Conversation

MoLi7
Copy link
Collaborator
@MoLi7 MoLi7 commented Nov 3, 2021

develop has incorporated lots of updates from recently merged PRs. I think it's time to merge it with master for a new release, your thoughts?
@WesIngwersen @bl-young

jvendries and others added 30 commits October 6, 2021 17:22
@jvendries
Added aggregation specs line to USEEIOv2.1.yml file
d89924d
@bl-young
handle crosswalk disaggregation when a sector to be disaggregated doe…
86bc9ef 
…s not have naics (e.g. gov't sector for electricity)
@jvendries
Resolve conflicts from merging electricity_disagg_refactor into elect…
9ef8800 
…ricity_disagg branch

Merge branch 'electricity_disagg_refactor' into electricity_disagg

# Conflicts:
#	R/AggregationFunctions.R
#	R/WriteModel.R
@bl-young
consolidate function to collapse TBS
77e8600
@bl-young
update sat table aggregation to replace sector codes and names with n…
0a82b6c 
…ew sector before collapsing
@bl-young
Merge branch 'electricity_disagg' of https://github.com/USEPA/useeior …
6718ae8 
…into electricity_disagg
@bl-young
change function name to aggregateSectorsinTBS
3a1c3c1
@bl-young
conform TBS to standard earlier to avoid missing fields across satell…
bf282a1 
…ite tables
@bl-young
add back in another conformTBStoStandardSatTable to avoid tables bein…
ddfe510 
…g stored as tibble
@bl-young
move updating of sector names to collapseTBS
1bc015b
@bl-young
consolidate logic for agg/disagg of satellite table
b30a8fd
@bl-young
update documentation
1a61369
@bl-young
update agg logging message
2b41fb4
@bl-young
clean up
f6618f9
@bl-young
Merge branch 'issue_166' into electricity_disagg
682135b
@bl-young
disaggregate prior to mapping NAICS to BEA to avoid incorrect disaggr…
5188a90 
…egation allocations
@bl-young
update disaggregation of satellite table to be more flexible to the n…
da345b6 
…umber of sectors needing allocation
@bl-young
prevent already disaggregated sectors from dropping when updating BEA…
7a6ea77 
… schema
@bl-young
fix error in appending lost flows to dataframe on data loss
391119a
@bl-young
avoid allocation error when no UUIDs in sattable
f03b3f6
@bl-young
fix error preventing disaggregation when flow present in EnvFileDF bu…
fdc7ce4 
…t for non target sectors
@bl-young
assign allocating sectors prior to subsetting envDF
2579982
@bl-young
update the sector and summary fields to match the aggregated target s…
85a3c38 
…ector in the crosswalk
@MoLi7
Update usage of model crosswalk in visualization function
4a934f0
@MoLi7
Re-org aggregation and disaggregation in load IO table step
e4c3975
@bl-young
add manual allocations for energy flows and SF6
633bdfb
@bl-young
revise logging messages
c515469
@bl-young
add env allocations for "compounds"
c4a4f79
@bl-young
update function docstrings
9068a39
@bl-young
Merge pull request #164 from USEPA/electricity_disagg
b9fd2b6 
Updates to disaggregation to support electricity
MoLi7 and others added 14 commits December 23, 2021 09:51
@MoLi7
Add link to CompareModel.Rmd in README
b57de2e
@MoLi7
Add doc about default demand vectors in README
0f4ae15
@MoLi7
c -> s in calculateDirectPerspectiveLCIA
937635c
@MoLi7
Merge branch 'develop' of https://github.com/USEPA/useeior into develop
f2eaf5e
@MoLi7
Modify model name according to new naming rule
9b00934
@MoLi7
Fix typos in README
f88db3d
@MoLi7
Update format in README
34a28e2
@MoLi7
Update model names in R-CMD-check.yaml
418f08c
@MoLi7
calculateConsumptionContributiontoImpact -> calculateSectorPurchasedb…
eb775cf 
…ySectorSourcedImpact
@MoLi7
Update README.md
b9b6d0f 
Specify flow and sector contribution to total or direct impacts
@WesIngwersen
Add hyphen before {form}{sector} in model names
10000
31f9334
@bl-young
add NAICS proxies for S00101 and S00202 electric utilities
8258f3f
@MoLi7
Re-generate MasterCrosswalk2012.rda due to 8258f3f.
c579bde 
Can confirm exact same changes are made in MasterCrosswalk2012.rda.
@MoLi7
Minor edits in README
7abb500
WesIngwersen
WesIngwersen reviewed Dec 29, 2021
View reviewed changes
MoLi7 and others added 14 commits December 29, 2021 09:12
@MoLi7
Add space between "USEEIO" and "v" in modelname
8048566 
accomodating to Versioning Scheme at #8a43f7f
@MoLi7
Revert "Add space between "USEEIO" and "v" in modelname"
afa0dcd 
This reverts commit 8048566.
@MoLi7
Merge pull request #196 from USEPA/revisemodelname
ad48b0c 
Modify model name according to new naming rule
@MoLi7
Rename columns in flow/sector contribution to impact table, update fu…
d5ab44f 
…nction docs.
@MoLi7
Correct explanation about flow/sector contribution in README
e51d1f4
@WesIngwersen
Correct description of parameters in calculateSectorContributiontoImpact
aa8340b
@WesIngwersen
Resolve merge conflicts with cal functions
de47b11 
Merge branch 'develop' of https://github.com/USEPA/useeior into develop

# Conflicts:
#	R/CalculationFunctions.R
#	man/calculateSectorContributiontoImpact.Rd
@WesIngwersen
add export tag back to calculateSectorContributiontoImpact
89cb023
@MoLi7
Make writeSectorCrosswalk internal function, wrap it in writeModelfor…
ad43b43 
…API.
@MoLi7
Correct param doc in writeSectorCrosswalk
1597752
@MoLi7
Add sector-by-sector impacts in Example.Rmd
6824742
@MoLi7
Create functions to download and load NAICS concordances
2ff3cca
@MoLi7
Delete unused data-raw/CensusData.R
586cc39
@MoLi7
Udpate date in DESCRIPTION
579fe2e
@MoLi7 MoLi7 merged commit 8e6dc3d into master Dec 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WesIngwersen WesIngwersen WesIngwersen approved these changes

@bl-young bl-young bl-young approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@MoLi7 @bl-young @catherinebirney @jvendries @WesIngwersen @a-w-beck
0