Skip to content

Commit 01c2a82

Browse files
lgu1234lgu1234
committed
Address comments and cleanup
1 parent 0ee8b1f commit 01c2a82

13 files changed

+44
-239
lines changed

‎src/EnergyPlus/FanCoilUnits.cc

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4119,28 +4119,6 @@ namespace FanCoilUnits {
41194119
return 0;
41204120
}
41214121

4122-
int GetFanCoilAirInNode(EnergyPlusData &state, int const FanCoilNum)
4123-
{
4124-
4125-
// FUNCTION INFORMATION:
4126-
// AUTHOR B Griffith
4127-
// DATE WRITTEN Dec 2006
4128-
4129-
// PURPOSE OF THIS FUNCTION:
4130-
// lookup function for OA inlet node for ventilation rate reporting
4131-
4132-
if (state.dataFanCoilUnits->GetFanCoilInputFlag) {
4133-
GetFanCoilUnits(state);
4134-
state.dataFanCoilUnits->GetFanCoilInputFlag = false;
4135-
}
4136-
4137-
if (FanCoilNum > 0 && FanCoilNum <= state.dataFanCoilUnits->NumFanCoils) {
4138-
return state.dataFanCoilUnits->FanCoil(FanCoilNum).AirInNode;
4139-
}
4140-
4141-
return 0;
4142-
}
4143-
41444122
int GetFanCoilOutAirNode(EnergyPlusData &state, int const FanCoilNum)
41454123
{
41464124

‎src/EnergyPlus/FanCoilUnits.hh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,6 @@ namespace FanCoilUnits {
321321

322322
int GetFanCoilZoneInletAirNode(EnergyPlusData &state, int const FanCoilNum);
323323

324-
int GetFanCoilAirInNode(EnergyPlusData &state, int const FanCoilNum);
325-
326324
int GetFanCoilOutAirNode(EnergyPlusData &state, int FanCoilNum);
327325

328326
int GetFanCoilReturnAirNode(EnergyPlusData &state, int FanCoilNum);

‎src/EnergyPlus/PurchasedAirManager.cc

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3318,21 +3318,6 @@ int GetPurchasedAirReturnAirNode(EnergyPlusData &state, int const PurchAirNum)
33183318
return GetPurchasedAirReturnAirNode;
33193319
}
33203320

3321-
int GetPurchasedAirZoneExhaustAirNode(EnergyPlusData &state, int PurchAirNum)
3322-
{
3323-
if (state.dataPurchasedAirMgr->GetPurchAirInputFlag) {
3324-
GetPurchasedAir(state);
3325-
state.dataPurchasedAirMgr->GetPurchAirInputFlag = false;
3326-
}
3327-
3328-
int GetPurchasedAirZoneExhaustAirNode = 0;
3329-
if (PurchAirNum > 0 && PurchAirNum <= state.dataPurchasedAirMgr->NumPurchAir) {
3330-
GetPurchasedAirZoneExhaustAirNode = state.dataPurchasedAirMgr->PurchAir(PurchAirNum).ZoneExhaustAirNodeNum;
3331-
}
3332-
3333-
return GetPurchasedAirZoneExhaustAirNode;
3334-
}
3335-
33363321
int getPurchasedAirIndex(EnergyPlusData &state, std::string_view PurchAirName, bool &errFlag)
33373322
{
33383323
if (state.dataPurchasedAirMgr->GetPurchAirInputFlag) {

‎src/EnergyPlus/PurchasedAirManager.hh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,6 @@ namespace PurchasedAirManager {
379379

380380
int GetPurchasedAirReturnAirNode(EnergyPlusData &state, int PurchAirNum);
381381

382-
int GetPurchasedAirZoneExhaustAirNode(EnergyPlusData &state, int PurchAirNum);
383-
384382
int getPurchasedAirIndex(EnergyPlusData &state, std::string_view PurchAirName, bool &errFlag);
385383

386384
Real64 GetPurchasedAirMixedAirTemp(EnergyPlusData &state, int PurchAirNum);

‎src/EnergyPlus/UnitHeater.cc

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,39 +1894,6 @@ namespace UnitHeater {
18941894
}
18951895
}
18961896

1897-
int GetUnitHeaterAirOutletNode(EnergyPlusData &state, int UnitHeaterNum)
1898-
{
1899-
// Return value
1900-
int GetUnitHeaterAirOutletNode = 0;
1901-
1902-
if (state.dataUnitHeaters->GetUnitHeaterInputFlag) {
1903-
GetUnitHeaterInput(state);
1904-
state.dataUnitHeaters->GetUnitHeaterInputFlag = false;
1905-
}
1906-
1907-
if (UnitHeaterNum > 0 && UnitHeaterNum <= state.dataUnitHeaters->NumOfUnitHeats) {
1908-
GetUnitHeaterAirOutletNode = state.dataUnitHeaters->UnitHeat(UnitHeaterNum).AirOutNode;
1909-
}
1910-
1911-
return GetUnitHeaterAirOutletNode;
1912-
}
1913-
1914-
int GetUnitHeaterAirInletNode(EnergyPlusData &state, int UnitHeaterNum)
1915-
{
1916-
int GetUnitHeaterAirInletNode = 0;
1917-
1918-
if (state.dataUnitHeaters->GetUnitHeaterInputFlag) {
1919-
GetUnitHeaterInput(state);
1920-
state.dataUnitHeaters->GetUnitHeaterInputFlag = false;
1921-
}
1922-
1923-
if (UnitHeaterNum > 0 && UnitHeaterNum <= state.dataUnitHeaters->NumOfUnitHeats) {
1924-
GetUnitHeaterAirInletNode = state.dataUnitHeaters->UnitHeat(UnitHeaterNum).AirInNode;
1925-
}
1926-
1927-
return GetUnitHeaterAirInletNode;
1928-
}
1929-
19301897
int getUnitHeaterIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag)
19311898
{
19321899
if (state.dataUnitHeaters->GetUnitHeaterInputFlag) {

‎src/EnergyPlus/UnitHeater.hh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,6 @@ namespace UnitHeater {
202202

203203
void ReportUnitHeater(EnergyPlusData &state, int const UnitHeatNum); // Unit index in unit heater array
204204

205-
int GetUnitHeaterAirOutletNode(EnergyPlusData &state, int UnitHeatNum);
206-
207-
int GetUnitHeaterAirInletNode(EnergyPlusData &state, int UnitHeatNum);
208-
209205
int getUnitHeaterIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag);
210206
} // namespace UnitHeater
211207

‎src/EnergyPlus/VentilatedSlab.cc

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4735,37 +4735,6 @@ namespace VentilatedSlab {
47354735
}
47364736
}
47374737

4738-
int GetVentilatedSlabReturnAirNode(EnergyPlusData &state, int const VentSlabNum)
4739-
{
4740-
int ReturnAirNode = 0;
4741-
if (state.dataVentilatedSlab->GetInputFlag) {
4742-
GetVentilatedSlabInput(state);
4743-
state.dataVentilatedSlab->GetInputFlag = false;
4744-
}
4745-
4746-
if (VentSlabNum > 0 && VentSlabNum <= state.dataVentilatedSlab->NumOfVentSlabs) {
4747-
ReturnAirNode = state.dataVentilatedSlab->VentSlab(VentSlabNum).ReturnAirNode;
4748-
}
4749-
4750-
return ReturnAirNode;
4751-
}
4752-
4753-
int GetVentilatedSlabZoneAirInNode(EnergyPlusData &state, int const VentSlabNum)
4754-
{
4755-
int ZoneAirInNode = 0;
4756-
4757-
if (state.dataVentilatedSlab->GetInputFlag) {
4758-
GetVentilatedSlabInput(state);
4759-
state.dataVentilatedSlab->GetInputFlag = false;
4760-
}
4761-
4762-
if (VentSlabNum > 0 && VentSlabNum <= state.dataVentilatedSlab->NumOfVentSlabs) {
4763-
ZoneAirInNode = state.dataVentilatedSlab->VentSlab(VentSlabNum).ZoneAirInNode;
4764-
}
4765-
4766-
return ZoneAirInNode;
4767-
}
4768-
47694738
int getVentilatedSlabIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag)
47704739
{
47714740
if (state.dataVentilatedSlab->GetInputFlag) {

‎src/EnergyPlus/VentilatedSlab.hh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,10 +383,6 @@ namespace VentilatedSlab {
383383

384384
void ReportVentilatedSlab(EnergyPlusData &state, int const Item); // Index for the ventilated slab under consideration within the derived types
385385

386-
int GetVentilatedSlabReturnAirNode(EnergyPlusData &state, int const VentSlabNum);
387-
388-
int GetVentilatedSlabZoneAirInNode(EnergyPlusData &state, int const VentSlabNum);
389-
390386
int getVentilatedSlabIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag);
391387
//*****************************************************************************************
392388

‎src/EnergyPlus/WaterThermalTanks.cc

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12465,36 +12465,6 @@ bool GetHeatPumpWaterHeaterNodeNumber(EnergyPlusData &state, int const NodeNumbe
1246512465
return HeatPumpWaterHeaterNodeException;
1246612466
}
1246712467

12468-
int GetHeatPumpWaterHeaterAirInletNodeNum(EnergyPlusData &state, int HPNum)
12469-
{
12470-
int HeatPumpWaterHeaterAirInletNodeNum = 0;
12471-
if (state.dataWaterThermalTanks->getWaterThermalTankInputFlag) {
12472-
GetWaterThermalTankInput(state);
12473-
state.dataWaterThermalTanks->getWaterThermalTankInputFlag = false;
12474-
}
12475-
12476-
if (HPNum > 0 && HPNum <= state.dataWaterThermalTanks->numHeatPumpWaterHeater) {
12477-
HeatPumpWaterHeaterAirInletNodeNum = state.dataWaterThermalTanks->HPWaterHeater(HPNum).HeatPumpAirInletNode;
12478-
}
12479-
12480-
return HeatPumpWaterHeaterAirInletNodeNum;
12481-
}
12482-
12483-
int GetHeatPumpWaterHeaterAirOutletNodeNum(EnergyPlusData &state, int HPNum)
12484-
{
12485-
int HeatPumpWaterHeaterAirOutletNodeNum = 0;
12486-
if (state.dataWaterThermalTanks->getWaterThermalTankInputFlag) {
12487-
GetWaterThermalTankInput(state);
12488-
state.dataWaterThermalTanks->getWaterThermalTankInputFlag = false;
12489-
}
12490-
12491-
if (HPNum > 0 && HPNum <= state.dataWaterThermalTanks->numHeatPumpWaterHeater) {
12492-
HeatPumpWaterHeaterAirOutletNodeNum = state.dataWaterThermalTanks->HPWaterHeater(HPNum).HeatPumpAirOutletNode;
12493-
}
12494-
12495-
return HeatPumpWaterHeaterAirOutletNodeNum;
12496-
}
12497-
1249812468
int getHeatPumpWaterHeaterIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag)
1249912469
{
1250012470
if (state.dataWaterThermalTanks->getWaterThermalTankInputFlag) {

‎src/EnergyPlus/WaterThermalTanks.hh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -988,10 +988,6 @@ namespace WaterThermalTanks {
988988

989989
bool GetHeatPumpWaterHeaterNodeNumber(EnergyPlusData &state, int NodeNumber);
990990

991-
int GetHeatPumpWaterHeaterAirInletNodeNum(EnergyPlusData &state, int HPNum);
992-
993-
int GetHeatPumpWaterHeaterAirOutletNodeNum(EnergyPlusData &state, int HPNum);
994-
995991
int getHeatPumpWaterHeaterIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag);
996992

997993
} // namespace WaterThermalTanks

‎src/EnergyPlus/ZoneDehumidifier.cc

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,36 +1179,6 @@ namespace ZoneDehumidifier {
11791179
return FindZoneDehumidifierNodeNumber;
11801180
}
11811181

1182-
int GetZoneDehumidifierAirOutletNodeNum(EnergyPlusData &state, int ZoneDehumidNum)
1183-
{
1184-
int ZoneDehumidifierAirOutletNodeNum = 0;
1185-
if (state.dataZoneDehumidifier->GetInputFlag) {
1186-
GetZoneDehumidifierInput(state);
1187-
state.dataZoneDehumidifier->GetInputFlag = false;
1188-
}
1189-
1190-
if (ZoneDehumidNum > 0 && ZoneDehumidNum <= (int)state.dataZoneDehumidifier->ZoneDehumid.size()) {
1191-
ZoneDehumidifierAirOutletNodeNum = state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidNum).AirOutletNodeNum;
1192-
}
1193-
1194-
return ZoneDehumidifierAirOutletNodeNum;
1195-
}
1196-
1197-
int GetZoneDehumidifierAirInletNodeNum(EnergyPlusData &state, int ZoneDehumidNum)
1198-
{
1199-
int ZoneDehumidifierAirInletNodeNum = 0;
1200-
if (state.dataZoneDehumidifier->GetInputFlag) {
1201-
GetZoneDehumidifierInput(state);
1202-
state.dataZoneDehumidifier->GetInputFlag = false;
1203-
}
1204-
1205-
if (ZoneDehumidNum > 0 && ZoneDehumidNum <= (int)state.dataZoneDehumidifier->ZoneDehumid.size()) {
1206-
ZoneDehumidifierAirInletNodeNum = state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidNum).AirInletNodeNum;
1207-
}
1208-
1209-
return ZoneDehumidifierAirInletNodeNum;
1210-
}
1211-
12121182
int getZoneDehumidifierIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag)
12131183
{
12141184
if (state.dataZoneDehumidifier->GetInputFlag) {

‎src/EnergyPlus/ZoneDehumidifier.hh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,6 @@ namespace ZoneDehumidifier {
153153

154154
bool GetZoneDehumidifierNodeNumber(EnergyPlusData &state, int NodeNumber); // Node being tested
155155

156-
int GetZoneDehumidifierAirOutletNodeNum(EnergyPlusData &state, int ZoneDehumidNum);
157-
158-
int GetZoneDehumidifierAirInletNodeNum(EnergyPlusData &state, int ZoneDehumidNum);
159-
160156
int getZoneDehumidifierIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag);
161157

162158
} // namespace ZoneDehumidifier

0 commit comments

Comments
 (0)