Major refactoring + bug fixes towards version 2.2

energy-modelling-toolkit · Mar 7, 2017 · 1920fd9 · 1920fd9
1 parent e09113f
commit 1920fd9
Show file tree

Hide file tree

Showing 162 changed files with 122,029 additions and 84,358 deletions.
diff --git a/Dispa-SET/ConfigFiles/Config.xlsx → ConfigFiles/Config.xlsx b/Dispa-SET/ConfigFiles/Config.xlsx → ConfigFiles/Config.xlsx
diff --git a/ConfigFiles/ConfigCY.xlsx b/ConfigFiles/ConfigCY.xlsx
diff --git a/ConfigFiles/ConfigEL.xlsx b/ConfigFiles/ConfigEL.xlsx
diff --git a/Dispa-SET/ConfigFiles/ConfigIE.xlsx → ConfigFiles/ConfigIE.xlsx b/Dispa-SET/ConfigFiles/ConfigIE.xlsx → ConfigFiles/ConfigIE.xlsx
diff --git a/Dispa-SET/ConfigFiles/ConfigIE_Lucy.xlsx → ConfigFiles/ConfigIE_Lucy.xlsx b/Dispa-SET/ConfigFiles/ConfigIE_Lucy.xlsx → ConfigFiles/ConfigIE_Lucy.xlsx
diff --git a/Dispa-SET/ConfigFiles/ConfigNL.xlsx → ConfigFiles/ConfigNL.xlsx b/Dispa-SET/ConfigFiles/ConfigNL.xlsx → ConfigFiles/ConfigNL.xlsx
diff --git a/ConfigFiles/ConfigTest.xlsx b/ConfigFiles/ConfigTest.xlsx
diff --git a/Dispa-SET/ConfigFiles/Config_EU_short.xlsx → ConfigFiles/Config_EU_short.xlsx b/Dispa-SET/ConfigFiles/Config_EU_short.xlsx → ConfigFiles/Config_EU_short.xlsx
diff --git a/...ase/AvailabilityFactors/AT/15min/2015.csv → ...ase/AvailabilityFactors/AT/15min/2015.csv b/...ase/AvailabilityFactors/AT/15min/2015.csv → ...ase/AvailabilityFactors/AT/15min/2015.csv
diff --git a/...tabase/AvailabilityFactors/AT/1h/2015.csv → Database/AvailabilityFactors/AT/1h/2015.csv b/...tabase/AvailabilityFactors/AT/1h/2015.csv → Database/AvailabilityFactors/AT/1h/2015.csv
diff --git a/...ase/AvailabilityFactors/BE/15min/2015.csv → ...ase/AvailabilityFactors/BE/15min/2015.csv b/...ase/AvailabilityFactors/BE/15min/2015.csv → ...ase/AvailabilityFactors/BE/15min/2015.csv
diff --git a/...tabase/AvailabilityFactors/BE/1h/2015.csv → Database/AvailabilityFactors/BE/1h/2015.csv b/...tabase/AvailabilityFactors/BE/1h/2015.csv → Database/AvailabilityFactors/BE/1h/2015.csv
diff --git a/...ase/AvailabilityFactors/CH/15min/2015.csv → ...ase/AvailabilityFactors/CH/15min/2015.csv b/...ase/AvailabilityFactors/CH/15min/2015.csv → ...ase/AvailabilityFactors/CH/15min/2015.csv
diff --git a/...tabase/AvailabilityFactors/CH/1h/2015.csv → Database/AvailabilityFactors/CH/1h/2015.csv b/...tabase/AvailabilityFactors/CH/1h/2015.csv → Database/AvailabilityFactors/CH/1h/2015.csv
diff --git a/Database/AvailabilityFactors/CY/1h/2015.csv b/Database/AvailabilityFactors/CY/1h/2015.csv
diff --git a/...ase/AvailabilityFactors/DE/15min/2015.csv → ...ase/AvailabilityFactors/DE/15min/2015.csv b/...ase/AvailabilityFactors/DE/15min/2015.csv → ...ase/AvailabilityFactors/DE/15min/2015.csv
diff --git a/...tabase/AvailabilityFactors/DE/1h/2015.csv → Database/AvailabilityFactors/DE/1h/2015.csv b/...tabase/AvailabilityFactors/DE/1h/2015.csv → Database/AvailabilityFactors/DE/1h/2015.csv
diff --git a/...tabase/AvailabilityFactors/EL/1h/2015.csv → Database/AvailabilityFactors/EL/1h/2015.csv b/...tabase/AvailabilityFactors/EL/1h/2015.csv → Database/AvailabilityFactors/EL/1h/2015.csv
diff --git a/...ase/AvailabilityFactors/FR/15min/2015.csv → ...ase/AvailabilityFactors/FR/15min/2015.csv b/...ase/AvailabilityFactors/FR/15min/2015.csv → ...ase/AvailabilityFactors/FR/15min/2015.csv
diff --git a/...tabase/AvailabilityFactors/FR/1h/2015.csv → Database/AvailabilityFactors/FR/1h/2015.csv b/...tabase/AvailabilityFactors/FR/1h/2015.csv → Database/AvailabilityFactors/FR/1h/2015.csv
diff --git a/...tabase/AvailabilityFactors/IE/1h/2015.csv → Database/AvailabilityFactors/IE/1h/2015.csv b/...tabase/AvailabilityFactors/IE/1h/2015.csv → Database/AvailabilityFactors/IE/1h/2015.csv
diff --git a/...ase/AvailabilityFactors/NL/15min/2015.csv → ...ase/AvailabilityFactors/NL/15min/2015.csv b/...ase/AvailabilityFactors/NL/15min/2015.csv → ...ase/AvailabilityFactors/NL/15min/2015.csv
diff --git a/...tabase/AvailabilityFactors/NL/1h/2015.csv → Database/AvailabilityFactors/NL/1h/2015.csv b/...tabase/AvailabilityFactors/NL/1h/2015.csv → Database/AvailabilityFactors/NL/1h/2015.csv
diff --git a/...ailabilityFactors/NL/1h/2015_withBEVS.csv → ...ailabilityFactors/NL/1h/2015_withBEVS.csv b/...ailabilityFactors/NL/1h/2015_withBEVS.csv → ...ailabilityFactors/NL/1h/2015_withBEVS.csv
diff --git a/...SET/Database/CrossBorderFlows/1h/2015.csv → Database/CrossBorderFlows/1h/2015.csv b/...SET/Database/CrossBorderFlows/1h/2015.csv → Database/CrossBorderFlows/1h/2015.csv
diff --git a/Dispa-SET/Database/DayAheadNTC/1h/2015.csv → Database/DayAheadNTC/1h/2015.csv b/Dispa-SET/Database/DayAheadNTC/1h/2015.csv → Database/DayAheadNTC/1h/2015.csv
diff --git a/...-SET/Database/FuelPrices/Biomass/2015.csv → Database/FuelPrices/Biomass/2015.csv b/...-SET/Database/FuelPrices/Biomass/2015.csv → Database/FuelPrices/Biomass/2015.csv
diff --git a/Dispa-SET/Database/FuelPrices/Coal/2015.csv → Database/FuelPrices/Coal/2015.csv b/Dispa-SET/Database/FuelPrices/Coal/2015.csv → Database/FuelPrices/Coal/2015.csv
diff --git a/Dispa-SET/Database/FuelPrices/Gas/2015.csv → Database/FuelPrices/Gas/2015.csv b/Dispa-SET/Database/FuelPrices/Gas/2015.csv → Database/FuelPrices/Gas/2015.csv
diff --git a/Database/FuelPrices/Gas/EL/2015.csv b/Database/FuelPrices/Gas/EL/2015.csv
diff --git a/Dispa-SET/Database/FuelPrices/Oil/2015.csv → Database/FuelPrices/Oil/2015.csv b/Dispa-SET/Database/FuelPrices/Oil/2015.csv → Database/FuelPrices/Oil/2015.csv
diff --git a/Database/HydroData/Inflows/EL/average.csv b/Database/HydroData/Inflows/EL/average.csv
diff --git a/Database/HydroData/Inflows/EL/dry.csv b/Database/HydroData/Inflows/EL/dry.csv
diff --git a/Database/HydroData/Inflows/EL/wet.csv b/Database/HydroData/Inflows/EL/wet.csv
diff --git a/...e/HydroData/ReservoirLevel/AT/1h/2015.csv → ...e/HydroData/ReservoirLevel/AT/1h/2015.csv b/...e/HydroData/ReservoirLevel/AT/1h/2015.csv → ...e/HydroData/ReservoirLevel/AT/1h/2015.csv
diff --git a/...e/HydroData/ReservoirLevel/BE/1h/2015.csv → ...e/HydroData/ReservoirLevel/BE/1h/2015.csv b/...e/HydroData/ReservoirLevel/BE/1h/2015.csv → ...e/HydroData/ReservoirLevel/BE/1h/2015.csv
diff --git a/...e/HydroData/ReservoirLevel/CH/1h/2015.csv → ...e/HydroData/ReservoirLevel/CH/1h/2015.csv b/...e/HydroData/ReservoirLevel/CH/1h/2015.csv → ...e/HydroData/ReservoirLevel/CH/1h/2015.csv
diff --git a/...e/HydroData/ReservoirLevel/DE/1h/2015.csv → ...e/HydroData/ReservoirLevel/DE/1h/2015.csv b/...e/HydroData/ReservoirLevel/DE/1h/2015.csv → ...e/HydroData/ReservoirLevel/DE/1h/2015.csv
diff --git a/Database/HydroData/ReservoirLevel/EL/1h/average.csv b/Database/HydroData/ReservoirLevel/EL/1h/average.csv
diff --git a/Database/HydroData/ReservoirLevel/EL/1h/dry.csv b/Database/HydroData/ReservoirLevel/EL/1h/dry.csv
diff --git a/Database/HydroData/ReservoirLevel/EL/1h/wet.csv b/Database/HydroData/ReservoirLevel/EL/1h/wet.csv
diff --git a/...e/HydroData/ReservoirLevel/FR/1h/2015.csv → ...e/HydroData/ReservoirLevel/FR/1h/2015.csv b/...e/HydroData/ReservoirLevel/FR/1h/2015.csv → ...e/HydroData/ReservoirLevel/FR/1h/2015.csv
diff --git a/...e/HydroData/ReservoirLevel/NL/1h/2015.csv → ...e/HydroData/ReservoirLevel/NL/1h/2015.csv b/...e/HydroData/ReservoirLevel/NL/1h/2015.csv → ...e/HydroData/ReservoirLevel/NL/1h/2015.csv
diff --git a/...se/HydroData/ScaledInflows/AT/1h/2015.csv → ...se/HydroData/ScaledInflows/AT/1h/2015.csv b/...se/HydroData/ScaledInflows/AT/1h/2015.csv → ...se/HydroData/ScaledInflows/AT/1h/2015.csv
diff --git a/...se/HydroData/ScaledInflows/BE/1h/2015.csv → ...se/HydroData/ScaledInflows/BE/1h/2015.csv b/...se/HydroData/ScaledInflows/BE/1h/2015.csv → ...se/HydroData/ScaledInflows/BE/1h/2015.csv
diff --git a/...se/HydroData/ScaledInflows/CH/1h/2015.csv → ...se/HydroData/ScaledInflows/CH/1h/2015.csv b/...se/HydroData/ScaledInflows/CH/1h/2015.csv → ...se/HydroData/ScaledInflows/CH/1h/2015.csv
diff --git a/...se/HydroData/ScaledInflows/DE/1h/2015.csv → ...se/HydroData/ScaledInflows/DE/1h/2015.csv b/...se/HydroData/ScaledInflows/DE/1h/2015.csv → ...se/HydroData/ScaledInflows/DE/1h/2015.csv
diff --git a/Database/HydroData/ScaledInflows/EL/1h/average.csv b/Database/HydroData/ScaledInflows/EL/1h/average.csv
diff --git a/Database/HydroData/ScaledInflows/EL/1h/dry.csv b/Database/HydroData/ScaledInflows/EL/1h/dry.csv
diff --git a/Database/HydroData/ScaledInflows/EL/1h/wet.csv b/Database/HydroData/ScaledInflows/EL/1h/wet.csv
diff --git a/...se/HydroData/ScaledInflows/FR/1h/2015.csv → ...se/HydroData/ScaledInflows/FR/1h/2015.csv b/...se/HydroData/ScaledInflows/FR/1h/2015.csv → ...se/HydroData/ScaledInflows/FR/1h/2015.csv
diff --git a/...se/HydroData/ScaledInflows/NL/1h/2015.csv → ...se/HydroData/ScaledInflows/NL/1h/2015.csv b/...se/HydroData/ScaledInflows/NL/1h/2015.csv → ...se/HydroData/ScaledInflows/NL/1h/2015.csv
diff --git a/.../Database/Load_DayAhead/AT/15min/2015.csv → Database/Load_DayAhead/AT/15min/2015.csv b/.../Database/Load_DayAhead/AT/15min/2015.csv → Database/Load_DayAhead/AT/15min/2015.csv
diff --git a/...SET/Database/Load_DayAhead/AT/1h/2015.csv → Database/Load_DayAhead/AT/1h/2015.csv b/...SET/Database/Load_DayAhead/AT/1h/2015.csv → Database/Load_DayAhead/AT/1h/2015.csv
diff --git a/.../Database/Load_DayAhead/BE/15min/2015.csv → Database/Load_DayAhead/BE/15min/2015.csv b/.../Database/Load_DayAhead/BE/15min/2015.csv → Database/Load_DayAhead/BE/15min/2015.csv
diff --git a/...SET/Database/Load_DayAhead/BE/1h/2015.csv → Database/Load_DayAhead/BE/1h/2015.csv b/...SET/Database/Load_DayAhead/BE/1h/2015.csv → Database/Load_DayAhead/BE/1h/2015.csv
diff --git a/.../Database/Load_DayAhead/CH/15min/2015.csv → Database/Load_DayAhead/CH/15min/2015.csv b/.../Database/Load_DayAhead/CH/15min/2015.csv → Database/Load_DayAhead/CH/15min/2015.csv
diff --git a/...SET/Database/Load_DayAhead/CH/1h/2015.csv → Database/Load_DayAhead/CH/1h/2015.csv b/...SET/Database/Load_DayAhead/CH/1h/2015.csv → Database/Load_DayAhead/CH/1h/2015.csv
diff --git a/.../Database/Load_DayAhead/DE/15min/2015.csv → Database/Load_DayAhead/DE/15min/2015.csv b/.../Database/Load_DayAhead/DE/15min/2015.csv → Database/Load_DayAhead/DE/15min/2015.csv
diff --git a/...SET/Database/Load_DayAhead/DE/1h/2015.csv → Database/Load_DayAhead/DE/1h/2015.csv b/...SET/Database/Load_DayAhead/DE/1h/2015.csv → Database/Load_DayAhead/DE/1h/2015.csv
diff --git a/.../Database/Load_DayAhead/FR/15min/2015.csv → Database/Load_DayAhead/FR/15min/2015.csv b/.../Database/Load_DayAhead/FR/15min/2015.csv → Database/Load_DayAhead/FR/15min/2015.csv
diff --git a/...SET/Database/Load_DayAhead/FR/1h/2015.csv → Database/Load_DayAhead/FR/1h/2015.csv b/...SET/Database/Load_DayAhead/FR/1h/2015.csv → Database/Load_DayAhead/FR/1h/2015.csv
diff --git a/.../Database/Load_DayAhead/NL/15min/2015.csv → Database/Load_DayAhead/NL/15min/2015.csv b/.../Database/Load_DayAhead/NL/15min/2015.csv → Database/Load_DayAhead/NL/15min/2015.csv
diff --git a/...SET/Database/Load_DayAhead/NL/1h/2015.csv → Database/Load_DayAhead/NL/1h/2015.csv b/...SET/Database/Load_DayAhead/NL/1h/2015.csv → Database/Load_DayAhead/NL/1h/2015.csv
diff --git a/.../Database/Load_RealTime/AT/15min/2015.csv → Database/Load_RealTime/AT/15min/2015.csv b/.../Database/Load_RealTime/AT/15min/2015.csv → Database/Load_RealTime/AT/15min/2015.csv
diff --git a/...SET/Database/Load_RealTime/AT/1h/2015.csv → Database/Load_RealTime/AT/1h/2015.csv b/...SET/Database/Load_RealTime/AT/1h/2015.csv → Database/Load_RealTime/AT/1h/2015.csv
diff --git a/.../Database/Load_RealTime/BE/15min/2015.csv → Database/Load_RealTime/BE/15min/2015.csv b/.../Database/Load_RealTime/BE/15min/2015.csv → Database/Load_RealTime/BE/15min/2015.csv
diff --git a/...SET/Database/Load_RealTime/BE/1h/2015.csv → Database/Load_RealTime/BE/1h/2015.csv b/...SET/Database/Load_RealTime/BE/1h/2015.csv → Database/Load_RealTime/BE/1h/2015.csv
diff --git a/.../Database/Load_RealTime/CH/15min/2015.csv → Database/Load_RealTime/CH/15min/2015.csv b/.../Database/Load_RealTime/CH/15min/2015.csv → Database/Load_RealTime/CH/15min/2015.csv
diff --git a/...SET/Database/Load_RealTime/CH/1h/2015.csv → Database/Load_RealTime/CH/1h/2015.csv b/...SET/Database/Load_RealTime/CH/1h/2015.csv → Database/Load_RealTime/CH/1h/2015.csv
diff --git a/Database/Load_RealTime/CY/1h/2015.csv b/Database/Load_RealTime/CY/1h/2015.csv
diff --git a/.../Database/Load_RealTime/DE/15min/2015.csv → Database/Load_RealTime/DE/15min/2015.csv b/.../Database/Load_RealTime/DE/15min/2015.csv → Database/Load_RealTime/DE/15min/2015.csv
diff --git a/...SET/Database/Load_RealTime/DE/1h/2015.csv → Database/Load_RealTime/DE/1h/2015.csv b/...SET/Database/Load_RealTime/DE/1h/2015.csv → Database/Load_RealTime/DE/1h/2015.csv
diff --git a/...SET/Database/Load_RealTime/EL/1h/2015.csv → Database/Load_RealTime/EL/1h/2015.csv b/...SET/Database/Load_RealTime/EL/1h/2015.csv → Database/Load_RealTime/EL/1h/2015.csv
@@ -2089,8 +2089,8 @@
 2015-03-28 23:00:00+00:00,4640
 2015-03-29 00:00:00+00:00,4593
 2015-03-29 01:00:00+00:00,4353
