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.

Sign up for GitHub

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

Country name fix #40

Merged
merged 4 commits into from
Dec 7, 2023
Merged

Country name fix #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7255833
added dictionary and loop to replace country names, but currently the…
HauHe Dec 5, 2023
3c67d12
formating fixed by lint
HauHe Dec 5, 2023
6b050bc
Simplified renaming of countries using the pyam function rename. And …
HauHe Dec 6, 2023
f17a5f2
Changed Czechia to Czech Republic in test.
HauHe Dec 6, 2023
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
21 changes: 16 additions & 5 deletions src/osemosys2iamc/resultify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,11 +530,22 @@ def main(config: Dict, inputs_path: str, results_path: str) -> pyam.IamDataFrame
if len(blob) > 0:
all_data = pyam.concat(blob)

all_data = all_data.convert_unit("PJ/yr", to="EJ/yr")
all_data = all_data.convert_unit("ktCO2/yr", to="Mt CO2/yr", factor=0.001)
all_data = all_data.convert_unit("MEUR_2015/PJ", to="EUR_2020/GJ", factor=1.05)
all_data = all_data.convert_unit("MEUR_2015/GW", to="EUR_2020/kW", factor=1.05)
all_data = all_data.convert_unit("kt CO2/yr", to="Mt CO2/yr")
all_data.convert_unit("PJ/yr", to="EJ/yr", inplace=True)
all_data.convert_unit("ktCO2/yr", to="Mt CO2/yr", factor=0.001, inplace=True)
all_data.convert_unit(
"MEUR_2015/PJ", to="EUR_2020/GJ", factor=1.05, inplace=True
)
all_data.convert_unit(
"MEUR_2015/GW", to="EUR_2020/kW", factor=1.05, inplace=True
)
all_data.convert_unit("kt CO2/yr", to="Mt CO2/yr", inplace=True)

dic_country_name_variants = {
"Netherlands": "The Netherlands",
"Czechia": "Czech Republic",
"United Kingdom of Great Britain and Northern Ireland": "United Kingdom",
}
all_data.rename(region=dic_country_name_variants, inplace=True)

all_data = pyam.IamDataFrame(all_data)
return all_data
Expand Down
2 changes: 1 addition & 1 deletion tests/test_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def test_main_result():
["Belgium", "Capacity|Electricity", 2016, 0.184866],
["Bulgaria", "Capacity|Electricity", 2015, 4.141],
["Cyprus", "Capacity|Electricity", 2015, 0.3904880555817921],
["Czechia", "Capacity|Electricity", 2015, 0.299709],
["Czech Republic", "Capacity|Electricity", 2015, 0.299709],
["Denmark", "Capacity|Electricity", 2015, 0.0005],
["Estonia", "Capacity|Electricity", 2015, 0.006],
["Finland", "Capacity|Electricity", 2015, 0.0263],
Expand Down
Loading