Closed measrainsey closed 5 months ago
All modified and coverable lines are covered by tests :white_check_mark:
Project coverage is 76.7%. Comparing base (
8f39459
) to head (c62cbf5
). Report is 3555 commits behind head on main.
Looks good to me :)
You might want to consider the name of your new file, though. When referring to regions, I think we typically use an upper-case
R
, soR12
in this case. Also, if you foresee adding indices for other types of region distributions and possibly more files specific to them, you could also makeR12
a folder withindata/intratec/
and just have a file calledindices.csv
in there.
Thanks @glatterf42! I implemented your advice and renamed the file/reorganized the folder structure.
I also added a line about the PR in doc/whatsnew
.
@measrainsey, looking at where your code uses this data, I see this:
So it is not clear whether the file is for the R12 node codelist, or for R11 and gets adapted. From the values it seems the latter.
I suggest:
R11_NAM
, in a column called "node".adapt_R11_R12
.I suggest:
* Store the data for R11. Include the exact node names, like `R11_NAM`, in a column called "node". * Call the existing function [`adapt_R11_R12`](https://docs.messageix.org/projects/models/en/latest/api/util.html#message_ix_models.util.node.adapt_R11_R12).
@khaeru: As per your suggestion, I changed the indices file to be for R11 instead (putting that file in an R11
folder), and now use adapt_R11_R12
when the R12 node is activated. (Just a note for myself on here that in order for adapt_R11_R12
to work, the other column in the DataFrame that is passed through had to be called value
.)
Convert Intratec data from Excel spreadsheet to CSV file
How to review
Read the diff and note that the CI checks all pass.
PR checklist
[x] Update doc/whatsnew.