diff --git a/input/impulse_response_function.xlsx b/input/impulse_response_function.xlsx deleted file mode 100644 index 4cf8d17..0000000 Binary files a/input/impulse_response_function.xlsx and /dev/null differ diff --git a/input/technology_ramping_cost.xlsx b/input/technology_ramping_cost.xlsx deleted file mode 100644 index 2540297..0000000 Binary files a/input/technology_ramping_cost.xlsx and /dev/null differ diff --git a/input/technology_startup_cost.xlsx b/input/technology_startup_cost.xlsx deleted file mode 100644 index 5d44cb4..0000000 Binary files a/input/technology_startup_cost.xlsx and /dev/null differ diff --git a/input/transmission_fixed_OM_cost.xlsx b/input/transmission_line_fixed_OM_cost.xlsx similarity index 100% rename from input/transmission_fixed_OM_cost.xlsx rename to input/transmission_line_fixed_OM_cost.xlsx diff --git a/params.json b/params.json index 1f44dda..92eb6b9 100644 --- a/params.json +++ b/params.json @@ -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], diff --git a/prepshot/rules.py b/prepshot/rules.py index c3381bb..6950f92 100644 --- a/prepshot/rules.py +++ b/prepshot/rules.py @@ -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