Merge branch 'main' into checks-for-7.0

example_output/6.0/lead_time_and_project_life.csv

@@ -0,0 +1,20 @@
+Technology,"Lead time for development (years)1, 2",Lead time (years),Construction time (years),Total lead time (years),Economic life (years) 5,Technical life (years) 6
+OCGT (small GT),2,0.75,1.25,4,25,40
+OCGT (large GT),2,1.0,1.1153846153846154,4,25,40
+CCGT,2,1.0,1.5,5,25,40
+CCGT with CCS,3,1.0,1.5,6,25,40
+Biomass,3,1.75,1.25,6,30,50
+Large scale Solar PV,0,1.0,0.5,2,30,30
+Solar Thermal (15hrs Storage),2,1.75,1.75,6,25,40
+Battery storage (1hr storage),0,1.0,0.8461538461538461,2,20,20
+Battery storage (2hrs storage),0,1.2,1.0,2,20,20
+Battery storage (4hrs storage),0,1.4,1.1538461538461537,3,20,20
+Battery Storage (8hrs storage),0,1.6,1.3076923076923077,3,20,20
+Wind,0,1.0,1.0,2,25,30
+Wind - offshore (fixed),4,2.0,3.0,9,25,30
+Wind - offshore (floating),4,2.0,3.0,9,25,30
+Pumped Hydro (8hrs storage),2,0.0,4.0,6,40,50
+Pumped Hydro (24hrs storage),2,0.0,4.0,6,40,50
+Pumped Hydro (48hrs storage),2,0.0,4.0,6,40,50
+BOTN - Cethana,2,0.0,4.0,6,40,50
+Hydrogen reciprocating engines,2,1.0,1.0,4,25,40

example_output/6.0/technology_specific_lcfs.csv

