Skip to content

Commit

Permalink
Minor formatting changes
Browse files Browse the repository at this point in the history
Padding issues corrected
  • Loading branch information
rongpengzhang committed Feb 17, 2015
1 parent f9b71e7 commit fec7eed
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/EnergyPlus/ChillerReformulatedEIR.cc
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ namespace ChillerReformulatedEIR {

//chiller part load curve types
int const PLR_UseLeavingCondenserWaterTemperature( 1 ); //Type 1_UseLeavingCondenserWaterTemperature
int const PLR_UseLift ( 2 ); //Type 2_UseLift
int const PLR_UseLift( 2 ); //Type 2_UseLift

// MODULE VARIABLE DECLARATIONS:
int NumElecReformEIRChillers( 0 ); // Number of electric reformulated EIR chillers specified in input
Expand Down
18 changes: 9 additions & 9 deletions src/EnergyPlus/ChillerReformulatedEIR.hh
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,10 @@ namespace ChillerReformulatedEIR {
ChillerEIRFPLRTempMax( 0.0 ),
ChillerEIRFPLRPLRMin( 0.0 ),
ChillerEIRFPLRPLRMax( 0.0 ),
ChillerLiftNomMin(0.0), //zrp_Aug2014
ChillerLiftNomMax(10.0),
ChillerTdevNomMin(0.0),
ChillerTdevNomMax(10.0),
ChillerLiftNomMin( 0.0 ), //zrp_Aug2014
ChillerLiftNomMax( 10.0 ),
ChillerTdevNomMin( 0.0 ),
ChillerTdevNomMax( 10.0 ),
CAPFTXIter( 0 ),
CAPFTXIterIndex( 0 ),
CAPFTYIter( 0 ),
Expand Down Expand Up @@ -374,7 +374,7 @@ namespace ChillerReformulatedEIR {
EIRFTName( EIRFTName ),
EIRFPLRName( EIRFPLRName ),
CondenserType( CondenserType ),
PartLoadCurveType(PartLoadCurveType),
PartLoadCurveType( PartLoadCurveType ),
RefCap( RefCap ),
RefCOP( RefCOP ),
FlowMode( FlowMode ),
Expand Down Expand Up @@ -428,10 +428,10 @@ namespace ChillerReformulatedEIR {
ChillerEIRFPLRTempMax( ChillerEIRFPLRTempMax ),
ChillerEIRFPLRPLRMin( ChillerEIRFPLRPLRMin ),
ChillerEIRFPLRPLRMax( ChillerEIRFPLRPLRMax ),
ChillerLiftNomMin(ChillerLiftNomMin), //zrp_Aug2014
ChillerLiftNomMax(ChillerLiftNomMax),
ChillerTdevNomMin(ChillerTdevNomMin),
ChillerTdevNomMax(ChillerTdevNomMax),
ChillerLiftNomMin( ChillerLiftNomMin ), //zrp_Aug2014
ChillerLiftNomMax( ChillerLiftNomMax ),
ChillerTdevNomMin( ChillerTdevNomMin ),
ChillerTdevNomMax( ChillerTdevNomMax ),
CAPFTXIter( CAPFTXIter ),
CAPFTXIterIndex( CAPFTXIterIndex ),
CAPFTYIter( CAPFTYIter ),
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/CurveManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2533,7 +2533,7 @@ namespace CurveManager {
// CurrentModuleObject='Curve:BiQuadratic/QuadraticLinear/BiCubic/CubicLinear'
SetupOutputVariable( "Performance Curve Input Variable 1 Value []", PerfCurve( CurveIndex ).CurveInput1, "HVAC", "Average", PerfCurve( CurveIndex ).Name );
SetupOutputVariable( "Performance Curve Input Variable 2 Value []", PerfCurve( CurveIndex ).CurveInput2, "HVAC", "Average", PerfCurve( CurveIndex ).Name );
} else if ( ( SELECT_CASE_var1 == TriQuadratic) || ( SELECT_CASE_var1 == ChillerPartLoadWithLift ) ) {
} else if ( ( SELECT_CASE_var1 == TriQuadratic ) || ( SELECT_CASE_var1 == ChillerPartLoadWithLift ) ) {
// CurrentModuleObject='Curve:TriQuadratic'
SetupOutputVariable( "Performance Curve Input Variable 1 Value []", PerfCurve( CurveIndex ).CurveInput1, "HVAC", "Average", PerfCurve( CurveIndex ).Name );
SetupOutputVariable( "Performance Curve Input Variable 2 Value []", PerfCurve( CurveIndex ).CurveInput2, "HVAC", "Average", PerfCurve( CurveIndex ).Name );
Expand Down

7 comments on commit fec7eed

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

LBNLChillerCurve-2 (rongpengzhang) - x86_64-MacOS-10.9-clang: Tests Failed

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.

LBNLChillerCurve-2 (rongpengzhang) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: Tests Failed

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.

LBNLChillerCurve-2 (rongpengzhang) - 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.

LBNLChillerCurve-2 (rongpengzhang) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (604 of 604 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.

LBNLChillerCurve-2 (rongpengzhang) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1103 of 1103 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.

LBNLChillerCurve-2 (rongpengzhang) - i386-Windows-7-VisualStudio-12: Tests Failed

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.

LBNLChillerCurve-2 (rongpengzhang) - Win64-Windows-7-VisualStudio-12: Tests Failed

Build Badge Test Badge

Please sign in to comment.