Skip to content

Commit

Permalink
Fix getinput and IDD errors for ElectricEquipment:ITE:AirCooled
Browse files Browse the repository at this point in the history
  • Loading branch information
mjwitte committed Mar 5, 2015
1 parent 130c60a commit af9bc81
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
14 changes: 6 additions & 8 deletions idd/Energy+.idd.in
Original file line number Diff line number Diff line change
Expand Up @@ -20067,14 +20067,12 @@ ElectricEquipment:ITE:AirCooled,
\default 1.0
A15, \field Electric Power Supply Efficiency Function of Part Load Ratio Curve Name
\type object-list
\object-list BiVariateCurves
\object-list BiVariateTables
\note The name of a two-variable curve or table lookup object which modifies the recirculation
\note fractionas a function of CPU loading (x) and supply air node temperature (y).
\note This curve (table) should equal 1.0 at design conditions (CPU loading = 1.0 and
\note Design Entering Air Temperature).This field is used only if the
\note Air Node Connection Type = AdjustedSupply. If this curve is left blank, then the curve
\note is assumed to always equal 1.0.
\object-list UniVariateCurves
\object-list UniVariateTables
\note The name of a single-variable curve or table lookup object which modifies the electric
\note power supply efficiency as a function of part-load ratio (x).
\note This curve (table) should equal 1.0 at full load (PLR = 1.0).
\note If this curve is left blank, then the curve is assumed to always equal 1.0.
N9 , \field Fraction of Electric Power Supply Losses to Zone
\note Fraction of the electric power supply losses which are a heat gain to the zone
\note If this field is <1.0, the remainder of the losses are assumed to be lost to the outdoors.
Expand Down
13 changes: 7 additions & 6 deletions src/EnergyPlus/InternalHeatGains.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2211,7 +2211,7 @@ namespace InternalHeatGains {
AlphaName = BlankString;
IHGNumbers = 0.0;

GetObjectItem( CurrentModuleObject, Item, AlphaName, NumAlpha, IHGNumbers, NumNumber, IOStat, lNumericFieldBlanks, lAlphaFieldBlanks, cAlphaFieldNames, cNumericFieldNames );
GetObjectItem( CurrentModuleObject, Loop, AlphaName, NumAlpha, IHGNumbers, NumNumber, IOStat, lNumericFieldBlanks, lAlphaFieldBlanks, cAlphaFieldNames, cNumericFieldNames );

ZoneITEq( Loop ).Name = AlphaName( 1 );
ZoneITEq( Loop ).ZonePtr = FindItemInList( AlphaName( 2 ), Zone.Name( ), NumOfZones );
Expand All @@ -2223,6 +2223,9 @@ namespace InternalHeatGains {
if ( lNumericFieldBlanks( 1 ) ) {
ShowWarningError( RoutineName + CurrentModuleObject + "=\"" + AlphaName( 1 ) + "\", specifies " + cNumericFieldNames( 1 ) + ", but that field is blank. 0 IT Equipment will result." );
}
if ( lNumericFieldBlanks( 2 ) ) {
ShowWarningError( RoutineName + CurrentModuleObject + "=\"" + AlphaName( 1 ) + "\", specifies " + cNumericFieldNames( 2 ) + ", but that field is blank. 0 IT Equipment will result." );
}

} else if ( equipmentLevel == "WATTS/AREA" ) {
if ( ZoneITEq( Loop ).ZonePtr != 0 ) {
Expand All @@ -2241,11 +2244,9 @@ namespace InternalHeatGains {
}

} else {
if ( Item1 == 1 ) {
ShowSevereError( RoutineName + CurrentModuleObject + "=\"" + AlphaName( 1 ) + "\", invalid " + cAlphaFieldNames( 4 ) + ", value =" + AlphaName( 4 ) );
ShowContinueError( "...Valid values are \"Watts/Unit\" or \"Watts/Area\"." );
ErrorsFound = true;
}
ShowSevereError( RoutineName + CurrentModuleObject + "=\"" + AlphaName( 1 ) + "\", invalid " + cAlphaFieldNames( 3 ) + ", value =" + AlphaName( 3 ) );
ShowContinueError( "...Valid values are \"Watts/Unit\" or \"Watts/Area\"." );
ErrorsFound = true;
}}

if ( lAlphaFieldBlanks( 4 ) ) {
Expand Down

7 comments on commit af9bc81

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

75127368_DCFSEC (mjwitte) - 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.

75127368_DCFSEC (mjwitte) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (634 of 635 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.

75127368_DCFSEC (mjwitte) - x86_64-MacOS-10.9-clang: OK (1638 of 1645 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.

75127368_DCFSEC (mjwitte) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (1644 of 1651 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.

75127368_DCFSEC (mjwitte) - i386-Windows-7-VisualStudio-12: OK (1644 of 1651 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.

75127368_DCFSEC (mjwitte) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1142 of 1144 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.

75127368_DCFSEC (mjwitte) - Win64-Windows-7-VisualStudio-12: OK (1644 of 1651 tests passed)

Build Badge Test Badge

Please sign in to comment.