skip divider in gas prices tables

Open-ISP · Oct 30, 2024 · 96b5373 · 96b5373
1 parent 13690b0
commit 96b5373
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/example_output/6.0/gas_prices_green_energy_exports.csv b/example_output/6.0/gas_prices_green_energy_exports.csv
@@ -37,7 +37,6 @@ Townsville Power Station,Green Energy Exports,12.871737217450802,12.678555123664
 Uranquinty,Green Energy Exports,17.0028648784394,16.453648262879717,15.927492226571989,14.010871506762971,11.312548682152366,10.42466619813991,10.279138552956763,10.196979891612402,10.061598261754641,9.78479249150191,9.589272022522758,9.620110203923204,9.695648421021822,9.790009266588795,9.837909761509994,9.90471008824423,10.036088829746426,10.072378098214383,10.141986519374186,10.286727735781493,10.41214217208506,10.528054934401627,10.613429890629028,10.719184668357038,10.836670168216177,10.91909507181634,10.979119638644189,10.993467545476737,11.008505621201701,11.105064982864631,11.202471299658946,11.300732000517293
 Valley Power,Green Energy Exports,18.629130723486103,17.934779237387367,17.367245546466567,14.8518551224642,11.332506943424924,10.315166517473934,10.171271522080342,10.08942660191724,9.937540933871297,9.65650954166788,9.46098907268873,9.491827254089177,9.567365471187788,9.661726316754763,9.70962681167596,9.77642713841019,9.907805879912388,9.945622326354563,10.016757925488584,10.161499141895895,10.28691357819946,10.439058577178741,10.560665770068852,10.666420547796855,10.751767232931744,10.797959899869198,10.866734433002904,10.889818998733606,10.895837818012243,10.98249372458313,11.06983881598487,11.157878573387185
 Yarwun Cogen,Green Energy Exports,12.982777059349614,12.789594965563488,12.49366957262501,11.199380032947928,9.007833792423225,8.00783379242325,8.00783379242325,8.00783379242325,8.00783379242325,8.00783379242325,8.13283379242325,8.25783379242325,8.25783379242325,8.25783379242325,8.25783379242325,8.38283379242325,8.50783379242325,8.50783379242325,8.63283379242325,8.75783379242325,8.75783379242325,8.75783379242325,8.75783379242325,8.75783379242325,8.75783379242325,8.75783379242325,8.75783379242325,8.779728376904309,8.82362701878883,8.867745153882773,8.912083879652185,8.956644299050446
-New generating stations,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 NSW new CCGT,Green Energy Exports,14.540571116862793,14.271527150277747,13.86297910543012,12.23043472024382,9.96007165942336,9.06597753082757,8.923882295463802,8.834650947517847,8.704365338320947,8.438759122755036,8.261963380561905,8.301241020702243,8.391246484478247,8.50229182339999,8.552409564998577,8.621427138410201,8.743004715809086,8.782476674063139,8.858645796208624,8.989830092794673,9.097017936613865,9.173964104170718,9.221897488152011,9.314911395610242,9.446360052418498,9.56257483463839,9.625105908254165,9.636943744579604,9.665337371864005,9.765427631115571,9.866554383932918,9.968728363817188
 NSW new OCGT,Green Energy Exports,18.962027691344744,18.231838922232747,17.594428864240108,15.354200994339784,12.30023165942336,11.46176253082757,11.318232295463803,11.22756594751785,11.095845338320949,10.828839122755035,10.650643380561906,10.688521020702241,10.777126484478242,10.886771823399986,10.935489564998576,11.003107138410197,11.123319715809084,11.133114174063138,11.179621629541955,11.309473426128005,11.415328769947195,11.490976604170715,11.537611654818678,11.629327228943573,11.756915052418496,11.866774834638392,11.923121741587503,11.912617985061596,11.91906371291335,12.013718477113137,12.109124938308724,12.205289066071511
 QLD new CCGT,Green Energy Exports,13.48856748181682,13.019453052943266,12.438690075962555,11.098488848446067,9.182105601881744,8.40784305034812,8.25161630860832,8.181821551247149,8.181821551247149,8.181821551247149,8.313071551247148,8.444321551247148,8.444321551247148,8.444321551247148,8.444321551247148,8.575571551247148,8.706821551247147,8.6031689137323,8.627641276217453,8.755766276217452,8.755766276217452,8.755766276217452,8.755766276217452,8.755766276217452,8.755048776217453,8.753665026217455,8.752383776217453,8.687337651624194,8.6225127709108,8.621725294631466,8.620937890270714,8.620150557821976

