Skip to content

Commit

Permalink
EMS and unit test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
amirroth committed Dec 21, 2023
1 parent 8c36ff6 commit faeba62
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/EnergyPlus/EMSManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ namespace EMSManager {
// Update sensors with current data
for (int SensorNum = 1; SensorNum <= state.dataRuntimeLang->NumSensors; ++SensorNum) {
int ErlVariableNum = state.dataRuntimeLang->Sensor(SensorNum).VariableNum;
if ((ErlVariableNum > 0) && (state.dataRuntimeLang->Sensor(SensorNum).Index > 0)) {
if ((ErlVariableNum > 0) && (state.dataRuntimeLang->Sensor(SensorNum).Index > -1)) {
if (state.dataRuntimeLang->Sensor(SensorNum).SchedNum == 0) { // not a schedule so get from output processor

state.dataRuntimeLang->ErlVariable(ErlVariableNum).Value = RuntimeLanguageProcessor::SetErlValueNumber(
Expand Down
1 change: 1 addition & 0 deletions tst/EnergyPlus/unit/OutputReportTabular.unit.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10064,6 +10064,7 @@ TEST_F(SQLiteFixture, OutputReportTabularMonthly_CurlyBraces)
ASSERT_TRUE(process_idf(idf_objects));

Meter *meter = new Meter("Electricity:Facility");
meter->units = Constant::Units::J;
state->dataOutputProcessor->meters.push_back(meter);
state->dataOutputProcessor->meterMap.insert_or_assign("ELECTRICITY:FACILITY", (int)state->dataOutputProcessor->meters.size()-1);
// We do need to trick it into thinking it's a weather simulation, otherwise the monthly reports aren't reported
Expand Down

5 comments on commit faeba62

@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.

Qsort (amirroth) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3584 of 3584 tests passed, 790 test warnings)

Messages:\n

  • 789 tests had: AUD diffs.
  • 52 tests had: ESO small diffs.
  • 71 tests had: MTR small diffs.
  • 25 tests had: MTD diffs.
  • 10 tests had: MDD diffs.
  • 1 test had: Table small diffs.
  • 5 tests had: RDD diffs.
  • 5 tests had: ERR diffs.

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.

Qsort (amirroth) - Win64-Windows-10-VisualStudio-16: OK (2753 of 2756 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1480
  • Failed: 1

integration Test Summary

  • Passed: 787
  • Failed: 2

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.

Qsort (amirroth) - x86_64-MacOS-10.17-clang-14.0.0: OK (3543 of 3543 tests passed, 786 test warnings)

Messages:\n

  • 785 tests had: AUD diffs.
  • 25 tests had: MTD diffs.
  • 75 tests had: MTR small diffs.
  • 56 tests had: ESO small diffs.
  • 10 tests had: MDD diffs.
  • 1 test had: Table small diffs.
  • 5 tests had: RDD diffs.
  • 5 tests had: ERR diffs.

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

Qsort (amirroth) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (785 of 790 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 785
  • Failed: 5

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

Qsort (amirroth) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (1969 of 1969 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.