Skip to content

Commit a130050

Browse files
mitchutemitchute
committed
format
1 parent 9dd2fbb commit a130050

27 files changed

Lines changed: 136 additions & 192 deletions

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,7 @@ design/FY2023/earth_tube_solution_space_diagram.pdf
103103

104104
# node modules in release/
105105
release/node_modules/*
106+
107+
# virtual environments
108+
venv/
109+
.venv/

‎src/EnergyPlus/Boilers.cc‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -740,11 +740,10 @@ void BoilerSpecs::SizeBoiler(EnergyPlusData &state)
740740
state.dataOutRptPredefined->pdchBoilerPlantloopName,
741741
equipName,
742742
this->plantLoc.loop != nullptr ? this->plantLoc.loop->Name : "N/A");
743-
OutputReportPredefined::PreDefTableEntry(
744-
state,
745-
state.dataOutRptPredefined->pdchBoilerPlantloopBranchName,
746-
equipName,
747-
this->plantLoc.loop != nullptr ? this->plantLoc.branch->Name : "N/A");
743+
OutputReportPredefined::PreDefTableEntry(state,
744+
state.dataOutRptPredefined->pdchBoilerPlantloopBranchName,
745+
equipName,
746+
this->plantLoc.loop != nullptr ? this->plantLoc.branch->Name : "N/A");
748747
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchBoilerMinPLR, equipName, this->MinPartLoadRat);
749748
OutputReportPredefined::PreDefTableEntry(
750749
state, state.dataOutRptPredefined->pdchBoilerFuelType, equipName, Constant::eFuelNames[static_cast<int>(this->FuelType)]);

‎src/EnergyPlus/ChillerAbsorption.cc‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,20 +1382,18 @@ void BLASTAbsorberSpecs::sizeChiller(EnergyPlusData &state)
13821382
state.dataOutRptPredefined->pdchChillerPlantloopName,
13831383
this->Name,
13841384
this->CWPlantLoc.loop != nullptr ? this->CWPlantLoc.loop->Name : "N/A");
1385-
OutputReportPredefined::PreDefTableEntry(
1386-
state,
1387-
state.dataOutRptPredefined->pdchChillerPlantloopBranchName,
1388-
this->Name,
1389-
this->CWPlantLoc.loop != nullptr ? this->CWPlantLoc.branch->Name : "N/A");
1385+
OutputReportPredefined::PreDefTableEntry(state,
1386+
state.dataOutRptPredefined->pdchChillerPlantloopBranchName,
1387+
this->Name,
1388+
this->CWPlantLoc.loop != nullptr ? this->CWPlantLoc.branch->Name : "N/A");
13901389
OutputReportPredefined::PreDefTableEntry(state,
13911390
state.dataOutRptPredefined->pdchChillerCondLoopName,
13921391
this->Name,
13931392
this->CDPlantLoc.loop != nullptr ? this->CDPlantLoc.loop->Name : "N/A");
1394-
OutputReportPredefined::PreDefTableEntry(
1395-
state,
1396-
state.dataOutRptPredefined->pdchChillerCondLoopBranchName,
1397-
this->Name,
1398-
this->CDPlantLoc.loop != nullptr ? this->CDPlantLoc.branch->Name : "N/A");
1393+
OutputReportPredefined::PreDefTableEntry(state,
1394+
state.dataOutRptPredefined->pdchChillerCondLoopBranchName,
1395+
this->Name,
1396+
this->CDPlantLoc.loop != nullptr ? this->CDPlantLoc.branch->Name : "N/A");
13991397
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchChillerMinPLR, this->Name, this->MinPartLoadRat);
14001398
OutputReportPredefined::PreDefTableEntry(state,
14011399
state.dataOutRptPredefined->pdchChillerFuelType,
@@ -1575,8 +1573,7 @@ void BLASTAbsorberSpecs::calculate(EnergyPlusData &state, Real64 &MyLoad, bool R
15751573
(state.dataLoopNodes->Node(this->EvapOutletNodeNum).TempSetPoint != DataLoopNode::SensedNodeFlagValue)) {
15761574
TempEvapOutSetPoint = state.dataLoopNodes->Node(this->EvapOutletNodeNum).TempSetPoint;
15771575
} else {
1578-
TempEvapOutSetPoint =
1579-
state.dataLoopNodes->Node(this->CWPlantLoc.loop->TempSetPointNodeNum).TempSetPoint;
1576+
TempEvapOutSetPoint = state.dataLoopNodes->Node(this->CWPlantLoc.loop->TempSetPointNodeNum).TempSetPoint;
15801577
}
15811578
} break;
15821579
case DataPlant::LoopDemandCalcScheme::DualSetPointDeadBand: {
@@ -1585,8 +1582,7 @@ void BLASTAbsorberSpecs::calculate(EnergyPlusData &state, Real64 &MyLoad, bool R
15851582
(state.dataLoopNodes->Node(this->EvapOutletNodeNum).TempSetPointHi != DataLoopNode::SensedNodeFlagValue)) {
15861583
TempEvapOutSetPoint = state.dataLoopNodes->Node(this->EvapOutletNodeNum).TempSetPointHi;
15871584
} else {
1588-
TempEvapOutSetPoint =
1589-
state.dataLoopNodes->Node(this->CWPlantLoc.loop->TempSetPointNodeNum).TempSetPointHi;
1585+
TempEvapOutSetPoint = state.dataLoopNodes->Node(this->CWPlantLoc.loop->TempSetPointNodeNum).TempSetPointHi;
15901586
}
15911587
} break;
15921588
default: {

‎src/EnergyPlus/ChillerExhaustAbsorption.cc‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,20 +1439,18 @@ void ExhaustAbsorberSpecs::size(EnergyPlusData &state)
14391439
state.dataOutRptPredefined->pdchChillerPlantloopName,
14401440
this->Name,
14411441
this->CWPlantLoc.loop != nullptr ? this->CWPlantLoc.loop->Name : "N/A");
1442-
OutputReportPredefined::PreDefTableEntry(
1443-
state,
1444-
state.dataOutRptPredefined->pdchChillerPlantloopBranchName,
1445-
this->Name,
1446-
this->CWPlantLoc.loop != nullptr ? this->CWPlantLoc.branch->Name : "N/A");
1442+
OutputReportPredefined::PreDefTableEntry(state,
1443+
state.dataOutRptPredefined->pdchChillerPlantloopBranchName,
1444+
this->Name,
1445+
this->CWPlantLoc.loop != nullptr ? this->CWPlantLoc.branch->Name : "N/A");
14471446
OutputReportPredefined::PreDefTableEntry(state,
14481447
state.dataOutRptPredefined->pdchChillerCondLoopName,
14491448
this->Name,
14501449
this->CDPlantLoc.loop != nullptr ? this->CDPlantLoc.loop->Name : "N/A");
1451-
OutputReportPredefined::PreDefTableEntry(
1452-
state,
1453-
state.dataOutRptPredefined->pdchChillerCondLoopBranchName,
1454-
this->Name,
1455-
this->CDPlantLoc.loop != nullptr ? this->CDPlantLoc.branch->Name : "N/A");
1450+
OutputReportPredefined::PreDefTableEntry(state,
1451+
state.dataOutRptPredefined->pdchChillerCondLoopBranchName,
1452+
this->Name,
1453+
this->CDPlantLoc.loop != nullptr ? this->CDPlantLoc.branch->Name : "N/A");
14561454
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchChillerMinPLR, this->Name, this->MinPartLoadRat);
14571455
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchChillerFuelType, this->Name, this->ExhaustSourceName);
14581456
OutputReportPredefined::PreDefTableEntry(
@@ -1522,8 +1520,8 @@ void ExhaustAbsorberSpecs::calcChiller(EnergyPlusData &state, Real64 &MyLoad)
15221520
Real64 revisedEstimateAvailCap; // final estimate of available capacity if using leaving
15231521
// condenser water temperature
15241522
Real64 errorAvailCap; // error fraction on final estimate of AvailableCoolingCapacity
1525-
Real64 Cp_CD = -1; // local fluid specific heat for condenser water -- initializing to negative to ensure it isn't used uninitialized
1526-
Real64 CpAir; // specific heat of exhaust air
1523+
Real64 Cp_CD = -1; // local fluid specific heat for condenser water -- initializing to negative to ensure it isn't used uninitialized
1524+
Real64 CpAir; // specific heat of exhaust air
15271525

15281526
// set node values to data structure values for nodes
15291527
int lChillReturnNodeNum = this->ChillReturnNodeNum; // Node number on the inlet side of the plant

‎src/EnergyPlus/EvaporativeFluidCoolers.cc‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2179,20 +2179,16 @@ namespace EvaporativeFluidCoolers {
21792179
// create std 229 new table for cooling towers and fluid coolers
21802180
OutputReportPredefined::PreDefTableEntry(
21812181
state, state.dataOutRptPredefined->pdchCTFCType, this->Name, DataPlant::PlantEquipTypeNames[static_cast<int>(this->Type)]);
2182+
OutputReportPredefined::PreDefTableEntry(
2183+
state, state.dataOutRptPredefined->pdchCTFCCondLoopName, this->Name, this->plantLoc.loop != nullptr ? this->plantLoc.loop->Name : "N/A");
21822184
OutputReportPredefined::PreDefTableEntry(state,
2183-
state.dataOutRptPredefined->pdchCTFCCondLoopName,
2185+
state.dataOutRptPredefined->pdchCTFCCondLoopBranchName,
21842186
this->Name,
2185-
this->plantLoc.loop != nullptr ? this->plantLoc.loop->Name : "N/A");
2186-
OutputReportPredefined::PreDefTableEntry(
2187-
state,
2188-
state.dataOutRptPredefined->pdchCTFCCondLoopBranchName,
2189-
this->Name,
2190-
this->plantLoc.loop != nullptr ? plantLoc.branch->Name : "N/A");
2191-
OutputReportPredefined::PreDefTableEntry(
2192-
state,
2193-
state.dataOutRptPredefined->pdchCTFCFluidType,
2194-
this->Name,
2195-
this->plantLoc.loop->FluidName); // Fluid Name more reasonable than FluidType
2187+
this->plantLoc.loop != nullptr ? plantLoc.branch->Name : "N/A");
2188+
OutputReportPredefined::PreDefTableEntry(state,
2189+
state.dataOutRptPredefined->pdchCTFCFluidType,
2190+
this->Name,
2191+
this->plantLoc.loop->FluidName); // Fluid Name more reasonable than FluidType
21962192
if ((this->DesignExitWaterTemp > -999.0) && (this->DesignEnteringWaterTemp > 0)) {
21972193
OutputReportPredefined::PreDefTableEntry(
21982194
state, state.dataOutRptPredefined->pdchCTFCRange, this->Name, this->DesignEnteringWaterTemp - this->DesignExitWaterTemp);
@@ -2305,8 +2301,7 @@ namespace EvaporativeFluidCoolers {
23052301
this->BypassFraction = 0.0;
23062302

23072303
// MassFlowTol is a parameter to indicate a no flow condition
2308-
if (this->WaterMassFlowRate <= DataBranchAirLoopPlant::MassFlowTolerance ||
2309-
this->plantLoc.side->FlowLock == DataPlant::FlowLock::Unlocked) {
2304+
if (this->WaterMassFlowRate <= DataBranchAirLoopPlant::MassFlowTolerance || this->plantLoc.side->FlowLock == DataPlant::FlowLock::Unlocked) {
23102305
return;
23112306
}
23122307

@@ -2487,8 +2482,7 @@ namespace EvaporativeFluidCoolers {
24872482
}
24882483

24892484
// MassFlowTol is a parameter to indicate a no flow condition
2490-
if (this->WaterMassFlowRate <= DataBranchAirLoopPlant::MassFlowTolerance ||
2491-
this->plantLoc.side->FlowLock == DataPlant::FlowLock::Unlocked) {
2485+
if (this->WaterMassFlowRate <= DataBranchAirLoopPlant::MassFlowTolerance || this->plantLoc.side->FlowLock == DataPlant::FlowLock::Unlocked) {
24922486
return;
24932487
}
24942488

@@ -2766,8 +2760,7 @@ namespace EvaporativeFluidCoolers {
27662760

27672761
state.dataLoopNodes->Node(this->WaterOutletNode).Temp = this->OutletWaterTemp;
27682762

2769-
if (this->plantLoc.side->FlowLock == DataPlant::FlowLock::Unlocked ||
2770-
state.dataGlobal->WarmupFlag) {
2763+
if (this->plantLoc.side->FlowLock == DataPlant::FlowLock::Unlocked || state.dataGlobal->WarmupFlag) {
27712764
return;
27722765
}
27732766

‎src/EnergyPlus/FluidCoolers.cc‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1616,20 +1616,16 @@ void FluidCoolerspecs::size(EnergyPlusData &state)
16161616
// create std 229 new table for cooling towers and fluid coolers
16171617
OutputReportPredefined::PreDefTableEntry(
16181618
state, state.dataOutRptPredefined->pdchCTFCType, this->Name, DataPlant::PlantEquipTypeNames[static_cast<int>(this->FluidCoolerType)]);
1619+
OutputReportPredefined::PreDefTableEntry(
1620+
state, state.dataOutRptPredefined->pdchCTFCCondLoopName, this->Name, this->plantLoc.loop != nullptr ? this->plantLoc.loop->Name : "N/A");
16191621
OutputReportPredefined::PreDefTableEntry(state,
1620-
state.dataOutRptPredefined->pdchCTFCCondLoopName,
1622+
state.dataOutRptPredefined->pdchCTFCCondLoopBranchName,
16211623
this->Name,
1622-
this->plantLoc.loop != nullptr ? this->plantLoc.loop->Name : "N/A");
1623-
OutputReportPredefined::PreDefTableEntry(
1624-
state,
1625-
state.dataOutRptPredefined->pdchCTFCCondLoopBranchName,
1626-
this->Name,
1627-
this->plantLoc.loop != nullptr ? plantLoc.branch->Name : "N/A");
1628-
OutputReportPredefined::PreDefTableEntry(
1629-
state,
1630-
state.dataOutRptPredefined->pdchCTFCFluidType,
1631-
this->Name,
1632-
this->plantLoc.loop->FluidName); // Fluid Name more reasonable than FluidType
1624+
this->plantLoc.loop != nullptr ? plantLoc.branch->Name : "N/A");
1625+
OutputReportPredefined::PreDefTableEntry(state,
1626+
state.dataOutRptPredefined->pdchCTFCFluidType,
1627+
this->Name,
1628+
this->plantLoc.loop->FluidName); // Fluid Name more reasonable than FluidType
16331629
OutputReportPredefined::PreDefTableEntry(
16341630
state, state.dataOutRptPredefined->pdchCTFCRange, this->Name, this->DesignEnteringWaterTemp - this->DesignLeavingWaterTemp);
16351631
OutputReportPredefined::PreDefTableEntry(
@@ -1835,8 +1831,7 @@ void FluidCoolerspecs::calcTwoSpeed(EnergyPlusData &state)
18351831
}
18361832

18371833
// MassFlowTol is a parameter to indicate a no flow condition
1838-
if (this->WaterMassFlowRate <= DataBranchAirLoopPlant::MassFlowTolerance ||
1839-
this->plantLoc.side->FlowLock == DataPlant::FlowLock::Unlocked) {
1834+
if (this->WaterMassFlowRate <= DataBranchAirLoopPlant::MassFlowTolerance || this->plantLoc.side->FlowLock == DataPlant::FlowLock::Unlocked) {
18401835
return;
18411836
}
18421837

@@ -1963,8 +1958,7 @@ void FluidCoolerspecs::update(EnergyPlusData &state)
19631958
int waterOutletNode = this->WaterOutletNodeNum;
19641959
state.dataLoopNodes->Node(waterOutletNode).Temp = this->OutletWaterTemp;
19651960

1966-
if (this->plantLoc.side->FlowLock == DataPlant::FlowLock::Unlocked ||
1967-
state.dataGlobal->WarmupFlag) {
1961+
if (this->plantLoc.side->FlowLock == DataPlant::FlowLock::Unlocked || state.dataGlobal->WarmupFlag) {
19681962
return;
19691963
}
19701964

‎src/EnergyPlus/HVACSingleDuctInduc.cc‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -623,8 +623,7 @@ namespace HVACSingleDuctInduc {
623623
int HotConNode = state.dataHVACSingleDuctInduc->IndUnit(IUNum).HWControlNode;
624624
if (HotConNode > 0 && !state.dataHVACSingleDuctInduc->MyPlantScanFlag(IUNum)) {
625625

626-
rho = state.dataHVACSingleDuctInduc->IndUnit(IUNum).HWPlantLoc.loop->
627-
glycol->getDensity(state, Constant::HWInitConvTemp, RoutineName);
626+
rho = state.dataHVACSingleDuctInduc->IndUnit(IUNum).HWPlantLoc.loop->glycol->getDensity(state, Constant::HWInitConvTemp, RoutineName);
628627
state.dataHVACSingleDuctInduc->IndUnit(IUNum).MaxHotWaterFlow =
629628
rho * state.dataHVACSingleDuctInduc->IndUnit(IUNum).MaxVolHotWaterFlow;
630629
state.dataHVACSingleDuctInduc->IndUnit(IUNum).MinHotWaterFlow =
@@ -640,8 +639,7 @@ namespace HVACSingleDuctInduc {
640639

641640
int ColdConNode = state.dataHVACSingleDuctInduc->IndUnit(IUNum).CWControlNode;
642641
if (ColdConNode > 0) {
643-
rho = state.dataHVACSingleDuctInduc->IndUnit(IUNum).CWPlantLoc.loop->
644-
glycol->getDensity(state, Constant::CWInitConvTemp, RoutineName);
642+
rho = state.dataHVACSingleDuctInduc->IndUnit(IUNum).CWPlantLoc.loop->glycol->getDensity(state, Constant::CWInitConvTemp, RoutineName);
645643
state.dataHVACSingleDuctInduc->IndUnit(IUNum).MaxColdWaterFlow =
646644
rho * state.dataHVACSingleDuctInduc->IndUnit(IUNum).MaxVolColdWaterFlow;
647645
state.dataHVACSingleDuctInduc->IndUnit(IUNum).MinColdWaterFlow =
@@ -847,11 +845,11 @@ namespace HVACSingleDuctInduc {
847845
state.dataSize->TermUnitFinalZoneSizing(state.dataSize->CurTermUnitSizingNum).DesHeatCoilInTempTU);
848846
}
849847
state.dataHVACSingleDuctInduc->IndUnit(IUNum).DesHeatingLoad = DesCoilLoad;
850-
Cp = state.dataHVACSingleDuctInduc->IndUnit(IUNum).HWPlantLoc.loop->
851-
glycol->getSpecificHeat(state, Constant::HWInitConvTemp, RoutineName);
848+
Cp = state.dataHVACSingleDuctInduc->IndUnit(IUNum).HWPlantLoc.loop->glycol->getSpecificHeat(
849+
state, Constant::HWInitConvTemp, RoutineName);
852850

853-
rho = state.dataHVACSingleDuctInduc->IndUnit(IUNum).HWPlantLoc.loop->
854-
glycol->getDensity(state, Constant::HWInitConvTemp, RoutineName);
851+
rho = state.dataHVACSingleDuctInduc->IndUnit(IUNum).HWPlantLoc.loop->glycol->getDensity(
852+
state, Constant::HWInitConvTemp, RoutineName);
855853

856854
MaxVolHotWaterFlowDes = DesCoilLoad / (state.dataSize->PlantSizData(PltSizHeatNum).DeltaT * Cp * rho);
857855
MaxVolHotWaterFlowDes = max(MaxVolHotWaterFlowDes, 0.0);
@@ -976,11 +974,9 @@ namespace HVACSingleDuctInduc {
976974
state.dataSize->TermUnitFinalZoneSizing(state.dataSize->CurTermUnitSizingNum).ZoneSizThermSetPtHi);
977975
}
978976
state.dataHVACSingleDuctInduc->IndUnit(IUNum).DesCoolingLoad = DesCoilLoad;
979-
Cp = state.dataHVACSingleDuctInduc->IndUnit(IUNum).CWPlantLoc.loop->
980-
glycol->getSpecificHeat(state, 5.0, RoutineName);
977+
Cp = state.dataHVACSingleDuctInduc->IndUnit(IUNum).CWPlantLoc.loop->glycol->getSpecificHeat(state, 5.0, RoutineName);
981978

982-
rho = state.dataHVACSingleDuctInduc->IndUnit(IUNum).CWPlantLoc.loop->
983-
glycol->getDensity(state, 5.0, RoutineName);
979+
rho = state.dataHVACSingleDuctInduc->IndUnit(IUNum).CWPlantLoc.loop->glycol->getDensity(state, 5.0, RoutineName);
984980

985981
MaxVolColdWaterFlowDes = DesCoilLoad / (state.dataSize->PlantSizData(PltSizCoolNum).DeltaT * Cp * rho);
986982
MaxVolColdWaterFlowDes = max(MaxVolColdWaterFlowDes, 0.0);

0 commit comments

Comments
 (0)