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.yaml b/src/isp_table_configs/6.0/capacity_factors.yaml index fa11c1e..f535c65 100644 --- a/src/isp_table_configs/6.0/capacity_factors.yaml +++ b/src/isp_table_configs/6.0/capacity_factors.yaml @@ -3,3 +3,33 @@ wind_high_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/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/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/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..f0b7388 --- /dev/null +++ b/src/isp_table_configs/6.0/hydrogen_assumptions_other.yaml @@ -0,0 +1,29 @@ +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..d75ec81 --- /dev/null +++ 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" 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..9c39b5a --- /dev/null +++ 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" 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..bbf5187 --- /dev/null +++ b/src/isp_table_configs/6.0/hydrogen_monthly_profiles.yaml @@ -0,0 +1,23 @@ +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" + 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" 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..13d49be --- /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" 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/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/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/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" 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..fa2faa9 --- /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: "B:AB" + +committed_generator_summary: + sheet_name: "Summary Mapping" + header_rows: [261, 262, 263] + end_row: 290 + column_range: "B:AB" + +anticipated_projects_summary: + sheet_name: "Summary Mapping" + header_rows: [293, 294, 295] + end_row: 311 + column_range: "B:AB" + +batteries_summary: + sheet_name: "Summary Mapping" + header_rows: [314, 315, 316] + end_row: 370 + column_range: "B:AB" + +additional_projects_summary: + sheet_name: "Summary Mapping" + header_rows: [372, 373, 374] + end_row: 387 + column_range: "B:AB" + +new_entrants_summary: + sheet_name: "Summary Mapping" + header_rows: [390, 391, 392] + end_row: 680 + column_range: "B:AG" 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 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..7966694 --- /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;