Skip to content

Commit

Permalink
Revised code to remove extra warnings and cleaned up the doc
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgu1234
lgu1234 committed Sep 16, 2015
1 parent 7b2ea0d commit 2e01a54
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 33 deletions.
2 changes: 1 addition & 1 deletion doc/src/docs/InputOutputReference/01d-InputOutputReference.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5600,7 +5600,7 @@ Coil:Cooling:DX:TwoStageWithHumidityControlMode,
CoilPerformance:DX:Cooling, !- Normal Mode Stage 1 Coil Performance Object Type
DOAS Standard Perf 1, !- Normal Mode Stage 1 Coil Performance Name
CoilPerformance:DX:Cooling, !- Normal Mode Stage 1+2 Coil Performance Object Type
DOAS Standard Perf 1+2, When the fuel type is not electricity and the parent object AirLoopHVAC:UnitaryHeatPump:AirToAir:MultiSpeed does not require waste heat calculations, this field is ignored. If the field is blank, a warning will be issues and simulation continues. When the fuel type is not electricity and the parent object AirLoopHVAC:UnitaryHeatPump:AirToAir:MultiSpeed requires waste heat calculations, if this field is left blank, the program assumes a constant value of 1 to make simulation continue and a warning will be issued. !- Normal Mode Stage 1+2 Coil Performance Name
DOAS Standard Perf 1+2, !- Normal Mode Stage 1+2 Coil Performance Name
CoilPerformance:DX:Cooling, !- Dehumidification Mode 1 Stage 1 Coil Performance Object Type
DOAS Dehumid Perf 1, !- Dehumidification Mode 1 Stage 1 Coil Performance Name
CoilPerformance:DX:Cooling, !- Dehumidification Mode 1 Stage 1+2 Coil Performance Object Type
Expand Down
12 changes: 8 additions & 4 deletions idd/Energy+.idd.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42013,11 +42013,11 @@ Coil:Cooling:DX:MultiSpeed,
\note startup. Suggested value is 45; zero value means latent degradation
\note model is disabled.
N15, \field Speed 1 Rated Waste Heat Fraction of Power Input
\required-field
\type real
\units dimensionless
\minimum> 0.0
\maximum 1.0
\default 0.2
\note Recoverable waste heat at full load and rated conditions
A18, \field Speed 1 Waste Heat Function of Temperature Curve Name
\type object-list
Expand Down Expand Up @@ -42169,11 +42169,11 @@ Coil:Cooling:DX:MultiSpeed,
\note startup. Suggested value is 45; zero value means latent degradation
\note model is disabled.
N28, \field Speed 2 Rated Waste Heat Fraction of Power Input
\required-field
\type real
\units dimensionless
\minimum> 0.0
\maximum 1.0
\default 0.2
\note Recoverable waste heat at full load and rated conditions
A24, \field Speed 2 Waste Heat Function of Temperature Curve Name
\type object-list
Expand Down Expand Up @@ -42321,6 +42321,7 @@ Coil:Cooling:DX:MultiSpeed,
\units dimensionless
\minimum> 0.0
\maximum 1.0
\default 0.2
\note Recoverable waste heat at full load and rated conditions
A30, \field Speed 3 Waste Heat Function of Temperature Curve Name
\type object-list
Expand Down Expand Up @@ -42468,6 +42469,7 @@ Coil:Cooling:DX:MultiSpeed,
\units dimensionless
\minimum> 0.0
\maximum 1.0
\default 0.2
\note Recoverable waste heat at full load and rated conditions
A36, \field Speed 4 Waste Heat Function of Temperature Curve Name
\type object-list
Expand Down Expand Up @@ -44568,11 +44570,11 @@ Coil:Heating:DX:MultiSpeed,
\note cubic curve = a + b*PLR + c*PLR**2 + d*PLR**3
\note PLR = part load ratio (sensible heating load/steady state heating capacity)
N14, \field Speed 1 Rated Waste Heat Fraction of Power Input
\required-field
\type real
\units dimensionless
\minimum> 0.0
\maximum 1.0
\default 0.2
\note recoverable waste heat at full load and rated conditions
A15, \field Speed 1 Waste Heat Function of Temperature Curve Name
\type object-list
Expand Down Expand Up @@ -44667,11 +44669,11 @@ Coil:Heating:DX:MultiSpeed,
\note cubic curve = a + b*PLR + c*PLR**2 + d*PLR**3
\note PLR = part load ratio (sensible heating load/steady state heating capacity)
N19, \field Speed 2 Rated Waste Heat Fraction of Power Input
\required-field
\type real
\units dimensionless
\minimum> 0.0
\maximum 1.0
\default 0.2
\note recoverable waste heat at full load and rated conditions
A21, \field Speed 2 Waste Heat Function of Temperature Curve Name
\type object-list
Expand Down Expand Up @@ -44762,6 +44764,7 @@ Coil:Heating:DX:MultiSpeed,
\units dimensionless
\minimum> 0.0
\maximum 1.0
\default 0.2
\note recoverable waste heat at full load and rated conditions
A27, \field Speed 3 Waste Heat Function of Temperature Curve Name
\type object-list
Expand Down Expand Up @@ -44852,6 +44855,7 @@ Coil:Heating:DX:MultiSpeed,
\units dimensionless
\minimum> 0.0
\maximum 1.0
\default 0.2
\note recoverable waste heat at full load and rated conditions
A33, \field Speed 4 Waste Heat Function of Temperature Curve Name
\type object-list
Expand Down
29 changes: 2 additions & 27 deletions src/EnergyPlus/DXCoils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4093,15 +4093,7 @@ namespace DXCoils {
// Read waste heat modifier curve name
DXCoil( DXCoilNum ).MSWasteHeat( I ) = GetCurveIndex( Alphas( 18 + ( I - 1 ) * 6 ) ); // convert curve name to number
if ( DXCoil( DXCoilNum ).FuelType != FuelTypeElectricity ) {
if ( DXCoil( DXCoilNum ).MSWasteHeat( I ) == 0 ) {
if ( lAlphaBlanks( 18 + ( I - 1 ) * 6 ) ) {
ShowWarningError( RoutineName + CurrentModuleObject + "=\"" + DXCoil( DXCoilNum ).Name + "\", missing" );
ShowContinueError( "... " + cAlphaFields( 18 + ( I - 1 ) * 6 ) + " is blank." );
} else {
ShowWarningError( RoutineName + CurrentModuleObject + "=\"" + DXCoil( DXCoilNum ).Name + "\", invalid" );
ShowContinueError( "...not found " + cAlphaFields( 18 + ( I - 1 ) * 6 ) + "=\"" + Alphas( 18 + ( I - 1 ) * 6 ) + "\"." );
}
} else {
if ( DXCoil( DXCoilNum ).MSWasteHeat( I ) > 0 ) {
// Verify Curve Object, only legal types are BiQuadratic
{ auto const SELECT_CASE_var( GetCurveType( DXCoil( DXCoilNum ).MSWasteHeat( I ) ) );

Expand Down Expand Up @@ -4607,16 +4599,7 @@ namespace DXCoils {
// Read waste heat modifier curve name
DXCoil( DXCoilNum ).MSWasteHeat( I ) = GetCurveIndex( Alphas( 15 + ( I - 1 ) * 6 ) ); // convert curve name to number
if ( DXCoil( DXCoilNum ).FuelType != FuelTypeElectricity ) {
if ( DXCoil( DXCoilNum ).MSWasteHeat( I ) == 0 ) {
if ( lAlphaBlanks( 11 ) ) {
ShowSevereError( RoutineName + CurrentModuleObject + "=\"" + DXCoil( DXCoilNum ).Name + "\", missing" );
ShowContinueError( "... " + cAlphaFields( 15 + ( I - 1 ) * 6 ) + " is blank." );
} else {
ShowSevereError( RoutineName + CurrentModuleObject + "=\"" + DXCoil( DXCoilNum ).Name + "\", invalid" );
ShowContinueError( "...not found " + cAlphaFields( 15 + ( I - 1 ) * 6 ) + "=\"" + Alphas( 15 + ( I - 1 ) * 6 ) + "\"." );
}

} else {
if ( DXCoil( DXCoilNum ).MSWasteHeat( I ) > 0 ) {
// Verify Curve Object, only legal types are BiQuadratic
{ auto const SELECT_CASE_var( GetCurveType( DXCoil( DXCoilNum ).MSWasteHeat( I ) ) );

Expand Down Expand Up @@ -5466,14 +5449,6 @@ namespace DXCoils {
break;
}
}
} else {
for ( SpeedNum = 1; SpeedNum <= DXCoil( DXCoilNum ).NumOfSpeeds; ++SpeedNum ) {
if ( DXCoil( DXCoilNum ).MSWasteHeat( SpeedNum ) == 0 ) {
ShowWarningError( "GetDXCoils:" + DXCoil( DXCoilNum ).Name + ". Since the parent object does not require waste heat, the input of Waste Heat Function of Temperature Curve value is not required." );
break;
}
}

}
}
MyEnvrnFlag( DXCoilNum ) = false;
Expand Down
2 changes: 1 addition & 1 deletion tst/EnergyPlus/unit/DXCoils.unit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1139,4 +1139,4 @@ namespace EnergyPlus {
DXCoil.deallocate( );

}
}
}

7 comments on commit 2e01a54

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

102497980-Improve-waste-heat-function-handling-for-CoilCoolingDXMultiSpeed-and-CoilHeatingDXMultiSpeed-#5162 (lgu1234) - x86_64-MacOS-10.9-clang: OK (1838 of 1864 tests passed)

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.

102497980-Improve-waste-heat-function-handling-for-CoilCoolingDXMultiSpeed-and-CoilHeatingDXMultiSpeed-#5162 (lgu1234) - i386-Windows-7-VisualStudio-12: OK (1844 of 1870 tests passed)

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.

102497980-Improve-waste-heat-function-handling-for-CoilCoolingDXMultiSpeed-and-CoilHeatingDXMultiSpeed-#5162 (lgu1234) - Win64-Windows-7-VisualStudio-12: OK (1844 of 1870 tests passed)

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.

102497980-Improve-waste-heat-function-handling-for-CoilCoolingDXMultiSpeed-and-CoilHeatingDXMultiSpeed-#5162 (lgu1234) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (1844 of 1870 tests passed)

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.

102497980-Improve-waste-heat-function-handling-for-CoilCoolingDXMultiSpeed-and-CoilHeatingDXMultiSpeed-#5162 (lgu1234) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

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.

102497980-Improve-waste-heat-function-handling-for-CoilCoolingDXMultiSpeed-and-CoilHeatingDXMultiSpeed-#5162 (lgu1234) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (800 of 800 tests passed)

Build Badge Test Badge Coverage 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.

102497980-Improve-waste-heat-function-handling-for-CoilCoolingDXMultiSpeed-and-CoilHeatingDXMultiSpeed-#5162 (lgu1234) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1336 of 1336 tests passed)

Build Badge Test Badge Coverage Badge

Please sign in to comment.