Skip to content

Commit

Permalink
Merge branch 'master' into ASEAN-ClimateFinance
Browse files Browse the repository at this point in the history
  • Loading branch information
maartenbrinkerink committed Dec 5, 2024
2 parents 19f0356 + 46f518b commit 7c0592f
Showing 1 changed file with 1 addition and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ def set_user_defined_capacity_trn(tech_capacity_trn, op_life_dict,
(df_max_cap_inv['YEAR'] == row['YEAR']), 'VALUE'] = df_max_cap_inv.loc[(
df_max_cap_inv['TECHNOLOGY'] == row['TECHNOLOGY']) &
(df_max_cap_inv['YEAR'] == row['YEAR']), 'VALUE'] + row['VALUE']

df_max_cap_inv.to_csv('temp5.csv')

# Add IAR and OAR for custom technologies
tech_list = list(tech_capacity_trn_df['TECHNOLOGY'].unique())
Expand Down Expand Up @@ -271,4 +269,4 @@ def set_user_defined_capacity_trn(tech_capacity_trn, op_life_dict,
inplace=True)

return(df_max_cap_inv, df_min_cap_inv, df_res_cap,
df_iar, df_oar, op_life, cap_cost, fix_cost, var_cost)
df_iar, df_oar, op_life, cap_cost, fix_cost, var_cost)

0 comments on commit 7c0592f

Please sign in to comment.