Ammonia added as fuel type, updates to figures

energy-modelling-toolkit · Dec 15, 2021 · 9352091 · 9352091
1 parent 88b5f98
commit 9352091
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 34 deletions.
diff --git a/ConfigFiles/ConfigTest.xlsx b/ConfigFiles/ConfigTest.xlsx
diff --git a/Docs/data.rst b/Docs/data.rst
@@ -134,7 +134,8 @@ Dispa-SET only considers a limited number of different fuel types. They are summ
 	Fuel	Examples
 	======= =============
 	AIR     Air energy from the surrounding environment (used by heat pumps and other heat generation technologies)
-	BIO	    Bagasse, Biodiesel, Gas From Biomass, Gasification, Biomass, Briquettes, Cattle Residues, Rice Hulls Or Padi Husk, Straw, Wood Gas (From Wood Gasification), Wood Waste Liquids Excl Blk Liq (Incl Red Liquor, Sludge, Wood,Spent Sulfite Liquor And Oth Liquids, Wood And Wood Waste
+	AMO     Ammonia
+    BIO	    Bagasse, Biodiesel, Gas From Biomass, Gasification, Biomass, Briquettes, Cattle Residues, Rice Hulls Or Padi Husk, Straw, Wood Gas (From Wood Gasification), Wood Waste Liquids Excl Blk Liq (Incl Red Liquor, Sludge, Wood,Spent Sulfite Liquor And Oth Liquids, Wood And Wood Waste
 	GAS	    Blast Furnace Gas, Boiler Natural Gas, Butane, Coal Bed Methane, Coke Oven Gas, Flare Gas, Gas (Generic), Methane, Mine Gas, Natural Gas, Propane, Refinery Gas, Sour Gas, Synthetic Natural Gas, Top Gas, Voc Gas & Vapor, Waste Gas, Wellhead Gas
 	GEO	    Geothermal steam
 	HRD	    Anthracite, Other Anthracite, Bituminous Coal, Coker By-Product, Coal Gas (From Coal Gasification), Coke, Coal (Generic), Coal-Oil Mixture, Other Coal, Coal And Pet Coke Mi, Coal Tar Oil, Anthracite Coal Waste, Coal-Water Mixture, Gob, Hard Coal / Anthracite, Imported Coal, Other Solids, Soft Coal, Anthracite Silt, Steam Coal, Subbituminous, Pelletized Synthetic Fuel From Coal, Bituminous Coal Waste)
@@ -156,6 +157,7 @@ Different fuels may be used to power a given technology, e.g. steam turbines may
 ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ==========
 f/t	COMC	GTUR	HDAM	HPHS	HROR	ICEN	PHOT	STUR	WTOF	WTON	Total
 ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ======= ==========
+AMO 1
 BIO		2				10		79			91
 GAS	485	188				28		97			798
 GEO								10			10

diff --git a/Docs/figures/original_figures/Figures.pptx b/Docs/figures/original_figures/Figures.pptx
diff --git a/dispaset/GAMS/UCM_h.gms b/dispaset/GAMS/UCM_h.gms
@@ -869,7 +869,7 @@ EQ_Storage_MaxDischarge(s,i)$(StorageCapacity(s)>PowerCapacity(s)*TimeStep)..
          =L=
          StorageInitial(s)$(ord(i) = 1)
          + StorageLevel(s,i-1)$(ord(i) > 1)
-         +StorageInflow(s,i)*Nunits(s)*TimeStep
+         + StorageInflow(s,i)*Nunits(s)*TimeStep
 ;
 
 *Charging is limited by the remaining storage capacity
@@ -1299,6 +1299,7 @@ OutputRampRate(au,h)
 OutputStartUp(au,h)
 OutputShutDown(au,h)
 OutputEmissions(n,p,z)
+CapacityMargin(n,h)
 ;
 
 OutputCommitted(au,z)=Committed.L(au,z);
@@ -1361,6 +1362,16 @@ OutputEmissions(n,p,z) = (sum(u,Power.L(u,z)*EmissionRate(u,p)*Location(u,n))
                         + sum(hu,Heat.L(hu,z)*EmissionRate(hu,p)*Location(hu,n)))
                         / (sum(u,Power.L(u,z)*Location(u,n)) + sum(hu,Heat.L(hu,z)*Location(hu,n)));
 
+CapacityMargin(n,z) = (sum(u, Nunits(u)*PowerCapacity(u)$(not s(u))*LoadMaximum(u,z)*Location(u,n))
+                      + min(sum(s, Nunits(s)*PowerCapacity(s)*LoadMaximum(s,z)*Location(s,n)), sum(s, StorageLevel.L(s,z)*StorageCapacity(s)))
+                      + sum(l,FlowMaximum(l,z)*LineNode(l,n))
+*                      + sum(l,Flow.L(l,z)*LineNode(l,n))
+                      - Demand("DA",n,z)
+*                      + Demand("Flex",n,z)
+*                      + DemandModulation.L(n,z)
+                      - sum(p2h,PowerConsumption.L(p2h,z)*Location(p2h,n))
+);
+
 EXECUTE_UNLOAD "Results.gdx"
 OutputCommitted,
 OutputFlow,
@@ -1412,6 +1423,7 @@ OutputRampRate,
 OutputStartUp,
 OutputShutDown,
 OutputEmissions,
+CapacityMargin,
 status
 ;
 

diff --git a/dispaset/common.py b/dispaset/common.py
@@ -34,14 +34,14 @@
 # List of CHP types:
 commons['types_CHP'] = ['extraction', 'back-pressure', 'p2h']
 # DispaSET fuels:
-commons['Fuels'] = ['AIR', 'BIO', 'GAS', 'HRD', 'LIG', 'NUC', 'OIL', 'PEA', 'SUN', 'WAT', 'WIN', 'WST', 'OTH', 'GEO',
-                    'HYD', 'WHT', 'ELE', 'THE']
+commons['Fuels'] = ['AIR', 'AMO', 'BIO', 'GAS', 'HRD', 'LIG', 'NUC', 'OIL', 'PEA', 'SUN', 'WAT', 'WIN', 'WST', 'OTH',
+                    'GEO', 'HYD', 'WHT', 'ELE', 'THE']
 # Ordered list of fuels for plotting (the first ones are negative):
 commons['MeritOrder'] = ['SCSP', 'BATS', 'BEVS', 'HDAM', 'HPHS', 'P2GS', 'FlowOut', 'GEO', 'NUC', 'LIG',
-                         'HRD', 'BIO', 'GAS', 'OIL', 'PEA', 'WST', 'OTH', 'SUN', 'WIN', 'FlowIn', 'WAT',
+                         'HRD', 'BIO', 'AMO', 'GAS', 'OIL', 'PEA', 'WST', 'OTH', 'SUN', 'WIN', 'FlowIn', 'WAT',
                          'HYD', 'AIR', 'WHT']
-commons['MeritOrderHeat'] = ['GEO', 'NUC', 'LIG', 'HRD', 'BIO', 'GAS', 'OIL', 'PEA', 'WST', 'OTH', 'SUN', 'WIN', 'WAT',
-                             'HYD', 'AIR', 'WHT', 'ELE', 'THE', 'HeatSlack', 'THMS']
+commons['MeritOrderHeat'] = ['GEO', 'NUC', 'LIG', 'HRD', 'BIO', 'AMO', 'GAS', 'OIL', 'PEA', 'WST', 'OTH', 'SUN', 'WIN',
+                             'WAT', 'HYD', 'AIR', 'WHT', 'ELE', 'THE', 'HeatSlack', 'THMS']
 
 # Colors associated with each fuel:
 # commons['colors'] = {'LIG': '#af4b9180', 'PEA': '#af4b9199', 'HRD': '#af4b91b2', 'OIL': '#af4b91ff',
@@ -69,6 +69,7 @@
                      'WAT': '#00a0e1ff',
                      'HYD': '#A0522D',
                      'BIO': '#7daf4bff',
+                     'AMO': '#ffff00ff',
                      'GEO': '#7daf4bbf',
                      'Storage': '#b93c46ff',
                      'FlowIn': '#b93c46b2',
@@ -92,7 +93,7 @@
 commons['colors']['curtailment'] = 'red'
 # Hatches associated with each fuel:
 commons['hatches'] = {'LIG': '', 'PEA': '', 'HRD': '', 'OIL': '', 'GAS': '', 'NUC': '', 'SUN': '', 'WIN': '', 'WAT': '',
-                      'BIO': '', 'GEO': '', 'Storage': '', 'WST': '', 'OTH': '', 'HYD': '',
+                      'BIO': '', 'AMO': '', 'GEO': '', 'Storage': '', 'WST': '', 'OTH': '', 'HYD': '',
                       'FlowIn': '/', 'FlowOut': '\\', 'HDAM': '/', 'HPHS': '/', 'SCSP': '/', 'THMS': '', 'BATS': '/',
                       'BEVS': '/', 'P2GS': '/', 'AIR': '', 'WHT': '', 'HeatSlack': '/', 'ELE': '', 'THE': ''
                       }

diff --git a/dispaset/postprocessing/data_handler.py b/dispaset/postprocessing/data_handler.py
@@ -160,24 +160,27 @@ def get_sim_results(path='.', cache=None, temp_path=None, return_xarray=False, r
                    'OutputStorageSlack', 'OutputPtLDemand', 'OutputH2Output', 'OutputPowerMustRun',
                    'OutputReserve_2U', 'OutputReserve_2D', 'OutputReserve_3U', 'ShadowPrice_RampUp_TC',
                    'ShadowPrice_RampDown_TC', 'OutputRampRate', 'OutputStartUp', 'OutputShutDown','HeatShadowPrice',
-                   'H2ShadowPrice', 'OutputCurtailedHeat', 'OutputEmissions']
+                   'H2ShadowPrice', 'OutputCurtailedHeat', 'OutputEmissions', 'CapacityMargin']
 
     # Setting the proper index to the result dataframes:
     from itertools import chain
     for key in chain(keys, keys_sparse):
         if key in results:
