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

Move DAC module's tools.costs assumptions into their own CSV files #271

Open
wants to merge 2 commits into
base: ssp-dev
Choose a base branch
from
Open

Move DAC module's tools.costs assumptions into their own CSV files #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
319d13e
Add dac module to function type hints
measrainsey Dec 17, 2024
91bb4ea
Move `dac` cost reduction assumptions to module folder
measrainsey Dec 17, 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
7 changes: 7 additions & 0 deletions message_ix_models/data/costs/dac/cost_reduction.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Cost reduction in 2100,,,,,
# ,,,,,
# Units: % ,,,,,
message_technology,very_low,low,medium,high,very_high
dac_lt,0.1,0.3,0.5,0.7,0.9
dac_hte,0.1,0.3,0.5,0.7,0.9
dac_htg,0.1,0.3,0.5,0.7,0.9
4 changes: 4 additions & 0 deletions message_ix_models/data/costs/dac/scenarios_reduction.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
message_technology,SSP1,SSP2,SSP3,SSP4,SSP5,LED
dac_lt,low,medium,medium,high,high,low
dac_hte,low,medium,medium,high,high,low
dac_htg,low,medium,medium,high,high,low
5 changes: 1 addition & 4 deletions message_ix_models/data/costs/energy/cost_reduction.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,4 @@ wind_res_hist_2020,0.15,0.3,0.53,0.53,0.65,0.75
wind_res1,0.15,0.3,0.53,0.53,0.65,0.75
wind_res2,0.15,0.3,0.53,0.53,0.65,0.75
wind_res3,0.15,0.3,0.53,0.53,0.65,0.75
wind_res4,0.15,0.3,0.53,0.53,0.65,0.75
dac_lt,0.1,0.3,0.5,0.7,0.9
dac_hte,0.1,0.3,0.5,0.7,0.9
dac_htg,0.1,0.3,0.5,0.7,0.9
wind_res4,0.15,0.3,0.53,0.53,0.65,0.75
3 changes: 0 additions & 3 deletions message_ix_models/data/costs/energy/scenarios_reduction.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,3 @@ wind_res1,high,medium,low,high,medium,very_high
wind_res2,high,medium,low,high,medium,very_high
wind_res3,high,medium,low,high,medium,very_high
wind_res4,high,medium,low,high,medium,very_high
dac_lt,low,medium,medium,high,high,low
dac_hte,low,medium,medium,high,high,low
dac_htg,low,medium,medium,high,high,low
6 changes: 3 additions & 3 deletions message_ix_models/tools/costs/decay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


def _get_module_scenarios_reduction(
module: Literal["energy", "materials", "cooling"],
module: Literal["energy", "materials", "cooling", "dac"],
energy_map_df: pd.DataFrame,
tech_map_df: pd.DataFrame,
) -> pd.DataFrame:
Expand Down Expand Up @@ -160,7 +160,7 @@ def _get_module_scenarios_reduction(


def _get_module_cost_reduction(
module: Literal["energy", "materials", "cooling"],
module: Literal["energy", "materials", "cooling", "dac"],
energy_map_df: pd.DataFrame,
tech_map_df: pd.DataFrame,
) -> pd.DataFrame:
Expand Down Expand Up @@ -294,7 +294,7 @@ def _get_module_cost_reduction(

# create function to get technology reduction scenarios data
def get_technology_reduction_scenarios_data(
first_year: int, module: Literal["energy", "materials", "cooling"]
first_year: int, module: Literal["energy", "materials", "cooling", "dac"]
) -> pd.DataFrame:
# Get full list of technologies from mapping
tech_map = energy_map = get_raw_technology_mapping("energy")
Expand Down
4 changes: 2 additions & 2 deletions message_ix_models/tools/costs/regional_differentiation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def get_intratec_data() -> pd.DataFrame:


def get_raw_technology_mapping(
module: Literal["energy", "materials", "cooling"],
module: Literal["energy", "materials", "cooling", "dac"],
) -> pd.DataFrame:
"""Retrieve a technology mapping for `module`.

Expand Down Expand Up @@ -235,7 +235,7 @@ def subset_module_map(raw_map):


def adjust_technology_mapping(
module: Literal["energy", "materials", "cooling"],
module: Literal["energy", "materials", "cooling", "dac"],
) -> pd.DataFrame:
"""Adjust technology mapping based on sources and assumptions.

Expand Down