-2015-03-29 02:00:00+00:00,
-2015-03-29 03:00:00+00:00,
+2015-03-29 02:00:00+00:00,4343
+2015-03-29 03:00:00+00:00,4338
 2015-03-29 04:00:00+00:00,4333
 2015-03-29 05:00:00+00:00,4556
 2015-03-29 06:00:00+00:00,4880
@@ -2983,7 +2983,7 @@
 2015-05-05 05:00:00+00:00,5299
 2015-05-05 06:00:00+00:00,5732
 2015-05-05 07:00:00+00:00,5877
-2015-05-05 08:00:00+00:00,
+2015-05-05 08:00:00+00:00,6018
 2015-05-05 09:00:00+00:00,6159
 2015-05-05 10:00:00+00:00,6152
 2015-05-05 11:00:00+00:00,5881
@@ -7148,7 +7148,7 @@
 2015-10-25 18:00:00+00:00,5397
 2015-10-25 19:00:00+00:00,5046
 2015-10-25 20:00:00+00:00,4662
-2015-10-25 21:00:00+00:00,
+2015-10-25 21:00:00+00:00,4436
 2015-10-25 22:00:00+00:00,4210
 2015-10-25 23:00:00+00:00,3896
 2015-10-26 00:00:00+00:00,3706

diff --git a/.../Database/Load_RealTime/FR/15min/2015.csv → Database/Load_RealTime/FR/15min/2015.csv b/.../Database/Load_RealTime/FR/15min/2015.csv → Database/Load_RealTime/FR/15min/2015.csv
diff --git a/...SET/Database/Load_RealTime/FR/1h/2015.csv → Database/Load_RealTime/FR/1h/2015.csv b/...SET/Database/Load_RealTime/FR/1h/2015.csv → Database/Load_RealTime/FR/1h/2015.csv
diff --git a/...SET/Database/Load_RealTime/IE/1h/2015.csv → Database/Load_RealTime/IE/1h/2015.csv b/...SET/Database/Load_RealTime/IE/1h/2015.csv → Database/Load_RealTime/IE/1h/2015.csv
diff --git a/.../Database/Load_RealTime/NL/15min/2015.csv → Database/Load_RealTime/NL/15min/2015.csv b/.../Database/Load_RealTime/NL/15min/2015.csv → Database/Load_RealTime/NL/15min/2015.csv
diff --git a/...SET/Database/Load_RealTime/NL/1h/2015.csv → Database/Load_RealTime/NL/1h/2015.csv b/...SET/Database/Load_RealTime/NL/1h/2015.csv → Database/Load_RealTime/NL/1h/2015.csv
diff --git a/Database/OutageFactors/EL/outages_EL_final.csv b/Database/OutageFactors/EL/outages_EL_final.csv
diff --git a/...SET/Database/OutageFactors/IE/1h/2015.csv → Database/OutageFactors/IE/1h/2015.csv b/...SET/Database/OutageFactors/IE/1h/2015.csv → Database/OutageFactors/IE/1h/2015.csv
diff --git a/Dispa-SET/Database/PowerPlants/AT/2015.csv → Database/PowerPlants/AT/2015.csv b/Dispa-SET/Database/PowerPlants/AT/2015.csv → Database/PowerPlants/AT/2015.csv
diff --git a/...-SET/Database/PowerPlants/AT/2015_sto.csv → Database/PowerPlants/AT/2015_sto.csv b/...-SET/Database/PowerPlants/AT/2015_sto.csv → Database/PowerPlants/AT/2015_sto.csv
diff --git a/Dispa-SET/Database/PowerPlants/BE/2015.csv → Database/PowerPlants/BE/2015.csv b/Dispa-SET/Database/PowerPlants/BE/2015.csv → Database/PowerPlants/BE/2015.csv
diff --git a/...-SET/Database/PowerPlants/BE/2015_sto.csv → Database/PowerPlants/BE/2015_sto.csv b/...-SET/Database/PowerPlants/BE/2015_sto.csv → Database/PowerPlants/BE/2015_sto.csv
diff --git a/Dispa-SET/Database/PowerPlants/CH/2015.csv → Database/PowerPlants/CH/2015.csv b/Dispa-SET/Database/PowerPlants/CH/2015.csv → Database/PowerPlants/CH/2015.csv
diff --git a/...-SET/Database/PowerPlants/CH/2015_sto.csv → Database/PowerPlants/CH/2015_sto.csv b/...-SET/Database/PowerPlants/CH/2015_sto.csv → Database/PowerPlants/CH/2015_sto.csv
diff --git a/Database/PowerPlants/CY/2015.csv b/Database/PowerPlants/CY/2015.csv
@@ -0,0 +1,23 @@
+,PowerCapacity,Type,Unit,Zone,Technology,Fuel,JRC_id,Efficiency,MinUpTime,MinDownTime,RampUpRate,RampDownRate,StartUpCost,NoLoadCost,RampingCost,PartLoadMin,MinEfficiency,StartUpTime,RampUpMax,RampDownMax,RampStartUpMaximum,RampShutDownMaximum,CO2Intensity,CHPType,CHPPowerToHeat,STOCapacity,STOSelfDischarge,STOMaxChargingPower,STOChargingEfficiency,CostFixed
+1,37.5,Fossil Gas,M07GTG_1-37.5MW,CY,GTUR,OIL,0,0.306,,,0.13333,0.13333,2500,,0,0.106,0.1522,0,,,,,0,,,,,,,240
+2,37.5,Fossil Gas,M08GTG_2-37.5MW,CY,GTUR,OIL,0,0.306,,,0.13333,0.13333,2500,,0,0.106,0.1522,0,,,,,0,,,,,,,240
+3,37.5,Fossil Gas,M09GTG_3-37.5MW,CY,GTUR,OIL,0,0.306,,,0.13333,0.13333,2500,,0,0.106,0.1522,0,,,,,0,,,,,,,240
+4,37.5,Fossil Gas,M10GTG_4-37.5MW,CY,GTUR,OIL,0,0.306,,,0.13333,0.13333,2500,,0,0.106,0.1522,0,,,,,0,,,,,,,240
+5,60,Fossil Gas,D1STG-60MW,CY,STUR,OIL,0,0.316,,,0.025,0.0333,10000,,0,0.4833,0.2867,0,,,,,0,,,,,,,30
+6,60,Fossil Gas,D2STG-60MW,CY,STUR,OIL,0,0.316,,,0.025,0.0333,10000,,0,0.4833,0.2867,0,,,,,0,,,,,,,30
+7,60,Fossil Gas,D3STG-60MW,CY,STUR,OIL,0,0.316,,,0.025,0.0333,10000,,0,0.4833,0.2867,0,,,,,0,,,,,,,30
+8,60,Fossil Gas,D4STG-60MW,CY,STUR,OIL,0,0.316,,,0.025,0.0333,10000,,0,0.4833,0.2867,0,,,,,0,,,,,,,30
+9,60,Fossil Gas,D5STG-60MW,CY,STUR,OIL,0,0.316,,,0.025,0.0333,10000,,0,0.4833,0.2867,0,,,,,0,,,,,,,30
+10,60,Fossil Gas,D6STG-60MW,CY,STUR,OIL,0,0.316,,,0.025,0.0333,10000,,0,0.4833,0.2867,0,,,,,0,,,,,,,30
+11,17.48,Internal Combustion Engine,DICE1-17.48MW,CY,ICEN,OIL,0,0.421,,,0.0572,0.0572,1200,,0,0.8581,0.4063,0,,,,,0,,,,,,,85
+12,17.48,Internal Combustion Engine,DICE2-17.48MW,CY,ICEN,OIL,0,0.421,,,0.0572,0.0572,1200,,0,0.8581,0.4063,0,,,,,0,,,,,,,85
+13,17.48,Internal Combustion Engine,DICE3-17.48MW,CY,ICEN,OIL,0,0.421,,,0.0572,0.0572,1200,,0,0.8581,0.4063,0,,,,,0,,,,,,,85
+14,17.07,Internal Combustion Engine,DICE4-17.07MW,CY,ICEN,OIL,0,0.421,,,0.0586,0.0586,600,,0,0.8787,0.4063,0,,,,,0,,,,,,,85
+15,17.07,Internal Combustion Engine,DICE5-17.07MW,CY,ICEN,OIL,0,0.421,,,0.0586,0.0586,600,,0,0.8787,0.4063,0,,,,,0,,,,,,,85
+16,17.07,Internal Combustion Engine,DICE6-17.07MW,CY,ICEN,OIL,0,0.421,,,0.0586,0.0586,600,,0,0.8787,0.4063,0,,,,,0,,,,,,,85
+17,130,Fossil Gas,V1STG1-130MW,CY,STUR,OIL,0,0.4012,,,0.0277,0.0277,20000,,0,0.4435,0.3676,0,,,,,0,,,,,,,60
+18,130,Fossil Gas,V2STG1-130MW,CY,STUR,OIL,0,0.4012,,,0.0277,0.0277,20000,,0,0.4435,0.3676,0,,,,,0,,,,,,,60
+19,130,Fossil Gas,V3STG1-130MW,CY,STUR,OIL,0,0.4012,,,0.0277,0.0277,20000,,0,0.4435,0.3676,0,,,,,0,,,,,,,60
+20,37.5,Fossil Gas,V-GTG-37.5MW,CY,GTUR,OIL,0,0.306,,,0.1333,0.1333,2500,,0,0.106,0.1522,0,,,,,0,,,,,,,240
+21,216,Fossil Gas,Vasilikos CCCP1,CY,COMC,OIL,0,0.4868,6,,0.027272727,0.027272727,17500,,0,0.272727273,0.4793,0,,,,,0,,,,,,,870
+22,216,Fossil Gas,Vasilikos CCCP2,CY,COMC,OIL,0,0.4868,6,,0.027272727,0.027272727,17500,,0,0.272727273,0.4793,0,,,,,0,,,,,,,870
diff --git a/Dispa-SET/Database/PowerPlants/DE/2015.csv → Database/PowerPlants/DE/2015.csv b/Dispa-SET/Database/PowerPlants/DE/2015.csv → Database/PowerPlants/DE/2015.csv
diff --git a/...-SET/Database/PowerPlants/DE/2015_sto.csv → Database/PowerPlants/DE/2015_sto.csv b/...-SET/Database/PowerPlants/DE/2015_sto.csv → Database/PowerPlants/DE/2015_sto.csv
diff --git a/Database/PowerPlants/EL/2015.csv b/Database/PowerPlants/EL/2015.csv
@@ -0,0 +1,54 @@
+PowerCapacity,Unit,Zone,Technology,Fuel,Efficiency,MinUpTime,MinDownTime,RampUpRate,RampDownRate,StartUpCost,NoLoadCost,RampingCost,PartLoadMin,MinEfficiency,StartUpTime,CO2Intensity,CHPType,CHPPowerToHeat,STOCapacity,STOSelfDischarge,STOMaxChargingPower,STOChargingEfficiency
+274,AGIOS DIMITRIOS 1,EL,STUR,LIG,0.3574,6,6,0.010948905,0.01459854,60000,0,0,0.547445255,0.3284,6,1.34,,,,,,
+274,AGIOS DIMITRIOS 2,EL,STUR,LIG,0.3574,6,6,0.010948905,0.01459854,60000,0,0,0.547445255,0.3284,6,1.34,,,,,,
+283,AGIOS DIMITRIOS 3,EL,STUR,LIG,0.3588,6,6,0.010600707,0.014134276,60000,0,0,0.54770318,0.3297,6,1.34,,,,,,
+283,AGIOS DIMITRIOS 4,EL,STUR,LIG,0.3594,6,6,0.010600707,0.014134276,60000,0,0,0.54770318,0.3303,6,1.34,,,,,,
+342,AGIOS DIMITRIOS 5,EL,STUR,LIG,0.37,6,6,0.00877193,0.011695906,60000,0,0,0.549707602,0.34,6,1.34,,,,,,
+417,ALIVERI 5 CC 1,EL,COMC,GAS,0.585,2,2,0.032142857,0.032142857,15000,0,0,0.436450839,0.43875,2,0.44,,,,,,
+273,AMYNTAIO 2,EL,STUR,LIG,0.3591,6,6,0.010989011,0.014652015,60000,0,0,0.549450549,0.33,6,1.31,,,,,,
+273,AMYNTAIO 1,EL,STUR,LIG,0.3597,6,6,0.010989011,0.014652015,60000,0,0,0.549450549,0.3305,6,1.31,,,,,,
+275,KARDIA 1,EL,STUR,LIG,0.3517,6,6,0.010909091,0.018181818,60000,0,0,0.549090909,0.3232,6,1.32,,,,,,
+280,KARDIA 3,EL,STUR,LIG,0.3517,6,6,0.010909091,0.018181818,60000,0,0,0.55,0.3232,6,1.32,,,,,,
+275,KARDIA 2,EL,STUR,LIG,0.3549,6,6,0.010714286,0.017857143,60000,0,0,0.549090909,0.3261,6,1.32,,,,,,
+280,KARDIA 4,EL,STUR,LIG,0.3555,6,6,0.010714286,0.017857143,60000,0,0,0.55,0.3267,6,1.32,,,,,,
+476,[KOMOTINI-1 GT 1;KOMOTINI-1 GT 2;KOMOTINI-1 SC 1],EL,COMC,GAS,0.52,2,2,0.021008403,0.021008403,15000,0,0,0.273109244,0.39,2,0.44,,,,,,
+550,[LAVRIO-IV GT 1;LAVRIO-IV GT 2;LAVRIO-IV GT 3;LAVRIO-IV SC 1],EL,COMC,GAS,0.51,2,2,0.021818182,0.021818182,15000,0,0,0.170909091,0.3825,2,0.44,,,,,,
+378,LAVRIO-V CC 1,EL,COMC,GAS,0.562,2,2,0.027777778,0.027777778,15000,0,0,0.582010582,0.4215,2,0.44,,,,,,
+255,MEGALOPOLIS-A NO 3,EL,STUR,LIG,0.3517,6,6,0.011764706,0.019607843,60000,0,0,0.603921569,0.3232,6,1.49,,,,,,
+256,MEGALOPOLIS-A NO 4,EL,STUR,LIG,0.3623,6,6,0.01171875,0.01953125,60000,0,0,0.76171875,0.3329,6,1.49,,,,,,
+845,MEGALOPOLIS-A NO 5,EL,STUR,LIG,0.38,6,6,0.01171875,0.01953125,60000,0,0,0.295857988,0.35,6,1.49,,,,,,
+289,FLORINA 1,EL,STUR,LIG,0.3701,6,6,0.010380623,0.01384083,60000,0,0,0.522491349,0.3401,6,0.94,,,,,,
+274,PTOLEMAIS 4,EL,STUR,LIG,0.3504,6,6,0.010948905,0.016423358,60000,0,0,0.547445255,0.322,6,1.31,,,,,,
+334,[AGIOS NIKOLAOS POWER CC-1 GT 1;AGIOS NIKOLAOS POWER CC-1 GT 2;AGIOS NIKOLAOS POWER CC-1 SC 1],EL,COMC,GAS,0.4493,2,2,0.038709677,0.038709677,15000,0,0,0.389221557,0.336975,2,0.44,,,,,,
+410,[THISVI ELPEDISON GT 1;THISVI ELPEDISON SC 1],EL,COMC,GAS,0.56,2,2,0.024390244,0.024390244,15000,0,0,0.56097561,0.42,2,0.44,,,,,,
+400,[THESSALONIKI POWER GT 1;THESSALONIKI POWER SC 1],EL,COMC,GAS,0.561,2,2,0.023076923,0.023076923,15000,0,0,0.55,0.42075,2,0.44,,,,,,
+422,THIVA HERON-2 CC 1,EL,COMC,GAS,0.57,2,2,0.028436019,0.028436019,15000,0,0,0.462085308,0.4275,2,0.44,,,,,,
+49,THIVA HERON-1 GT 1,EL,GTUR,GAS,0.39,1,1,0.06122449,0.163265306,4000,0,0,0.204081633,0.273,2,0.44,,,,,,
+49,THIVA HERON-1 GT 2,EL,GTUR,GAS,0.39,1,1,0.06122449,0.163265306,4000,0,0,0.204081633,0.273,2,0.44,,,,,,
+49,THIVA HERON-1 GT 3,EL,GTUR,GAS,0.39,1,1,0.06122449,0.163265306,4000,0,0,0.204081633,0.273,2,0.44,,,,,,
+154,[ILARIONAS 1;ILARIONAS 2;ILARIONAS A1],EL,HDAM,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,95550,,,
+433,KORINTHOS POWER CC 1,EL,COMC,GAS,0.58,2,2,0.032258065,0.032258065,15000,0,0,0.45034642,0.435,2,0.44,,,,,,
+432,AGIOS NIKOLAOS POWER CC-2 CC 1,EL,COMC,GAS,0.58,2,2,0.03235498,0.03235498,15000,0,0,0.451388889,0.435,2,0.44,,,,,,
+384,THISAVROS,EL,HPHS,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,264545.5556,,100,0.8
+50,[AGRAS 1;AGRAS 2],EL,HROR,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,0,,,
+108,[ASSOMATA 1;ASSOMATA 2],EL,HDAM,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,1415.555556,,,
+19,EDESSAIOS 1,EL,HROR,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,0,,,
+8.5,GHIONA 1,EL,HROR,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,0,,,
+4.8,[GLAFKOS-II NO1;GLAFKOS-II NO2],EL,HROR,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,0,,,
+320,[KASTRAKI 1;KASTRAKI 2;KASTRAKI 3;KASTRAKI 4],EL,HDAM,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,13850.66667,,,
+437,[KREMASTA 1;KREMASTA 2;KREMASTA 3;KREMASTA 4],EL,HDAM,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,1482250,,,
+70,LADONAS,EL,HDAM,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,7012.444444,,,
+10.3,[LOUROS 1;LOUROS 2;LOUROS 3],EL,HROR,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,0,,,
+10.8,[MAKROHORI-I NO 1;MAKROHORI-I NO 2;MAKROHORI-I NO 3],EL,HROR,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,0,,,
+130,[PLASTIRA 1;PLASTIRA 2;PLASTIRA 3],EL,HDAM,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,67783.33333,,,
+210,[PIGAI AOOS 1;PIGAI AOOS 2],EL,HDAM,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,30576,,,
+116,[PLATANOVRISI 1;PLATANOVRISI 2],EL,HDAM,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,14740.83333,,,
+375,[POLYPHYTON 1;POLYPHYTON 2;POLYPHYTON 3],EL,HDAM,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,371964.4444,,,
+34,[POURNARI-II NO 1;POURNARI-II NO 2],EL,HDAM,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,163.3333333,,,
+300,[POURNARI-I NO 1;POURNARI-I NO 2;POURNARI-I NO 3;POURNARI-I NO A1],EL,HDAM,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,71760.5,,,
+315,[SFIKIA 1;SFIKIA 2;SFIKIA 3],EL,HPHS,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,4018,,315,0.8
+6,[STRATOS-II NO 1;STRATOS-II NO 2],EL,HDAM,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,0,,,
+150,[STRATOS-I NO 1;STRATOS-I NO 2],EL,HROR,WAT,1,0,0,1,1,0,0,0,0,0.5,1,0,,,778.5555556,,,
+1613,Cluster Wind Onshore,EL,WTON,WIN,1,0,0,1,1,0,0,0,0,0.5,1,0,,,,,,
+2429,Cluster Solar,EL,PHOT,SUN,1,0,0,1,1,0,0,0,0,0.5,1,0,,,,,,
+298,Cluster Other renewable,EL,STUR,BIO,0.39,1,1,0.04,0.05,10728,0,0,0.2,0.195,1,0,,,,,,
diff --git a/Dispa-SET/Database/PowerPlants/FR/2015.csv → Database/PowerPlants/FR/2015.csv b/Dispa-SET/Database/PowerPlants/FR/2015.csv → Database/PowerPlants/FR/2015.csv
diff --git a/...-SET/Database/PowerPlants/FR/2015_sto.csv → Database/PowerPlants/FR/2015_sto.csv b/...-SET/Database/PowerPlants/FR/2015_sto.csv → Database/PowerPlants/FR/2015_sto.csv
diff --git a/...SET/Database/PowerPlants/IE/2015_Lucy.csv → Database/PowerPlants/IE/2015_Lucy.csv b/...SET/Database/PowerPlants/IE/2015_Lucy.csv → Database/PowerPlants/IE/2015_Lucy.csv
diff --git a/Dispa-SET/Database/PowerPlants/NL/2015.csv → Database/PowerPlants/NL/2015.csv b/Dispa-SET/Database/PowerPlants/NL/2015.csv → Database/PowerPlants/NL/2015.csv
diff --git a/...SET/Database/PowerPlants/NL/2015_BEVS.csv → Database/PowerPlants/NL/2015_BEVS.csv b/...SET/Database/PowerPlants/NL/2015_BEVS.csv → Database/PowerPlants/NL/2015_BEVS.csv
diff --git a/...-SET/Database/PowerPlants/NL/2015_sto.csv → Database/PowerPlants/NL/2015_sto.csv b/...-SET/Database/PowerPlants/NL/2015_sto.csv → Database/PowerPlants/NL/2015_sto.csv
diff --git a/Dispa-SET/ConfigFiles/ConfigEL.xlsx b/Dispa-SET/ConfigFiles/ConfigEL.xlsx
diff --git a/Dispa-SET/ConfigFiles/ConfigTest.xlsx b/Dispa-SET/ConfigFiles/ConfigTest.xlsx