Skip to content

Commit

Permalink
Merge pull request #61 from Open-ISP/checks-for-7.0
Browse files Browse the repository at this point in the history
v7 workbook
  • Loading branch information
nick-gorman authored Jan 7, 2025
2 parents 6cda6ce + 099c2e5 commit b2b3487
Show file tree
Hide file tree
Showing 331 changed files with 7,725 additions and 52 deletions.
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ repos:
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
exclude: |
(?x)^(
^workbooks |
tests/test_data/2024-isp-inputs-and-assumptions-workbook-missing-sheets\.xlsx
)$
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.8.1
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ retirement_costs:
While we have no strict rules on how table configurations should be named and organised, we encourage the following:
- Group tables of a common theme in one `.yaml` file.
- For example, all tables that contain generation capacity factor data should ideally be defined within a single YAML file, e.g. `capacity_factors.yaml`
- Tables that are on the same workbook sheet should be in the same `.yaml` file.
- For example, all tables that are in the `Capacity factors` sheet should be defined within a single YAML file, e.g. `capacity_factors.yaml`
- Name individual tables (e.g. `retirement_cost` as above) with sufficient detail such that another user using `Parser.get_tables()` can infer what data the table contains

### Report Bugs
Expand Down
2 changes: 1 addition & 1 deletion example_output/6.0/connection_costs_other.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Region,CCGT,CCGT with CCS,Small OCGT,Large OCGT,Reciprocating engines,Hydrogen Reciprocating engines,Biomass,1 hr Battery Storage,2 hr Battery Storage,4 hr Battery Storage,8 hr Battery Storage,Pumped Hydro3 (8 hrs storage),Pumped Hydro (24 hrs storage),Pumped Hydro (48 hrs storage),BOTN- Cethana
Region,CCGT,CCGT with CCS,Small OCGT2,Large OCGT,Reciprocating engines,Hydrogen Reciprocating engines,Biomass,1 hr Battery Storage,2 hr Battery Storage,4 hr Battery Storage,8 hr Battery Storage,Pumped Hydro3 (8 hrs storage),Pumped Hydro (24 hrs storage),Pumped Hydro (48 hrs storage),BOTN- Cethana
QLD,110.49433333333297,110.49433333333297,110.49433333333332,110.49433333333332,110.49433333333332,110.49433333333332,110.49433333333332,103.36566666666667,103.36566666666667,103.36566666666667,103.36566666666667,0,0,0,0
NSW,85.544,85.544,85.544,85.544,85.544,85.544,85.544,77.52425,77.52425,77.52425,77.52425,0,0,0,0
VIC,80.19749999999999,80.19749999999999,115.4844,115.4844,115.4844,115.4844,115.4844,106.92999999999999,106.92999999999999,106.92999999999999,106.92999999999999,0,0,0,0
Expand Down
10 changes: 5 additions & 5 deletions example_output/6.0/flow_path_transfer_capability.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Flow paths (Forward power flow direction),"Forward direction capability approximation (MW) - Notes 1,2&_Peak demand","Forward direction capability approximation (MW) - Notes 1,2&_Summer Typical","Forward direction capability approximation (MW) - Notes 1,2&_Winter Reference","Reverse direction capability approximation (MW) - Notes 1,2&_Peak demand","Reverse direction capability approximation (MW) - Notes 1,2&_Summer Typical","Reverse direction capability approximation (MW) - Notes 1,2&_Winter Reference",Dominant constraints_Forward direction,Dominant constraints_Reverse direction
CQ - NQ (Note 10),1200,1200,1400,1200,1200,1400,Voltage stability in NQ for the loss of NQ or CQ transmission network elements.,Thermal capability of Strathmore to Ross 275 kV line for the loss of the Haughton River to Strathmore 275 kV line.
CQ ­– GG (Note 4),700,700,1050,750,750,1100,Thermal overload of Calvale to Wurdong 275 kV line,Thermal capacity of Calliope River-Woolooga for the loss of one of the parallel lines
Flow paths (Forward power flow direction),Forward direction capability approximation (MW)_Peak demand,Forward direction capability approximation (MW)_Summer Typical,Forward direction capability approximation (MW)_Winter Reference,Reverse direction capability approximation (MW)_Peak demand,Reverse direction capability approximation (MW)_Summer Typical,Reverse direction capability approximation (MW)_Winter Reference,Dominant constraints_Forward direction,Dominant constraints_Reverse direction
CQ - NQ,1200,1200,1400,1200,1200,1400,Voltage stability in NQ for the loss of NQ or CQ transmission network elements.,Thermal capability of Strathmore to Ross 275 kV line for the loss of the Haughton River to Strathmore 275 kV line.
CQ ­– GG,700,700,1050,750,750,1100,Thermal overload of Calvale to Wurdong 275 kV line,Thermal capacity of Calliope River-Woolooga for the loss of one of the parallel lines
SQ – CQ,1100,1100,1100,2100,2100,2100,Thermal capability of Blackwall -South Pine 275 kV line.,Transient stability or voltage stability for a contingency of the Calvale-Halys 275 kV circuit.
"NNSW – SQ (Northern part of ""QNI"")",685,745,745,1205,1165,1170,Voltage stability or transient stability for the loss of Kogan Creek generator.,Thermal capability of Armidale-Sapphire and Armidale-Dumaresq 330 kV circuits and dispatch of generation at Sapphire.
NNSW – SQ (“Terranora”),0,50,50,130,150,200,Thermal capability of Lismore 132 kV lines (9U9).,Thermal capability of Mudgeeraba 275/110 kV transformers
Expand All @@ -9,7 +9,7 @@ CNSW ­– SNW Northern limit,4490,4490,4730,4490,4490,4730,Maximum transfer cap
CNSW ­– SNW Southern limit,2540,2540,2720,2540,2540,2720,Maximum transfer capability is limited by several 330 kV lines and the most limiting element is Bannaby-Sydney West 330 kV line.,
"SNSW – CNSW (Northern part of ""VNI"")",2700,2700,2950,2320,2320,2590,"Thermal capability of Crookwell-Bannaby, Collector-Marula or Yass-Marulan 330 kV lines. Prior to HumeLink service, Snowy 2.0 generation or pump load is limited by a transient stability limit.","Thermal capability of Yass-Canberra, Collector -Yass or Gullen Range-Yass 330 kV line."
"VIC – SNSW (Southern part of ""VNI"")",870,1000,1000,400,400,400,Transient stability for a fault on a Hazelwood-South 500 circuit or volage stability in Southern New South Wales for loss of largest load in Victoria.,"Voltage stability in SNSW for loss of the largest generator in Victoria. Prior to HumeLink service, Snowy 2.0 generation or pump load is limited by a transient stability limit."
VIC – SESA (“Heywood”) - (Note 9),650,650,650,650,650,650,Thermal capacity of Heywood-South East 275 kV line or transient stability limit for loss of the largest generator in South Australia or transient stability limit of loss of South East - Tailem Bend 275 kV line.,Oscillatory stability limit.
VIC – SESA (“Heywood”),650,650,650,650,650,650,Thermal capacity of Heywood-South East 275 kV line or transient stability limit for loss of the largest generator in South Australia or transient stability limit of loss of South East - Tailem Bend 275 kV line.,Oscillatory stability limit.
SESA-CSA,650,650,650,650,650,650,Transient stability limit for loss of the largest generator in South Australia or transient stability limit of loss of South East - Tailem Bend 275 kV line.,Oscillatory stability limit.
VIC – CSA (Murraylink),220,220,220,100,200,200,Murraylink thermal capacity. Assumes high renewable generation in North West Victoria during high ambient temperature.,Thermal capability of 132 kV lines between Robertstown and North West Bend
TAS – VIC (Note 12),594,594,594,478,478,478,Basslink HVDC submarine cable transfer limit.,Basslink HVDC submarine cable transfer limit.
TAS – VIC,594,594,594,478,478,478,Basslink HVDC submarine cable transfer limit.,Basslink HVDC submarine cable transfer limit.
8 changes: 4 additions & 4 deletions example_output/6.0/initial_build_limits.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
REZ ID,REZ Name,Region,NTNDP zone,ISP Sub-region,Wind generation total limits (MW)_High,Wind generation total limits (MW)_Medium,Wind generation total limits (MW)_Offshore -fixed,Wind generation total limits (MW)_Offshore -floating,Solar PV plus Solar thermal Limits (MW)_Solar,REZ resource limit violation penalty factor ($M/MW),REZ Transmission Network limit (Note 1)_Peak demand,REZ Transmission Network limit (Note 1)_Summer Typical,REZ Transmission Network limit (Note 1)_Winter Reference,Indicative transmission expansion cost ($M/MW)2 (Note 13),Indicative transmission expansion cost ($M/MW) (Note 10)_Tranche 2,Indicative transmission expansion cost ($M/MW) (Note 10)_Tranche 3,Distance to nearest load centre (km) - Green Energy Exports scenario,Indicative transmission expansion cost - Green Energy Export scenario ($M/MW) (Note 13),Land use limits in MW_Wind,Land use limits in MW_Solar,Land use limits in MW Green Energy Exports scenario_Wind,Land use limits in MW Green Energy Exports scenario_Solar,Land area (km2)
REZ ID,REZ Name,Region,NTNDP zone,ISP Sub-region,Wind generation total limits (MW)_High,Wind generation total limits (MW)_Medium,Wind generation total limits (MW)_Offshore -fixed,Wind generation total limits (MW)_Offshore -floating,Solar PV plus Solar thermal Limits (MW)_Solar,REZ resource limit violation penalty factor ($M/MW),REZ Transmission Network limit_Peak demand,REZ Transmission Network limit_Summer Typical,REZ Transmission Network limit_Winter Reference,Indicative transmission expansion cost ($M/MW),Indicative transmission expansion cost ($M/MW)_Tranche 2,Indicative transmission expansion cost ($M/MW)_Tranche 3,Distance to nearest load centre (km) - Green Energy Exports scenario,Indicative transmission expansion cost - Green Energy Export scenario ($M/MW),Land use limits in MW_Wind,Land use limits in MW_Solar,Land use limits in MW Green Energy Exports scenario_Wind,Land use limits in MW Green Energy Exports scenario_Solar,Land area (km2)
Q1,Far North QLD,QLD,NQ,NQ,570.0,1710.0,,,1100,0.288711,750,750.0,750.0,1.42,,,370,0.6647666666666666,6764.1666720779995,16234.0,33820.836039,81170.0,32468
Q2,North Qld Clean Energy Hub,QLD,NQ,NQ,4700.0,13900.0,,,8000,0.288711,700,700.0,700.0,0.43,,,292,0.5246266666666667,27529.7916886905,66071.5,137648.96934525002,330357.5,132143
Q3,Northern Qld,QLD,NQ,NQ,0.0,0.0,,,3400,0.288711,Modelled as part of NQ-CQ sub-regional limit,,,,,,49,0.08803666666666667,2087.7083350035,5010.5,10438.54250175,25052.5,10021
Q4,Isaac,QLD,NQ,CQ,1000.0,2800.0,,,6900,0.288711,See Group Constraint NQ2,,,,,,160,0.28746666666666665,12925.416677007,31021.0,64627.0885035,155105.0,62042
Q5,Barcaldine,QLD,CQ,CQ,1000.0,2900.0,,,8000,0.288711,85,85.0,85.0,0.79,,,415,0.7456166666666667,5320.83333759,12770.0,26604.168795,63850.0,25540
Q6,Fitzroy,QLD,CQ,CQ,900.0,2600.0,,,7533,0.288711,Modelled as part of CQ-SQ sub-regional limit (Note 11),,,0,,,181,0.3251966666666667,4921.4583372705,11811.5,24607.293635250004,59057.5,23623
Q6,Fitzroy,QLD,CQ,CQ,900.0,2600.0,,,7533,0.288711,Modelled as part of CQ-SQ sub-regional limit,,,0,,,181,0.3251966666666667,4921.4583372705,11811.5,24607.293635250004,59057.5,23623
Q7,Wide Bay,QLD,SQ,SQ,300.0,800.0,,,2200,0.288711,See Grouip Constraint SQ1,,,0,,,66,0.11858,2907.7083356595,6978.5,14538.542829750002,34892.5,13957
Q8,Darling Downs,QLD,SWQ,SQ,1400.0,4200.0,,,6992,0.288711,See Transmission Limit SWQLD1,,,0,,,147,0.26411,9618.9583410285,23085.5,48094.79551425001,115427.5,46171
Q9,Banana,QLD,CQ,SQ,900.0,2500.0,,,6100,0.288711,150,150.0,150.0,0,,,238,0.4276066666666667,11423.5416758055,27416.5,57117.712902750005,137082.5,54833
Expand All @@ -14,7 +14,7 @@ N3,Central-West Orana,NSW,NCEN,CNSW,800.0,2200.0,,,6850,0.288711,900,900.0,900.0
N4,Broken Hill,NSW,CAN,SNSW,1300.0,3800.0,,,8000,0.288711,250,250.0,250.0,2.61,,,1032,1.85416,6312.916671717,15151.0,31564.585858500002,75755.0,30302
N5,South West NSW,NSW,SWNSW,SNSW,1000.0,2900.0,,,2256,0.288711,215,215.0,215.0,0.57,0.21,,532,0.9558266666666667,5615.416671159,13477.0,28077.085579500002,67385.0,26954
N6,Wagga Wagga,NSW,SWNSW,SNSW,300.0,700.0,,,1028,0.288711,1100,1100.0,1100.0,,,,265,0.4761166666666667,2106.4583350185,5055.5,10532.29250925,25277.5,10111
N7,Tumut,NSW,SWNSW,SNSW,0.0,0.0,,,0,0.288711,0,0.0,0.0,N/A (Note 3),,,260,0.46713333333333334,2819.3750022555,6766.5,14096.876127750002,33832.5,13533
N7,Tumut,NSW,SWNSW,SNSW,0.0,0.0,,,0,0.288711,0,0.0,0.0,N/A,,,260,0.46713333333333334,2819.3750022555,6766.5,14096.876127750002,33832.5,13533
N8,Cooma-Monaro,NSW,CAN,SNSW,100.0,200.0,,,0,0.288711,350,350.0,350.0,1.02,,,260,0.46713333333333334,828.333333996,1988.0,4141.666998000001,9940.0,3976
N9,Hunter-Central Coast,NSW,NCEN,CNSW,400.0,1000.0,,,516,0.288711,400,400.0,400.0,0.12,,,26,0.046713333333333336,1524.3750012195,3658.5,7621.875609750001,18292.5,7317
N10,Hunter Coast,NSW,NCEN,SNW,0.0,0.0,,7420.0,0,0.288711,5650,5650.0,5650.0,0.46,,,26,0.046713333333333336,0.0,0.0,0.0,0.0,0
Expand All @@ -27,7 +27,7 @@ V4,South West Victoria,VIC,MEL,VIC,860.5,2581.5,,,0,0.288711,See Transmission Li
V5,Gippsland,VIC,LV,VIC,500.0,1500.0,,,500,0.288711,See Transmission Limit SEVIC1,,,0,,,183,0.32879,1030.6250008245,2473.5,5153.12541225,12367.5,4947
V6,Central North Vic,VIC,NVIC,VIC,400.0,1200.0,,,1700,0.288711,650,650.0,1300.0,2.22,,,131,0.23536333333333334,1253.750001003,3009.0,6268.750501500001,15045.0,6018
V7,Gippsland Coast,VIC,LV,VIC,0.0,0.0,54996.0,5000.0,0,,0,0.0,0.0,,Included in the connection cost,,222,0.39886,0.0,0.0,0.0,0.0,0
V8,Southern Ocean (Note 15),VIC,MEL,VIC,0.0,0.0,780.0,3330.0,0,,See Transmission Limit SWV1,,,0,,,242,0.4347933333333333,0.0,0.0,0.0,0.0,0
V8,Southern Ocean,VIC,MEL,VIC,0.0,0.0,780.0,3330.0,0,,See Transmission Limit SWV1,,,0,,,242,0.4347933333333333,0.0,0.0,0.0,0.0,0
S1,South East SA,SA,SESA,SESA,800.0,2400.0,,,100,0.288711,Modelled as part of SESA-CSA subregional limit,,,0,,,230,0.41323333333333334,5528.9583377564995,13269.5,27644.793878250002,66347.5,26539
S2,Riverland,SA,NSA,CSA,400.0,1000.0,,,4000,0.288711,130,130.0,130.0,0.14,,,165,0.29645,844.7916673425,2027.5,4223.95867125,10137.5,4055
S3,Mid-North SA,SA,ADE,CSA,1200.0,3400.0,,,1300,0.288711,See Group Constraint MN1,,,0,,,116,0.20841333333333334,6243.333338328,14984.0,31216.669164000003,74920.0,29968
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Flow Path,Interconnector Name,Interconnector,From region,Loss Equation,MLF Equation,From region loss proportion,To region loss proportion
Western Victoria Transmission Network Project,Victoria - New South Wales (VNI),VIC1-NSW1,VIC1,= (0.0592 + -8.2284e-06*Vd + 4.6665e-06*Nd + -4.6779e-05*Sd)*VNt + 8.5659e-05*VNt^2,= 1.0592 + 1.7132e-04*VNt + -8.2284e-06*Vd + 4.6665e-06*Nd + -4.6779e-05*Sd,0.3413,0.6587
Project EnergyConnect (Note 1),Victoria - New South Wales (VNI),VIC1-NSW1,VIC1,= (0.0899 + -9.8738e-06*Vd + 9.7753e-06*Nd + -5.5933e-05*Sd)*VNt + 9.4981e-05*VNt^2,= 1.0899 + 1.8996e-04*VNt + -9.8738e-06*Vd + 9.7753e-06*Nd + -5.5933e-05*Sd,0.61,0.39
Project EnergyConnect (Note 1),Victoria - South Australia (Heywood),V-SA,VIC1,=(0.0092 + -7.0871e-07*Vd + -8.7315e-07*Sd)*VSAt + 9.5206e-05*VSAt^2,= 1.0092 + 1.9041e-04*VSAt + -7.0871e-07*Vd + -8.7315e-07*Sd,0.9,0.09999999999999998
Project EnergyConnect (Note 2),Project EnergyConnect,SA-NSW,SA1,=(-0.1078 - 8.825e-07*Nd + 2.192e-06*Vd + 3.254e-05*Sd) * SNt + 1.277e-04*SNt^2,=0.8922 + 2.5540e-04*SNt + -8.8250e-07*Nd + 2.1920e-06*Vd + 3.2540e-05*Sd,0.46,0.54
Project EnergyConnect,Victoria - New South Wales (VNI),VIC1-NSW1,VIC1,= (0.0899 + -9.8738e-06*Vd + 9.7753e-06*Nd + -5.5933e-05*Sd)*VNt + 9.4981e-05*VNt^2,= 1.0899 + 1.8996e-04*VNt + -9.8738e-06*Vd + 9.7753e-06*Nd + -5.5933e-05*Sd,0.61,0.39
Project EnergyConnect,Victoria - South Australia (Heywood),V-SA,VIC1,=(0.0092 + -7.0871e-07*Vd + -8.7315e-07*Sd)*VSAt + 9.5206e-05*VSAt^2,= 1.0092 + 1.9041e-04*VSAt + -7.0871e-07*Vd + -8.7315e-07*Sd,0.9,0.09999999999999998
Project EnergyConnect,Project EnergyConnect,SA-NSW,SA1,=(-0.1078 - 8.825e-07*Nd + 2.192e-06*Vd + 3.254e-05*Sd) * SNt + 1.277e-04*SNt^2,=0.8922 + 2.5540e-04*SNt + -8.8250e-07*Nd + 2.1920e-06*Vd + 3.2540e-05*Sd,0.46,0.54
4 changes: 2 additions & 2 deletions example_output/6.0/interconnector_transfer_capability.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Flow paths (Forward power flow direction),"Forward direction capability approximation (MW) - Notes 1,2&_Peak demand","Forward direction capability approximation (MW) - Notes 1,2&_Summer Typical","Forward direction capability approximation (MW) - Notes 1,2&_Winter Reference","Reverse direction capability approximation (MW) - Notes 1,2&_Peak demand","Reverse direction capability approximation (MW) - Notes 1,2&_Summer Typical","Reverse direction capability approximation (MW) - Notes 1,2&_Winter Reference",Dominant constraints_Forward direction,Dominant constraints_Reverse direction
Flow paths (Forward power flow direction),Forward direction capability approximation (MW)_Peak demand,Forward direction capability approximation (MW)_Summer Typical,Forward direction capability approximation (MW)_Winter Reference,Reverse direction capability approximation (MW)_Peak demand,Reverse direction capability approximation (MW)_Summer Typical,Reverse direction capability approximation (MW)_Winter Reference,Dominant constraints_Forward direction,Dominant constraints_Reverse direction
"NSW – QLD (""QNI"")",685,745,745,1205,1165,1170,Thermal capability of Armidale-Sapphire and Armidale-Dumaresq 330 kV circuits and dispatch of generation at Sapphire.,Thermal capability of Armidale-Sapphire and Armidale-Dumaresq 330 kV circuits and dispatch of generation at Sapphire.
NNSW – SQ (“Terranora”),0,50,50,130,150,200,Thermal capability of Lismore 132kV lines (9U9).,Thermal capability of Mudgeeraba 275/110 kV transformers
VIC – NSW,870,1000,1000,400,400,400,Transient stability for a fault on a Hazelwood-South 500 circuit or volage stability in Southern New South Wales for loss of largest load in Victoria.,Voltage stability in SNSW for loss of the largest generator in Victoria.
VIC – SESA (“Heywood”),650,650,650,650,650,650,Thermal capacity of Heywood-South East 275 kV line or transient stability limit for loss of the largest generator in South Australia or transient stability limit of loss of South East - Tailem Bend 275 kV line.,Oscillatory stability limit.
VIC – CSA (Murraylink),220,220,220,100,200,200,Murraylink thermal capacity. Assumes high renewable generation in North West Victoria during high ambient temperature.,Thermal capability of 132 kV lines between Robertstown and North West Bend
TAS – VIC (Note 6),594,594,594,478,478,478,Basslink HVDC submarine cable transfer limit.,Basslink HVDC submarine cable transfer limit.
TAS – VIC,594,594,594,478,478,478,Basslink HVDC submarine cable transfer limit.,Basslink HVDC submarine cable transfer limit.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Project (Note 1),Service Date (Note 1 + Note 2)
Project,Service Date
CopperString 2032 (QEJP Stage 4),2029-06-30 00:00:00
Project EnergyConnect - Stage 1,2024-12-01 00:00:00
Project EnergyConnect - Stage 2,2027-07-01 00:00:00
Waratah Super Battery Network Augmentations and SIPS Control,2025-08-01 00:00:00
Waratah Super Battery Network Augmentation,2025-08-01 00:00:00
Central-West Orana REZ Transmission Link ( Note 3),2028-08-01 00:00:00
Far North Queensland REZ (Note 3),2024-04-01 00:00:00
Far North Queensland REZ,2024-04-01 00:00:00
Mortlake Turn-In,2025-10-01 00:00:00
Koorangie Energy Storage System (KESS),2025-06-01 00:00:00
Murray River REZ and Western Victoria REZ minor augmentations,2025-10-01 00:00:00
Expand Down
Loading

0 comments on commit b2b3487

Please sign in to comment.