Merge pull request #5986 from NREL/137816619-Make-the-fuel-type-field…

…-as-required Changed Fuel Type field as required in Coil:Cooling:DX:MultiSpeed and…
NREL · Feb 10, 2017 · c81883d · c81883d
2 parents d72afa8 + 40c3331
commit c81883d
Show file tree

Hide file tree

Showing 7 changed files with 968 additions and 8 deletions.
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
@@ -2436,7 +2436,7 @@ \subsubsection{Inputs}\label{inputs-16-003}
 
 \paragraph{Field: Fuel Type}\label{field-fuel-type-000}
 
-This alpha field determines the type of fuel that this cooling coil uses. This field has seven choices: Electricity, NaturalGas, PropaneGas, Coal, Diesel, Gasoline, FuelOil\#1, FuelOil\#2, OtherFuel1 and OtherFuel2. The default is NaturalGas.
+This alpha field determines the type of fuel that this cooling coil uses. This field has seven choices: Electricity, NaturalGas, Propane, Coal, Diesel, Gasoline, FuelOil\#1, FuelOil\#2, OtherFuel1 and OtherFuel2. This is a required field with no default.
 
 \paragraph{Field: Number of Speeds}\label{field-number-of-speeds}
 
@@ -3963,7 +3963,7 @@ \subsubsection{Inputs}\label{inputs-20-001}
 
 \paragraph{Field: Fuel Type}\label{field-fuel-type-1-000}
 
-This alpha field determines the type of fuel that the chiller uses. This field has seven choices: Electricity, NaturalGas, PropaneGas, Coal, Diesel, Gasoline, FuelOil\#1, FuelOil\#2, OtherFuel1 and OtherFuel2. The default is NaturalGas.
+This alpha field determines the type of fuel that the chiller uses. This field has seven choices: Electricity, NaturalGas, Propane, Coal, Diesel, Gasoline, FuelOil\#1, FuelOil\#2, OtherFuel1 and OtherFuel2. This is a required field with no default.
 
 \paragraph{Field: Number of Speeds}\label{field-number-of-speeds-2}
 

diff --git a/idd/Energy+.idd.in b/idd/Energy+.idd.in
@@ -42889,17 +42889,17 @@ Coil:Cooling:DX:MultiSpeed,
        \note If a schedule name is not entered, the basin heater is allowed to operate
        \note throughout the entire simulation.
   A12, \field Fuel Type
+       \required-field
        \type choice
        \key Electricity
        \key NaturalGas
-       \key PropaneGas
+       \key Propane
        \key Diesel
        \key Gasoline
        \key FuelOil#1
        \key FuelOil#2
        \key OtherFuel1
        \key OtherFuel2
-       \default NaturalGas
   N5 , \field Number of Speeds
        \required-field
        \type integer
@@ -45508,17 +45508,17 @@ Coil:Heating:DX:MultiSpeed,
        \key No
        \default No
   A9 , \field Fuel Type
+       \required-field
        \type choice
        \key Electricity
        \key NaturalGas
-       \key PropaneGas
+       \key Propane
        \key Diesel
        \key Gasoline
        \key FuelOil#1
        \key FuelOil#2
        \key OtherFuel1
        \key OtherFuel2
-       \default NaturalGas
   N8,  \field Region number for Calculating HSPF
        \type integer
        \minimum 1

diff --git a/src/EnergyPlus/DXCoils.cc b/src/EnergyPlus/DXCoils.cc
@@ -3862,7 +3862,7 @@ namespace DXCoils {
 				DXCoil( DXCoilNum ).FuelType = FuelTypeElectricity;
 			} else if ( SameString( Alphas( 12 ), "NaturalGas" ) ) {
 				DXCoil( DXCoilNum ).FuelType = FuelTypeNaturalGas;
-			} else if ( SameString( Alphas( 12 ), "PropaneGas" ) ) {
+			} else if ( SameString( Alphas( 12 ), "Propane" ) ) {
 				DXCoil( DXCoilNum ).FuelType = FuelTypePropaneGas;
 			} else if ( SameString( Alphas( 12 ), "Diesel" ) ) {
 				DXCoil( DXCoilNum ).FuelType = FuelTypeDiesel;
@@ -4359,7 +4359,7 @@ namespace DXCoils {
 				DXCoil( DXCoilNum ).FuelType = FuelTypeElectricity;
 			} else if ( SameString( Alphas( 9 ), "NaturalGas" ) ) {
 				DXCoil( DXCoilNum ).FuelType = FuelTypeNaturalGas;
-			} else if ( SameString( Alphas( 9 ), "PropaneGas" ) ) {
+			} else if ( SameString( Alphas( 9 ), "Propane" ) ) {
 				DXCoil( DXCoilNum ).FuelType = FuelTypePropaneGas;
 			} else if ( SameString( Alphas( 9 ), "Diesel" ) ) {
 				DXCoil( DXCoilNum ).FuelType = FuelTypeDiesel;

diff --git a/src/Transition/CMakeLists.txt b/src/Transition/CMakeLists.txt
@@ -52,6 +52,7 @@ list( APPEND VERSIONS 8_3_0 )
 list( APPEND VERSIONS 8_4_0 )
 list( APPEND VERSIONS 8_5_0 )
 list( APPEND VERSIONS 8_6_0 )
+list( APPEND VERSIONS 8_7_0 )
 
 if(APPLE)
   if( "${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU" )
@@ -129,3 +130,5 @@ install( FILES "SupportFiles/Report Variables 8-2-0 to 8-3-0.csv" DESTINATION "P
 install( FILES "SupportFiles/Report Variables 8-3-0 to 8-4-0.csv" DESTINATION "PreProcess/IDFVersionUpdater" )
 install( FILES "SupportFiles/Report Variables 8-4-0 to 8-5-0.csv" DESTINATION "PreProcess/IDFVersionUpdater" )
 install( FILES "SupportFiles/Report Variables 8-5-0 to 8-6-0.csv" DESTINATION "PreProcess/IDFVersionUpdater" )
+install( FILES "SupportFiles/Report Variables 8-6-0 to 8-7-0.csv" DESTINATION "PreProcess/IDFVersionUpdater" )
+