fix errors and warnings in reportEmi #501
Conversation
|
ups, too slow I guess... still, I think is good that @fschreyer takes a look. thank you for fixing my mess though, Falk! I thought the tests would fail if I didn't do that and I probably forgot to check manually. thanks again! |
| @@ -2536,10 +2535,9 @@ if (!is.null(vm_plasticsCarbon)) { | |||
|
|
|||
| # 8. Ad-hoc fix for emissions w/o non-energy use and Aggregation to global and regional values ---- | |||
|
|
|||
| if (is.null(vm_demFENonEnergySector) && (module2realisation["industry", 2] == "fixed_shares")) { | |||
There was a problem hiding this comment.
Yeah, thanks. I guess, I overlooked that in the review as well. So far, these cases should still be covered by the reporting for backwards compatability also if industry realization is subsectors. We currently use this part for ARIADNE. Once we smoothly updated to the version including vm_demFENonEnergySector, I will remove these parts below.
| # TODO: add non-energy use variables for all regionmappings and sector realizations | ||
| #Note (SM): I'm not sure if I got these notes so I created the condition above to try to make sure that this will work anyways | ||
|
|
||
| # Note: Non-energy use emissions should not be confused with process emissions. Non-energy use emissions are emissions/carbon flow of FE carriers which are used as feedstocks in industry. | ||
| if ("FE|Non-energy Use|Industry (EJ/yr)" %in% getNames(output) && |
There was a problem hiding this comment.
What would be important is that the version with vm_demFENonEnergySector does not enter this bracket. We do not need emissions variables corrected for non-energy use in Simon's implementation anymore. However, it looks like it does not enter here because Simon named the variables slightly differently e.g. FE|Non-energy Use|+|Industry (EJ/yr) instead of FE|Non-energy Use|Industry (EJ/yr). However, for clarity of the code it would advisable to add a is.null(vm_demFENonEnergySector) condition.
|
This PR was just meant to make buildLibrary work again in the least intrusive way possible, as it was blocking others developing updates for remind2. Please address any follow-up issues in new PRs. @mellamoSimon always remember to run lucode2::buildLibrary before merging your changes |
This PR increments the library version, as it was not done in #489
In addition, warnings and errors caused by this PR in reportEmi are fixed as well.