resolving conflict in combinator.py

USEPA / ElectricityLCI

Creative Commons Zero v1.0 Universal

24 stars 10 forks source link

Closed bl-young closed 4 years ago

bl-young commented 4 years ago

Conversions and unit matching are done within the eLCI mapping file so this stretch of code is not needed and will throw errors.

bl-young commented 4 years ago

@jump2conclusionsmatt I didn't see that you had resolved this (#95) so created this pull request

m-jamieson commented 4 years ago

Yeah, I was going to try and just revert this file to the previous commit. This works too. Have you run it after this change?

bl-young commented 4 years ago

I ran it successfully within combinator.py but didn't actually try the full run. Will give it a shot just to confirm.

bl-young commented 4 years ago

Ok I was able to complete the model build and import using eLCI-1. Good to go