Merge pull request #8413 from NREL/combustion-generators-fuel-types

Additional fuel types for Generator:*Turbine objects
NREL · Dec 15, 2020 · 9d6116a · 9d6116a · nrel-bot-3 · Dec 15, 2020
2 parents 4bbdd2b + 8b0a836
commit 9d6116a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/doc/input-output-reference/src/overview/group-electric-load-center-generator.tex b/doc/input-output-reference/src/overview/group-electric-load-center-generator.tex
@@ -1840,7 +1840,7 @@ \subsubsection{Inputs}\label{inputs-8-005}
 
 \paragraph{Field: Fuel Type}\label{field-fuel-type-1}
 
-This alpha field determines the type of fuel that the generator uses. Valid choices are: \textbf{NaturalGas, Propane, Diesel, Gasoline, FuelOilNo1, FuelOilNo2, OtherFuel1} and \textbf{OtherFuel2}. The default is \textbf{NaturalGas}.
+This choice field specifies the type of fuel used by the generator. The fuel type can be NaturalGas, Propane, FuelOilNo1, FuelOilNo2, Diesel, Gasoline, Coal, OtherFuel1, or OtherFuel2. If the field is left blank, the fuel type will be assumed to be \textbf{NaturalGas}.
 
 \paragraph{Field: Heat Recovery Maximum Temperature}\label{field-heat-recovery-maximum-temperature-1}
 
@@ -2040,7 +2040,7 @@ \subsubsection{Inputs}\label{inputs-9-004}
 
 \paragraph{Field: Fuel Type}\label{field-fuel-type-2}
 
-This choice field specifies the type of fuel used by the generator. Valid field types are Propane and NaturalGas. If the field is left blank, the fuel type will be assumed to be NaturalGas.
+This choice field specifies the type of fuel used by the generator. The fuel type can be NaturalGas, Propane, FuelOilNo1, FuelOilNo2, Diesel, Gasoline, Coal, OtherFuel1, or OtherFuel2. If the field is left blank, the fuel type will be assumed to be \textbf{NaturalGas}.
 
 \paragraph{Field: Fuel Higher Heating Value}\label{field-fuel-higher-heating-value-2}
 

diff --git a/idd/Energy+.idd.in b/idd/Energy+.idd.in
@@ -86147,10 +86147,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
@@ -86242,6 +86243,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