Skip to content

Commit

Permalink
More unit test cleanup. Attempt to fix EvaporativeCoolers.IndEvapCool…
Browse files Browse the repository at this point in the history
…erPower failure on Linux CI which does not fail on Win64 local
  • Loading branch information
mjwitte committed Mar 5, 2015
1 parent af9bc81 commit 9b0989c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
8 changes: 7 additions & 1 deletion tst/EnergyPlus/unit/EvaporativeCoolers.unit.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// EnergyPlus::ExteriorEnergyUse Unit Tests
// EnergyPlus::Evaporative Cooler Unit Tests

// Google Test Headers
#include <gtest/gtest.h>
Expand Down Expand Up @@ -96,6 +96,8 @@ TEST( EvaporativeCoolers, CalcSecondaryAirOutletCondition )
EXPECT_DOUBLE_EQ( 47103.205375000471, EvaporativeCoolers::EvapCond( EvapCoolNum ).SecOutletEnthalpy );
EXPECT_DOUBLE_EQ( QHXTotal, QHXLatent );

EvaporativeCoolers::EvapCond.deallocate();

}

TEST( EvaporativeCoolers, CalcIndirectRDDEvapCoolerOutletTemp )
Expand Down Expand Up @@ -141,6 +143,8 @@ TEST( EvaporativeCoolers, CalcIndirectRDDEvapCoolerOutletTemp )

EXPECT_DOUBLE_EQ( 14.25, EvaporativeCoolers::EvapCond( EvapCoolNum ).OutletTemp );

EvaporativeCoolers::EvapCond.deallocate( );

}

TEST( EvaporativeCoolers, IndEvapCoolerPower )
Expand Down Expand Up @@ -198,4 +202,6 @@ TEST( EvaporativeCoolers, IndEvapCoolerPower )

// check outputs for wet modulated operating condition
EXPECT_EQ( 150.0, EvaporativeCoolers::EvapCond( EvapCoolNum ).EvapCoolerPower );

EvaporativeCoolers::EvapCond.deallocate( );
}
1 change: 1 addition & 0 deletions tst/EnergyPlus/unit/PurchasedAirManager.unit.cc
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ TEST( SizePurchasedAirTest, Test1 )
ZoneEqSizing.allocate( 1 );
CurZoneEqNum = 1;
ZoneEqSizing( CurZoneEqNum ).SizingMethod.allocate( 24 );
CurSysNum = 0;

FinalZoneSizing.allocate(1);
FinalZoneSizing( CurZoneEqNum ).DesHeatVolFlow = 1.0;
Expand Down

7 comments on commit 9b0989c

@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-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) - 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) - Win64-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-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-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1142 of 1144 tests passed)

Build Badge Test Badge Coverage Badge

Please sign in to comment.