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

Massive change to use of locations and calculation of production volumes #154

Merged
merged 48 commits into from
Dec 19, 2018
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
4fbb1b4
Fix manual tests
cmutel Dec 11, 2018
70f8a04
Add default value for production_volume
cmutel Dec 11, 2018
150b39f
Change `annotate_exchange` to not clobber flow name
cmutel Dec 11, 2018
04a7151
Add preliminary version of market group finding
cmutel Dec 11, 2018
e31fa36
Merge branch 'master' into market_groups
cmutel Dec 11, 2018
4313dcb
Start documenting fixes to market groups
cmutel Dec 13, 2018
b12ddf3
Activities can go both ways (spicy!)
cmutel Dec 13, 2018
1100061
Validate no RoW market groups
cmutel Dec 13, 2018
0c2dfac
Start rewrite of market group linking
cmutel Dec 13, 2018
d74e751
Further progress on rewriting geolinking
cmutel Dec 13, 2018
66558d0
Fixing some tests for market groups
cmutel Dec 14, 2018
196823b
Fixes for topology.contained
cmutel Dec 14, 2018
5510522
Fix market groups tests
cmutel Dec 14, 2018
fcf0e1a
Docs updates
cmutel Dec 14, 2018
48de90f
More big changes to spatial functions and tests
cmutel Dec 14, 2018
c2e8e37
Fix a test
cmutel Dec 14, 2018
c0f8f83
Consistent and simpler RoW and GLO handling in tolopolgy functions
cmutel Dec 15, 2018
d262a17
RoW as backup supplier
cmutel Dec 15, 2018
e9219f8
Update docs
cmutel Dec 15, 2018
1ff93b2
Dont let zero amount dropped products break row label regrouping
cmutel Dec 15, 2018
33a3585
Correct a specific 3.3 bug
cmutel Dec 16, 2018
2595921
Add test combining resolved_row and subtract
cmutel Dec 16, 2018
b2492ed
Sort by topo faces with area proxy function
cmutel Dec 16, 2018
1ea1e50
Fix calculation of production volumes in market groups
cmutel Dec 17, 2018
36da8ad
Activities can consume from multiple markets - progress
cmutel Dec 17, 2018
1f1cfa1
Fix tests
cmutel Dec 17, 2018
85a2a98
Fix global activity consuming from multiple regional markets
cmutel Dec 17, 2018
7c44d55
Add topology speedups
cmutel Dec 17, 2018
f4ba806
Link markets and market groups simultaneously
cmutel Dec 17, 2018
10abed2
Misc cleanup
cmutel Dec 17, 2018
bf809ee
CZ in Europe
cmutel Dec 17, 2018
0c12d07
Use constructive_geometries
cmutel Dec 18, 2018
e5e43e9
Speed up ordered_dependencies
cmutel Dec 18, 2018
62820ad
Log subtracted activity links
cmutel Dec 18, 2018
52c4a51
Update PVs for transforming activities
cmutel Dec 18, 2018
e16b839
Market reference product suppliers must be contained
cmutel Dec 18, 2018
f983a56
Skip activity links for internal market losses
cmutel Dec 18, 2018
51a6b78
Link TA and MA with `link_consumers_to_markets`
cmutel Dec 18, 2018
abf0fdc
Delete faulty 3.5 activity link
cmutel Dec 18, 2018
3d6170c
Add more logging
cmutel Dec 18, 2018
871e572
Rename function
cmutel Dec 18, 2018
8845c83
Drop zero PV markets
cmutel Dec 18, 2018
94b0cf5
Correctly account for subtracted PVs in markets and GLO->RoW
cmutel Dec 19, 2018
799a632
Remove debugging and fix tests
cmutel Dec 19, 2018
6dae44f
Add missing dependency
cmutel Dec 19, 2018
f80abbc
Fix CI syntax error
cmutel Dec 19, 2018
5686f99
Another syntax fix
cmutel Dec 19, 2018
9d11684
Need to group by activity name, not reference product
cmutel Dec 19, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix CI syntax error
cmutel committed Dec 19, 2018
commit f80abbcba0386f7bde9716e0531702e5e72f8ab0
3 changes: 1 addition & 2 deletions ocelot/transformations/locations/markets.py
Original file line number Diff line number Diff line change
@@ -283,8 +283,7 @@ def get_original_pv(exc):

total_pv = sum(get_original_pv(o)
for o in ds['suppliers'])
rp['production volume'][
'original total']: total_pv
rp['production volume']['original total']: total_pv
missing_market_pv = rp['production volume'].get('subtracted activity link volume', 0)
missing_inputs_pv = sum(
s['production volume'].get("subtracted activity link volume", 0)