Skip to content

Commit

Permalink
fix input filename
Browse files Browse the repository at this point in the history
  • Loading branch information
Zhanwei-Liu committed Nov 25, 2023
1 parent f674c10 commit 966950b
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 3 deletions.
Binary file removed input/impulse_response_function.xlsx
Binary file not shown.
Binary file removed input/technology_ramping_cost.xlsx
Binary file not shown.
Binary file removed input/technology_startup_cost.xlsx
Binary file not shown.
File renamed without changes.
4 changes: 2 additions & 2 deletions params.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@
"first_col_only": false,
"drop_na": true
},
"transmission_fixed_OM_cost": {
"file_name": "transmission_fixed_OM_cost",
"transmission_line_fixed_OM_cost": {
"file_name": "transmission_line_fixed_OM_cost",
"index_cols": [0],
"header_rows": [0],
"unstack_levels": [0],
Expand Down
2 changes: 1 addition & 1 deletion prepshot/rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def fix_cost_rule(self, model):
pyomo.core.base.PyomoModel.ConcreteModel: Model with fixed O&M cost of technologies and transmission line constraints.
"""
fix_cost_tech = sum(self.para['technology_fixed_OM_cost'][te, y] * model.cap_existing[y, z, te] * self.para['fix_factor'][y] for y, z, te in model.year_zone_tech_tuples)
fix_cost_line = 0.5 * sum(self.para['transmission_fixed_OM_cost'][z, z1] * model.cap_lines_existing[y, z, z1] * self.para['fix_factor'][y] for y, z1, z in model.year_zone_zone_tuples)
fix_cost_line = 0.5 * sum(self.para['transmission_line_fixed_OM_cost'][z, z1] * model.cap_lines_existing[y, z, z1] * self.para['fix_factor'][y] for y, z1, z in model.year_zone_zone_tuples)
return model.cost_fix == fix_cost_tech + fix_cost_line


Expand Down

0 comments on commit 966950b

Please sign in to comment.