From 966950b173e1166dc2fd9a2e4dcb3c849bc8cf5e Mon Sep 17 00:00:00 2001 From: Zhanwei-Liu <337891617@qq.com> Date: Sat, 25 Nov 2023 19:40:07 +0800 Subject: [PATCH] fix input filename --- input/impulse_response_function.xlsx | Bin 9730 -> 0 bytes input/technology_ramping_cost.xlsx | Bin 8564 -> 0 bytes input/technology_startup_cost.xlsx | Bin 8573 -> 0 bytes ...xlsx => transmission_line_fixed_OM_cost.xlsx} | Bin params.json | 4 ++-- prepshot/rules.py | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 input/impulse_response_function.xlsx delete mode 100644 input/technology_ramping_cost.xlsx delete mode 100644 input/technology_startup_cost.xlsx rename input/{transmission_fixed_OM_cost.xlsx => transmission_line_fixed_OM_cost.xlsx} (100%) diff --git a/input/impulse_response_function.xlsx b/input/impulse_response_function.xlsx deleted file mode 100644 index 4cf8d1762527a7fc44e16626b8e819b7d46124a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9730 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 Gv;PCu<=Hj> diff --git a/input/technology_startup_cost.xlsx b/input/technology_startup_cost.xlsx deleted file mode 100644 index 5d44cb442dc068f969f9ee373e697ca6e507907d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8573 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 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