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

use distance to France as transport distances to #443

Merged
merged 2 commits into from
Jun 12, 2024
Merged

use distance to France as transport distances to #443

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab2f047
use distance to France as transport distances to EU
joAschauer Jun 11, 2024
860fd1a
fix key error when no pipeline distance available
joAschauer Jun 11, 2024
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
9 changes: 7 additions & 2 deletions app/tab_market_scanning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from app.excel_download import prepare_and_download_df_as_excel
from app.ptxboa_functions import (
change_index_names,
config_number_columns,
read_markdown_file,
remove_subregions,
Expand Down Expand Up @@ -209,8 +210,11 @@ def content_market_scanning(api: PtxboaAPI, res_costs: pd.DataFrame, cd: dict) -
df.at["USA", "h2_demand_2030"] = 10

# EU data is missing completely in context_data.xlsx:
df.at["EU", "shipping distance"] = 1104
df.at["EU", "pipeline distance"] = 2000
df.at["EU", "shipping distance"] = df.at["France", "shipping distance"]
try:
df.at["EU", "pipeline distance"] = df.at["France", "pipeline distance"]
except KeyError:
df.at["EU", "pipeline distance"] = None
df.at["EU", "h2_demand_2030"] = 20

df["h2_demand_2030"] = df["h2_demand_2030"].astype(float)
Expand All @@ -234,6 +238,7 @@ def content_market_scanning(api: PtxboaAPI, res_costs: pd.DataFrame, cd: dict) -
)

# create plot:
df = change_index_names(df, mapping={"target_country_code": "Target country"})
df_plot = df.copy().round(0)

# distinguish between selected region and others:
Expand Down
Loading