From 7e15f983e95bdb3c5903a50f1ad24ef7fe8d4a9e Mon Sep 17 00:00:00 2001 From: Yujie Xu <yujiex@5c-e9-1e-83-4f-ff.dhcp.lbnl.us> Date: Mon, 22 Jul 2024 09:15:00 -0700 Subject: [PATCH] fix enum format, clang-format, include filename --- src/EnergyPlus/ExtendedHI.cc | 16 ++-- src/EnergyPlus/ExtendedHI.hh | 6 +- src/EnergyPlus/HeatBalanceSurfaceManager.cc | 5 +- tst/EnergyPlus/unit/ExtendedHI.unit.cc | 94 ++++++++++----------- 4 files changed, 60 insertions(+), 61 deletions(-) diff --git a/src/EnergyPlus/ExtendedHI.cc b/src/EnergyPlus/ExtendedHI.cc index 787b7625d04..e2ac01610ce 100644 --- a/src/EnergyPlus/ExtendedHI.cc +++ b/src/EnergyPlus/ExtendedHI.cc @@ -64,7 +64,7 @@ #include <EnergyPlus/Data/EnergyPlusData.hh> #include <EnergyPlus/General.hh> #include <EnergyPlus/HVACSystemRootFindingAlgorithm.hh> -#include <EnergyPlus/extendedHI.hh> +#include <EnergyPlus/ExtendedHI.hh> namespace EnergyPlus { @@ -384,12 +384,12 @@ namespace ExtendedHI { Real64 Rf; if (flux1 <= 0.0) { - eqvar_name = static_cast<int>(eqvarName::phi); + eqvar_name = static_cast<int>(EqvarName::Phi); phi = 1.0 - (Q - Qv(Ta, Pa)) * Rs / (Tc - Ts); Rf = std::numeric_limits<Real64>::infinity(); return {eqvar_name, phi}; } else if (flux2 <= 0.0) { - eqvar_name = static_cast<int>(eqvarName::Rf); + eqvar_name = static_cast<int>(EqvarName::Rf); Real64 Ts_bar = Tc - (Q - Qv(Ta, Pa)) * Rs / phi + (1.0 / phi - 1.0) * (Tc - Ts); General::SolveRoot( state, @@ -419,7 +419,7 @@ namespace ExtendedHI { 0.0, Tc); Rs = (Tc - Ts) / (Q - Qv(Ta, Pa)); - eqvar_name = static_cast<int>(eqvarName::Rs); + eqvar_name = static_cast<int>(EqvarName::Rs); Real64 Ps = Pc - (Pc - Pa) * Zs(Rs) / (Zs(Rs) + Za_un); if (Ps > phi_salt * pvstar(Ts)) { General::SolveRoot( @@ -436,7 +436,7 @@ namespace ExtendedHI { return {eqvar_name, Rs}; } else { Rs = 0.0; - eqvar_name = static_cast<int>(eqvarName::dTcdt); + eqvar_name = static_cast<int>(EqvarName::DTcdt); dTcdt = (1.0 / C) * flux3; return {eqvar_name, dTcdt}; } @@ -449,10 +449,10 @@ namespace ExtendedHI { Real64 T; int SolFla; - if (eqvar_name == static_cast<int>(eqvarName::phi)) { + if (eqvar_name == static_cast<int>(EqvarName::Phi)) { General::SolveRoot( state, tol, maxIter, SolFla, T, [&](Real64 T) { return find_eqvar_phi(state, T, 1.0) - eqvar; }, 0.0, 240.0); - } else if (eqvar_name == static_cast<int>(eqvarName::Rf)) { + } else if (eqvar_name == static_cast<int>(EqvarName::Rf)) { General::SolveRoot( state, tol, @@ -462,7 +462,7 @@ namespace ExtendedHI { [&](Real64 T) { return (find_eqvar_Rf(state, T, std::min(1.0, Pa0 / pvstar(T)))) - eqvar; }, 230.0, 300.0); - } else if (eqvar_name == static_cast<int>(eqvarName::Rs)) { + } else if (eqvar_name == static_cast<int>(EqvarName::Rs)) { General::SolveRoot( state, tol, maxIter, SolFla, T, [&](Real64 T) { return find_eqvar_rs(state, T, Pa0 / pvstar(T)) - eqvar; }, 295.0, 350.0); } else { diff --git a/src/EnergyPlus/ExtendedHI.hh b/src/EnergyPlus/ExtendedHI.hh index 69e46ba7f70..ae4a36d7ca1 100644 --- a/src/EnergyPlus/ExtendedHI.hh +++ b/src/EnergyPlus/ExtendedHI.hh @@ -60,13 +60,13 @@ struct EnergyPlusData; namespace ExtendedHI { - enum class eqvarName + enum class EqvarName { Invalid = -1, - phi = 1, + Phi = 1, Rf = 2, Rs = 3, - dTcdt = 4, + DTcdt = 4, Num }; diff --git a/src/EnergyPlus/HeatBalanceSurfaceManager.cc b/src/EnergyPlus/HeatBalanceSurfaceManager.cc index 6468035cd63..8b1ba3f0893 100644 --- a/src/EnergyPlus/HeatBalanceSurfaceManager.cc +++ b/src/EnergyPlus/HeatBalanceSurfaceManager.cc @@ -119,7 +119,7 @@ #include <EnergyPlus/WindowManagerExteriorData.hh> #include <EnergyPlus/WindowManagerExteriorThermal.hh> #include <EnergyPlus/ZoneTempPredictorCorrector.hh> -#include <EnergyPlus/extendedHI.hh> +#include <EnergyPlus/ExtendedHI.hh> #include <WCECommon.hpp> #include <WCEMultiLayerOptics.hpp> #include <WCESingleLayerOptics.hpp> @@ -5623,8 +5623,7 @@ void CalcThermalResilience(EnergyPlusData &state) Real64 const ZoneRH = Psychrometrics::PsyRhFnTdbWPb(state, ZoneT, ZoneW, state.dataEnvrn->OutBaroPress); Real64 const ZoneTF = ZoneT * (9.0 / 5.0) + 32.0; // calculate extended heat index - state.dataHeatBal->Resilience(ZoneNum).ZoneHeatIndex = - ExtendedHI::heatindex(state, ZoneT + Constant::Kelvin, ZoneRH) - Constant::Kelvin; + state.dataHeatBal->Resilience(ZoneNum).ZoneHeatIndex = ExtendedHI::heatindex(state, ZoneT + Constant::Kelvin, ZoneRH) - Constant::Kelvin; } } if (state.dataHeatBalSurfMgr->reportVarHumidex || state.dataOutRptTab->displayThermalResilienceSummary) { diff --git a/tst/EnergyPlus/unit/ExtendedHI.unit.cc b/tst/EnergyPlus/unit/ExtendedHI.unit.cc index 95662f584f2..22a96d59a50 100644 --- a/tst/EnergyPlus/unit/ExtendedHI.unit.cc +++ b/tst/EnergyPlus/unit/ExtendedHI.unit.cc @@ -57,7 +57,7 @@ #include "Fixtures/EnergyPlusFixture.hh" #include <EnergyPlus/Data/EnergyPlusData.hh> #include <EnergyPlus/HVACSystemRootFindingAlgorithm.hh> -#include <EnergyPlus/extendedHI.hh> +#include <EnergyPlus/ExtendedHI.hh> using namespace EnergyPlus; using namespace ExtendedHI; @@ -220,48 +220,48 @@ TEST_F(EnergyPlusFixture, extendedHI_find_eqvar) Real64 tol = 1e-5; std::vector<Real64> Ta_values = {240, 260, 280, 300, 320, 340, 360}; std::vector<Real64> RH_values = {0, 0.2, 0.4, 0.6, 0.8, 1.0}; - std::vector<std::vector<int>> result_0 = {{static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf)}, - {static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf)}, - {static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rf)}, - {static_cast<int>(eqvarName::Rf), - static_cast<int>(eqvarName::Rs), - static_cast<int>(eqvarName::Rs), - static_cast<int>(eqvarName::Rs), - static_cast<int>(eqvarName::Rs), - static_cast<int>(eqvarName::Rs)}, - {static_cast<int>(eqvarName::Rs), - static_cast<int>(eqvarName::Rs), - static_cast<int>(eqvarName::dTcdt), - static_cast<int>(eqvarName::dTcdt), - static_cast<int>(eqvarName::dTcdt), - static_cast<int>(eqvarName::dTcdt)}, - {static_cast<int>(eqvarName::Rs), - static_cast<int>(eqvarName::dTcdt), - static_cast<int>(eqvarName::dTcdt), - static_cast<int>(eqvarName::dTcdt), - static_cast<int>(eqvarName::dTcdt), - static_cast<int>(eqvarName::dTcdt)}, - {static_cast<int>(eqvarName::Rs), - static_cast<int>(eqvarName::dTcdt), - static_cast<int>(eqvarName::dTcdt), - static_cast<int>(eqvarName::dTcdt), - static_cast<int>(eqvarName::dTcdt), - static_cast<int>(eqvarName::dTcdt)}}; + std::vector<std::vector<int>> result_0 = {{static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf)}, + {static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf)}, + {static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rf)}, + {static_cast<int>(EqvarName::Rf), + static_cast<int>(EqvarName::Rs), + static_cast<int>(EqvarName::Rs), + static_cast<int>(EqvarName::Rs), + static_cast<int>(EqvarName::Rs), + static_cast<int>(EqvarName::Rs)}, + {static_cast<int>(EqvarName::Rs), + static_cast<int>(EqvarName::Rs), + static_cast<int>(EqvarName::DTcdt), + static_cast<int>(EqvarName::DTcdt), + static_cast<int>(EqvarName::DTcdt), + static_cast<int>(EqvarName::DTcdt)}, + {static_cast<int>(EqvarName::Rs), + static_cast<int>(EqvarName::DTcdt), + static_cast<int>(EqvarName::DTcdt), + static_cast<int>(EqvarName::DTcdt), + static_cast<int>(EqvarName::DTcdt), + static_cast<int>(EqvarName::DTcdt)}, + {static_cast<int>(EqvarName::Rs), + static_cast<int>(EqvarName::DTcdt), + static_cast<int>(EqvarName::DTcdt), + static_cast<int>(EqvarName::DTcdt), + static_cast<int>(EqvarName::DTcdt), + static_cast<int>(EqvarName::DTcdt)}}; std::vector<std::vector<Real64>> result_1 = {{33.04275, 32.69563, 32.35542, 32.02191, 31.69491, 31.37423}, {1.56043, 1.54633, 1.53238, 1.51858, 1.50491, 1.49139}, @@ -287,23 +287,23 @@ TEST_F(EnergyPlusFixture, extendedHI_find_T) std::vector<Real64> Rf_values = {30, 32, 34, 36, 38}; std::vector<Real64> result_0_rf = {240.0675404, 239.9711237, 239.8858108, 239.8097882, 239.7416167}; for (size_t i = 0; i < Rf_values.size(); ++i) { - EXPECT_NEAR(ExtendedHI::find_T(*state, static_cast<int>(EnergyPlus::ExtendedHI::eqvarName::Rf), Rf_values[i]), result_0_rf[i], tol); + EXPECT_NEAR(ExtendedHI::find_T(*state, static_cast<int>(EnergyPlus::ExtendedHI::EqvarName::Rf), Rf_values[i]), result_0_rf[i], tol); } std::vector<Real64> Rs_values = {0.01, 0.02, 0.03}; std::vector<Real64> result_0_rs = {337.8697, 329.7587, 307.4816}; tol = 1e-4; for (size_t i = 0; i < Rs_values.size(); ++i) { - EXPECT_NEAR(ExtendedHI::find_T(*state, static_cast<int>(EnergyPlus::ExtendedHI::eqvarName::Rs), Rs_values[i]), result_0_rs[i], tol); + EXPECT_NEAR(ExtendedHI::find_T(*state, static_cast<int>(EnergyPlus::ExtendedHI::EqvarName::Rs), Rs_values[i]), result_0_rs[i], tol); } std::vector<Real64> phi_values = {0.86, 0.88, 0.90, 0.92, 0.94, 0.96}; std::vector<Real64> result_0_phi = {228.6900, 215.9994, 199.0012, 175.1865, 139.7124, 82.0478}; for (size_t i = 0; i < phi_values.size(); ++i) { - EXPECT_NEAR(ExtendedHI::find_T(*state, static_cast<int>(EnergyPlus::ExtendedHI::eqvarName::phi), phi_values[i]), result_0_phi[i], tol); + EXPECT_NEAR(ExtendedHI::find_T(*state, static_cast<int>(EnergyPlus::ExtendedHI::EqvarName::Phi), phi_values[i]), result_0_phi[i], tol); } std::vector<Real64> dTcdt_values = {0.01, 0.03, 0.05, 0.07, 0.09}; std::vector<Real64> result_0_dTcdt = {412.5272, 512.3596, 584.547, 641.1988, 688.0423}; for (size_t i = 0; i < dTcdt_values.size(); ++i) { - EXPECT_NEAR(ExtendedHI::find_T(*state, static_cast<int>(EnergyPlus::ExtendedHI::eqvarName::dTcdt), dTcdt_values[i]), result_0_dTcdt[i], tol); + EXPECT_NEAR(ExtendedHI::find_T(*state, static_cast<int>(EnergyPlus::ExtendedHI::EqvarName::DTcdt), dTcdt_values[i]), result_0_dTcdt[i], tol); } }