diff --git a/example_output/6.0/gas_prices_progressive_change.csv b/example_output/6.0/gas_prices_progressive_change.csv
@@ -37,7 +37,6 @@ Townsville Power Station,Progressive Change,13.967265253989849,13.76769166953396
 Uranquinty,Progressive Change,17.41005926428744,17.08876646731997,15.87695508607903,13.87187577114363,12.671340628337113,12.464348013822022,12.29489486819622,12.272965663988506,12.396865340577797,12.427109940781882,12.573010333236834,13.064253555159713,13.58198128240233,13.868528540950546,13.937173479138579,14.107443145702412,14.267017373744784,14.247719926874755,14.395183563122949,14.611941934589924,14.794428417761885,15.077420125455141,15.263361192573129,15.409488399099233,15.53158918635206,15.768947283488536,16.315130382240024,16.67308843201242,16.85115152567733,17.15644960631203,17.467278876782473,17.783739547548322
 Valley Power,Progressive Change,18.71637424858907,18.448354983354225,17.02356150213611,14.312030160427522,12.698123910472573,12.537343448309652,12.518080359697176,12.5910914754663,12.66514868882811,12.557133035939867,12.54737636146237,13.017772892798257,13.568085048271687,13.923972286375307,14.082771246967658,14.374185652299534,14.622194382595012,14.672243411380123,14.894260121287676,15.196667054395105,15.435129162973677,15.716390833545276,15.924528444699702,16.05733494930152,16.156496271018128,16.393854368154607,16.898839604774906,17.19949503287009,17.34882479179982,17.62835896413882,17.91239715069451,18.20101192271604
 Yarwun Cogen,Progressive Change,14.078305095888654,13.878731511432811,13.569239777972488,12.484918988630254,11.49803580903465,11.447807326630201,11.398206633876551,11.354609654688101,11.354265242359151,11.3556349595525,11.43599949782255,11.67691543157805,11.8326352597138,11.8578337924232,11.8578337924232,11.9828337924232,12.1078337924232,12.1078337924232,12.2328337924232,12.3578337924232,12.3578337924232,12.3578337924232,12.3578337924232,12.3578337924232,12.3578337924232,12.3578337924232,12.3578337924232,12.388728376904258,12.450672018788778,12.51292537888272,12.575490005777132,12.638367455806016
-New generating stations,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 NSW new CCGT,Progressive Change,14.74820099423192,14.615585426522234,14.12199451894674,12.592269212590317,11.307577955844907,11.007860299993727,10.762708475849873,10.723836761338312,10.862086617507984,10.95236276063685,11.158025438850675,11.652253298023695,12.124144494814065,12.367316012157644,12.411603195990548,12.547575514600508,12.690592545040936,12.641919140409964,12.737278683296232,12.936463641286204,13.068054399272444,13.247838808701115,13.400348112279278,13.590736963362607,13.736281481247481,13.965504798013225,14.536886527181025,14.810337315351962,15.03474996988421,15.521502731413548,15.870087171078175,16.226500176937645
 NSW new OCGT,Progressive Change,19.50129615505406,19.072217762107318,17.265098565952457,14.79718850442202,13.647737955844907,13.403645299993725,13.157058475849873,13.116751761338314,13.253566617507982,13.34244276063685,13.546705438850674,14.039533298023695,14.510024494814065,14.751796012157644,14.794683195990547,14.92925551460051,15.070907545040935,14.992556640409965,15.058254516629566,15.256106974619538,15.38636523260578,15.564851308701115,15.716062278945945,15.90515279669594,16.04683648124748,16.269704798013223,16.834902360514356,17.085572298213428,17.284815016845933,17.76096182907382,18.0985020006637,18.442459855324188
 QLD new CCGT,Progressive Change,14.338660630793974,14.029591557829441,13.518826788600386,12.312006986728933,11.56817529364647,11.812383994707398,11.759918219084227,11.69100460875816,11.690642975812763,11.6946470303523,11.781395541916456,12.034357272359731,12.197863091902267,12.22432155124719,12.22432155124719,12.355571551247191,12.486821551247191,12.338168913732343,12.317641276217493,12.445766276217494,12.445766276217494,12.449911359519476,12.465506032782336,12.484752959374696,12.491832796006177,12.490449046006177,12.496965132637605,12.413329849246011,12.33173545530743,12.345914329005609,12.35582960422263,12.365752842615159

