From 62b89de47baed9fc7e137060c1784594d648758d Mon Sep 17 00:00:00 2001 From: Amir Roth Date: Fri, 11 Apr 2025 17:38:56 -0400 Subject: [PATCH 1/6] Fix Reheat Coil Multiplier report --- src/EnergyPlus/SingleDuct.cc | 40 ++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/src/EnergyPlus/SingleDuct.cc b/src/EnergyPlus/SingleDuct.cc index edbeecbfff0..e318b011931 100644 --- a/src/EnergyPlus/SingleDuct.cc +++ b/src/EnergyPlus/SingleDuct.cc @@ -364,6 +364,7 @@ void GetSysInput(EnergyPlusData &state) airTerm.SysName = Alphas(1); airTerm.sysType = CurrentModuleObject; airTerm.SysType_Num = SysType::SingleDuctVAVReheat; + airTerm.ReheatComp = Alphas(7); if (Util::SameString(airTerm.ReheatComp, "Coil:Heating:Fuel")) { airTerm.ReheatComp_Num = HeatingCoilType::Gas; @@ -380,12 +381,20 @@ void GetSysInput(EnergyPlusData &state) ShowContinueError(state, format("Occurs in {} = {}", airTerm.sysType, airTerm.SysName)); ErrorsFound = true; } + airTerm.ReheatName = Alphas(8); ValidateComponent(state, airTerm.ReheatComp, airTerm.ReheatName, IsNotOK, airTerm.sysType); if (IsNotOK) { ShowContinueError(state, format("In {} = {}", airTerm.sysType, airTerm.SysName)); ErrorsFound = true; - } + } else if (airTerm.ReheatComp_Num == HeatingCoilType::Gas || airTerm.ReheatComp_Num == HeatingCoilType::Electric) { + HeatingCoils::GetCoilIndex(state, airTerm.ReheatName, airTerm.ReheatComp_Index, ErrorsFound); + } else if (airTerm.ReheatComp_Num == HeatingCoilType::SimpleHeating) { + airTerm.ReheatComp_Index = WaterCoils::GetWaterCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + } else if (airTerm.ReheatComp_Num == HeatingCoilType::SteamAirHeating) { + airTerm.ReheatComp_Index = SteamCoils::GetSteamCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + } + if (lAlphaBlanks(2)) { airTerm.availSched = Sched::GetScheduleAlwaysOn(state); } else if ((airTerm.availSched = Sched::GetSchedule(state, Alphas(2))) == nullptr) { @@ -696,8 +705,14 @@ void GetSysInput(EnergyPlusData &state) if (IsNotOK) { ShowContinueError(state, format("In {} = {}", airTerm.sysType, airTerm.SysName)); ErrorsFound = true; - } - + } else if (airTerm.ReheatComp_Num == HeatingCoilType::Gas || airTerm.ReheatComp_Num == HeatingCoilType::Electric) { + HeatingCoils::GetCoilIndex(state, airTerm.ReheatName, airTerm.ReheatComp_Index, ErrorsFound); + } else if (airTerm.ReheatComp_Num == HeatingCoilType::SimpleHeating) { + airTerm.ReheatComp_Index = WaterCoils::GetWaterCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + } else if (airTerm.ReheatComp_Num == HeatingCoilType::SteamAirHeating) { + airTerm.ReheatComp_Index = SteamCoils::GetSteamCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + } + if (lAlphaBlanks(2)) { airTerm.availSched = Sched::GetScheduleAlwaysOn(state); } else if ((airTerm.availSched = Sched::GetSchedule(state, Alphas(2))) == nullptr) { @@ -923,8 +938,14 @@ void GetSysInput(EnergyPlusData &state) if (IsNotOK) { ShowContinueError(state, format("In {} = {}", airTerm.sysType, airTerm.SysName)); ErrorsFound = true; - } - + } else if (airTerm.ReheatComp_Num == HeatingCoilType::Gas || airTerm.ReheatComp_Num == HeatingCoilType::Electric) { + HeatingCoils::GetCoilIndex(state, airTerm.ReheatName, airTerm.ReheatComp_Index, ErrorsFound); + } else if (airTerm.ReheatComp_Num == HeatingCoilType::SimpleHeating) { + airTerm.ReheatComp_Index = WaterCoils::GetWaterCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + } else if (airTerm.ReheatComp_Num == HeatingCoilType::SteamAirHeating) { + airTerm.ReheatComp_Index = SteamCoils::GetSteamCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + } + if (lAlphaBlanks(2)) { airTerm.availSched = Sched::GetScheduleAlwaysOn(state); } else if ((airTerm.availSched = Sched::GetSchedule(state, Alphas(2))) == nullptr) { @@ -1658,7 +1679,14 @@ void GetSysInput(EnergyPlusData &state) if (IsNotOK) { ShowContinueError(state, format("In {} = {}", airTerm.sysType, airTerm.SysName)); ErrorsFound = true; - } + } else if (airTerm.ReheatComp_Num == HeatingCoilType::Gas || airTerm.ReheatComp_Num == HeatingCoilType::Electric) { + HeatingCoils::GetCoilIndex(state, airTerm.ReheatName, airTerm.ReheatComp_Index, ErrorsFound); + } else if (airTerm.ReheatComp_Num == HeatingCoilType::SimpleHeating) { + airTerm.ReheatComp_Index = WaterCoils::GetWaterCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + } else if (airTerm.ReheatComp_Num == HeatingCoilType::SteamAirHeating) { + airTerm.ReheatComp_Index = SteamCoils::GetSteamCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + } + airTerm.fanType = static_cast(getEnumValue(HVAC::fanTypeNamesUC, Alphas(5))); From ab2c9ffae7e77b4668d84def1a007dcd5e12d6f1 Mon Sep 17 00:00:00 2001 From: Amir Roth Date: Mon, 14 Apr 2025 20:59:00 -0400 Subject: [PATCH 2/6] A little cleanup to get CI to run again --- src/EnergyPlus/SingleDuct.cc | 73 ++++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 20 deletions(-) diff --git a/src/EnergyPlus/SingleDuct.cc b/src/EnergyPlus/SingleDuct.cc index e318b011931..ce73faf4bdc 100644 --- a/src/EnergyPlus/SingleDuct.cc +++ b/src/EnergyPlus/SingleDuct.cc @@ -383,16 +383,24 @@ void GetSysInput(EnergyPlusData &state) } airTerm.ReheatName = Alphas(8); - ValidateComponent(state, airTerm.ReheatComp, airTerm.ReheatName, IsNotOK, airTerm.sysType); - if (IsNotOK) { - ShowContinueError(state, format("In {} = {}", airTerm.sysType, airTerm.SysName)); - ErrorsFound = true; - } else if (airTerm.ReheatComp_Num == HeatingCoilType::Gas || airTerm.ReheatComp_Num == HeatingCoilType::Electric) { + if (airTerm.ReheatComp_Num == HeatingCoilType::Gas || airTerm.ReheatComp_Num == HeatingCoilType::Electric) { HeatingCoils::GetCoilIndex(state, airTerm.ReheatName, airTerm.ReheatComp_Index, ErrorsFound); + if (airTerm.ReheatComp_Index == 0) { + ShowSevereItemNotFound(state, eoh, cAlphaFields(8), Alphas(8)); + ErrorsFound = true; + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SimpleHeating) { airTerm.ReheatComp_Index = WaterCoils::GetWaterCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + if (airTerm.ReheatComp_Index == 0) { + ShowSevereItemNotFound(state, eoh, cAlphaFields(8), Alphas(8)); + ErrorsFound = true; + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SteamAirHeating) { airTerm.ReheatComp_Index = SteamCoils::GetSteamCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + if (airTerm.ReheatComp_Index == 0) { + ShowSevereItemNotFound(state, eoh, cAlphaFields(8), Alphas(8)); + ErrorsFound = true; + } } if (lAlphaBlanks(2)) { @@ -701,16 +709,24 @@ void GetSysInput(EnergyPlusData &state) ErrorsFound = true; } airTerm.ReheatName = Alphas(6); - ValidateComponent(state, airTerm.ReheatComp, airTerm.ReheatName, IsNotOK, airTerm.sysType); - if (IsNotOK) { - ShowContinueError(state, format("In {} = {}", airTerm.sysType, airTerm.SysName)); - ErrorsFound = true; - } else if (airTerm.ReheatComp_Num == HeatingCoilType::Gas || airTerm.ReheatComp_Num == HeatingCoilType::Electric) { + if (airTerm.ReheatComp_Num == HeatingCoilType::Gas || airTerm.ReheatComp_Num == HeatingCoilType::Electric) { HeatingCoils::GetCoilIndex(state, airTerm.ReheatName, airTerm.ReheatComp_Index, ErrorsFound); + if (airTerm.ReheatComp_Index == 0) { + ShowSevereItemNotFound(state, eoh, cAlphaFields(6), Alphas(6)); + ErrorsFound = true; + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SimpleHeating) { airTerm.ReheatComp_Index = WaterCoils::GetWaterCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + if (airTerm.ReheatComp_Index == 0) { + ShowSevereItemNotFound(state, eoh, cAlphaFields(6), Alphas(6)); + ErrorsFound = true; + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SteamAirHeating) { airTerm.ReheatComp_Index = SteamCoils::GetSteamCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + if (airTerm.ReheatComp_Index == 0) { + ShowSevereItemNotFound(state, eoh, cAlphaFields(6), Alphas(6)); + ErrorsFound = true; + } } if (lAlphaBlanks(2)) { @@ -934,16 +950,24 @@ void GetSysInput(EnergyPlusData &state) ErrorsFound = true; } airTerm.ReheatName = Alphas(6); - ValidateComponent(state, airTerm.ReheatComp, airTerm.ReheatName, IsNotOK, airTerm.sysType); - if (IsNotOK) { - ShowContinueError(state, format("In {} = {}", airTerm.sysType, airTerm.SysName)); - ErrorsFound = true; - } else if (airTerm.ReheatComp_Num == HeatingCoilType::Gas || airTerm.ReheatComp_Num == HeatingCoilType::Electric) { + if (airTerm.ReheatComp_Num == HeatingCoilType::Gas || airTerm.ReheatComp_Num == HeatingCoilType::Electric) { HeatingCoils::GetCoilIndex(state, airTerm.ReheatName, airTerm.ReheatComp_Index, ErrorsFound); + if (airTerm.ReheatComp_Index == 0) { + ShowSevereItemNotFound(state, eoh, cAlphaFields(6), Alphas(6)); + ErrorsFound = true; + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SimpleHeating) { airTerm.ReheatComp_Index = WaterCoils::GetWaterCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + if (airTerm.ReheatComp_Index == 0) { + ShowSevereItemNotFound(state, eoh, cAlphaFields(6), Alphas(6)); + ErrorsFound = true; + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SteamAirHeating) { airTerm.ReheatComp_Index = SteamCoils::GetSteamCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + if (airTerm.ReheatComp_Index == 0) { + ShowSevereItemNotFound(state, eoh, cAlphaFields(6), Alphas(6)); + ErrorsFound = true; + } } if (lAlphaBlanks(2)) { @@ -1675,16 +1699,25 @@ void GetSysInput(EnergyPlusData &state) ShowContinueError(state, format("Occurs in {} = {}", airTerm.sysType, airTerm.SysName)); ErrorsFound = true; } - ValidateComponent(state, airTerm.ReheatComp, airTerm.ReheatName, IsNotOK, airTerm.sysType); - if (IsNotOK) { - ShowContinueError(state, format("In {} = {}", airTerm.sysType, airTerm.SysName)); - ErrorsFound = true; - } else if (airTerm.ReheatComp_Num == HeatingCoilType::Gas || airTerm.ReheatComp_Num == HeatingCoilType::Electric) { + + if (airTerm.ReheatComp_Num == HeatingCoilType::Gas || airTerm.ReheatComp_Num == HeatingCoilType::Electric) { HeatingCoils::GetCoilIndex(state, airTerm.ReheatName, airTerm.ReheatComp_Index, ErrorsFound); + if (airTerm.ReheatComp_Index == 0) { + ShowSevereItemNotFound(state, eoh, cAlphaFields(8), Alphas(8)); + ErrorsFound = true; + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SimpleHeating) { airTerm.ReheatComp_Index = WaterCoils::GetWaterCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + if (airTerm.ReheatComp_Index == 0) { + ShowSevereItemNotFound(state, eoh, cAlphaFields(8), Alphas(8)); + ErrorsFound = true; + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SteamAirHeating) { airTerm.ReheatComp_Index = SteamCoils::GetSteamCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); + if (airTerm.ReheatComp_Index == 0) { + ShowSevereItemNotFound(state, eoh, cAlphaFields(8), Alphas(8)); + ErrorsFound = true; + } } From 4e7da1d5968d93cdd493e215d82f30f44467b071 Mon Sep 17 00:00:00 2001 From: rraustad Date: Tue, 15 Apr 2025 17:36:23 -0400 Subject: [PATCH 3/6] Clang-format --- src/EnergyPlus/SingleDuct.cc | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/src/EnergyPlus/SingleDuct.cc b/src/EnergyPlus/SingleDuct.cc index ce73faf4bdc..487e7ab3f2e 100644 --- a/src/EnergyPlus/SingleDuct.cc +++ b/src/EnergyPlus/SingleDuct.cc @@ -364,7 +364,7 @@ void GetSysInput(EnergyPlusData &state) airTerm.SysName = Alphas(1); airTerm.sysType = CurrentModuleObject; airTerm.SysType_Num = SysType::SingleDuctVAVReheat; - + airTerm.ReheatComp = Alphas(7); if (Util::SameString(airTerm.ReheatComp, "Coil:Heating:Fuel")) { airTerm.ReheatComp_Num = HeatingCoilType::Gas; @@ -381,28 +381,28 @@ void GetSysInput(EnergyPlusData &state) ShowContinueError(state, format("Occurs in {} = {}", airTerm.sysType, airTerm.SysName)); ErrorsFound = true; } - + airTerm.ReheatName = Alphas(8); if (airTerm.ReheatComp_Num == HeatingCoilType::Gas || airTerm.ReheatComp_Num == HeatingCoilType::Electric) { HeatingCoils::GetCoilIndex(state, airTerm.ReheatName, airTerm.ReheatComp_Index, ErrorsFound); if (airTerm.ReheatComp_Index == 0) { ShowSevereItemNotFound(state, eoh, cAlphaFields(8), Alphas(8)); ErrorsFound = true; - } + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SimpleHeating) { airTerm.ReheatComp_Index = WaterCoils::GetWaterCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); if (airTerm.ReheatComp_Index == 0) { ShowSevereItemNotFound(state, eoh, cAlphaFields(8), Alphas(8)); ErrorsFound = true; - } + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SteamAirHeating) { airTerm.ReheatComp_Index = SteamCoils::GetSteamCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); if (airTerm.ReheatComp_Index == 0) { ShowSevereItemNotFound(state, eoh, cAlphaFields(8), Alphas(8)); ErrorsFound = true; - } + } } - + if (lAlphaBlanks(2)) { airTerm.availSched = Sched::GetScheduleAlwaysOn(state); } else if ((airTerm.availSched = Sched::GetSchedule(state, Alphas(2))) == nullptr) { @@ -714,21 +714,21 @@ void GetSysInput(EnergyPlusData &state) if (airTerm.ReheatComp_Index == 0) { ShowSevereItemNotFound(state, eoh, cAlphaFields(6), Alphas(6)); ErrorsFound = true; - } + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SimpleHeating) { airTerm.ReheatComp_Index = WaterCoils::GetWaterCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); if (airTerm.ReheatComp_Index == 0) { ShowSevereItemNotFound(state, eoh, cAlphaFields(6), Alphas(6)); ErrorsFound = true; - } + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SteamAirHeating) { airTerm.ReheatComp_Index = SteamCoils::GetSteamCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); if (airTerm.ReheatComp_Index == 0) { ShowSevereItemNotFound(state, eoh, cAlphaFields(6), Alphas(6)); ErrorsFound = true; - } + } } - + if (lAlphaBlanks(2)) { airTerm.availSched = Sched::GetScheduleAlwaysOn(state); } else if ((airTerm.availSched = Sched::GetSchedule(state, Alphas(2))) == nullptr) { @@ -955,21 +955,21 @@ void GetSysInput(EnergyPlusData &state) if (airTerm.ReheatComp_Index == 0) { ShowSevereItemNotFound(state, eoh, cAlphaFields(6), Alphas(6)); ErrorsFound = true; - } + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SimpleHeating) { airTerm.ReheatComp_Index = WaterCoils::GetWaterCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); if (airTerm.ReheatComp_Index == 0) { ShowSevereItemNotFound(state, eoh, cAlphaFields(6), Alphas(6)); ErrorsFound = true; - } + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SteamAirHeating) { airTerm.ReheatComp_Index = SteamCoils::GetSteamCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); if (airTerm.ReheatComp_Index == 0) { ShowSevereItemNotFound(state, eoh, cAlphaFields(6), Alphas(6)); ErrorsFound = true; - } + } } - + if (lAlphaBlanks(2)) { airTerm.availSched = Sched::GetScheduleAlwaysOn(state); } else if ((airTerm.availSched = Sched::GetSchedule(state, Alphas(2))) == nullptr) { @@ -1705,21 +1705,20 @@ void GetSysInput(EnergyPlusData &state) if (airTerm.ReheatComp_Index == 0) { ShowSevereItemNotFound(state, eoh, cAlphaFields(8), Alphas(8)); ErrorsFound = true; - } + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SimpleHeating) { airTerm.ReheatComp_Index = WaterCoils::GetWaterCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); if (airTerm.ReheatComp_Index == 0) { ShowSevereItemNotFound(state, eoh, cAlphaFields(8), Alphas(8)); ErrorsFound = true; - } + } } else if (airTerm.ReheatComp_Num == HeatingCoilType::SteamAirHeating) { airTerm.ReheatComp_Index = SteamCoils::GetSteamCoilIndex(state, airTerm.ReheatComp, airTerm.ReheatName, ErrorsFound); if (airTerm.ReheatComp_Index == 0) { ShowSevereItemNotFound(state, eoh, cAlphaFields(8), Alphas(8)); ErrorsFound = true; - } + } } - airTerm.fanType = static_cast(getEnumValue(HVAC::fanTypeNamesUC, Alphas(5))); From 1ee2afe276eff159852921e54421de369bf1a295 Mon Sep 17 00:00:00 2001 From: Edwin Lee Date: Thu, 15 May 2025 15:58:38 -0500 Subject: [PATCH 4/6] Point to the regression tool branch for table diff handling --- .github/workflows/test_pull_requests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_pull_requests.yml b/.github/workflows/test_pull_requests.yml index 85dc29c84e6..f0e83614888 100644 --- a/.github/workflows/test_pull_requests.yml +++ b/.github/workflows/test_pull_requests.yml @@ -168,7 +168,7 @@ jobs: - name: Install Regression Tool if: always() && matrix.run_regressions && steps.branch_build.outcome != 'failure' # always run this step as long as we actually built - run: pip install energyplus-regressions>=2.1.3 + run: pip install git+https://github.com/NREL/EnergyPlusRegressionTool.git@AllowSomeTableReordering # energyplus-regressions>=2.1.4 - name: Run Regressions if: always() && matrix.run_regressions && steps.branch_build.outcome != 'failure' # always run this step as long as we actually built From 4b7afcac28370dfec71cc78dcb1d3ab28d622a72 Mon Sep 17 00:00:00 2001 From: Edwin Lee Date: Fri, 16 May 2025 09:35:13 -0500 Subject: [PATCH 5/6] Patch in a separate unit test fix --- tst/EnergyPlus/unit/EconomicTariff.unit.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tst/EnergyPlus/unit/EconomicTariff.unit.cc b/tst/EnergyPlus/unit/EconomicTariff.unit.cc index a21d82817a9..c40a1c42c8c 100644 --- a/tst/EnergyPlus/unit/EconomicTariff.unit.cc +++ b/tst/EnergyPlus/unit/EconomicTariff.unit.cc @@ -420,6 +420,7 @@ TEST_F(EnergyPlusFixture, EconomicTariff_LEEDtariffReporting_Test) state->dataEconTariff->tariff(1).totalAnnualEnergy = 4855.21; state->dataEconTariff->tariff(1).kindMtr = EconomicTariff::MeterType::ElecPurchased; state->dataEconTariff->tariff(1).reportMeterIndx = GetMeterIndex(*state, "ELECTRICITY:FACILITY"); + state->dataEconTariff->tariff(1).demandWindow = DemandWindow::Day; state->dataEconTariff->tariff(2).tariffName = "SmallCGUnit"; state->dataEconTariff->tariff(2).isSelected = true; @@ -427,18 +428,21 @@ TEST_F(EnergyPlusFixture, EconomicTariff_LEEDtariffReporting_Test) state->dataEconTariff->tariff(2).totalAnnualEnergy = 0.00; state->dataEconTariff->tariff(2).kindMtr = EconomicTariff::MeterType::Gas; state->dataEconTariff->tariff(2).reportMeterIndx = GetMeterIndex(*state, "NATURALGAS:FACILITY"); + state->dataEconTariff->tariff(2).demandWindow = DemandWindow::Day; state->dataEconTariff->tariff(3).tariffName = "DistrictCoolingUnit"; state->dataEconTariff->tariff(3).isSelected = true; state->dataEconTariff->tariff(3).totalAnnualCost = 55.22; state->dataEconTariff->tariff(3).totalAnnualEnergy = 8.64; state->dataEconTariff->tariff(3).reportMeterIndx = GetMeterIndex(*state, "DISTRICTCOOLING:FACILITY"); + state->dataEconTariff->tariff(3).demandWindow = DemandWindow::Day; state->dataEconTariff->tariff(4).tariffName = "DistrictHeatingUnit"; state->dataEconTariff->tariff(4).isSelected = true; state->dataEconTariff->tariff(4).totalAnnualCost = 15.98; state->dataEconTariff->tariff(4).totalAnnualEnergy = 1.47; state->dataEconTariff->tariff(4).reportMeterIndx = GetMeterIndex(*state, "DISTRICTHEATINGWATER:FACILITY"); + state->dataEconTariff->tariff(4).demandWindow = DemandWindow::Day; SetPredefinedTables(*state); // need to setup the predefined table entry numbers From c008272bf310fddbe0f891e57dad4c43a19b4324 Mon Sep 17 00:00:00 2001 From: Edwin Lee Date: Fri, 16 May 2025 09:37:11 -0500 Subject: [PATCH 6/6] Pin regressions back to pypi --- .github/workflows/test_pull_requests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_pull_requests.yml b/.github/workflows/test_pull_requests.yml index f0e83614888..05f549c93a4 100644 --- a/.github/workflows/test_pull_requests.yml +++ b/.github/workflows/test_pull_requests.yml @@ -168,7 +168,7 @@ jobs: - name: Install Regression Tool if: always() && matrix.run_regressions && steps.branch_build.outcome != 'failure' # always run this step as long as we actually built - run: pip install git+https://github.com/NREL/EnergyPlusRegressionTool.git@AllowSomeTableReordering # energyplus-regressions>=2.1.4 + run: pip install energyplus-regressions>=2.1.4 - name: Run Regressions if: always() && matrix.run_regressions && steps.branch_build.outcome != 'failure' # always run this step as long as we actually built