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
Rename anthroEmissions #116
Conversation
This is in line with RCP data where the category is called 'Fossil fuels and Industry'. In the CSV files the fossil and land use emissions are renamed from ffiEmissions and lucEmissions to ffi_emissions and luc_emissions for consistency with other categories.
Thanks @rgieseke. This looks good and makes a lot of sense; @kvcalvin notes it's entirely consistent with Integrated Assessment terminology too. The one issue is that this is a major change, in that it changes both the model's inputs and outputs. Per our use of semantic versioning, it should be merged into a (not yet existing) v2 branch, not the current master. @rplzzz ? |
@bpbond Yes, I agree. We can create an rc2.0 branch. As far as I know, there is no way to retarget a pull request, but it's easy enough to do the merge by hand. |
@bpbond Did we decide that this was ready to go onto the (yet to be created) rc2.0 branch? Or is there still stuff to do on it? |
Ready to go afaik. Note though we (w/ @Chartin ) at least) still need to discuss branch management at some point though. |
Yeah. We also need to figure out how we're going to manage the documentation, since it lives in the wiki, not the repository. And we'll need to come up with a plan for the next release. I'll make the new branch and resolve the conflicts with this one this afternoon, so at least that part will be ready to go. |
Some comments/questions:
Happy to make any amendments to this pull request as you see fit ... [1] http://theredddesk.org/encyclopaedia/agriculture-forestry-and-other-land-uses |
Since Hector takes its LUC emissions as inputs, "LUC" includes whatever the user chose to include in their input data. When you use hector with GCAM the emissions you get are AFOLU. |
Should it be called AFOLU then, as this seems to be the broadest category? |
anything that does not end in _emissions does not get read into Hector and should be deleted from the emissions files. |
Sure, this makes sense. Just thought to mention it now, as the input files need changes anyway ... |
I'm not the chartin you're looking for. Remove me from the thread.
|
Sorry about that @Chartin . Just click "unsubscribe". |
Click where? On Tue, Nov 10, 2015 at 2:55 PM, Ben Bond-Lamberty <notifications@github.com
|
@Chartin : here's a link to this discussion #116 (comment) . On the webpage, look on the right side for the "Unsubscribe" button. Click it. Hope this resolves it! |
This branch has been merged into the rc2.0.0 branch. It will be merged into master when we are ready for the 2.0 release. |
To get started on #111 I looked into what would need to be changed. I hope I found everything and am happy to update this if you prefer any other naming scheme. I chose renaming them from
anthroEmisisons
toffiEmissions
.This is in line with RCP data where the category is called 'Fossil fuels and Industry'. In the CSV files the fossil and land use emissions are renamed from ffiEmissions and lucEmissions to ffi_emissions and
luc_emissions for consistency with other categories.