diff --git a/example_output/6.0/gas_prices_step_change.csv b/example_output/6.0/gas_prices_step_change.csv
@@ -37,7 +37,6 @@ Townsville Power Station,Step Change,13.2610113243468,13.0717372174508,12.684265
 Uranquinty,Step Change,17.460456285528238,17.05082708690508,16.08193977312382,14.11436704548111,12.370005083438471,11.695849174893809,11.284001797221816,11.213689187769322,11.22893483350969,11.260441479380724,11.35982433861019,11.507247311914222,11.713049644951301,11.834729102830032,11.83134022931235,11.956088422451824,12.125737462516048,12.383412444864826,12.719614040472255,12.941068302891278,12.936383608838337,12.878850239433465,13.049650979690451,13.31347795698552,13.466334196580144,13.484266868988046,13.570321350325155,13.694884329886403,13.854908486510949,14.11990173234945,14.389963320603087,14.665190189949508
 Valley Power,Step Change,18.929408209089548,18.631477013943126,17.53944219870715,14.754579709762499,12.505976034219922,12.024761394259368,11.736988842077988,11.676934180839297,11.66407569739588,11.622886534234475,11.670641449519227,11.780862214043088,11.973451438672805,12.077665238508565,12.035786283388639,12.145561608955799,12.30523121716698,12.617823465604982,13.023309834778267,13.331310179449606,13.467682034398626,13.512753479175572,13.724679843334414,13.997684536187716,14.153209173200189,14.17025237980214,14.254527929527349,14.37677529250007,14.537156215386698,14.80747418607937,15.082818711085466,15.363283259027149
 Yarwun Cogen,Step Change,13.372051166245608,13.182777059349611,12.795305425886411,11.302470845871255,10.00783379242325,10.0078337924232,10.0078337924232,10.0078337924232,10.0078337924232,10.13283379242325,10.25783379242325,10.2578337924232,10.2578337924232,10.2578337924232,10.3828337924232,10.50783379242325,10.50783379242325,10.6328337924232,10.7578337924232,10.75783379242325,10.75783379242325,10.7578337924232,10.7578337924232,10.7578337924232,10.7578337924232,10.7578337924232,10.784728376904258,10.838652018788778,10.892845278882723,10.947309505277136,11.00204605280352,11.057056283067535
-New generating stations,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 NSW new CCGT,Step Change,14.83206700571008,14.480749785672991,13.94306643845363,12.54914798379583,10.952373112769706,10.178160956525677,9.708755536170374,9.597172617339899,9.60544092289383,9.692490241411786,9.836261625593073,10.001084616367237,10.16737665313796,10.293031630021487,10.343785506288139,10.466518193417208,10.612058941046536,10.800770474577721,11.041810858299531,11.20850571892128,11.202086587167233,11.137945480685383,11.258921570775188,11.442771534261372,11.534131573988399,11.53600237980214,11.62027792952735,11.665580788127802,11.65056829539271,11.72171489273537,11.793295961443299,11.865314154705464
 NSW new OCGT,Step Change,19.42273616808894,19.026308297472294,17.692975830183464,15.19073344491579,13.292533112769707,12.573945956525677,12.103105536170375,11.990087617339903,11.996920922893839,12.082570241411794,12.224941625593079,12.388364616367237,12.553256653137968,12.6775116300215,12.726865506288146,12.848198193417211,12.992373941046534,13.17972047457772,13.419395858299534,13.58472571892128,13.548677420500567,13.454957980685386,13.574635737441856,13.757187367594703,13.844686573988398,13.84020237980214,13.918293762860685,13.941617993889373,13.905465910673735,13.97215186034915,14.039157613468241,14.106484703701035
 QLD new CCGT,Step Change,13.651871938312622,13.318265108029141,12.617250781682571,11.424938472102742,10.364980430742317,10.165633936184989,10.17466731026551,10.152142212671603,10.146647471924304,10.14249921031238,10.283392212671604,10.418790474283528,10.414642212671602,10.382474112718466,10.318137912812201,10.41307155124717,10.54432155124719,10.54432155124719,10.68405344638128,10.81530344638128,10.678168913732343,10.580918469028886,10.646484422429012,10.83837085582593,11.1750067021509,11.372534747166606,11.39182254436645,11.382035285679697,11.445421450608633,11.594073257062686,11.744655735939542,11.897193962588727

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "isp-workbook-parser"
-version = "2.0.0"
+version = "2.0.1"
 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]" },

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
@@ -9,18 +9,21 @@ gas_prices_step_change:
   header_rows: 10
   end_row: 59
   column_range: "B:AI"
+  skip_rows: 49
 
 gas_prices_progressive_change:
   sheet_name: "Gas, Liquid fuel, H2 price"
   header_rows: 62
   end_row: 111
   column_range: "B:AI"
+  skip_rows: 101
 
 gas_prices_green_energy_exports:
   sheet_name: "Gas, Liquid fuel, H2 price"
   header_rows: 114
   end_row: 163
   column_range: "B:AI"
+  skip_rows: 153
 
 industrial_fuel_costs_step_change:
   sheet_name: "Gas, Liquid fuel, H2 price"