@@ -0,0 +1,28 @@
+Cost zones / Sub-region,OCGT (small GT),OCGT (large GT),CCGT,CCGT with CCS,Biomass,Battery storage (1hr storage),Battery storage (2hrs storage),Battery storage (4hrs storage),Battery Storage (8hrs storage),Large scale Solar PV,Solar Thermal (15hrs storage),Wind,Wind - Offshore (fixed),Wind - offshore (floating),Hydrogen reciprocating engines,Pumped Hydro (8hrs storage),Pumped Hydro (24hrs storage),Pumped Hydro (48hrs storage),BOTN - Cethana
+NSW Low,1.0,1.0099999999999998,1.0,1.0,1.0,1.0,1.0,1.0,0.99,1.0099999999999998,1.0,0.99,1.0,1.0,1.0,,,,
+NSW Medium,1.0432000000000001,1.054,1.0433000000000001,1.0431000000000001,1.0477000000000003,1.0434999999999999,1.0461,1.0513,1.0434,1.0638999999999998,1.0599,1.0463,1.0593,1.0593,1.0477000000000003,,,,
+NSW High,1.0578,1.0702,1.0576,1.0570000000000002,1.0658,1.0685,1.0774,1.0952,1.0931,1.0956,1.1161,1.0952,1.1112,1.1112,1.0658,,,,
+QLD Low,1.0,1.0099999999999998,1.0,1.0,1.0,1.0,1.0,1.0,0.99,1.0099999999999998,1.0,0.99,1.0,1.0,1.0,,,,
+QLD Medium,1.0337,1.0452,1.0337,1.0332000000000001,1.0422000000000002,1.035,1.0406,1.0518,1.0469,1.0648999999999997,1.0694,1.0523,1.0677999999999999,1.0677999999999999,1.0422000000000002,,,,
+QLD High,1.0889000000000002,1.1022,1.0888,1.0877000000000001,1.1065,1.0828,1.0917,1.1095000000000002,1.1074000000000002,1.1374,1.1436000000000002,1.1216,1.1431,1.1431,1.1065,,,,
+SA Low,1.0,1.0099999999999998,1.0,1.0,1.0,1.0,1.0,1.0,0.99,1.0099999999999998,1.0,0.99,1.0,1.0,1.0,,,,
+SA Medium,1.0209,1.0324,1.0209000000000001,1.0204,1.0294,1.027,1.0342,1.0486,1.0453,1.0553,1.0678,1.0491,1.0646,1.0646,1.0294,,,,
+SA High,1.08,1.0931,1.0799,1.0789000000000002,1.0959,1.0782,1.0875000000000001,1.1061,1.1044,1.1274,1.1382,1.116,1.1364999999999998,1.1364999999999998,1.0959,,,,
+TAS Low,1.0,1.0099999999999998,1.0,1.0,1.0,1.0,1.0,1.0,0.99,1.0099999999999998,1.0,0.99,1.0,1.0,1.0,,,,
+TAS Medium,1.0375999999999999,1.0484,1.0377,1.0375,1.0421,1.04,1.0433,1.0499,1.0427,1.0596999999999999,1.0592000000000001,1.0449,1.0578999999999998,1.0578999999999998,1.0421,,,,
+TAS High,1.0937999999999999,1.1053000000000002,1.0941,1.0937000000000001,1.1039,1.0913,1.0958999999999999,1.1051000000000002,1.0987,1.1252,1.1229,1.1062,1.1227,1.1227,1.1039,,,,
+VIC Low,1.0,1.0099999999999998,1.0,1.0,1.0,1.0,1.0,1.0,0.99,1.0099999999999998,1.0,0.99,1.0,1.0,1.0,,,,
+VIC Medium,1.0028000000000001,1.0131000000000001,1.0028000000000001,1.0028000000000001,1.0028000000000001,1.013,1.0164,1.0232,1.0163,1.0199,1.0266,1.0129000000000001,1.0232,1.0232,1.0028000000000001,,,,
+VIC High,0.9948,1.0053,0.9948000000000001,0.9948000000000001,0.9948000000000001,1.0155,1.0224,1.0362,1.0326,1.0191,1.0431000000000001,1.0257,1.0362,1.0362,0.9948000000000001,,,,
+NQ,,,,,,,,,,,,,,,,1.01,0.88,0.864,
+CQ,,,,,,,,,,,,,,,,1.01,0.88,0.864,
+GG,,,,,,,,,,,,,,,,,,,
+SQ,,,,,,,,,,,,,,,,1.114,0.964,0.876,
+NNSW,,,,,,,,,,,,,,,,0.881,0.822,0.624,
+CNSW,,,,,,,,,,,,,,,,1.025,1.08,1.121,
+SNSW,,,,,,,,,,,,,,,,1.044,1.004,0.911,
+SNW,,,,,,,,,,,,,,,,,,,
+VIC,,,,,,,,,,,,,,,,1.0,1.0,1.0,
+CSA,,,,,,,,,,,,,,,,1.351,1.667,,
+SESA,,,,,,,,,,,,,,,,,,,
+TAS,,,,,,,,,,,,,,,,0.748,0.618,0.464,1.0

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "isp-workbook-parser"
-version = "2.0.2"
+version = "2.0.3"
 description = "A Python package for reading data from the Inputs, Assumptions and Scenarios Report (IASR) Microsoft Excel workbook published by the Australian Energy Market Operator for use in their Integrated System Plan modelling."
 authors = [
     { name = "nick-gorman", email = "[email protected]" },

src/isp_table_configs/6.0/lead_time_and_project_life.yaml

@@ -0,0 +1,5 @@
+lead_time_and_project_life:
+  sheet_name: "Lead time and project life"
+  header_rows: 7
+  end_row: 26
+  column_range: "B:H"

src/isp_table_configs/6.0/locational_cost_factors.yaml

@@ -9,3 +9,10 @@ technology_cost_breakdown_ratios:
   header_rows: 33
   end_row: 48
   column_range: "B:F"
+
+technology_specific_lcfs:
+  sheet_name: "Locational Cost Factors"
+  header_rows: 55
+  end_row: 82
+  column_range: "B:U"
+  forward_fill_values: False