Merge pull request #5940 from NREL/heatingcoil_propane_bugfix

Coil:Heating:Fuel changed to accept Propane
NREL · Jan 13, 2017 · 14e9219 · 14e9219 · nrel-bot-2 · Jan 13, 2017
2 parents 9329f4f + 9e1b879
commit 14e9219
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 2 deletions.
diff --git a/doc/input-output-reference/src/overview/group-air-distribution-equipment.tex b/doc/input-output-reference/src/overview/group-air-distribution-equipment.tex
@@ -332,6 +332,7 @@ \subsubsection{Inputs}\label{inputs-2-001}
     COIL:Heating:Fuel,
       SPACE1-1 Zone Coil,  !- Coil Name
       ReheatCoilAvailSched,  !- Availability Schedule Name
+      NaturalGas,             !- Fuel Type
       0.8,  !- Gas Burner Efficiency of the Coil
       autosize,  !- Nominal Capacity of the Coil {W}
       SPACE1-1 Zone Coil Air In Node,  !- Coil_Air_Inlet_Node

diff --git a/doc/input-output-reference/src/overview/group-heating-and-cooling-coils.tex b/doc/input-output-reference/src/overview/group-heating-and-cooling-coils.tex
@@ -1231,7 +1231,7 @@ \subsubsection{Inputs}\label{inputs-10-006}
 
 \paragraph{Field: Fuel Type}\label{field-gas-burner-efficiency}
 
-This field designates the appropriate fuel type for the coil. Valid fuel types are: Gas, NaturalGas, PropaneGas, FuelOil\#1, FuelOil\#2, Diesel, Gasoline, Coal, Steam, DistrictHeating, DistrictCooling, OtherFuel1 and OtherFuel2. The fuel type triggers the application of consumption amounts to the appropriate energy meters. NaturalGas is the default.
+This field designates the appropriate fuel type for the coil. Valid fuel types are: Gas, NaturalGas, Propane, FuelOil\#1, FuelOil\#2, Diesel, Gasoline, Coal, Steam, DistrictHeating, DistrictCooling, OtherFuel1 and OtherFuel2. The fuel type triggers the application of consumption amounts to the appropriate energy meters. NaturalGas is the default.
 
 \paragraph{Field: Burner Efficiency}\label{field-gas-burner-efficiency}
 

diff --git a/doc/input-output-reference/src/overview/group-unitary-equipment.tex b/doc/input-output-reference/src/overview/group-unitary-equipment.tex
@@ -888,6 +888,7 @@ \subsubsection{Inputs}\label{inputs-2-043}
   Coil:Heating:Fuel,
       Furnace Heating Coil 1,         !- Coil Name
       FanAndCoilAvailSched,           !- Availability Schedule Name
+      NaturalGas,                     !- Fuel Type
       0.8,    !- Gas Burner Efficiency of the Coil
       25000,  !- Nominal Capacity of the Coil {W}
       Heating Coil Air Inlet Node,    !- Coil\_Air\_Inlet\_Node
@@ -1130,6 +1131,7 @@ \subsubsection{Field: Reheat Coil Name}\label{field-reheat-coil-name-1-000}
     Coil:Heating:Fuel,
       Unitary System Heating Coil 1,  !- Coil Name
       FanAndCoilAvailSched,           !- Availability Schedule Name
+      NaturalGas,                     !- Fuel Type
       0.8,    !- Gas Burner Efficiency of the Coil
       25000,  !- Nominal Capacity of the Coil {W}
       Heating Coil Air Inlet Node,    !- Coil\_Air\_Inlet\_Node
@@ -1415,6 +1417,7 @@ \subsubsection{Inputs}\label{inputs-3-039}
      Coil:Heating:Fuel,
         Heat Pump DX Supp Heating Coil 1, ! Name of heating coil
         FanAndCoilAvailSched,             ! Availability schedule
+        NaturalGas,                       ! Fuel Type
         0.8 ,                             ! Gas Burner Efficiency of the Coil
         32000,                            ! Nominal Capacity of the Coil [W]
         SuppHeating Coil Air Inlet Node,  ! Supplementary heating coil air side inlet node
@@ -1838,6 +1841,7 @@ \subsubsection{Inputs}\label{inputs-4-036}
   Coil:Heating:Fuel,
       Supp Gas Heating Coil 1,  !- Coil Name
       FanAndCoilAvailSched,    !- Availability Schedule Name
+      NaturalGas,              !- Fuel Type
       0.8,                     !- Gas Burner Efficiency of the Coil
       45000,                   !- Nominal Capacity of the Coil {W}
       SuppHeating Coil Air Inlet Node,  !- Coil\_Air\_Inlet\_Node
