From afdef98f9d8179cac8be4d38ab02dbb514ebb54a Mon Sep 17 00:00:00 2001 From: prakaa Date: Thu, 22 Aug 2024 10:53:18 +1000 Subject: [PATCH 1/5] add all tables for existing yaml --- .../6.0/capacity_factors.yaml | 5 --- .../6.0/capacity_factors_new_VRE.yaml | 35 +++++++++++++++++++ .../6.0/generator_reliability_settings.yaml | 17 +++++++++ src/isp_table_configs/6.0/outages.yaml | 5 --- src/isp_table_configs/6.0/retirement.yaml | 6 ++++ 5 files changed, 58 insertions(+), 10 deletions(-) delete mode 100644 src/isp_table_configs/6.0/capacity_factors.yaml create mode 100644 src/isp_table_configs/6.0/capacity_factors_new_VRE.yaml create mode 100644 src/isp_table_configs/6.0/generator_reliability_settings.yaml delete mode 100644 src/isp_table_configs/6.0/outages.yaml diff --git a/src/isp_table_configs/6.0/capacity_factors.yaml b/src/isp_table_configs/6.0/capacity_factors.yaml deleted file mode 100644 index fa11c1e..0000000 --- a/src/isp_table_configs/6.0/capacity_factors.yaml +++ /dev/null @@ -1,5 +0,0 @@ -wind_high_capacity_factors: - sheet_name: "Capacity Factors " - header_rows: [7, 8, 9] - end_row: 48 - column_range: "B:R" diff --git a/src/isp_table_configs/6.0/capacity_factors_new_VRE.yaml b/src/isp_table_configs/6.0/capacity_factors_new_VRE.yaml new file mode 100644 index 0000000..f535c65 --- /dev/null +++ b/src/isp_table_configs/6.0/capacity_factors_new_VRE.yaml @@ -0,0 +1,35 @@ +wind_high_capacity_factors: + sheet_name: "Capacity Factors " + header_rows: [7, 8, 9] + end_row: 48 + column_range: "B:R" + +wind_medium_capacity_factors: + sheet_name: "Capacity Factors " + header_rows: [7, 8, 9] + end_row: 48 + column_range: "T:AJ" + +solar_pv_capacity_factors: + sheet_name: "Capacity Factors " + header_rows: [50, 51, 52] + end_row: 91 + column_range: "B:R" + +solar_thermal_15hrstorage_capacity_factors: + sheet_name: "Capacity Factors " + header_rows: [50, 51, 52] + end_row: 91 + column_range: "T:AJ" + +offshore_wind_fixed_capacity_factors: + sheet_name: "Capacity Factors " + header_rows: [93, 94, 95] + end_row: 102 + column_range: "B:R" + +offshore_wind_floating_capacity_factors: + sheet_name: "Capacity Factors " + header_rows: [93, 94, 95] + end_row: 102 + column_range: "T:AJ" diff --git a/src/isp_table_configs/6.0/generator_reliability_settings.yaml b/src/isp_table_configs/6.0/generator_reliability_settings.yaml new file mode 100644 index 0000000..51a3336 --- /dev/null +++ b/src/isp_table_configs/6.0/generator_reliability_settings.yaml @@ -0,0 +1,17 @@ +existing_generator_long_duration_outages: + sheet_name: "Generator Reliability Settings" + header_rows: 10 + end_row: 14 + column_range: "B:D" + +existing_generator_outages_2023-2024: + sheet_name: "Generator Reliability Settings" + header_rows: [19, 20] + end_row: 28 + column_range: "B:G" + +new_entrant_outages: + sheet_name: "Generator Reliability Settings" + header_rows: [19, 20] + end_row: 40 + column_range: "I:N" diff --git a/src/isp_table_configs/6.0/outages.yaml b/src/isp_table_configs/6.0/outages.yaml deleted file mode 100644 index cfb923f..0000000 --- a/src/isp_table_configs/6.0/outages.yaml +++ /dev/null @@ -1,5 +0,0 @@ -existing_generator_outages_2023-2024: - sheet_name: "Generator Reliability Settings" - header_rows: [19, 20] - end_row: 28 - column_range: "B:G" diff --git a/src/isp_table_configs/6.0/retirement.yaml b/src/isp_table_configs/6.0/retirement.yaml index ed110df..88768ed 100644 --- a/src/isp_table_configs/6.0/retirement.yaml +++ b/src/isp_table_configs/6.0/retirement.yaml @@ -3,3 +3,9 @@ retirement_costs: header_rows: 9 end_row: 16 column_range: "H:I" + +expected_closure_years: + sheet_name: "Retirement" + header_rows: 9 + end_row: 460 + column_range: "B:E" From 37a90a400d45b6a18d2d9e3c0ec253147fc82a23 Mon Sep 17 00:00:00 2001 From: nick-gorman Date: Thu, 22 Aug 2024 14:21:19 +1000 Subject: [PATCH 2/5] add config files for all sheets --- .../6.0/affine_heat_rates.yaml | 0 .../6.0/aggregated_energy_storages.yaml | 0 .../6.0/assumptions_summary.yaml | 0 src/isp_table_configs/6.0/auxiliary.yaml | 0 .../6.0/battery_&_plug-in_evs.yaml | 0 .../6.0/build_costs_pem.yaml | 0 src/isp_table_configs/6.0/build_limits.yaml | 0 .../6.0/build_limits_phes.yaml | 0 ...ors_new_VRE.yaml => capacity_factors.yaml} | 0 src/isp_table_configs/6.0/carbon_budgets.yaml | 0 .../6.0/ccgt_unit_max_capacity.yaml | 0 src/isp_table_configs/6.0/change_log.yaml | 0 .../6.0/coal_and_biomass_price.yaml | 0 .../6.0/connection_cost.yaml | 0 .../6.0/connection_costs_forecast.yaml | 0 .../6.0/costs_summary_pem.yaml | 0 .../6.0/demand_and_energy_forecasts.yaml | 0 src/isp_table_configs/6.0/disclaimer.yaml | 0 src/isp_table_configs/6.0/dsp.yaml | 0 .../6.0/economic_growth_forecasts.yaml | 0 .../6.0/electrification.yaml | 0 .../6.0/embedded_energy_storages.yaml | 0 .../6.0/emissions_intensity.yaml | 0 .../6.0/energy_efficiency.yaml | 0 .../6.0/energy_policy_targets.yaml | 0 src/isp_table_configs/6.0/ev_v2g.yaml | 0 .../6.0/existing_gen_data_summary.yaml | 0 .../6.0/financial_parameters.yaml | 0 src/isp_table_configs/6.0/fixed_opex.yaml | 0 .../6.0/flow_path_augmentation_options.yaml | 0 .../6.0/flow_path_costs_forecast.yaml | 0 src/isp_table_configs/6.0/fuel_cell_evs.yaml | 0 .../6.0/fuel_price_summary.yaml | 0 .../6.0/gas_liquid_fuel_h2_price.yaml | 0 .../6.0/generation_limits.yaml | 0 .../6.0/gpg_emissions_reduction_biom.yaml | 0 .../6.0/gpg_min_stable_level.yaml | 0 .../6.0/h2_gpg_emissions_reduction_.yaml | 0 src/isp_table_configs/6.0/heat_rates.yaml | 0 .../6.0/hydro_climate_factor.yaml | 0 .../6.0/hydro_scheme_inflows.yaml | 0 .../6.0/hydrogen_assumptions_other.yaml | 30 ++++++++++++++++ .../6.0/hydrogen_demand_domestic.yaml | 0 .../6.0/hydrogen_demand_export&steel.yaml | 0 .../6.0/hydrogen_export_ports.yaml | 0 .../6.0/hydrogen_monthly_profiles.yaml | 23 ++++++++++++ .../6.0/lead_time_and_project_life.yaml | 0 .../6.0/locational_cost_factors.yaml | 0 src/isp_table_configs/6.0/maintenance.yaml | 0 .../6.0/marginal_loss_factors.yaml | 17 +++++++++ src/isp_table_configs/6.0/max_ramp_rates.yaml | 0 .../6.0/maximum_capacity.yaml | 0 .../6.0/min_up&down_times.yaml | 0 .../6.0/network_capability.yaml | 0 src/isp_table_configs/6.0/network_losses.yaml | 0 .../6.0/network_representation.yaml | 0 .../6.0/new_entrant_data_summary.yaml | 0 .../6.0/non-rez_assumptions.yaml | 0 .../6.0/other_hydrogen_assumptions.yaml | 0 .../6.0/power_system_constraints.yaml | 0 src/isp_table_configs/6.0/pvnsg.yaml | 0 .../6.0/regional_build_costs_summary.yaml | 0 .../6.0/renewable_energy_zones.yaml | 0 src/isp_table_configs/6.0/reserves.yaml | 0 .../6.0/rez_augmentations_options.yaml | 0 .../6.0/rez_costs_forecast.yaml | 0 src/isp_table_configs/6.0/rooftop_pv.yaml | 0 src/isp_table_configs/6.0/scenarios.yaml | 0 .../6.0/seasonal_ratings.yaml | 0 .../6.0/storage_properties.yaml | 0 .../6.0/sub-regional_demand_allocation.yaml | 0 .../6.0/summary_mapping.yaml | 35 +++++++++++++++++++ .../6.0/transmission_reliability.yaml | 0 src/isp_table_configs/6.0/variable_opex.yaml | 0 src/isp_workbook_parser/config_model.py | 5 ++- 75 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 src/isp_table_configs/6.0/affine_heat_rates.yaml create mode 100644 src/isp_table_configs/6.0/aggregated_energy_storages.yaml create mode 100644 src/isp_table_configs/6.0/assumptions_summary.yaml create mode 100644 src/isp_table_configs/6.0/auxiliary.yaml create mode 100644 src/isp_table_configs/6.0/battery_&_plug-in_evs.yaml create mode 100644 src/isp_table_configs/6.0/build_costs_pem.yaml create mode 100644 src/isp_table_configs/6.0/build_limits.yaml create mode 100644 src/isp_table_configs/6.0/build_limits_phes.yaml rename src/isp_table_configs/6.0/{capacity_factors_new_VRE.yaml => capacity_factors.yaml} (100%) create mode 100644 src/isp_table_configs/6.0/carbon_budgets.yaml create mode 100644 src/isp_table_configs/6.0/ccgt_unit_max_capacity.yaml create mode 100644 src/isp_table_configs/6.0/change_log.yaml create mode 100644 src/isp_table_configs/6.0/coal_and_biomass_price.yaml create mode 100644 src/isp_table_configs/6.0/connection_cost.yaml create mode 100644 src/isp_table_configs/6.0/connection_costs_forecast.yaml create mode 100644 src/isp_table_configs/6.0/costs_summary_pem.yaml create mode 100644 src/isp_table_configs/6.0/demand_and_energy_forecasts.yaml create mode 100644 src/isp_table_configs/6.0/disclaimer.yaml create mode 100644 src/isp_table_configs/6.0/dsp.yaml create mode 100644 src/isp_table_configs/6.0/economic_growth_forecasts.yaml create mode 100644 src/isp_table_configs/6.0/electrification.yaml create mode 100644 src/isp_table_configs/6.0/embedded_energy_storages.yaml create mode 100644 src/isp_table_configs/6.0/emissions_intensity.yaml create mode 100644 src/isp_table_configs/6.0/energy_efficiency.yaml create mode 100644 src/isp_table_configs/6.0/energy_policy_targets.yaml create mode 100644 src/isp_table_configs/6.0/ev_v2g.yaml create mode 100644 src/isp_table_configs/6.0/existing_gen_data_summary.yaml create mode 100644 src/isp_table_configs/6.0/financial_parameters.yaml create mode 100644 src/isp_table_configs/6.0/fixed_opex.yaml create mode 100644 src/isp_table_configs/6.0/flow_path_augmentation_options.yaml create mode 100644 src/isp_table_configs/6.0/flow_path_costs_forecast.yaml create mode 100644 src/isp_table_configs/6.0/fuel_cell_evs.yaml create mode 100644 src/isp_table_configs/6.0/fuel_price_summary.yaml create mode 100644 src/isp_table_configs/6.0/gas_liquid_fuel_h2_price.yaml create mode 100644 src/isp_table_configs/6.0/generation_limits.yaml create mode 100644 src/isp_table_configs/6.0/gpg_emissions_reduction_biom.yaml create mode 100644 src/isp_table_configs/6.0/gpg_min_stable_level.yaml create mode 100644 src/isp_table_configs/6.0/h2_gpg_emissions_reduction_.yaml create mode 100644 src/isp_table_configs/6.0/heat_rates.yaml create mode 100644 src/isp_table_configs/6.0/hydro_climate_factor.yaml create mode 100644 src/isp_table_configs/6.0/hydro_scheme_inflows.yaml create mode 100644 src/isp_table_configs/6.0/hydrogen_assumptions_other.yaml create mode 100644 src/isp_table_configs/6.0/hydrogen_demand_domestic.yaml create mode 100644 src/isp_table_configs/6.0/hydrogen_demand_export&steel.yaml create mode 100644 src/isp_table_configs/6.0/hydrogen_export_ports.yaml create mode 100644 src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml create mode 100644 src/isp_table_configs/6.0/lead_time_and_project_life.yaml create mode 100644 src/isp_table_configs/6.0/locational_cost_factors.yaml create mode 100644 src/isp_table_configs/6.0/maintenance.yaml create mode 100644 src/isp_table_configs/6.0/marginal_loss_factors.yaml create mode 100644 src/isp_table_configs/6.0/max_ramp_rates.yaml create mode 100644 src/isp_table_configs/6.0/maximum_capacity.yaml create mode 100644 src/isp_table_configs/6.0/min_up&down_times.yaml create mode 100644 src/isp_table_configs/6.0/network_capability.yaml create mode 100644 src/isp_table_configs/6.0/network_losses.yaml create mode 100644 src/isp_table_configs/6.0/network_representation.yaml create mode 100644 src/isp_table_configs/6.0/new_entrant_data_summary.yaml create mode 100644 src/isp_table_configs/6.0/non-rez_assumptions.yaml create mode 100644 src/isp_table_configs/6.0/other_hydrogen_assumptions.yaml create mode 100644 src/isp_table_configs/6.0/power_system_constraints.yaml create mode 100644 src/isp_table_configs/6.0/pvnsg.yaml create mode 100644 src/isp_table_configs/6.0/regional_build_costs_summary.yaml create mode 100644 src/isp_table_configs/6.0/renewable_energy_zones.yaml create mode 100644 src/isp_table_configs/6.0/reserves.yaml create mode 100644 src/isp_table_configs/6.0/rez_augmentations_options.yaml create mode 100644 src/isp_table_configs/6.0/rez_costs_forecast.yaml create mode 100644 src/isp_table_configs/6.0/rooftop_pv.yaml create mode 100644 src/isp_table_configs/6.0/scenarios.yaml create mode 100644 src/isp_table_configs/6.0/seasonal_ratings.yaml create mode 100644 src/isp_table_configs/6.0/storage_properties.yaml create mode 100644 src/isp_table_configs/6.0/sub-regional_demand_allocation.yaml create mode 100644 src/isp_table_configs/6.0/summary_mapping.yaml create mode 100644 src/isp_table_configs/6.0/transmission_reliability.yaml create mode 100644 src/isp_table_configs/6.0/variable_opex.yaml diff --git a/src/isp_table_configs/6.0/affine_heat_rates.yaml b/src/isp_table_configs/6.0/affine_heat_rates.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/aggregated_energy_storages.yaml b/src/isp_table_configs/6.0/aggregated_energy_storages.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/assumptions_summary.yaml b/src/isp_table_configs/6.0/assumptions_summary.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/auxiliary.yaml b/src/isp_table_configs/6.0/auxiliary.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/battery_&_plug-in_evs.yaml b/src/isp_table_configs/6.0/battery_&_plug-in_evs.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/build_costs_pem.yaml b/src/isp_table_configs/6.0/build_costs_pem.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/build_limits.yaml b/src/isp_table_configs/6.0/build_limits.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/build_limits_phes.yaml b/src/isp_table_configs/6.0/build_limits_phes.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/capacity_factors_new_VRE.yaml b/src/isp_table_configs/6.0/capacity_factors.yaml similarity index 100% rename from src/isp_table_configs/6.0/capacity_factors_new_VRE.yaml rename to src/isp_table_configs/6.0/capacity_factors.yaml diff --git a/src/isp_table_configs/6.0/carbon_budgets.yaml b/src/isp_table_configs/6.0/carbon_budgets.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/ccgt_unit_max_capacity.yaml b/src/isp_table_configs/6.0/ccgt_unit_max_capacity.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/change_log.yaml b/src/isp_table_configs/6.0/change_log.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/coal_and_biomass_price.yaml b/src/isp_table_configs/6.0/coal_and_biomass_price.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/connection_cost.yaml b/src/isp_table_configs/6.0/connection_cost.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/connection_costs_forecast.yaml b/src/isp_table_configs/6.0/connection_costs_forecast.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/costs_summary_pem.yaml b/src/isp_table_configs/6.0/costs_summary_pem.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/demand_and_energy_forecasts.yaml b/src/isp_table_configs/6.0/demand_and_energy_forecasts.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/disclaimer.yaml b/src/isp_table_configs/6.0/disclaimer.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/dsp.yaml b/src/isp_table_configs/6.0/dsp.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/economic_growth_forecasts.yaml b/src/isp_table_configs/6.0/economic_growth_forecasts.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/electrification.yaml b/src/isp_table_configs/6.0/electrification.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/embedded_energy_storages.yaml b/src/isp_table_configs/6.0/embedded_energy_storages.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/emissions_intensity.yaml b/src/isp_table_configs/6.0/emissions_intensity.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/energy_efficiency.yaml b/src/isp_table_configs/6.0/energy_efficiency.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/energy_policy_targets.yaml b/src/isp_table_configs/6.0/energy_policy_targets.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/ev_v2g.yaml b/src/isp_table_configs/6.0/ev_v2g.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/existing_gen_data_summary.yaml b/src/isp_table_configs/6.0/existing_gen_data_summary.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/financial_parameters.yaml b/src/isp_table_configs/6.0/financial_parameters.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/fixed_opex.yaml b/src/isp_table_configs/6.0/fixed_opex.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/flow_path_augmentation_options.yaml b/src/isp_table_configs/6.0/flow_path_augmentation_options.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/flow_path_costs_forecast.yaml b/src/isp_table_configs/6.0/flow_path_costs_forecast.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/fuel_cell_evs.yaml b/src/isp_table_configs/6.0/fuel_cell_evs.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/fuel_price_summary.yaml b/src/isp_table_configs/6.0/fuel_price_summary.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/gas_liquid_fuel_h2_price.yaml b/src/isp_table_configs/6.0/gas_liquid_fuel_h2_price.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/generation_limits.yaml b/src/isp_table_configs/6.0/generation_limits.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/gpg_emissions_reduction_biom.yaml b/src/isp_table_configs/6.0/gpg_emissions_reduction_biom.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/gpg_min_stable_level.yaml b/src/isp_table_configs/6.0/gpg_min_stable_level.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/h2_gpg_emissions_reduction_.yaml b/src/isp_table_configs/6.0/h2_gpg_emissions_reduction_.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/heat_rates.yaml b/src/isp_table_configs/6.0/heat_rates.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/hydro_climate_factor.yaml b/src/isp_table_configs/6.0/hydro_climate_factor.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/hydro_scheme_inflows.yaml b/src/isp_table_configs/6.0/hydro_scheme_inflows.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/hydrogen_assumptions_other.yaml b/src/isp_table_configs/6.0/hydrogen_assumptions_other.yaml new file mode 100644 index 0000000..86bb188 --- /dev/null +++ b/src/isp_table_configs/6.0/hydrogen_assumptions_other.yaml @@ -0,0 +1,30 @@ +hydrogen_heat_content: + sheet_name: "Other hydrogen assumptions" + header_rows: 5 + end_row: 6 + column_range: "B:C" + +electrolysers_electricity_consumption_rate: + sheet_name: "Other hydrogen assumptions" + header_rows: 10 + end_row: 11 + column_range: "B:AH" + +electricity_consumption_rate_adjustments_to_include_conversion_to_ammonia: + sheet_name: "Other hydrogen assumptions" + header_rows: 15 + end_row: 16 + column_range: "B:AH" + +electrolysers_baseload: + sheet_name: "Other hydrogen assumptions" + header_rows: 21 + end_row: 23 + column_range: "B:C" + +pem_electrolyser_technical_parameters : + sheet_name: "Other hydrogen assumptions" + header_rows: 27 + end_row: 28 + column_range: "B:H" + diff --git a/src/isp_table_configs/6.0/hydrogen_demand_domestic.yaml b/src/isp_table_configs/6.0/hydrogen_demand_domestic.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/hydrogen_demand_export&steel.yaml b/src/isp_table_configs/6.0/hydrogen_demand_export&steel.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/hydrogen_export_ports.yaml b/src/isp_table_configs/6.0/hydrogen_export_ports.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml b/src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml new file mode 100644 index 0000000..9eadd67 --- /dev/null +++ b/src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml @@ -0,0 +1,23 @@ +consultant_forecast_mapping: + sheet_name: "hydrogen_monthly_profiles" + header_rows: 8 + end_row: 9 + column_range: "B:E" + +hydrogen_monthly_profiles_progressive_change: + sheet_name: "hydrogen_monthly_profiles" + header_rows: 12 + end_row: 24 + column_range: "B:AH" + +hydrogen_monthly_profiles_step_change: + sheet_name: "hydrogen_monthly_profiles" + header_rows: 28 + end_row: 40 + column_range: "B:AH" + +hydrogen_monthly_profiles_green_energy_exports: + sheet_name: "hydrogen_monthly_profiles" + header_rows: 44 + end_row: 56 + column_range: "B:AH" \ No newline at end of file diff --git a/src/isp_table_configs/6.0/lead_time_and_project_life.yaml b/src/isp_table_configs/6.0/lead_time_and_project_life.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/locational_cost_factors.yaml b/src/isp_table_configs/6.0/locational_cost_factors.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/maintenance.yaml b/src/isp_table_configs/6.0/maintenance.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/marginal_loss_factors.yaml b/src/isp_table_configs/6.0/marginal_loss_factors.yaml new file mode 100644 index 0000000..7e64259 --- /dev/null +++ b/src/isp_table_configs/6.0/marginal_loss_factors.yaml @@ -0,0 +1,17 @@ +existing_generators_marginal_loss_factors: + sheet_name: "Marginal Loss Factors" + header_rows: 8 + end_row: 260 + column_range: "B:C" + +committed_projects_marginal_loss_factors: + sheet_name: "Marginal Loss Factors" + header_rows: 8 + end_row: 35 + column_range: "E:G" + +new_entrants_marginal_loss_factors: + sheet_name: "Marginal Loss Factors" + header_rows: 8 + end_row: 103 + column_range: "I:K" \ No newline at end of file diff --git a/src/isp_table_configs/6.0/max_ramp_rates.yaml b/src/isp_table_configs/6.0/max_ramp_rates.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/maximum_capacity.yaml b/src/isp_table_configs/6.0/maximum_capacity.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/min_up&down_times.yaml b/src/isp_table_configs/6.0/min_up&down_times.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/network_capability.yaml b/src/isp_table_configs/6.0/network_capability.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/network_losses.yaml b/src/isp_table_configs/6.0/network_losses.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/network_representation.yaml b/src/isp_table_configs/6.0/network_representation.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/new_entrant_data_summary.yaml b/src/isp_table_configs/6.0/new_entrant_data_summary.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/non-rez_assumptions.yaml b/src/isp_table_configs/6.0/non-rez_assumptions.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/other_hydrogen_assumptions.yaml b/src/isp_table_configs/6.0/other_hydrogen_assumptions.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/power_system_constraints.yaml b/src/isp_table_configs/6.0/power_system_constraints.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/pvnsg.yaml b/src/isp_table_configs/6.0/pvnsg.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/regional_build_costs_summary.yaml b/src/isp_table_configs/6.0/regional_build_costs_summary.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/renewable_energy_zones.yaml b/src/isp_table_configs/6.0/renewable_energy_zones.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/reserves.yaml b/src/isp_table_configs/6.0/reserves.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/rez_augmentations_options.yaml b/src/isp_table_configs/6.0/rez_augmentations_options.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/rez_costs_forecast.yaml b/src/isp_table_configs/6.0/rez_costs_forecast.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/rooftop_pv.yaml b/src/isp_table_configs/6.0/rooftop_pv.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/scenarios.yaml b/src/isp_table_configs/6.0/scenarios.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/seasonal_ratings.yaml b/src/isp_table_configs/6.0/seasonal_ratings.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/storage_properties.yaml b/src/isp_table_configs/6.0/storage_properties.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/sub-regional_demand_allocation.yaml b/src/isp_table_configs/6.0/sub-regional_demand_allocation.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/summary_mapping.yaml b/src/isp_table_configs/6.0/summary_mapping.yaml new file mode 100644 index 0000000..5407210 --- /dev/null +++ b/src/isp_table_configs/6.0/summary_mapping.yaml @@ -0,0 +1,35 @@ +existing_generator_summary: + sheet_name: "Summary Mapping" + header_rows: [4, 5, 6] + end_row: 258 + column_range: "A:B" + +committed_generator_summary: + sheet_name: "Summary Mapping" + header_rows: [261, 262, 263] + end_row: 290 + column_range: "A:B" + +anticipated_projects_summary: + sheet_name: "Summary Mapping" + header_rows: [293, 294, 295] + end_row: 311 + column_range: "A:B" + +batteries_summary: + sheet_name: "Summary Mapping" + header_rows: [314, 315, 316] + end_row: 370 + column_range: "A:B" + +additional_projects_summary: + sheet_name: "Summary Mapping" + header_rows: [372, 373, 374] + end_row: 387 + column_range: "A:B" + +new_entrants_summary: + sheet_name: "Summary Mapping" + header_rows: [390, 391, 392] + end_row: 680 + column_range: "A:G" \ No newline at end of file diff --git a/src/isp_table_configs/6.0/transmission_reliability.yaml b/src/isp_table_configs/6.0/transmission_reliability.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_table_configs/6.0/variable_opex.yaml b/src/isp_table_configs/6.0/variable_opex.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/isp_workbook_parser/config_model.py b/src/isp_workbook_parser/config_model.py index e750765..08ff988 100644 --- a/src/isp_workbook_parser/config_model.py +++ b/src/isp_workbook_parser/config_model.py @@ -77,5 +77,8 @@ def load_yaml(path: Path) -> dict[str, TableConfig]: with open(path, "r") as f: config = yaml.safe_load(f) f.close() - tables = {name: TableConfig(name=name, **config[name]) for name in config} + if config is not None: + tables = {name: TableConfig(name=name, **config[name]) for name in config} + else: + tables = {} return tables From 0b7014c63202bca64bb2b93eeef8f4d493113620 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 05:17:40 +0000 Subject: [PATCH 3/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/isp_table_configs/6.0/hydrogen_assumptions_other.yaml | 1 - src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml | 2 +- src/isp_table_configs/6.0/marginal_loss_factors.yaml | 2 +- src/isp_table_configs/6.0/summary_mapping.yaml | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/isp_table_configs/6.0/hydrogen_assumptions_other.yaml b/src/isp_table_configs/6.0/hydrogen_assumptions_other.yaml index 86bb188..f0b7388 100644 --- a/src/isp_table_configs/6.0/hydrogen_assumptions_other.yaml +++ b/src/isp_table_configs/6.0/hydrogen_assumptions_other.yaml @@ -27,4 +27,3 @@ pem_electrolyser_technical_parameters : header_rows: 27 end_row: 28 column_range: "B:H" - diff --git a/src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml b/src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml index 9eadd67..fec1e40 100644 --- a/src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml +++ b/src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml @@ -20,4 +20,4 @@ hydrogen_monthly_profiles_green_energy_exports: sheet_name: "hydrogen_monthly_profiles" header_rows: 44 end_row: 56 - column_range: "B:AH" \ No newline at end of file + column_range: "B:AH" diff --git a/src/isp_table_configs/6.0/marginal_loss_factors.yaml b/src/isp_table_configs/6.0/marginal_loss_factors.yaml index 7e64259..13d49be 100644 --- a/src/isp_table_configs/6.0/marginal_loss_factors.yaml +++ b/src/isp_table_configs/6.0/marginal_loss_factors.yaml @@ -14,4 +14,4 @@ new_entrants_marginal_loss_factors: sheet_name: "Marginal Loss Factors" header_rows: 8 end_row: 103 - column_range: "I:K" \ No newline at end of file + column_range: "I:K" diff --git a/src/isp_table_configs/6.0/summary_mapping.yaml b/src/isp_table_configs/6.0/summary_mapping.yaml index 5407210..f3cfd8c 100644 --- a/src/isp_table_configs/6.0/summary_mapping.yaml +++ b/src/isp_table_configs/6.0/summary_mapping.yaml @@ -32,4 +32,4 @@ new_entrants_summary: sheet_name: "Summary Mapping" header_rows: [390, 391, 392] end_row: 680 - column_range: "A:G" \ No newline at end of file + column_range: "A:G" From 2628b70e995f7b5a58ba28b4405d9e18b6e6befd Mon Sep 17 00:00:00 2001 From: nick-gorman Date: Thu, 22 Aug 2024 16:15:05 +1000 Subject: [PATCH 4/5] add config data --- .../6.0/hydrogen_demand_domestic.yaml | 29 +++++++++++++++ .../6.0/hydrogen_demand_export&steel.yaml | 35 +++++++++++++++++++ .../6.0/hydrogen_monthly_profiles.yaml | 10 +++--- .../6.0/summary_mapping.yaml | 12 +++---- ...-isp-inputs-and-assumptions-workbook.xlsx# | 1 + 5 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 workbooks/6.0/.~lock.2024-isp-inputs-and-assumptions-workbook.xlsx# diff --git a/src/isp_table_configs/6.0/hydrogen_demand_domestic.yaml b/src/isp_table_configs/6.0/hydrogen_demand_domestic.yaml index e69de29..b03964e 100644 --- a/src/isp_table_configs/6.0/hydrogen_demand_domestic.yaml +++ b/src/isp_table_configs/6.0/hydrogen_demand_domestic.yaml @@ -0,0 +1,29 @@ +hydrogen_demand_domestic_consultant_forecast_mapping: + sheet_name: "Hydrogen demand - Domestic" + header_rows: 9 + end_row: 10 + column_range: "B:E" + +hydrogen_demand_domestic_progressive_change: + sheet_name: "Hydrogen demand - Domestic" + header_rows: 13 + end_row: 22 + column_range: "B:AI" + +hydrogen_demand_domestic_step_change: + sheet_name: "Hydrogen demand - Domestic" + header_rows: 26 + end_row: 35 + column_range: "B:AI" + +hydrogen_demand_domestic_green_energy_exports: + sheet_name: "Hydrogen demand - Domestic" + header_rows: 39 + end_row: 48 + column_range: "B:AI" + +hydrogen_demand_domestic_electrification_alternatives_sensitivity: + sheet_name: "Hydrogen demand - Domestic" + header_rows: 52 + end_row: 61 + column_range: "B:AI" \ No newline at end of file diff --git a/src/isp_table_configs/6.0/hydrogen_demand_export&steel.yaml b/src/isp_table_configs/6.0/hydrogen_demand_export&steel.yaml index e69de29..0212c3e 100644 --- a/src/isp_table_configs/6.0/hydrogen_demand_export&steel.yaml +++ b/src/isp_table_configs/6.0/hydrogen_demand_export&steel.yaml @@ -0,0 +1,35 @@ +hydrogen_demand_export&steel_consultant_forecast_mapping: + sheet_name: "Hydrogen demand_Export&Steel" + header_rows: 8 + end_row: 9 + column_range: "B:E" + +hydrogen_demand_export&steel_progressive_change: + sheet_name: "Hydrogen demand_Export&Steel" + header_rows: 12 + end_row: 13 + column_range: "B:AH" + +hydrogen_demand_export&steel_step_change: + sheet_name: "Hydrogen demand_Export&Steel" + header_rows: 16 + end_row: 17 + column_range: "B:AH" + +hydrogen_demand_export&steel_green_energy_exports: + sheet_name: "Hydrogen demand_Export&Steel" + header_rows: 20 + end_row: 21 + column_range: "B:AH" + +hydrogen_demand_for_green_steel_production: + sheet_name: "Hydrogen demand_Export&Steel" + header_rows: 27 + end_row: 28 + column_range: "B:AH" + +electricity_demand_for_green_steel_production: + sheet_name: "Hydrogen demand_Export&Steel" + header_rows: 36 + end_row: 37 + column_range: "B:AH" \ No newline at end of file diff --git a/src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml b/src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml index fec1e40..bbf5187 100644 --- a/src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml +++ b/src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml @@ -1,23 +1,23 @@ -consultant_forecast_mapping: - sheet_name: "hydrogen_monthly_profiles" +hydrogen_monthly_profiles_consultant_forecast_mapping: + sheet_name: "Hydrogen monthly profiles" header_rows: 8 end_row: 9 column_range: "B:E" hydrogen_monthly_profiles_progressive_change: - sheet_name: "hydrogen_monthly_profiles" + sheet_name: "Hydrogen monthly profiles" header_rows: 12 end_row: 24 column_range: "B:AH" hydrogen_monthly_profiles_step_change: - sheet_name: "hydrogen_monthly_profiles" + sheet_name: "Hydrogen monthly profiles" header_rows: 28 end_row: 40 column_range: "B:AH" hydrogen_monthly_profiles_green_energy_exports: - sheet_name: "hydrogen_monthly_profiles" + sheet_name: "Hydrogen monthly profiles" header_rows: 44 end_row: 56 column_range: "B:AH" diff --git a/src/isp_table_configs/6.0/summary_mapping.yaml b/src/isp_table_configs/6.0/summary_mapping.yaml index f3cfd8c..fa2faa9 100644 --- a/src/isp_table_configs/6.0/summary_mapping.yaml +++ b/src/isp_table_configs/6.0/summary_mapping.yaml @@ -2,34 +2,34 @@ existing_generator_summary: sheet_name: "Summary Mapping" header_rows: [4, 5, 6] end_row: 258 - column_range: "A:B" + column_range: "B:AB" committed_generator_summary: sheet_name: "Summary Mapping" header_rows: [261, 262, 263] end_row: 290 - column_range: "A:B" + column_range: "B:AB" anticipated_projects_summary: sheet_name: "Summary Mapping" header_rows: [293, 294, 295] end_row: 311 - column_range: "A:B" + column_range: "B:AB" batteries_summary: sheet_name: "Summary Mapping" header_rows: [314, 315, 316] end_row: 370 - column_range: "A:B" + column_range: "B:AB" additional_projects_summary: sheet_name: "Summary Mapping" header_rows: [372, 373, 374] end_row: 387 - column_range: "A:B" + column_range: "B:AB" new_entrants_summary: sheet_name: "Summary Mapping" header_rows: [390, 391, 392] end_row: 680 - column_range: "A:G" + column_range: "B:AG" diff --git a/workbooks/6.0/.~lock.2024-isp-inputs-and-assumptions-workbook.xlsx# b/workbooks/6.0/.~lock.2024-isp-inputs-and-assumptions-workbook.xlsx# new file mode 100644 index 0000000..0cca266 --- /dev/null +++ b/workbooks/6.0/.~lock.2024-isp-inputs-and-assumptions-workbook.xlsx# @@ -0,0 +1 @@ +,nick,nick-ThinkPad-T450,22.08.2024 16:10,file:///home/nick/.config/libreoffice/4; \ No newline at end of file From 2475fafdd5879f427beed1ea6fb65b44b2fd6c0e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 06:15:30 +0000 Subject: [PATCH 5/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/isp_table_configs/6.0/hydrogen_demand_domestic.yaml | 2 +- src/isp_table_configs/6.0/hydrogen_demand_export&steel.yaml | 2 +- .../6.0/.~lock.2024-isp-inputs-and-assumptions-workbook.xlsx# | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/isp_table_configs/6.0/hydrogen_demand_domestic.yaml b/src/isp_table_configs/6.0/hydrogen_demand_domestic.yaml index b03964e..d75ec81 100644 --- a/src/isp_table_configs/6.0/hydrogen_demand_domestic.yaml +++ b/src/isp_table_configs/6.0/hydrogen_demand_domestic.yaml @@ -26,4 +26,4 @@ hydrogen_demand_domestic_electrification_alternatives_sensitivity: sheet_name: "Hydrogen demand - Domestic" header_rows: 52 end_row: 61 - column_range: "B:AI" \ No newline at end of file + column_range: "B:AI" diff --git a/src/isp_table_configs/6.0/hydrogen_demand_export&steel.yaml b/src/isp_table_configs/6.0/hydrogen_demand_export&steel.yaml index 0212c3e..9c39b5a 100644 --- a/src/isp_table_configs/6.0/hydrogen_demand_export&steel.yaml +++ b/src/isp_table_configs/6.0/hydrogen_demand_export&steel.yaml @@ -32,4 +32,4 @@ electricity_demand_for_green_steel_production: sheet_name: "Hydrogen demand_Export&Steel" header_rows: 36 end_row: 37 - column_range: "B:AH" \ No newline at end of file + column_range: "B:AH" diff --git a/workbooks/6.0/.~lock.2024-isp-inputs-and-assumptions-workbook.xlsx# b/workbooks/6.0/.~lock.2024-isp-inputs-and-assumptions-workbook.xlsx# index 0cca266..7966694 100644 --- a/workbooks/6.0/.~lock.2024-isp-inputs-and-assumptions-workbook.xlsx# +++ b/workbooks/6.0/.~lock.2024-isp-inputs-and-assumptions-workbook.xlsx# @@ -1 +1 @@ -,nick,nick-ThinkPad-T450,22.08.2024 16:10,file:///home/nick/.config/libreoffice/4; \ No newline at end of file +,nick,nick-ThinkPad-T450,22.08.2024 16:10,file:///home/nick/.config/libreoffice/4;