Skip to content

Commit ffd146e

Browse files
Patch back parent cool tech params
Add growth up for extract surface water
1 parent 94f4539 commit ffd146e

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

message_ix_models/model/water/data/water_for_ppl.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -692,26 +692,26 @@ def _expand_parent_parameters(
692692
param_names = [
693693
"historical_activity",
694694
"historical_new_capacity",
695-
# "initial_activity_up",
696-
# "initial_activity_lo",
697-
# "initial_new_capacity_up",
695+
"initial_activity_up",
696+
"initial_activity_lo",
697+
"initial_new_capacity_up",
698698
# "soft_activity_up",
699699
# # "soft_activity_lo", #causes infeasibilty.
700700
# "soft_new_capacity_up",
701701
# "level_cost_activity_soft_up",
702702
# "level_cost_activity_soft_lo",
703703
# # "growth_activity_lo", #cause infeasibility
704-
# "growth_activity_up",
705-
# "growth_new_capacity_up",
704+
"growth_activity_up",
705+
"growth_new_capacity_up",
706706
]
707707

708708
# Parameters that need multiplier application
709709
multip_list = [
710710
"historical_activity",
711711
"historical_new_capacity",
712-
# "initial_activity_up",
713-
# "initial_activity_lo",
714-
# "initial_new_capacity_up",
712+
"initial_activity_up",
713+
"initial_activity_lo",
714+
"initial_new_capacity_up",
715715
]
716716

717717
# Extract parameters from parent technologies

message_ix_models/model/water/data/water_supply.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,16 @@ def add_water_supply(context: "Context") -> dict[str, pd.DataFrame]:
886886
else:
887887
results["var_cost"] = var_cost_fossil
888888

889+
# Add growth constraint for extract_surfacewater (10% annual growth limit)
890+
growth_activity_up = make_df(
891+
"growth_activity_up",
892+
technology="extract_surfacewater",
893+
value=0.1,
894+
unit="-",
895+
).pipe(broadcast, year_act=year_wat, node_loc=df_node["node"])
896+
897+
results["growth_activity_up"] = growth_activity_up
898+
889899
# Remove duplicates and NaN values from all DataFrames in results
890900
for key, df in results.items():
891901
results[key] = df.dropna().drop_duplicates().reset_index(drop=True)

0 commit comments

Comments
 (0)