-            if len(results[key]) == len(
-                    index_long):  # Case of variables for which the look-ahead period recorded (e.g. the lost loads)
+            # Case of variables for which the look-ahead period is recorded (e.g. the lost loads)
+            if len(results[key]) == len(index_long):
                 results[key].index = index_long
-            elif len(results[key]) == len(
-                    index):  # Case of variables for which the look-ahead is not recorded (standard case)
+            # Case of variables for which the look-ahead is not recorded (standard case)
+            elif len(results[key]) == len(index):
                 results[key].index = index
-            else:  # Variables whose index is not complete (sparse formulation)
+            # Variables whose index is not complete (sparse formulation)
+            else:
                 results[key].index = index_long[results[key].index - 1]
                 if key in keys_sparse:
                     results[key] = results[key].reindex(index).fillna(0)
         else:
             results[key] = pd.DataFrame(index=index)
+        if isinstance(results[key], type(pd.DataFrame())):
+            results[key] = results[key].reindex(sorted(results[key].columns), axis=1)
 
     # Include water slack in the results (only one number)
     if 'LostLoad_WaterSlack' in results:

diff --git a/dispaset/preprocessing/build.py b/dispaset/preprocessing/build.py
@@ -273,7 +273,7 @@ def build_single_run(config, profiles=None, PtLDemand=None, MTS=0):
 
     # Fuel prices:
     fuels = ['PriceOfNuclear', 'PriceOfBlackCoal', 'PriceOfGas', 'PriceOfFuelOil', 'PriceOfBiomass', 'PriceOfCO2',
-             'PriceOfLignite', 'PriceOfPeat']
+             'PriceOfLignite', 'PriceOfPeat', 'PriceOfAmmonia']
     FuelPrices = {}
     for fuel in fuels:
         FuelPrices[fuel] = NodeBasedTable(fuel, config, default=config['default'][fuel])
