From e233def4d002af4dfd9f7d5648e46ef922d39ccc Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Fri, 22 Dec 2023 11:03:32 +0100 Subject: [PATCH] Use parenthesis for HysteresisModel conditions that clang-format 17 is treating as a template param --- .../PhaseChangeModeling/HysteresisModel.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/EnergyPlus/PhaseChangeModeling/HysteresisModel.cc b/src/EnergyPlus/PhaseChangeModeling/HysteresisModel.cc index 8e3af8a8de2..095034e5d98 100644 --- a/src/EnergyPlus/PhaseChangeModeling/HysteresisModel.cc +++ b/src/EnergyPlus/PhaseChangeModeling/HysteresisModel.cc @@ -165,14 +165,14 @@ namespace HysteresisPhaseChange { phaseChangeState = PhaseChangeStates::FREEZING; this->enthNew = this->getEnthalpy(updatedTempTDT, this->peakTempFreezing, this->deltaTempFreezingLow, this->deltaTempFreezingHigh); - } else if (this->enthNew > this->enthalpyM && this->enthNew < this->enthalpyF) { + } else if ((this->enthNew < this->enthalpyF) && (this->enthNew > this->enthalpyM)) { phaseChangeState = PhaseChangeStates::TRANSITION; this->enthNew = (this->specHeatTransition * updatedTempTDT) + (this->enthOld - (this->specHeatTransition * prevTempTD)); - } else if (this->enthNew < this->enthalpyF && updatedTempTDT > phaseChangeTempReverse) { + } else if ((this->enthNew < this->enthalpyF) && (updatedTempTDT > phaseChangeTempReverse)) { phaseChangeState = PhaseChangeStates::TRANSITION; this->enthNew = (this->specHeatTransition * updatedTempTDT) + (this->enthRev - (this->specHeatTransition * phaseChangeTempReverse)); - } else if (this->enthNew <= this->enthalpyM && updatedTempTDT <= phaseChangeTempReverse) { + } else if ((this->enthNew <= this->enthalpyM) && (updatedTempTDT <= phaseChangeTempReverse)) { phaseChangeState = PhaseChangeStates::TRANSITION; this->enthNew = (this->specHeatTransition * updatedTempTDT) + (this->enthRev - (this->specHeatTransition * phaseChangeTempReverse)); @@ -191,11 +191,11 @@ namespace HysteresisPhaseChange { this->enthNew = (this->specHeatTransition * updatedTempTDT) + (this->enthOld - (this->specHeatTransition * prevTempTD)); this->enthalpyM = this->getEnthalpy(updatedTempTDT, this->peakTempMelting, this->deltaTempMeltingLow, this->deltaTempMeltingHigh); this->enthalpyF = this->getEnthalpy(updatedTempTDT, this->peakTempMelting, this->deltaTempMeltingLow, this->deltaTempMeltingHigh); - if (this->enthNew > this->enthalpyF && updatedTempTDT < phaseChangeTempReverse) { + if ((updatedTempTDT < phaseChangeTempReverse) && (this->enthNew > this->enthalpyF)) { phaseChangeState = PhaseChangeStates::FREEZING; this->enthNew = this->getEnthalpy(updatedTempTDT, this->peakTempFreezing, this->deltaTempFreezingLow, this->deltaTempFreezingHigh); - } else if (this->enthNew > this->enthalpyM && this->enthNew < this->enthalpyF && + } else if ((this->enthNew < this->enthalpyF) && (this->enthNew > this->enthalpyM) && (updatedTempTDT < prevTempTD || updatedTempTDT > prevTempTD)) { phaseChangeState = PhaseChangeStates::TRANSITION; this->enthNew = @@ -211,7 +211,7 @@ namespace HysteresisPhaseChange { this->enthNew = (this->specHeatTransition * updatedTempTDT) + (this->enthRev - (this->specHeatTransition * phaseChangeTempReverse)); this->enthalpyM = this->getEnthalpy(updatedTempTDT, this->peakTempMelting, this->deltaTempMeltingLow, this->deltaTempMeltingHigh); this->enthalpyF = this->getEnthalpy(updatedTempTDT, this->peakTempFreezing, this->deltaTempFreezingLow, this->deltaTempFreezingHigh); - if (this->enthNew > this->enthalpyM && this->enthNew < this->enthalpyF) { + if ((this->enthNew < this->enthalpyF) && (this->enthNew > this->enthalpyM)) { phaseChangeState = PhaseChangeStates::TRANSITION; this->enthNew = (this->specHeatTransition * updatedTempTDT) + (this->enthRev - (this->specHeatTransition * phaseChangeTempReverse)); @@ -223,14 +223,14 @@ namespace HysteresisPhaseChange { this->enthNew = (this->specHeatTransition * updatedTempTDT) + (this->enthOld - (this->specHeatTransition * prevTempTD)); this->enthalpyM = this->getEnthalpy(updatedTempTDT, this->peakTempMelting, this->deltaTempMeltingLow, this->deltaTempMeltingHigh); this->enthalpyF = this->getEnthalpy(updatedTempTDT, this->peakTempFreezing, this->deltaTempFreezingLow, this->deltaTempFreezingHigh); - if (this->enthNew < this->enthOld && updatedTempTDT < prevTempTD) { + if ((this->enthNew < this->enthOld) && (updatedTempTDT < prevTempTD)) { phaseChangeState = PhaseChangeStates::TRANSITION; this->enthNew = (this->specHeatTransition * updatedTempTDT) + (this->enthOld - (this->specHeatTransition * prevTempTD)); - } else if (this->enthNew > this->enthalpyM && this->enthNew < this->enthalpyF && updatedTempTDT < prevTempTD) { + } else if ((this->enthNew < this->enthalpyF) && (this->enthNew > this->enthalpyM) && (updatedTempTDT < prevTempTD)) { phaseChangeState = PhaseChangeStates::TRANSITION; this->enthNew = (this->specHeatTransition * updatedTempTDT) + (this->enthRev - (this->specHeatTransition * phaseChangeTempReverse)); - } else if (this->enthNew >= this->enthalpyF && updatedTempTDT <= phaseChangeTempReverse) { + } else if ((this->enthNew >= this->enthalpyF) && (updatedTempTDT <= phaseChangeTempReverse)) { phaseChangeState = PhaseChangeStates::TRANSITION; this->enthNew = (this->specHeatTransition * updatedTempTDT) + (this->enthRev - (this->specHeatTransition * phaseChangeTempReverse));