Skip to content

Commit e9a9b4e

Browse files
brianlballbrianlball
committed
Apply clang-format v19 to CondFD source and unit test
1 parent d017d56 commit e9a9b4e

File tree

2 files changed

+154
-30
lines changed

2 files changed

+154
-30
lines changed

‎src/EnergyPlus/HeatBalFiniteDiffManager.cc‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1833,10 +1833,9 @@ namespace HeatBalFiniteDiffManager {
18331833
Real64 const Cp_DelX2_RhoS(Cp * pow_2(DelX) * RhoS);
18341834
Real64 const Two_Delt_kt(2.0 * Delt * kt);
18351835
if (enetAct.isActuated) {
1836-
TDT_i =
1837-
(Two_Delt_DelX * (QRadSWOutFD + hgnd * Tgnd + (hconvo + hrad) * Toa + enetAct.actuatedValue + hsurr * Tsurr) +
1838-
Cp_DelX2_RhoS * TD_i + Two_Delt_kt * TDT_p) /
1839-
(Two_Delt_DelX * (hconvo + hgnd + hrad + hsurr) + Two_Delt_kt + Cp_DelX2_RhoS);
1836+
TDT_i = (Two_Delt_DelX * (QRadSWOutFD + hgnd * Tgnd + (hconvo + hrad) * Toa + enetAct.actuatedValue + hsurr * Tsurr) +
1837+
Cp_DelX2_RhoS * TD_i + Two_Delt_kt * TDT_p) /
1838+
(Two_Delt_DelX * (hconvo + hgnd + hrad + hsurr) + Two_Delt_kt + Cp_DelX2_RhoS);
18401839
} else {
18411840
TDT_i = (Two_Delt_DelX * (QRadSWOutFD + hgnd * Tgnd + (hconvo + hrad) * Toa + hsky * Tsky + hsurr * Tsurr) +
18421841
Cp_DelX2_RhoS * TD_i + Two_Delt_kt * TDT_p) /
@@ -1851,13 +1850,12 @@ namespace HeatBalFiniteDiffManager {
18511850

18521851
Real64 TInsulOut;
18531852
if (enetAct.isActuated) {
1854-
TInsulOut =
1855-
(QRadSWOutMvInsulFD + hgnd * Tgnd + HMovInsul * TDT_i + (hconvo + hrad) * Toa + enetAct.actuatedValue + hsurr * Tsurr) /
1856-
(hconvo + hgnd + HMovInsul + hrad + hsurr);
1853+
TInsulOut = (QRadSWOutMvInsulFD + hgnd * Tgnd + HMovInsul * TDT_i + (hconvo + hrad) * Toa + enetAct.actuatedValue +
1854+
hsurr * Tsurr) /
1855+
(hconvo + hgnd + HMovInsul + hrad + hsurr);
18571856
} else {
1858-
TInsulOut =
1859-
(QRadSWOutMvInsulFD + hgnd * Tgnd + HMovInsul * TDT_i + (hconvo + hrad) * Toa + hsky * Tsky + hsurr * Tsurr) /
1860-
(hconvo + hgnd + HMovInsul + hrad + hsky + hsurr);
1857+
TInsulOut = (QRadSWOutMvInsulFD + hgnd * Tgnd + HMovInsul * TDT_i + (hconvo + hrad) * Toa + hsky * Tsky + hsurr * Tsurr) /
1858+
(hconvo + hgnd + HMovInsul + hrad + hsky + hsurr);
18611859
}
18621860
Real64 const Two_Delt_DelX(2.0 * Delt_DelX);
18631861
Real64 const Cp_DelX2_RhoS(Cp * pow_2(DelX) * RhoS);

‎tst/EnergyPlus/unit/HeatBalFiniteDiffManager.unit.cc‎

Lines changed: 146 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,8 +1088,8 @@ TEST_F(EnergyPlusFixture, HeatBalFiniteDiffManager_EnetActuatorOverride)
10881088

10891089
// ExteriorBCEqns parameters
10901090
constexpr int Delt = 600;
1091-
constexpr int nodeIdx = 1; // outside face node
1092-
constexpr int Lay = 1; // first layer
1091+
constexpr int nodeIdx = 1; // outside face node
1092+
constexpr int Lay = 1; // first layer
10931093
constexpr Real64 HMovInsul = 0.0;
10941094

10951095
// Create local arrays for function call
@@ -1108,8 +1108,22 @@ TEST_F(EnergyPlusFixture, HeatBalFiniteDiffManager_EnetActuatorOverride)
11081108
surfFD.enetActuator.actuatedValue = 0.0;
11091109
TDT_arr = 20.0; // reset
11101110

1111-
ExteriorBCEqns(*state, Delt, nodeIdx, Lay, SurfNum, T_arr, TT_arr, Rhov_arr, RhoT_arr, RH_arr, TD_arr, TDT_arr, EnthOld_arr, EnthNew_arr,
1112-
TotNodes, HMovInsul);
1111+
ExteriorBCEqns(*state,
1112+
Delt,
1113+
nodeIdx,
1114+
Lay,
1115+
SurfNum,
1116+
T_arr,
1117+
TT_arr,
1118+
Rhov_arr,
1119+
RhoT_arr,
1120+
RH_arr,
1121+
TD_arr,
1122+
TDT_arr,
1123+
EnthOld_arr,
1124+
EnthNew_arr,
1125+
TotNodes,
1126+
HMovInsul);
11131127

11141128
Real64 const TDT_baseline = TDT_arr(nodeIdx);
11151129
Real64 const QRad_baseline = state->dataHeatBalSurf->SurfQdotRadOutRepPerArea(1);
@@ -1123,8 +1137,22 @@ TEST_F(EnergyPlusFixture, HeatBalFiniteDiffManager_EnetActuatorOverride)
11231137
surfFD.enetActuator.actuatedValue = 0.0;
11241138
TDT_arr = 20.0; // reset
11251139

1126-
ExteriorBCEqns(*state, Delt, nodeIdx, Lay, SurfNum, T_arr, TT_arr, Rhov_arr, RhoT_arr, RH_arr, TD_arr, TDT_arr, EnthOld_arr, EnthNew_arr,
1127-
TotNodes, HMovInsul);
1140+
ExteriorBCEqns(*state,
1141+
Delt,
1142+
nodeIdx,
1143+
Lay,
1144+
SurfNum,
1145+
T_arr,
1146+
TT_arr,
1147+
Rhov_arr,
1148+
RhoT_arr,
1149+
RH_arr,
1150+
TD_arr,
1151+
TDT_arr,
1152+
EnthOld_arr,
1153+
EnthNew_arr,
1154+
TotNodes,
1155+
HMovInsul);
11281156

11291157
Real64 const TDT_enet0 = TDT_arr(nodeIdx);
11301158
Real64 const QRad_enet0 = state->dataHeatBalSurf->SurfQdotRadOutRepPerArea(1);
@@ -1142,8 +1170,22 @@ TEST_F(EnergyPlusFixture, HeatBalFiniteDiffManager_EnetActuatorOverride)
11421170
surfFD.enetActuator.actuatedValue = -200.0;
11431171
TDT_arr = 20.0; // reset
11441172

1145-
ExteriorBCEqns(*state, Delt, nodeIdx, Lay, SurfNum, T_arr, TT_arr, Rhov_arr, RhoT_arr, RH_arr, TD_arr, TDT_arr, EnthOld_arr, EnthNew_arr,
1146-
TotNodes, HMovInsul);
1173+
ExteriorBCEqns(*state,
1174+
Delt,
1175+
nodeIdx,
1176+
Lay,
1177+
SurfNum,
1178+
T_arr,
1179+
TT_arr,
1180+
Rhov_arr,
1181+
RhoT_arr,
1182+
RH_arr,
1183+
TD_arr,
1184+
TDT_arr,
1185+
EnthOld_arr,
1186+
EnthNew_arr,
1187+
TotNodes,
1188+
HMovInsul);
11471189

11481190
Real64 const TDT_enetNeg200 = TDT_arr(nodeIdx);
11491191
Real64 const QRad_enetNeg200 = state->dataHeatBalSurf->SurfQdotRadOutRepPerArea(1);
@@ -1157,8 +1199,22 @@ TEST_F(EnergyPlusFixture, HeatBalFiniteDiffManager_EnetActuatorOverride)
11571199
surfFD.enetActuator.actuatedValue = 200.0;
11581200
TDT_arr = 20.0; // reset
11591201

1160-
ExteriorBCEqns(*state, Delt, nodeIdx, Lay, SurfNum, T_arr, TT_arr, Rhov_arr, RhoT_arr, RH_arr, TD_arr, TDT_arr, EnthOld_arr, EnthNew_arr,
1161-
TotNodes, HMovInsul);
1202+
ExteriorBCEqns(*state,
1203+
Delt,
1204+
nodeIdx,
1205+
Lay,
1206+
SurfNum,
1207+
T_arr,
1208+
TT_arr,
1209+
Rhov_arr,
1210+
RhoT_arr,
1211+
RH_arr,
1212+
TD_arr,
1213+
TDT_arr,
1214+
EnthOld_arr,
1215+
EnthNew_arr,
1216+
TotNodes,
1217+
HMovInsul);
11621218

11631219
Real64 const TDT_enetPos200 = TDT_arr(nodeIdx);
11641220
Real64 const QRad_enetPos200 = state->dataHeatBalSurf->SurfQdotRadOutRepPerArea(1);
@@ -1185,8 +1241,22 @@ TEST_F(EnergyPlusFixture, HeatBalFiniteDiffManager_EnetActuatorOverride)
11851241
surfFD.enetActuator.actuatedValue = 0.0;
11861242
TDT_arr = 20.0; // reset
11871243

1188-
ExteriorBCEqns(*state, Delt, nodeIdx, Lay, SurfNum, T_arr, TT_arr, Rhov_arr, RhoT_arr, RH_arr, TD_arr, TDT_arr, EnthOld_arr, EnthNew_arr,
1189-
TotNodes, HMovInsul);
1244+
ExteriorBCEqns(*state,
1245+
Delt,
1246+
nodeIdx,
1247+
Lay,
1248+
SurfNum,
1249+
T_arr,
1250+
TT_arr,
1251+
Rhov_arr,
1252+
RhoT_arr,
1253+
RH_arr,
1254+
TD_arr,
1255+
TDT_arr,
1256+
EnthOld_arr,
1257+
EnthNew_arr,
1258+
TotNodes,
1259+
HMovInsul);
11901260

11911261
EXPECT_NEAR(TDT_arr(nodeIdx), TDT_baseline, 1e-10);
11921262
EXPECT_NEAR(state->dataHeatBalSurf->SurfQdotRadOutRepPerArea(1), QRad_baseline, 1e-10);
@@ -1397,8 +1467,22 @@ TEST_F(EnergyPlusFixture, HeatBalFiniteDiffManager_EnetActuatorOverride_CrankNic
13971467
surfFD.enetActuator.actuatedValue = 0.0;
13981468
TDT_arr = 20.0;
13991469

1400-
ExteriorBCEqns(*state, Delt, nodeIdx, Lay, SurfNum, T_arr, TT_arr, Rhov_arr, RhoT_arr, RH_arr, TD_arr, TDT_arr, EnthOld_arr, EnthNew_arr,
1401-
TotNodes, HMovInsul);
1470+
ExteriorBCEqns(*state,
1471+
Delt,
1472+
nodeIdx,
1473+
Lay,
1474+
SurfNum,
1475+
T_arr,
1476+
TT_arr,
1477+
Rhov_arr,
1478+
RhoT_arr,
1479+
RH_arr,
1480+
TD_arr,
1481+
TDT_arr,
1482+
EnthOld_arr,
1483+
EnthNew_arr,
1484+
TotNodes,
1485+
HMovInsul);
14021486

14031487
Real64 const TDT_baseline = TDT_arr(nodeIdx);
14041488
Real64 const QRad_baseline = state->dataHeatBalSurf->SurfQdotRadOutRepPerArea(1);
@@ -1410,8 +1494,22 @@ TEST_F(EnergyPlusFixture, HeatBalFiniteDiffManager_EnetActuatorOverride_CrankNic
14101494
surfFD.enetActuator.actuatedValue = 0.0;
14111495
TDT_arr = 20.0;
14121496

1413-
ExteriorBCEqns(*state, Delt, nodeIdx, Lay, SurfNum, T_arr, TT_arr, Rhov_arr, RhoT_arr, RH_arr, TD_arr, TDT_arr, EnthOld_arr, EnthNew_arr,
1414-
TotNodes, HMovInsul);
1497+
ExteriorBCEqns(*state,
1498+
Delt,
1499+
nodeIdx,
1500+
Lay,
1501+
SurfNum,
1502+
T_arr,
1503+
TT_arr,
1504+
Rhov_arr,
1505+
RhoT_arr,
1506+
RH_arr,
1507+
TD_arr,
1508+
TDT_arr,
1509+
EnthOld_arr,
1510+
EnthNew_arr,
1511+
TotNodes,
1512+
HMovInsul);
14151513

14161514
Real64 const TDT_enet0 = TDT_arr(nodeIdx);
14171515

@@ -1420,8 +1518,22 @@ TEST_F(EnergyPlusFixture, HeatBalFiniteDiffManager_EnetActuatorOverride_CrankNic
14201518
surfFD.enetActuator.actuatedValue = -200.0;
14211519
TDT_arr = 20.0;
14221520

1423-
ExteriorBCEqns(*state, Delt, nodeIdx, Lay, SurfNum, T_arr, TT_arr, Rhov_arr, RhoT_arr, RH_arr, TD_arr, TDT_arr, EnthOld_arr, EnthNew_arr,
1424-
TotNodes, HMovInsul);
1521+
ExteriorBCEqns(*state,
1522+
Delt,
1523+
nodeIdx,
1524+
Lay,
1525+
SurfNum,
1526+
T_arr,
1527+
TT_arr,
1528+
Rhov_arr,
1529+
RhoT_arr,
1530+
RH_arr,
1531+
TD_arr,
1532+
TDT_arr,
1533+
EnthOld_arr,
1534+
EnthNew_arr,
1535+
TotNodes,
1536+
HMovInsul);
14251537

14261538
Real64 const TDT_enetNeg200 = TDT_arr(nodeIdx);
14271539

@@ -1430,8 +1542,22 @@ TEST_F(EnergyPlusFixture, HeatBalFiniteDiffManager_EnetActuatorOverride_CrankNic
14301542
surfFD.enetActuator.actuatedValue = 200.0;
14311543
TDT_arr = 20.0;
14321544

1433-
ExteriorBCEqns(*state, Delt, nodeIdx, Lay, SurfNum, T_arr, TT_arr, Rhov_arr, RhoT_arr, RH_arr, TD_arr, TDT_arr, EnthOld_arr, EnthNew_arr,
1434-
TotNodes, HMovInsul);
1545+
ExteriorBCEqns(*state,
1546+
Delt,
1547+
nodeIdx,
1548+
Lay,
1549+
SurfNum,
1550+
T_arr,
1551+
TT_arr,
1552+
Rhov_arr,
1553+
RhoT_arr,
1554+
RH_arr,
1555+
TD_arr,
1556+
TDT_arr,
1557+
EnthOld_arr,
1558+
EnthNew_arr,
1559+
TotNodes,
1560+
HMovInsul);
14351561

14361562
Real64 const TDT_enetPos200 = TDT_arr(nodeIdx);
14371563

0 commit comments

Comments
 (0)