From 3fb2e3382205812ca2edd96ad6c96a4bdd20efe5 Mon Sep 17 00:00:00 2001
From: Julien Marrec <julien.marrec@gmail.com>
Date: Wed, 24 Feb 2021 10:15:59 +0100
Subject: [PATCH] New key choices in Generator:MicroTurbine and
 Output:Table:SummaryReports

Generator:CombustionTurbine isn't wrapped in OS
Additional fuel types for Generator:*Turbine objects NREL/EnergyPlus#8413
---
 resources/energyplus/ProposedEnergy+.idd | 17 +++++++++++++----
 resources/model/OpenStudio.idd           | 12 ++++++++++--
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/resources/energyplus/ProposedEnergy+.idd b/resources/energyplus/ProposedEnergy+.idd
index fd79efe0ae6..6d601da2d9f 100644
--- a/resources/energyplus/ProposedEnergy+.idd
+++ b/resources/energyplus/ProposedEnergy+.idd
@@ -39190,7 +39190,7 @@ Controller:MechanicalVentilation,
         \key VentilationRateProcedure
         \key IndoorAirQualityProcedure
         \key ProportionalControlBasedOnDesignOccupancy
-        \key ProportionalControlBasedonOccupancySchedule
+        \key ProportionalControlBasedOnOccupancySchedule
         \key IndoorAirQualityProcedureGenericContaminant
         \key IndoorAirQualityProcedureCombined
         \key ProportionalControlBasedOnDesignOARate
@@ -40665,7 +40665,7 @@ HeaderedPumps:ConstantSpeed,
        \units W/(m3/s)
        \ip-units W/(gal/min)
        \minimum> 0
-  N9, \field Design Shaft Power per Unit Flow Rate per Unit Head
+  N9,  \field Design Shaft Power per Unit Flow Rate per Unit Head
        \type real
        \note Used to size Design Power Consumption from design flow rate for head and motor efficiency
        \default 1.282051282
@@ -54131,10 +54131,11 @@ Generator:CombustionTurbine,
        \type choice
        \key NaturalGas
        \key Propane
-       \key Diesel
-       \key Gasoline
        \key FuelOilNo1
        \key FuelOilNo2
+       \key Diesel
+       \key Gasoline
+       \key Coal
        \key OtherFuel1
        \key OtherFuel2
        \default NaturalGas
@@ -54227,6 +54228,13 @@ Generator:MicroTurbine,
       \type choice
       \key NaturalGas
       \key Propane
+      \key FuelOilNo1
+      \key FuelOilNo2
+      \key Diesel
+      \key Gasoline
+      \key Coal
+      \key OtherFuel1
+      \key OtherFuel2
       \default NaturalGas
   N8, \field Fuel Higher Heating Value
       \type real
@@ -59883,6 +59891,7 @@ Output:Table:SummaryReports,
        \key ComponentSizingSummary
        \key CoilSizingDetails
        \key OutdoorAirSummary
+       \key OutdoorAirDetails
        \key ObjectCountSummary
        \key ComponentCostEconomicsSummary
        \key AdaptiveComfortSummary
diff --git a/resources/model/OpenStudio.idd b/resources/model/OpenStudio.idd
index c407c07b0ab..be3c95ce623 100644
--- a/resources/model/OpenStudio.idd
+++ b/resources/model/OpenStudio.idd
@@ -19072,7 +19072,7 @@ OS:Controller:MechanicalVentilation,
        \key VentilationRateProcedure
        \key IndoorAirQualityProcedure
        \key ProportionalControl
-       \key ProportionalControlBasedonOccupancySchedule
+       \key ProportionalControlBasedOnOccupancySchedule
        \key ProportionalControlBasedOnDesignOccupancy
   A6, \field Thermal Zone
        \note A zone name or a zone list name may be used here
@@ -19112,7 +19112,7 @@ OS:ZoneControl:ContaminantController,
        \note Schedule values should be carbon dioxide concentration in parts per
        \note million (ppm)
        \note This field is used when the field System Outdoor Air Method =
-       \note ProportionalControlBasedonOccupancySchedule or ProportionalControlBasedOnDesignOccupancy
+       \note ProportionalControlBasedOnOccupancySchedule or ProportionalControlBasedOnDesignOccupancy
        \note in Controller:MechanicalVentilation
   A7 , \field Generic Contaminant Control Availability Schedule Name
        \note Availability schedule name for generic contaminant controller. Schedule value > 0 means
@@ -29520,6 +29520,13 @@ OS:Generator:MicroTurbine,
       \type choice
       \key NaturalGas
       \key Propane
+      \key FuelOilNo1
+      \key FuelOilNo2
+      \key Diesel
+      \key Gasoline
+      \key Coal
+      \key OtherFuel1
+      \key OtherFuel2
       \default NaturalGas
   N8, \field Fuel Higher Heating Value
       \type real
@@ -32211,6 +32218,7 @@ OS:Output:Table:SummaryReports,
        \key ComponentSizingSummary
        \key CoilSizingDetails
        \key OutdoorAirSummary
+       \key OutdoorAirDetails
        \key ObjectCountSummary
        \key ComponentCostEconomicsSummary
        \key AdaptiveComfortSummary