@@ -2117,6 +2121,7 @@ \subsubsection{Inputs}\label{inputs-5-033}
     Coil:Heating:Fuel,
       Furnace Coil,          !- Coil Name
       FanAndCoilAvailSched,  !- Availability Schedule Name
+      NaturalGas,            !- Fuel Type
       0.8,                   !- Gas Burner Efficiency of the Coil
       20000,                 !- Nominal Capacity of the Coil {W}
       Heating Coil Air Inlet Node,  !- Coil_Air_Inlet_Node
@@ -2292,6 +2297,7 @@ \subsubsection{Inputs}\label{inputs-6-030}
     Coil:Heating:Fuel,
       Unitary System Heating Coil, !- Coil Name
       FanAndCoilAvailSched,        !- Availability Schedule Name
+      NaturalGas,                 !- Fuel Type
       0.8,                         !- Gas Burner Efficiency of the Coil
       20000,                       !- Nominal Capacity of the Coil {W}
       Heating Coil Air Inlet Node, !- Coil_Air_Inlet_Node
@@ -2683,6 +2689,7 @@ \subsubsection{Inputs}\label{inputs-7-029}
     Coil:Heating:Fuel,
       Heat Pump DX Supp Heating Coil 1,  !- Name
       FanAndCoilAvailSched,    !- Availability Schedule Name
+      NaturalGas,              !- Fuel Type
       0.8,                     !- Gas Burner Efficiency
       32000,                   !- Nominal Capacity {W}
       SuppHeating Coil Air Inlet Node,  !- Air Inlet Node Name
@@ -3070,6 +3077,7 @@ \subsubsection{Inputs}\label{inputs-8-027}
   Coil:Heating:Fuel,
       Furnace Heating Coil 1,  !- Coil Name
       FanAndCoilAvailSched,    !- Availability Schedule Name
+      NaturalGas,              !- Fuel Type
       0.8,                     !- Gas Burner Efficiency of the Coil
       35000,                   !- Nominal Capacity of the Coil {W}
       Heating Coil Air Inlet Node,  !- Coil\_Air\_Inlet\_Node

diff --git a/doc/input-output-reference/src/overview/group-zone-forced-air-units.tex b/doc/input-output-reference/src/overview/group-zone-forced-air-units.tex
@@ -3187,6 +3187,7 @@ \subsubsection{Inputs}\label{inputs-11-023}
     Coil:Heating:Fuel,
       Heat Pump DX Supp Heating Coil 1,  !- Name
       FanAndCoilAvailSched,    !- Availability Schedule Name
+      NaturalGas,              !- Fuel Type
       0.8,                     !- Gas Burner Efficiency
       32000,                   !- Nominal Capacity {W}
       Sys 1 SuppHeating Coil Air Inlet Node,  !- Air Inlet Node Name

diff --git a/idd/Energy+.idd.in b/idd/Energy+.idd.in
@@ -44944,7 +44944,7 @@ Coil:Heating:Fuel,
        \type choice
        \key Gas
        \key NaturalGas
-       \key PropaneGas
+       \key Propane
        \key Diesel
        \key Gasoline
        \key FuelOil#1

diff --git a/tst/EnergyPlus/unit/HeatingCoils.unit.cc b/tst/EnergyPlus/unit/HeatingCoils.unit.cc
@@ -104,4 +104,25 @@ namespace EnergyPlus {
 		EXPECT_TRUE( compare_err_stream( error_string, true ) );
 
 	}
+
+	TEST_F( EnergyPlusFixture, HeatingCoils_FuelTypePropaneGas ) {
+		std::string const idf_objects = delimited_string({
+			 "Coil:Heating:Fuel,",
+			 "  Furnace Coil,            !- Name",
+			 "  ,    !- Availability Schedule Name",
+			 "  Propane,                 !- FuelType",
+			 "  0.8,                     !- Gas Burner Efficiency",
+			 "  20000,                   !- Nominal Capacity {W}",
+			 "  Heating Coil Air Inlet Node,  !- Air Inlet Node Name",
+			 "  Air Loop Outlet Node;    !- Air Outlet Node Name"
+														 });
+
+		ASSERT_FALSE( process_idf( idf_objects ) );
+
+		ASSERT_NO_THROW( HeatingCoils::GetHeatingCoilInput() );
+
+		EXPECT_EQ( HeatingCoils::HeatingCoil( 1 ).FuelType_Num, DataGlobalConstants::iRT_Propane);
+
+	}
+
 }