increase input data robustness and avoid empty columns in variable ma…

…x/min files
IIT-EnergySystemModels · Dec 4, 2024 · b937844 · b937844
1 parent b0619c3
commit b937844
Show file tree

Hide file tree

Showing 206 changed files with 549 additions and 525 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,10 @@ Change Log
 
 [4.18.0] - 2024-12-04
 -----------------------
+- [CHANGED] in this version no need to introduce all the generators as headings of the variable max/min data files
+- [FIXED] all the cases have been updated to this new version
+- [FIXED] to improve model robustness the first cells of the heading row of all the Data files are filled with sensible headers. These changes are mandatory for this new version.
+- [FIXED] first column of Parameter and Option files dropped
 - [FIXED] minor changes in output results
 
 [4.17.9] - 2024-11-19

diff --git a/doc/rst/InputData.rst b/doc/rst/InputData.rst
diff --git a/doc/rst/conf.py b/doc/rst/conf.py
@@ -12,7 +12,7 @@
 author = 'Andres Ramos'
 
 # The short X.Y version
-version = 'version 4.17.9'
+version = 'version 4.18.0'
 # The full version, including alpha/beta/rc tags
 release = ''
 
@@ -84,13 +84,13 @@
 #
 # html_sidebars = {}
 html_theme = 'alabaster'
