Skip to content

Commit

Permalink
Changed PropaneGas to Propane as a fuel type choice
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgu1234
lgu1234 committed Jan 19, 2017
1 parent fb69022 commit 51ecd43
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions doc/input-output-reference/src/overview/group-heating-and-cooling-coils.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. This is a required field with no default.
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}

Expand Down Expand Up @@ -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. This is a required field with no default.
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}

Expand Down
4 changes: 2 additions & 2 deletions idd/Energy+.idd.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42872,7 +42872,7 @@ Coil:Cooling:DX:MultiSpeed,
\type choice
\key Electricity
\key NaturalGas
\key PropaneGas
\key Propane
\key Diesel
\key Gasoline
\key FuelOil#1
Expand Down Expand Up @@ -45491,7 +45491,7 @@ Coil:Heating:DX:MultiSpeed,
\type choice
\key Electricity
\key NaturalGas
\key PropaneGas
\key Propane
\key Diesel
\key Gasoline
\key FuelOil#1
Expand Down
4 changes: 2 additions & 2 deletions src/EnergyPlus/DXCoils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Binary file modified src/Transition/InputRulesFiles/Rules8-6-0-to-8-7-0.xls
View file
Binary file not shown.

8 comments on commit 51ecd43

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

137816619-Make-the-fuel-type-field-as-required (lgu1234) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (2334 of 2391 tests passed, 8 test warnings)

  • 8 tests had: AUD diffs.
  • 8 tests had: Table small diffs.

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

137816619-Make-the-fuel-type-field-as-required (lgu1234) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

137816619-Make-the-fuel-type-field-as-required (lgu1234) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (1207 of 1207 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

137816619-Make-the-fuel-type-field-as-required (lgu1234) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1783 of 1783 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

137816619-Make-the-fuel-type-field-as-required (lgu1234) - x86_64-Linux-Ubuntu-14.04-custom_check: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

137816619-Make-the-fuel-type-field-as-required (lgu1234) - i386-Windows-7-VisualStudio-14: OK (2300 of 2357 tests passed, 8 test warnings)

  • 8 tests had: AUD diffs.
  • 8 tests had: Table small diffs.

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

137816619-Make-the-fuel-type-field-as-required (lgu1234) - Win64-Windows-7-VisualStudio-14: OK (2300 of 2357 tests passed, 8 test warnings)

  • 8 tests had: AUD diffs.
  • 8 tests had: Table small diffs.

Build Badge Test Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

137816619-Make-the-fuel-type-field-as-required (lgu1234) - x86_64-MacOS-10.9-clang: OK (2294 of 2351 tests passed, 514 test warnings)

  • 514 tests had: AUD diffs.
  • 483 tests had: RDD diffs.
  • 8 tests had: Table small diffs.

Build Badge Test Badge

Please # to comment.