Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into SimplifyFluidCaching
Browse files Browse the repository at this point in the history
  • Loading branch information
@amirroth
amirroth committed Apr 8, 2023
2 parents fb0905b + 1f2fd7e commit 25fc1f7
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/EnergyPlus/Furnaces.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12506,7 +12506,8 @@ namespace Furnaces {
}
}

if (GetCurrentScheduleValue(state, state.dataFurnaces->Furnace(FurnaceNum).SchedPtr) == 0.0) {
if ((GetCurrentScheduleValue(state, state.dataFurnaces->Furnace(FurnaceNum).SchedPtr) == 0.0) || state.dataHVACGlobal->TurnFansOff ||
(GetCurrentScheduleValue(state, state.dataFurnaces->Furnace(FurnaceNum).FanAvailSchedPtr) == 0.0 && !state.dataHVACGlobal->TurnFansOn)) {
state.dataLoopNodes->Node(InletNode).MassFlowRate = 0.0;
OnOffAirFlowRatio = 0.0;
} else {
Expand Down
21 changes: 21 additions & 0 deletions tst/EnergyPlus/unit/Furnaces.unit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,18 @@ TEST_F(EnergyPlusFixture, SetVSHPAirFlowTest_VSFurnaceFlowTest)
EXPECT_DOUBLE_EQ(1.0, OnOffAirFlowRatio);
EXPECT_DOUBLE_EQ(1.0, state->dataLoopNodes->Node(state->dataFurnaces->Furnace(FurnaceNum).FurnaceInletNodeNum).MassFlowRate);

// Test availability manager signal
state->dataHVACGlobal->TurnFansOff = true;
state->dataHVACGlobal->TurnFansOn = false;
SetVSHPAirFlow(*state, FurnaceNum, PartLoadRatio, OnOffAirFlowRatio);
EXPECT_DOUBLE_EQ(1.0, state->dataHVACGlobal->MSHPMassFlowRateLow);
EXPECT_DOUBLE_EQ(1.0, state->dataHVACGlobal->MSHPMassFlowRateHigh);
EXPECT_DOUBLE_EQ(0.0, state->dataFurnaces->CompOffMassFlow);
EXPECT_DOUBLE_EQ(1.0, state->dataFurnaces->CompOnMassFlow);
EXPECT_DOUBLE_EQ(0.0, OnOffAirFlowRatio);
EXPECT_DOUBLE_EQ(0.0, state->dataLoopNodes->Node(state->dataFurnaces->Furnace(FurnaceNum).FurnaceInletNodeNum).MassFlowRate);
state->dataHVACGlobal->TurnFansOff = false;

state->dataFurnaces->Furnace(FurnaceNum).NumOfSpeedHeating = 0;
state->dataFurnaces->Furnace(FurnaceNum).NumOfSpeedCooling = 1;
state->dataFurnaces->HeatingLoad = false;
Expand Down Expand Up @@ -1192,6 +1204,15 @@ TEST_F(EnergyPlusFixture, UnitaryHeatPumpAirToAir_MaxSuppAirTempTest)
EXPECT_FALSE(state->dataFurnaces->CoolingLoad);
// check if the air-to-air heat pump outlet temperature is capped at 45.0C
EXPECT_NEAR(45.0, state->dataLoopNodes->Node(state->dataFurnaces->Furnace(1).FurnaceOutletNodeNum).Temp, 0.000001);
EXPECT_NEAR(0.3326, state->dataLoopNodes->Node(state->dataFurnaces->Furnace(1).FurnaceOutletNodeNum).MassFlowRate, 0.0001);
EXPECT_NEAR(121.06458, state->dataFurnaces->Furnace(1).SensibleLoadMet, 0.001);

// Test airflow when fan is forced off
state->dataHVACGlobal->TurnFansOn = false;
state->dataHVACGlobal->TurnFansOff = true;
SimFurnace(*state, state->dataFurnaces->Furnace(1).Name, FirstHVACIteration, AirLoopNum, CompIndex);
EXPECT_NEAR(0.0, state->dataLoopNodes->Node(state->dataFurnaces->Furnace(1).FurnaceOutletNodeNum).MassFlowRate, 0.000001);
EXPECT_NEAR(0.0, state->dataFurnaces->Furnace(1).SensibleLoadMet, 0.001);
}

TEST_F(EnergyPlusFixture, Furnaces_SetMinOATCompressor)
Expand Down

5 comments on commit 25fc1f7

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

SimplifyFluidCaching (amirroth) - Win64-Windows-10-VisualStudio-16: OK (2630 of 2630 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

SimplifyFluidCaching (amirroth) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1858 of 1858 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

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

SimplifyFluidCaching (amirroth) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (3421 of 3443 tests passed, 424 test warnings)

Messages:\n

  • 334 tests had: EIO diffs.
  • 420 tests had: ESO small diffs.
  • 265 tests had: Table small diffs.
  • 374 tests had: MTR small diffs.
  • 2 tests had: JSON big diffs.
  • 9 tests had: ESO big diffs.
  • 15 tests had: Table big diffs.
  • 17 tests had: ERR diffs.
  • 2 tests had: EDD diffs.

Failures:\n

regression Test Summary

  • Passed: 769
  • Failed: 22

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.

SimplifyFluidCaching (amirroth) - x86_64-MacOS-10.17-clang-13.0.0: OK (3380 of 3402 tests passed, 421 test warnings)

Messages:\n

  • 416 tests had: ESO small diffs.
  • 318 tests had: EIO diffs.
  • 370 tests had: MTR small diffs.
  • 257 tests had: Table small diffs.
  • 2 tests had: JSON big diffs.
  • 14 tests had: Table big diffs.
  • 19 tests had: ERR diffs.
  • 9 tests had: ESO big diffs.
  • 2 tests had: EDD diffs.

Failures:\n

regression Test Summary

  • Passed: 749
  • Failed: 22

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.

SimplifyFluidCaching (amirroth) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: OK (776 of 776 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.