From faeba622df1e42a070a43be09b8e59e2e8635ad7 Mon Sep 17 00:00:00 2001 From: amirroth Date: Thu, 21 Dec 2023 16:48:28 -0500 Subject: [PATCH] EMS and unit test fixes --- src/EnergyPlus/EMSManager.cc | 2 +- tst/EnergyPlus/unit/OutputReportTabular.unit.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/EnergyPlus/EMSManager.cc b/src/EnergyPlus/EMSManager.cc index 4945d3e07af..97774f3581b 100644 --- a/src/EnergyPlus/EMSManager.cc +++ b/src/EnergyPlus/EMSManager.cc @@ -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( diff --git a/tst/EnergyPlus/unit/OutputReportTabular.unit.cc b/tst/EnergyPlus/unit/OutputReportTabular.unit.cc index 97312bb5143..7765d57e641 100644 --- a/tst/EnergyPlus/unit/OutputReportTabular.unit.cc +++ b/tst/EnergyPlus/unit/OutputReportTabular.unit.cc @@ -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