Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShahmBarmada
ShahmBarmada committed Dec 2, 2021
1 parent 6fba7de commit d2fdf4f
Show file tree
Hide file tree
Showing 4 changed files with 320 additions and 55 deletions.
7 changes: 2 additions & 5 deletions App.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,11 +564,8 @@ def PrepareFigure(self):

global figure

if self.cb_Legend.isChecked:
showLegend = True

if self.cb_StudiesNames.isChecked:
showTitle = True
showLegend = self.cb_Legend.isChecked()
showTitle = self.cb_StudiesNames.isChecked()

if self.rb_Selective.isChecked():
# get selected figure card
Expand Down
2 changes: 1 addition & 1 deletion CSV_Parser.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def csvParser (originalFile: str, inputFile: str, timestamp: str) -> str:
exceptionList1 = ['RESULT: Da','ANNUAL CO2','SHARE OF R','ANNUAL FUE','ANNUAL COS']
exceptionList2 = ['EnergyPLAN','RESULT: Da','Technical ','Critical E']
exceptionList3 = ['Coal ','Oil ','N.Gas ','Biomass ','Renewable ','H2 Etc. ','Biofuel ','Nucl/Ccs ','Total ','So2 ','Pm2.5 ','Nox ','Ch4 ','N2O ','Detailed Emi']
headerList = ['Index','g0-Data1','g0-Data2','g0-Data3','g1-DHP','g1-CHP2','g1-CHP3','g1-Boiler2','g1-Boiler3','g1-PP','g1-Geo/Nu','g1-Hydro','g1-Waste/HTL','g1-CAES/ELT','g1-BioCon','g1-EFuel','g1-VRES','g1-SolarTh','g1-Transp','g1-Househ','g1-Ind/Var','g1-Total','0001_ElectrDemand','0002_ElecdemCooling','0003_FixedExp/Imp','0004_DHDemand','0101_WindElectr','0102_OffshoreElectr','0103_PVElectr','0104_CSPElectr','0105_RiverElectr','0106_WaveElectr','0107_TidalElectr','0108_CSP2Electr','0109_CSP2Storage','0110_CSP2loss','0201_HydroElectr','0202_Hydropump','0203_Hydrostorage','0204_HydroWat-Sup','0205_HydroWat-Loss','0301_SolarHeat','0401_CSHP1Heat','0402_Waste1Heat','0005_Boiler1Heat','0302_Solar1Heat','0303_Sol1StrHeat','0403_CSHP2Heat','0404_Waste2Heat','0501_Geoth2Heat','0502_Geoth2Steam','0503_Geoth2Storage','0006_CHP2Heat','0007_HP2Heat','0008_Boiler2Heat','0009_EH2Heat','0010_ELT2Heat','0304_Solar2Heat','0305_Sol2StrHeat','0011_Storage2Heat','0012_Balance2Heat','0405_CSHP3Heat','0406_Waste3Heat','0504_Geoth3Heat','0505_Geoth3Steam','0506_Geoth3Storage','0013_CHP3Heat','0014_HP3Heat','0015_Boiler3Heat','0016_EH3Heat','0017_ELT3Heat','0306_Solar3Heat','0307_Sol3StrHeat','0018_Storage3Heat','0019_Balance3Heat','0020_FlexibleElectr','0021_HPElectr','0022_CSHPElectr','0023_CHPElectr','0601_PPElectr','0602_PP2Electr','0701_NuclearElectr','0702_GeotherElectr','0801_PumpElectr','0901_TurbineElectr','1001_PumpedStorage','0802_Pump2Electr','0902_Turbine2Electr','1002_Pumped2Storage','0903_RockinElectr','0904_RockoutSteam','0905_RockstrStorage','1101_ELT2Electr','1102_ELT2H2ELT2','1201_ELT3Electr','1202_ELT3H2ELT3','1301_V2GDemand','1302_V2GCharge','1303_V2GDischa','1304_V2GStorage','2001_H2Electr','2002_H2Storage','2003_CO2HydroElectr','2004_NH3HydroElectr','2005_CO2Hydroliqfuel','2006_NH3HydroAmmonia','1801_HH-CHPElectr','1802_HH-HPElectr','1803_HH-HP/EBElectr','1804_HH-EBElectr','1901_HH-H2Electr','1902_HH-H2Storage','1903_HH-H2Prices','1701_HHDemHeat','1702_HHCHP+HPHeat','1703_HHBoilHeat','1704_HHSolarHeat','1705_HHStoreHeat','1706_HHBalanHeat','0024_StabilLoadPercent','0025_ImportElectr','0026_ExportElectr','0027_CEEPElectr','0028_EEEPElectr','1401_ExMarketPrices','1402_ExMarketProd','1501_SystemPrices','1502_InMarketPrices','1503_Btl-neckPrices','0029_ImportPayment','1601_ExportPayment','1602_Blt-neckPayment','0030_Add-expPayment','2301_Boilers','2302_CHP2+3','2303_PPCAES','2304_Indi-vidual','2305_Transp','2306_IndustVarious','2307_DemandSum','2308_Biogas','2309_Syngas','2310_CO2HyGas','2311_SynHyGas','2312_SynFuel','2313_Storage','2314_StorageContent','2315_Sum','2316_ImportGas','2317_ExportGas','2201_FreshWDemand','2202_FreshWStorage','2203_SaltWDemand','2204_BrineProd','2205_BrineStorage','2206_DesalPlElectr','2207_FWPumpElectr','2208_TurbineElectr','2209_PumpElectr','2101_CoolGr1Demand','2102_CoolGr2Demand','2103_CoolGr3Demand','2104_Cool-ElDemand','2105_CoolGr1Natural','2106_CoolGr2Natural','2107_CoolGr3Natural','2108_CoolingDHgr1','2109_CoolingDHgr2','2110_CoolingDHgr3','2111_CoolingElectr']
headerList = ['Index','g0-Data1','g0-Data2','g0-Data3','g1_DHP','g1_CHP2','g1_CHP3','g1_Boiler2','g1_Boiler3','g1_PP','g1_Geo/Nu','g1_Hydro','g1_Waste/HTL','g1_CAES/ELT','g1_BioCon','g1_EFuel','g1_VRES','g1_SolarTh','g1_Transp','g1_Househ','g1_Ind/Var','g1_Total','0001_ElectrDemand','0002_ElecdemCooling','0003_FixedExp/Imp','0004_DHDemand','0101_WindElectr','0102_OffshoreElectr','0103_PVElectr','0104_CSPElectr','0105_RiverElectr','0106_WaveElectr','0107_TidalElectr','0108_CSP2Electr','0109_CSP2Storage','0110_CSP2loss','0201_HydroElectr','0202_Hydropump','0203_Hydrostorage','0204_HydroWat-Sup','0205_HydroWat-Loss','0301_SolarHeat','0401_CSHP1Heat','0402_Waste1Heat','0005_Boiler1Heat','0302_Solar1Heat','0303_Sol1StrHeat','0403_CSHP2Heat','0404_Waste2Heat','0501_Geoth2Heat','0502_Geoth2Steam','0503_Geoth2Storage','0006_CHP2Heat','0007_HP2Heat','0008_Boiler2Heat','0009_EH2Heat','0010_ELT2Heat','0304_Solar2Heat','0305_Sol2StrHeat','0011_Storage2Heat','0012_Balance2Heat','0405_CSHP3Heat','0406_Waste3Heat','0504_Geoth3Heat','0505_Geoth3Steam','0506_Geoth3Storage','0013_CHP3Heat','0014_HP3Heat','0015_Boiler3Heat','0016_EH3Heat','0017_ELT3Heat','0306_Solar3Heat','0307_Sol3StrHeat','0018_Storage3Heat','0019_Balance3Heat','0020_FlexibleElectr','0021_HPElectr','0022_CSHPElectr','0023_CHPElectr','0601_PPElectr','0602_PP2Electr','0701_NuclearElectr','0702_GeotherElectr','0801_PumpElectr','0901_TurbineElectr','1001_PumpedStorage','0802_Pump2Electr','0902_Turbine2Electr','1002_Pumped2Storage','0903_RockinElectr','0904_RockoutSteam','0905_RockstrStorage','1101_ELT2Electr','1102_ELT2H2ELT2','1201_ELT3Electr','1202_ELT3H2ELT3','1301_V2GDemand','1302_V2GCharge','1303_V2GDischa','1304_V2GStorage','2001_H2Electr','2002_H2Storage','2003_CO2HydroElectr','2004_NH3HydroElectr','2005_CO2Hydroliqfuel','2006_NH3HydroAmmonia','1801_HH-CHPElectr','1802_HH-HPElectr','1803_HH-HP/EBElectr','1804_HH-EBElectr','1901_HH-H2Electr','1902_HH-H2Storage','1903_HH-H2Prices','1701_HHDemHeat','1702_HHCHP+HPHeat','1703_HHBoilHeat','1704_HHSolarHeat','1705_HHStoreHeat','1706_HHBalanHeat','0024_StabilLoadPercent','0025_ImportElectr','0026_ExportElectr','0027_CEEPElectr','0028_EEEPElectr','1401_ExMarketPrices','1402_ExMarketProd','1501_SystemPrices','1502_InMarketPrices','1503_Btl-neckPrices','0029_ImportPayment','1601_ExportPayment','1602_Blt-neckPayment','0030_Add-expPayment','2301_Boilers','2302_CHP2+3','2303_PPCAES','2304_Indi-vidual','2305_Transp','2306_IndustVarious','2307_DemandSum','2308_Biogas','2309_Syngas','2310_CO2HyGas','2311_SynHyGas','2312_SynFuel','2313_Storage','2314_StorageContent','2315_Sum','2316_ImportGas','2317_ExportGas','2201_FreshWDemand','2202_FreshWStorage','2203_SaltWDemand','2204_BrineProd','2205_BrineStorage','2206_DesalPlElectr','2207_FWPumpElectr','2208_TurbineElectr','2209_PumpElectr','2101_CoolGr1Demand','2102_CoolGr2Demand','2103_CoolGr3Demand','2104_Cool-ElDemand','2105_CoolGr1Natural','2106_CoolGr2Natural','2107_CoolGr3Natural','2108_CoolingDHgr1','2109_CoolingDHgr2','2110_CoolingDHgr3','2111_CoolingElectr']
lookupValues = ['input_cap_pp_el','input_cap_chp2_el','input_cap_chp3_el','input_cap_pp2_el','input_nuclear_cap','input_GeoPower_cap','input_hydro_cap','input_RES1_capacity','input_RES2_capacity','input_RES3_capacity','input_RES4_capacity','input_RES5_capacity','input_RES6_capacity','input_RES7_capacity','Input_CSP_Power_cap','input_cap_hp2_el','input_cap_hp3_el','input_cap_ELTtrans_el','input_eh2','input_eh3','input_cap_boiler2_th','input_cap_boiler3_th','input_cap_chp2_thermal','input_cap_chp3_thermal']
out1, out2, out3 = '', '', ''
list1, list2 = [], []
Expand Down
Loading

0 comments on commit d2fdf4f

Please sign in to comment.