@@ -716,7 +716,7 @@ def build_single_run(config, profiles=None, PtLDemand=None, MTS=0):
     # Variable Cost
     # Equivalence dictionary between fuel types and price entries in the config sheet:
     FuelEntries = {'BIO': 'PriceOfBiomass', 'GAS': 'PriceOfGas', 'HRD': 'PriceOfBlackCoal', 'LIG': 'PriceOfLignite',
-                   'NUC': 'PriceOfNuclear', 'OIL': 'PriceOfFuelOil', 'PEA': 'PriceOfPeat'}
+                   'NUC': 'PriceOfNuclear', 'OIL': 'PriceOfFuelOil', 'PEA': 'PriceOfPeat', 'AMO': 'PriceOfAmmonia'}
     for unit in range(Nunits):
         c = Plants_merged['Zone'][unit]  # zone to which the unit belongs
         found = False
@@ -910,7 +910,7 @@ def build_single_run(config, profiles=None, PtLDemand=None, MTS=0):
     shutil.copyfile(os.path.join(GMS_FOLDER, 'writeresults.gms'),
                     os.path.join(sim, 'writeresults.gms'))
     # Create cplex option file
-    cplex_options = {'epgap': 0.005,  # TODO: For the moment hardcoded, it has to be moved to a config file
+    cplex_options = {'epgap': 0.0005,  # TODO: For the moment hardcoded, it has to be moved to a config file
                      'numericalemphasis': 0,
                      'scaind': 1,
                      'lpmethod': 0,

diff --git a/dispaset/preprocessing/data_handler.py b/dispaset/preprocessing/data_handler.py
@@ -13,7 +13,7 @@
     pass
 
 DEFAULTS = {'ReservoirLevelInitial': 0.5, 'ReservoirLevelFinal': 0.5, 'ValueOfLostLoad': 1E5,
-            'PriceOfSpillage': 1, 'WaterValue': 100, 'ShareOfQuickStartUnits': 0.5,
+            'PriceOfSpillage': 1, 'WaterValue': 100, 'ShareOfQuickStartUnits': 0.5, 'PriceOfAmmonia': 0,
             'PriceOfNuclear': 0, 'PriceOfBlackCoal': 0, 'PriceOfGas': 0, 'PriceOfFuelOil': 0, 'PriceOfBiomass': 0,
             'PriceOfCO2': 0, 'PriceOfLignite': 0, 'PriceOfPeat': 0, 'LoadShedding': 0, 'CostHeatSlack': 0,
             'CostLoadShedding': 100, 'ShareOfFlexibleDemand': 0, 'DemandFlexibility': 0, 'PriceTransmission': 0,
@@ -605,15 +605,15 @@ def load_config_excel(ConfigFile, AbsPath=True):
             'CostH2Slack': 170, 'CostCurtailment': 171,
             # Fuel price related data
             'PriceOfNuclear': 180, 'PriceOfBlackCoal': 181, 'PriceOfGas': 182, 'PriceOfFuelOil': 183,
-            'PriceOfBiomass': 184, 'PriceOfLignite': 185, 'PriceOfPeat': 186
+            'PriceOfBiomass': 184, 'PriceOfLignite': 185, 'PriceOfPeat': 186, 'PriceOfAmmonia': 187
         }
         modifiers = {'Demand': 274, 'Wind': 275, 'Solar': 276, 'Storage': 277}
         default = {
             # Hydro scheduling defaults
             'ReservoirLevelInitial': 101, 'ReservoirLevelFinal': 102,
             # Fuel price defaults
             'PriceOfNuclear': 180, 'PriceOfBlackCoal': 181, 'PriceOfGas': 182, 'PriceOfFuelOil': 183,
-            'PriceOfBiomass': 184, 'PriceOfLignite': 185, 'PriceOfPeat': 186,
+            'PriceOfBiomass': 184, 'PriceOfLignite': 185, 'PriceOfPeat': 186, 'PriceOfAmmonia': 187,
             # Other price defaults
             'PriceOfCO2': 166, 'CostHeatSlack': 167, 'CostLoadShedding': 168, 'PriceTransmission': 169,
             'CostH2Slack': 170, 'CostCurtailment': 171,
@@ -809,10 +809,10 @@ def load_config_yaml(filename, AbsPath=True):
     # Define missing parameters if they were not provided in the config file
     PARAMS = ['Demand', 'Outages', 'PowerPlantData', 'RenewablesAF', 'LoadShedding', 'NTC', 'Interconnections',
               'ReservoirScaledInflows', 'PriceOfNuclear', 'PriceOfBlackCoal', 'PriceOfGas', 'PriceOfFuelOil',
-              'PriceOfBiomass', 'PriceOfCO2', 'ReservoirLevels', 'PriceOfLignite', 'PriceOfPeat', 'HeatDemand',
-              'CostHeatSlack', 'CostLoadShedding', 'ShareOfFlexibleDemand', 'Temperatures', 'PriceTransmission',
-              'Reserve2D', 'Reserve2U', 'H2RigidDemand', 'H2FlexibleDemand', 'H2FlexibleCapacity', 'CostH2Slack',
-              'GeoData']
+              'PriceOfBiomass', 'PriceOfCO2', 'ReservoirLevels', 'PriceOfLignite', 'PriceOfPeat', 'PriceOfAmmonia',
+              'HeatDemand', 'CostHeatSlack', 'CostLoadShedding', 'ShareOfFlexibleDemand', 'Temperatures',
+              'PriceTransmission', 'Reserve2D', 'Reserve2U', 'H2RigidDemand', 'H2FlexibleDemand', 'H2FlexibleCapacity',
+              'CostH2Slack', 'GeoData']
     for param in PARAMS:
         if param not in config:
             config[param] = ''

diff --git a/tests/dummy_data/Units_testcase.csv b/tests/dummy_data/Units_testcase.csv
@@ -1,19 +1,19 @@
 ,Unit,PowerCapacity,Nunits,Zone,Zone_th,Technology,Fuel,Efficiency,MinUpTime,MinDownTime,RampUpRate,RampDownRate,StartUpCost,NoLoadCost_pu,RampingCost,PartLoadMin,MinEfficiency,StartUpTime,CO2Intensity,CHPType,CHPPowerToHeat,CHPPowerLossFactor,CHPMaxHeat,COP,Tnominal,coef_COP_a,coef_COP_b,STOCapacity,STOSelfDischarge,STOMaxChargingPower,STOChargingEfficiency,WaterWithdrawal,WaterConsumption
-0,Maasvlakte,500,1,Z2,,STUR,HRD,0.395,8,6,0.004672897,0.004672897,112542.12,0,0,0.3,0.395,7,0.95,,,,,,,,,,,,,2.5,2.08
-1,Diemen,430,1,Z2,Z2_th_1,COMC,GAS,0.525,5,1,0.016330409,0.016330409,112542.12,0,0,0.4,0.525,1,0.45,back-pressure,1,0,430,,,,,,,,,2.5,2.08
-2,Rijnmond II,427,6,Z2,Z2_th_2,COMC,GAS,0.525,5,1,0.026159251,0.026159251,112542.12,0,0,0.4,0.525,1,0.45,p2h,0.3,0.1,,,,,,,,,,100,50
-3,Borssele 12,408,1,Z2,,STUR,HRD,0.395,8,6,0.012254902,0.012254902,117242.17,0,0,0.3,0.395,7,0.95,,,,,,,,,,,,,15,3
+0,Maasvlakte,500,1,Z2,,STUR,HRD,0.395,8,6,0.004672897,0.004672897,112542.12,0,0,0.3,0.395,7,0.911392405,,,,,,,,,,,,,2.5,2.08
+1,Diemen,430,1,Z2,Z2_th_1,COMC,GAS,0.525,5,1,0.016330409,0.016330409,112542.12,0,0,0.4,0.525,1,0.380952381,back-pressure,1,0,430,,,,,,,,,2.5,2.08
+2,Rijnmond II,427,6,Z2,Z2_th_2,COMC,GAS,0.525,5,1,0.026159251,0.026159251,112542.12,0,0,0.4,0.525,1,0.380952381,p2h,0.3,0.1,,,,,,,,,,100,50
+3,Borssele 12,408,1,Z2,,STUR,HRD,0.395,8,6,0.012254902,0.012254902,117242.17,0,0,0.3,0.395,7,0.911392405,,,,,,,,,,,,,15,3
 4,PHOT_Z2,400,1,Z2,,PHOT,SUN,1,0,0,0.629811057,0.629811057,0,0,0,0,1,0,0,,,,,,,,,,,,,,
 5,WindOff_Z2,200,1,Z2,,WTOF,WIN,1,0,0,0.562248996,0.562248996,0,0,0,0,1,0,0,,,,,,,,,,,,,,
 6,WindOn_Z2,300,1,Z2,,WTON,WIN,1,0.001,0.001,0.044378698,0.044378698,0,0,0,0,1,0,0,,,,,,,,,,,,,,
 7,TIHANGE 3,500,1,Z1,,STUR,NUC,0.405,48,48,0.003279159,0.003279159,200000,0,0,0.9,0.405,0,0,,,,,,,,,,,,,,
 8,COO II T,690,1,Z1,,HPHS,WAT,0.86,0,0,0.434782609,0.434782609,0,0,0,0,0.86,0,0,,,,,,,,,3105,0,690,0.86,,
-9,DROGENBOS TGV,465,1,Z1,Z1_th_1,COMC,GAS,0.525,5,1,0.024021505,0.024021505,112542.12,0,0,0.4,0.525,0,0.45,back-pressure,0.5,0,,,,,,,,,,,
+9,DROGENBOS TGV,465,1,Z1,Z1_th_1,COMC,GAS,0.525,5,1,0.024021505,0.024021505,112542.12,0,0,0.4,0.525,0,0.380952381,back-pressure,0.5,0,,,,,,,,,,,
 10,SISTERON,214,1,Z1,,HDAM,WAT,0.85,0,0,0.420560748,0.420560748,0,0,0,0,0.85,0,0,,,,,,,,,4494,0,0,,,
 11,RODENHUIZE 4,268,1,Z1,,STUR,BIO,0.45,8,6,0.018656716,0.018656716,2000,0,0,0.2,0.45,0,0,,,,,,,,,,,,,,
-12,LANGERLO 2,235,1,Z1,,STUR,HRD,0.395,8,6,0.021276596,0.021276596,117242.17,0,0,0.3,0.395,0,0.95,,,,,,,,,,,,,,
-13,INESCO WKK,216,1,Z1,Z1_th_1,COMC,GAS,0.4868,6,,0.027272727,0.027272727,17500,4,0,0.272727273,0.4793,0,0,Extraction,1,0.18,,,,,,1500,0.03,,,,
-14,PHOT_Z1,300,1,Z1,,PHOT,SUN,1,0,0,0.304774805,0.304774805,,0,0,0,1,0,0,,,,,,,,,,,,,,
+12,LANGERLO 2,235,1,Z1,,STUR,HRD,0.395,8,6,0.021276596,0.021276596,117242.17,0,0,0.3,0.395,0,0.911392405,,,,,,,,,,,,,,
+13,INESCO WKK,216,1,Z1,Z1_th_1,COMC,GAS,0.4868,6,,0.027272727,0.027272727,17500,4,0,0.272727273,0.4793,0,0.410846343,Extraction,1,0.18,,,,,,1500,0.03,,,,
+14,PHOT_Z1,300,1,Z1,,PHOT,SUN,1,0,0,0.304774805,0.304774805,0,0,0,0,1,0,0,,,,,,,,,,,,,,
 15,WindOn_Z1,200,1,Z1,,WTON,WIN,1,0,0,0.108086469,0.108086469,0,0,0,0,1,0,0,,,,,,,,,,,,,,
 16,WindOn_ZZ3,200,1,ZZ3,,WTON,WIN,1,0,0,0.044378698,0.044378698,0,0,0,0,1,0,0,,,,,,,,,,,,,,
 17,HeatPump,100,1,Z1,Z1_th_1,P2HT,OTH,1,0,0,1,1,0,0,0,0,0,0,0,,,,,3,10,0.01,0.01,900,0.03,,,,
@@ -24,14 +24,15 @@
 23,Bug Power,0,1,Z2,,WTOF,WIN,1,0,0,0.562248996,0.562248996,0,0,0,0,1,0,0,,,,,,,,,,,,,,
 24,Bug Tech,200,1,Z2,,Other,WIN,1,0,0,0.562248996,0.562248996,0,0,0,0,1,0,0,,,,,,,,,,,,,,
 25,Wave energy,20,1,Z1,,WAVE,WAT,1,0,0,1,1,0,0,0,0,1,0,0,,,,,,,,,,,,,,
-26,Absorption HP,1,1,Z1,Z1_th_2,ABHP,WHT,1,0,0,1,1,0,0,0,0,0,0,0,,,,,1.8,,,,,,,,,
+26,Absorption HP,1,1,Z1,Z1_th_2,ABHP,GAS,1,0,0,1,1,0,0,0,0,0,0,0,,,,,1.8,,,,,,,,,
 27,Air source HP,1,1,Z1,Z1_th_2,ASHP,AIR,1,0,0,1,1,0,0,0,0,0,0,0,,,,,3,10,0.01,0.01,,,,,,
 28,Geo thermal,2,1,Z1,Z1_th_2,GETH,GEO,0.95,0,0,1,1,0,0,0,0,0,0,0,,,,,,,,,,,,,,
 29,Ground source HP,1,1,Z1,Z1_th_2,GSHP,GEO,1,0,0,1,1,0,0,0,0,0,0,0,,,,,2.7,10,0.01,0.01,,,,,,
-30,Heat only boiler,7,1,Z1,Z1_th_2,HOBO,GAS,0.98,0,0,1,1,0,0,0,0,0,0,0,,,,,,,,,,,,,,
+30,Heat only boiler,7,1,Z1,Z1_th_2,HOBO,GAS,0.98,0,0,1,1,0,0,0,0,0,0,0.204081633,,,,,,,,,,,,,,
 31,Hybrid HP,1,1,Z1,Z1_th_2,HYHP,OTH,1,0,0,1,1,0,0,0,0,0,0,0,,,,,1.8,0,0.01,0.01,,,,,,
 32,Resistive heater,1,1,Z1,Z1_th_2,REHE,OTH,1,0,0,1,1,0,0,0,0,0,0,0,,,,,1,,,,,,,,,
 33,Solar thermal,100,1,Z1,Z1_th_2,SOTH,SUN,1,0,0,1,1,0,0,0,0,0,0,0,,,,,,,,,,,,,,
 34,Water source heat pump,1,1,Z1,Z1_th_2,WSHP,WAT,1,0,0,1,1,0,0,0,0,0,0,0,,,,,3.2,10,0.01,0.01,,,,,,
 35,Thermal storage,1,1,Z1,Z1_th_2,THMS,OTH,0.86,0,0,0.434782609,0.434782609,0,0,0,0,0.86,0,0,,,,,,,,,10,0,1,0.86,,
 36,BEVS,100,1,ZZ3,,BEVS,OTH,0.89,0,0,1,1,0,0,0,0,0.89,0,0,,,,,,,,,1000,0,180,0.89,,
+37,Ammonia gas turbine,476,1,Z2,,COMC,AMO,0.531,1,1,0.025,0.1,28560,0,0.5,0.5,0.57,2,0,,,,,,,,,,,,,,