-html_title = 'version 4.17.9'
+html_title = 'version 4.18.0'
 html_logo  = '../img/openTEPES.png'
 html_last_updated_fmt = ''
 html_show_sphinx = False
 html_theme_options = {
     'analytics_id': 'UA-515200-2',  #  Provided by Google in your dashboard
-    'description': 'version 4.17.9',
+    'description': 'version 4.18.0',
     'body_max_width' : 'none',
     'page_width': 'auto',
     'font_family': 'Georgia'

diff --git a/openTEPES/9n/oT_Data_Demand_9n.csv b/openTEPES/9n/oT_Data_Demand_9n.csv
@@ -1,4 +1,4 @@
-,,,Node_1,Node_2,Node_3,Node_4,Node_5,Node_6,Node_7,Node_8,Node_9
+Period,Scenario,LoadLevel,Node_1,Node_2,Node_3,Node_4,Node_5,Node_6,Node_7,Node_8,Node_9
 2030,sc01,01-01 00:00:00+01:00,1,240,40,160,240,80,100,15,100
 2030,sc01,01-01 01:00:00+01:00,0.957471204,229.793089,38.29884817,153.1953927,229.793089,76.59769634,95.74712042,14.36206806,95.74712042
 2030,sc01,01-01 02:00:00+01:00,0.918110919,220.3466205,36.72443676,146.897747,220.3466205,73.44887351,91.81109189,13.77166378,91.81109189

diff --git a/openTEPES/9n/oT_Data_Duration_9n.csv b/openTEPES/9n/oT_Data_Duration_9n.csv
@@ -1,4 +1,4 @@
-,,,Duration,Stage
+Period,Scenario,LoadLevel,Duration,Stage
 2030,sc01,01-01 00:00:00+01:00,1,st1
 2030,sc01,01-01 01:00:00+01:00,1,st1
 2030,sc01,01-01 02:00:00+01:00,1,st1

diff --git a/openTEPES/9n/oT_Data_Emission_9n.csv b/openTEPES/9n/oT_Data_Emission_9n.csv
@@ -1,2 +1,2 @@
-,,CO2Emission
+Period,Area,CO2Emission
 2030,Area1,
diff --git a/openTEPES/9n/oT_Data_EnergyInflows_9n.csv b/openTEPES/9n/oT_Data_EnergyInflows_9n.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,Nuclear2,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1,ESS2
+Period,Scenario,LoadLevel,Nuclear,Nuclear2,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1,ESS2
 2030,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,,,,,
 2030,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,,,,,
 2030,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n/oT_Data_EnergyOutflows_9n.csv b/openTEPES/9n/oT_Data_EnergyOutflows_9n.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
+Period,Scenario,LoadLevel,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
 2030,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n/oT_Data_Generation_9n.csv b/openTEPES/9n/oT_Data_Generation_9n.csv
@@ -1,4 +1,4 @@
-,Node,Technology,MutuallyExclusive,StorageType,OutflowsType,EnergyType,MustRun,OutflowsIncompatibility,NoOperatingReserve,BinaryInvestment,BinaryRetirement,BinaryCommitment,InitialPeriod,FinalPeriod,MaximumPower,MinimumPower,MaximumPowerHeat,MinimumPowerHeat,MaximumCharge,MinimumCharge,InitialStorage,MaximumStorage,MinimumStorage,Efficiency,ShiftTime,EFOR,RampUp,RampDown,UpTime,DownTime,StableTime,FuelCost,LinearTerm,ConstantTerm,OMVariableCost,OperReserveCost,StartUpCost,ShutDownCost,CO2EmissionRate,Availability,FixedInvestmentCost,FixedRetirementCost,FixedChargeRate,StorageInvestment,Inertia,MaximumReactivePower,MinimumReactivePower,InvestmentLo,InvestmentUp,RetirementLo,RetirementUp,ProductionFunctionHydro,ProductionFunctionH2,ProductionFunctionHeat,ProductionFunctionH2ToHeat
+Generator,Node,Technology,MutuallyExclusive,StorageType,OutflowsType,EnergyType,MustRun,OutflowsIncompatibility,NoOperatingReserve,BinaryInvestment,BinaryRetirement,BinaryCommitment,InitialPeriod,FinalPeriod,MaximumPower,MinimumPower,MaximumPowerHeat,MinimumPowerHeat,MaximumCharge,MinimumCharge,InitialStorage,MaximumStorage,MinimumStorage,Efficiency,ShiftTime,EFOR,RampUp,RampDown,UpTime,DownTime,StableTime,FuelCost,LinearTerm,ConstantTerm,OMVariableCost,OperReserveCost,StartUpCost,ShutDownCost,CO2EmissionRate,Availability,FixedInvestmentCost,FixedRetirementCost,FixedChargeRate,StorageInvestment,Inertia,MaximumReactivePower,MinimumReactivePower,InvestmentLo,InvestmentUp,RetirementLo,RetirementUp,ProductionFunctionHydro,ProductionFunctionH2,ProductionFunctionHeat,ProductionFunctionH2ToHeat
 Nuclear,Node_1,Nuclear,,,,,,,,,,,2020,2050,771.6,771.6,,,,,,,,,,,300,300,10.7,12,,1,15,,,,,,,1,,,,,,,,,,,,,,,
 DomesticCoal_Anthracite,Node_2,Coal,,,,,,,,,,,2020,2050,588,235.2,,,,,,,,,,,350,350,2,2,,0.02,2400,50000,6,,2,,,1,,,,,,,,,,,,,,,
 BrownLignite,Node_3,Coal,,,,,,,,,,,2020,2050,203.1,81.2,,,,,,,,,,,120,120,,,,0.02,2300,50000,6,,2,,,1,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n/oT_Data_Inertia_9n.csv b/openTEPES/9n/oT_Data_Inertia_9n.csv
@@ -1,4 +1,4 @@
-,,,Area1
+Period,Scenario,LoadLevel,Area1
 2030,sc01,01-01 00:00:00+01:00,
 2030,sc01,01-01 01:00:00+01:00,
 2030,sc01,01-01 02:00:00+01:00,

diff --git a/openTEPES/9n/oT_Data_Network_9n.csv b/openTEPES/9n/oT_Data_Network_9n.csv
@@ -1,4 +1,4 @@
-,,,LineType,Switching,InitialPeriod,FinalPeriod,Voltage,Length,LossFactor,Reactance,TTC,TTCBck,SecurityFactor,FixedInvestmentCost,FixedChargeRate,BinaryInvestment,SwOnTime,SwOffTime,Resistance,Susceptance,Tap,AngMin,AngMax,InvestmentLo,InvestmentUp
+InitialNode,FinalNode,Circuit,LineType,Switching,InitialPeriod,FinalPeriod,Voltage,Length,LossFactor,Reactance,TTC,TTCBck,SecurityFactor,FixedInvestmentCost,FixedChargeRate,BinaryInvestment,SwOnTime,SwOffTime,Resistance,Susceptance,Tap,AngMin,AngMax,InvestmentLo,InvestmentUp
 Node_1,Node_6,ac1,AC,,2020,2050,400,,0.02,0.02,1000,,0.67,,,,,,,,,,,,
 Node_2,Node_3,ac1,AC,,2020,2050,400,,0.02,0.03,1000,,0.67,,,,,,,,,,,,
 Node_2,Node_6,ac1,AC,,2020,2050,400,,0.02,0.04,1000,,0.67,,,,,,,,,,,,

diff --git a/openTEPES/9n/oT_Data_NodeLocation_9n.csv b/openTEPES/9n/oT_Data_NodeLocation_9n.csv
@@ -1,4 +1,4 @@
-,Latitude,Longitude
+Node,Latitude,Longitude
 Node_1,43.36666667,-8.383333333
 Node_2,43.53333333,-5.7
 Node_3,43.26222222,-2.953333333

diff --git a/openTEPES/9n/oT_Data_OperatingReserveDown_9n.csv b/openTEPES/9n/oT_Data_OperatingReserveDown_9n.csv
@@ -1,4 +1,4 @@
-,,,Area1
+Period,Scenario,LoadLevel,Area1
 2030,sc01,01-01 00:00:00+01:00,13.01333333
 2030,sc01,01-01 01:00:00+01:00,12.45989194
 2030,sc01,01-01 02:00:00+01:00,11.94768342

diff --git a/openTEPES/9n/oT_Data_OperatingReserveUp_9n.csv b/openTEPES/9n/oT_Data_OperatingReserveUp_9n.csv
@@ -1,4 +1,4 @@
-,,,Area1
+Period,Scenario,LoadLevel,Area1
 2030,sc01,01-01 00:00:00+01:00,13.01333333
 2030,sc01,01-01 01:00:00+01:00,12.45989194
 2030,sc01,01-01 02:00:00+01:00,11.94768342

diff --git a/openTEPES/9n/oT_Data_Option_9n.csv b/openTEPES/9n/oT_Data_Option_9n.csv
@@ -1,2 +1,2 @@
-,IndBinGenInvest,IndBinGenRetirement,IndBinRsrInvest,IndBinNetInvest,IndBinNetH2Invest,IndBinNetHeatInvest,IndBinGenOperat,IndBinNetLosses,IndBinLineCommit,IndBinSingleNode,IndBinGenRamps,IndBinGenMinTime
-Options,0,0,0,0,0,0,0,1,0,0,0,0
+IndBinGenInvest,IndBinGenRetirement,IndBinRsrInvest,IndBinNetInvest,IndBinNetH2Invest,IndBinNetHeatInvest,IndBinGenOperat,IndBinNetLosses,IndBinLineCommit,IndBinSingleNode,IndBinGenRamps,IndBinGenMinTime
+0,0,0,0,0,0,0,1,0,0,0,0
diff --git a/openTEPES/9n/oT_Data_Parameter_9n.csv b/openTEPES/9n/oT_Data_Parameter_9n.csv
@@ -1,2 +1,2 @@
-,ENSCost,HNSCost,HTNSCost,CO2Cost,UpReserveActivation,DwReserveActivation,MinRatioDwUp,MaxRatioDwUp,SBase,ReferenceNode,TimeStep,EconomicBaseYear,AnnualDiscountRate
-Parameters,10000,10000,10000,25,0.25,0.3,0,1,100,Node_4,1,2020,0
+ENSCost,HNSCost,HTNSCost,CO2Cost,UpReserveActivation,DwReserveActivation,MinRatioDwUp,MaxRatioDwUp,SBase,ReferenceNode,TimeStep,EconomicBaseYear,AnnualDiscountRate
+10000,10000,10000,25,0.25,0.3,0,1,100,Node_4,1,2020,0
diff --git a/openTEPES/9n/oT_Data_Period_9n.csv b/openTEPES/9n/oT_Data_Period_9n.csv
@@ -1,2 +1,2 @@
-,Weight
+Period,Weight
 2030,1
diff --git a/openTEPES/9n/oT_Data_RESEnergy_9n.csv b/openTEPES/9n/oT_Data_RESEnergy_9n.csv
@@ -1,2 +1,2 @@
-,,RESEnergy
+Period,Scenario,RESEnergy
 2030,Area1,1000
diff --git a/openTEPES/9n/oT_Data_ReserveMargin_9n.csv b/openTEPES/9n/oT_Data_ReserveMargin_9n.csv
@@ -1,2 +1,2 @@
-,,ReserveMargin
+Period,Scenario,ReserveMargin
 2030,Area1,1.1
diff --git a/openTEPES/9n/oT_Data_Scenario_9n.csv b/openTEPES/9n/oT_Data_Scenario_9n.csv
@@ -1,2 +1,2 @@
-,,Probability
+Period,Scenario,Probability
 2030,sc01,1
diff --git a/openTEPES/9n/oT_Data_Stage_9n.csv b/openTEPES/9n/oT_Data_Stage_9n.csv
@@ -1,2 +1,2 @@
-,Weight
+Stage,Weight
 st1,1
diff --git a/openTEPES/9n/oT_Data_VariableEmissionCost_9n.csv b/openTEPES/9n/oT_Data_VariableEmissionCost_9n.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
+Period,Scenario,LoadLevel,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
 2030,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n/oT_Data_VariableFuelCost_9n.csv b/openTEPES/9n/oT_Data_VariableFuelCost_9n.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
+Period,Scenario,LoadLevel,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
 2030,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n/oT_Data_VariableMaxConsumption_9n.csv b/openTEPES/9n/oT_Data_VariableMaxConsumption_9n.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
+Period,Scenario,LoadLevel,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
 2030,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n/oT_Data_VariableMaxEnergy_9n.csv b/openTEPES/9n/oT_Data_VariableMaxEnergy_9n.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
+Period,Scenario,LoadLevel,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
 2030,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n/oT_Data_VariableMaxGeneration_9n.csv b/openTEPES/9n/oT_Data_VariableMaxGeneration_9n.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
+Period,Scenario,LoadLevel,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
 2030,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,157.075,0.000001,
 2030,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,144.7056,0.000001,
 2030,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,134.218275,0.000001,

diff --git a/openTEPES/9n/oT_Data_VariableMaxStorage_9n.csv b/openTEPES/9n/oT_Data_VariableMaxStorage_9n.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,Nuclear2,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1,ESS2
+Period,Scenario,LoadLevel,Nuclear,Nuclear2,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1,ESS2
 2030,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,,,,,
 2030,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,,,,,
 2030,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n/oT_Data_VariableMinConsumption_9n.csv b/openTEPES/9n/oT_Data_VariableMinConsumption_9n.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
+Period,Scenario,LoadLevel,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
 2030,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n/oT_Data_VariableMinEnergy_9n.csv b/openTEPES/9n/oT_Data_VariableMinEnergy_9n.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
+Period,Scenario,LoadLevel,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
 2030,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n/oT_Data_VariableMinGeneration_9n.csv b/openTEPES/9n/oT_Data_VariableMinGeneration_9n.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
+Period,Scenario,LoadLevel,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1
 2030,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,,,
 2030,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n/oT_Data_VariableMinStorage_9n.csv b/openTEPES/9n/oT_Data_VariableMinStorage_9n.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,Nuclear2,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1,ESS2
+Period,Scenario,LoadLevel,Nuclear,Nuclear2,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1,ESS2
 2030,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,,,,,
 2030,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,,,,,
 2030,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n7y/oT_Data_Demand_9n7y.csv b/openTEPES/9n7y/oT_Data_Demand_9n7y.csv
@@ -1,4 +1,4 @@
-,,,Node_1,Node_2,Node_3,Node_4,Node_5,Node_6,Node_7,Node_8,Node_9
+Period,Scenario,LoadLevel,Node_1,Node_2,Node_3,Node_4,Node_5,Node_6,Node_7,Node_8,Node_9
 2020,sc01,01-01 00:00:00+01:00,1.1,264,44,176,264,88,110,16.5,110
 2020,sc01,01-01 01:00:00+01:00,1.053218324,252.7723979,42.12873299,168.514932,252.7723979,84.25746597,105.3218325,15.79827487,105.3218325
 2020,sc01,01-01 02:00:00+01:00,1.009922011,242.3812826,40.39688044,161.5875217,242.3812826,80.79376086,100.9922011,15.14883016,100.9922011

diff --git a/openTEPES/9n7y/oT_Data_Duration_9n7y.csv b/openTEPES/9n7y/oT_Data_Duration_9n7y.csv
@@ -1,4 +1,4 @@
-,,,Duration,Stage
+Period,Scenario,LoadLevel,Duration,Stage
 2020,sc01,01-01 00:00:00+01:00,1,st1
 2020,sc01,01-01 01:00:00+01:00,1,st1
 2020,sc01,01-01 02:00:00+01:00,1,st1

diff --git a/openTEPES/9n7y/oT_Data_Emission_9n7y.csv b/openTEPES/9n7y/oT_Data_Emission_9n7y.csv
@@ -1,4 +1,4 @@
-,,CO2Emission
+Period,Area,CO2Emission
 2020,Area1,
 2025,Area1,
 2030,Area1,

diff --git a/openTEPES/9n7y/oT_Data_EnergyInflows_9n7y.csv b/openTEPES/9n7y/oT_Data_EnergyInflows_9n7y.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,Nuclear2,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1,ESS2,CCGT_5,CCGT_6,CCGT_7,CCGT_8,SolarPV_2
+Period,Scenario,LoadLevel,Nuclear,Nuclear2,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1,ESS2,CCGT_5,CCGT_6,CCGT_7,CCGT_8,SolarPV_2
 2020,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,,,,,,,,,,
 2020,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,,,,,,,,,,
 2020,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n7y/oT_Data_EnergyOutflows_9n7y.csv b/openTEPES/9n7y/oT_Data_EnergyOutflows_9n7y.csv
@@ -1,4 +1,4 @@
-,,,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1,CCGT_5,CCGT_6,CCGT_7,CCGT_8,SolarPV_2
+Period,Scenario,LoadLevel,Nuclear,DomesticCoal_Anthracite,BrownLignite,ImportedCoal_SubBituminous,ImportedCoal_Bituminous,CCGT_1,CCGT_2,CCGT_3,CCGT_4,OCGT_1,OCGT_2,OCGT_3,FuelOilGas,WindFarm_1,SolarPV_1,ESS1,CCGT_5,CCGT_6,CCGT_7,CCGT_8,SolarPV_2
 2020,sc01,01-01 00:00:00+01:00,,,,,,,,,,,,,,,,,,,,,
 2020,sc01,01-01 01:00:00+01:00,,,,,,,,,,,,,,,,,,,,,
 2020,sc01,01-01 02:00:00+01:00,,,,,,,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n7y/oT_Data_Generation_9n7y.csv b/openTEPES/9n7y/oT_Data_Generation_9n7y.csv
@@ -1,4 +1,4 @@
-,Node,Technology,MutuallyExclusive,StorageType,OutflowsType,EnergyType,MustRun,OutflowsIncompatibility,NoOperatingReserve,BinaryInvestment,BinaryRetirement,BinaryCommitment,InitialPeriod,FinalPeriod,MaximumPower,MinimumPower,MaximumCharge,MinimumCharge,MaximumPowerHeat,MinimumPowerHeat,InitialStorage,MaximumStorage,MinimumStorage,Efficiency,ShiftTime,EFOR,RampUp,RampDown,UpTime,DownTime,StableTime,FuelCost,LinearTerm,ConstantTerm,OMVariableCost,OperReserveCost,StartUpCost,ShutDownCost,CO2EmissionRate,Availability,FixedInvestmentCost,FixedRetirementCost,FixedChargeRate,StorageInvestment,Inertia,MaximumReactivePower,MinimumReactivePower,InvestmentLo,InvestmentUp,RetirementLo,RetirementUp,ProductionFunctionHydro,ProductionFunctionH2,ProductionFunctionHeat,ProductionFunctionH2ToHeat
+Generator,Node,Technology,MutuallyExclusive,StorageType,OutflowsType,EnergyType,MustRun,OutflowsIncompatibility,NoOperatingReserve,BinaryInvestment,BinaryRetirement,BinaryCommitment,InitialPeriod,FinalPeriod,MaximumPower,MinimumPower,MaximumCharge,MinimumCharge,MaximumPowerHeat,MinimumPowerHeat,InitialStorage,MaximumStorage,MinimumStorage,Efficiency,ShiftTime,EFOR,RampUp,RampDown,UpTime,DownTime,StableTime,FuelCost,LinearTerm,ConstantTerm,OMVariableCost,OperReserveCost,StartUpCost,ShutDownCost,CO2EmissionRate,Availability,FixedInvestmentCost,FixedRetirementCost,FixedChargeRate,StorageInvestment,Inertia,MaximumReactivePower,MinimumReactivePower,InvestmentLo,InvestmentUp,RetirementLo,RetirementUp,ProductionFunctionHydro,ProductionFunctionH2,ProductionFunctionHeat,ProductionFunctionH2ToHeat
 Nuclear,Node_1,Nuclear,,,,,,,,,,,2020,2050,771.6,771.6,,,,,,,,,,,300,300,10.7,12,,1,15,,,,,,,1,,,,,,,,,,,,,,,
 DomesticCoal_Anthracite,Node_2,Coal,,,,,,,,,,,2020,2050,588,235.2,,,,,,,,,,,350,350,2,2,,0.02,2400,50000,6,,2,,,1,,,,,,,,,,,,,,,
 BrownLignite,Node_3,Coal,,,,,,,,,,,2020,2050,203.1,81.2,,,,,,,,,,,120,120,,,,0.02,2300,50000,6,,2,,,1,,,,,,,,,,,,,,,

diff --git a/openTEPES/9n7y/oT_Data_Inertia_9n7y.csv b/openTEPES/9n7y/oT_Data_Inertia_9n7y.csv
@@ -1,4 +1,4 @@
-,,,Area1
+Period,Scenario,LoadLevel,Area1
 2020,sc01,01-01 00:00:00+01:00,
 2020,sc01,01-01 01:00:00+01:00,
 2020,sc01,01-01 02:00:00+01:00,

diff --git a/openTEPES/9n7y/oT_Data_Network_9n7y.csv b/openTEPES/9n7y/oT_Data_Network_9n7y.csv
@@ -1,4 +1,4 @@
-,,,LineType,Switching,InitialPeriod,FinalPeriod,Voltage,Length,LossFactor,Reactance,TTC,TTCBck,SecurityFactor,FixedInvestmentCost,FixedChargeRate,BinaryInvestment,SwOnTime,SwOffTime,Resistance,Susceptance,Tap,AngMin,AngMax,InvestmentLo,InvestmentUp,CommitmentLo,CommitmentUp
+InitialNode,FinalNode,Circuit,LineType,Switching,InitialPeriod,FinalPeriod,Voltage,Length,LossFactor,Reactance,TTC,TTCBck,SecurityFactor,FixedInvestmentCost,FixedChargeRate,BinaryInvestment,SwOnTime,SwOffTime,Resistance,Susceptance,Tap,AngMin,AngMax,InvestmentLo,InvestmentUp,CommitmentLo,CommitmentUp
 Node_1,Node_6,ac1,AC,,2020,2050,400,,0.02,0.02,1000,,0.67,,,,,,,,,,,1,1,0.000001,0.000001
 Node_2,Node_3,ac1,AC,,2020,2050,400,,0.02,0.03,1000,,0.67,,,,,,,,,,,1,1,1,1
 Node_2,Node_6,ac1,AC,,2020,2050,400,,0.02,0.04,1000,,0.67,,,,,,,,,,,1,1,1,1

diff --git a/openTEPES/9n7y/oT_Data_NodeLocation_9n7y.csv b/openTEPES/9n7y/oT_Data_NodeLocation_9n7y.csv
@@ -1,4 +1,4 @@
-,Latitude,Longitude
+Node,Latitude,Longitude
 Node_1,43.36666667,-8.383333333
 Node_2,43.53333333,-5.7
 Node_3,43.26222222,-2.953333333

diff --git a/openTEPES/9n7y/oT_Data_OperatingReserveDown_9n7y.csv b/openTEPES/9n7y/oT_Data_OperatingReserveDown_9n7y.csv
@@ -1,4 +1,4 @@
-,,,Area1
+Period,Scenario,LoadLevel,Area1
 2020,sc01,01-01 00:00:00+01:00,13.01333333
 2020,sc01,01-01 01:00:00+01:00,12.45989194
 2020,sc01,01-01 02:00:00+01:00,11.94768342

diff --git a/openTEPES/9n7y/oT_Data_OperatingReserveUp_9n7y.csv b/openTEPES/9n7y/oT_Data_OperatingReserveUp_9n7y.csv
@@ -1,4 +1,4 @@
-,,,Area1
+Period,Scenario,LoadLevel,Area1
 2020,sc01,01-01 00:00:00+01:00,13.01333333
 2020,sc01,01-01 01:00:00+01:00,12.45989194
 2020,sc01,01-01 02:00:00+01:00,11.94768342

diff --git a/openTEPES/9n7y/oT_Data_Option_9n7y.csv b/openTEPES/9n7y/oT_Data_Option_9n7y.csv
@@ -1,2 +1,2 @@
-,IndBinGenInvest,IndBinGenRetirement,IndBinRsrInvest,IndBinNetInvest,IndBinNetH2Invest,IndBinNetHeatInvest,IndBinGenOperat,IndBinNetLosses,IndBinLineCommit,IndBinSingleNode,IndBinGenRamps,IndBinGenMinTime
-Options,0,0,0,0,0,0,0,1,0,0,0,0
+IndBinGenInvest,IndBinGenRetirement,IndBinRsrInvest,IndBinNetInvest,IndBinNetH2Invest,IndBinNetHeatInvest,IndBinGenOperat,IndBinNetLosses,IndBinLineCommit,IndBinSingleNode,IndBinGenRamps,IndBinGenMinTime
+0,0,0,0,0,0,0,1,0,0,0,0
diff --git a/openTEPES/9n7y/oT_Data_Parameter_9n7y.csv b/openTEPES/9n7y/oT_Data_Parameter_9n7y.csv
@@ -1,2 +1,2 @@
-,ENSCost,HNSCost,HTNSCost,CO2Cost,UpReserveActivation,DwReserveActivation,MinRatioDwUp,MaxRatioDwUp,SBase,ReferenceNode,TimeStep,EconomicBaseYear,AnnualDiscountRate
-Parameters,10000,10000,10000,25,0.25,0.3,0,1,100,Node_4,4,2020,0
+ENSCost,HNSCost,HTNSCost,CO2Cost,UpReserveActivation,DwReserveActivation,MinRatioDwUp,MaxRatioDwUp,SBase,ReferenceNode,TimeStep,EconomicBaseYear,AnnualDiscountRate
+10000,10000,10000,25,0.25,0.3,0,1,100,Node_4,4,2020,0
diff --git a/openTEPES/9n7y/oT_Data_Period_9n7y.csv b/openTEPES/9n7y/oT_Data_Period_9n7y.csv
@@ -1,4 +1,4 @@
-,Weight
+Period,Weight
 2020,5
 2025,5
 2030,5
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    ,Weight
+    Period,Weight
 ,5
 ,5
 ,5
@@ Expand Down @@