Skip to content

Commit

Permalink
Address comments and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgu1234
lgu1234 committed Jul 10, 2024
1 parent 0ee8b1f commit 01c2a82
Show file tree
Hide file tree
Showing 13 changed files with 44 additions and 239 deletions.
22 changes: 0 additions & 22 deletions src/EnergyPlus/FanCoilUnits.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4119,28 +4119,6 @@ namespace FanCoilUnits {
return 0;
}

int GetFanCoilAirInNode(EnergyPlusData &state, int const FanCoilNum)
{

// FUNCTION INFORMATION:
// AUTHOR B Griffith
// DATE WRITTEN Dec 2006

// PURPOSE OF THIS FUNCTION:
// lookup function for OA inlet node for ventilation rate reporting

if (state.dataFanCoilUnits->GetFanCoilInputFlag) {
GetFanCoilUnits(state);
state.dataFanCoilUnits->GetFanCoilInputFlag = false;
}

if (FanCoilNum > 0 && FanCoilNum <= state.dataFanCoilUnits->NumFanCoils) {
return state.dataFanCoilUnits->FanCoil(FanCoilNum).AirInNode;
}

return 0;
}

int GetFanCoilOutAirNode(EnergyPlusData &state, int const FanCoilNum)
{

Expand Down
2 changes: 0 additions & 2 deletions src/EnergyPlus/FanCoilUnits.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,6 @@ namespace FanCoilUnits {

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

int GetFanCoilAirInNode(EnergyPlusData &state, int const FanCoilNum);

int GetFanCoilOutAirNode(EnergyPlusData &state, int FanCoilNum);

int GetFanCoilReturnAirNode(EnergyPlusData &state, int FanCoilNum);
Expand Down
15 changes: 0 additions & 15 deletions src/EnergyPlus/PurchasedAirManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3318,21 +3318,6 @@ int GetPurchasedAirReturnAirNode(EnergyPlusData &state, int const PurchAirNum)
return GetPurchasedAirReturnAirNode;
}

int GetPurchasedAirZoneExhaustAirNode(EnergyPlusData &state, int PurchAirNum)
{
if (state.dataPurchasedAirMgr->GetPurchAirInputFlag) {
GetPurchasedAir(state);
state.dataPurchasedAirMgr->GetPurchAirInputFlag = false;
}

int GetPurchasedAirZoneExhaustAirNode = 0;
if (PurchAirNum > 0 && PurchAirNum <= state.dataPurchasedAirMgr->NumPurchAir) {
GetPurchasedAirZoneExhaustAirNode = state.dataPurchasedAirMgr->PurchAir(PurchAirNum).ZoneExhaustAirNodeNum;
}

return GetPurchasedAirZoneExhaustAirNode;
}

int getPurchasedAirIndex(EnergyPlusData &state, std::string_view PurchAirName, bool &errFlag)
{
if (state.dataPurchasedAirMgr->GetPurchAirInputFlag) {
Expand Down
2 changes: 0 additions & 2 deletions src/EnergyPlus/PurchasedAirManager.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,6 @@ namespace PurchasedAirManager {

int GetPurchasedAirReturnAirNode(EnergyPlusData &state, int PurchAirNum);

int GetPurchasedAirZoneExhaustAirNode(EnergyPlusData &state, int PurchAirNum);

int getPurchasedAirIndex(EnergyPlusData &state, std::string_view PurchAirName, bool &errFlag);

Real64 GetPurchasedAirMixedAirTemp(EnergyPlusData &state, int PurchAirNum);
Expand Down
33 changes: 0 additions & 33 deletions src/EnergyPlus/UnitHeater.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1894,39 +1894,6 @@ namespace UnitHeater {
}
}

int GetUnitHeaterAirOutletNode(EnergyPlusData &state, int UnitHeaterNum)
{
// Return value
int GetUnitHeaterAirOutletNode = 0;

if (state.dataUnitHeaters->GetUnitHeaterInputFlag) {
GetUnitHeaterInput(state);
state.dataUnitHeaters->GetUnitHeaterInputFlag = false;
}

if (UnitHeaterNum > 0 && UnitHeaterNum <= state.dataUnitHeaters->NumOfUnitHeats) {
GetUnitHeaterAirOutletNode = state.dataUnitHeaters->UnitHeat(UnitHeaterNum).AirOutNode;
}

return GetUnitHeaterAirOutletNode;
}

int GetUnitHeaterAirInletNode(EnergyPlusData &state, int UnitHeaterNum)
{
int GetUnitHeaterAirInletNode = 0;

if (state.dataUnitHeaters->GetUnitHeaterInputFlag) {
GetUnitHeaterInput(state);
state.dataUnitHeaters->GetUnitHeaterInputFlag = false;
}

if (UnitHeaterNum > 0 && UnitHeaterNum <= state.dataUnitHeaters->NumOfUnitHeats) {
GetUnitHeaterAirInletNode = state.dataUnitHeaters->UnitHeat(UnitHeaterNum).AirInNode;
}

return GetUnitHeaterAirInletNode;
}

int getUnitHeaterIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag)
{
if (state.dataUnitHeaters->GetUnitHeaterInputFlag) {
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/UnitHeater.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,6 @@ namespace UnitHeater {

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

int GetUnitHeaterAirOutletNode(EnergyPlusData &state, int UnitHeatNum);

int GetUnitHeaterAirInletNode(EnergyPlusData &state, int UnitHeatNum);

int getUnitHeaterIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag);
} // namespace UnitHeater

Expand Down
31 changes: 0 additions & 31 deletions src/EnergyPlus/VentilatedSlab.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4735,37 +4735,6 @@ namespace VentilatedSlab {
}
}

int GetVentilatedSlabReturnAirNode(EnergyPlusData &state, int const VentSlabNum)
{
int ReturnAirNode = 0;
if (state.dataVentilatedSlab->GetInputFlag) {
GetVentilatedSlabInput(state);
state.dataVentilatedSlab->GetInputFlag = false;
}

if (VentSlabNum > 0 && VentSlabNum <= state.dataVentilatedSlab->NumOfVentSlabs) {
ReturnAirNode = state.dataVentilatedSlab->VentSlab(VentSlabNum).ReturnAirNode;
}

return ReturnAirNode;
}

int GetVentilatedSlabZoneAirInNode(EnergyPlusData &state, int const VentSlabNum)
{
int ZoneAirInNode = 0;

if (state.dataVentilatedSlab->GetInputFlag) {
GetVentilatedSlabInput(state);
state.dataVentilatedSlab->GetInputFlag = false;
}

if (VentSlabNum > 0 && VentSlabNum <= state.dataVentilatedSlab->NumOfVentSlabs) {
ZoneAirInNode = state.dataVentilatedSlab->VentSlab(VentSlabNum).ZoneAirInNode;
}

return ZoneAirInNode;
}

int getVentilatedSlabIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag)
{
if (state.dataVentilatedSlab->GetInputFlag) {
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/VentilatedSlab.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,10 +383,6 @@ namespace VentilatedSlab {

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

int GetVentilatedSlabReturnAirNode(EnergyPlusData &state, int const VentSlabNum);

int GetVentilatedSlabZoneAirInNode(EnergyPlusData &state, int const VentSlabNum);

int getVentilatedSlabIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag);
//*****************************************************************************************

Expand Down
30 changes: 0 additions & 30 deletions src/EnergyPlus/WaterThermalTanks.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12465,36 +12465,6 @@ bool GetHeatPumpWaterHeaterNodeNumber(EnergyPlusData &state, int const NodeNumbe
return HeatPumpWaterHeaterNodeException;
}

int GetHeatPumpWaterHeaterAirInletNodeNum(EnergyPlusData &state, int HPNum)
{
int HeatPumpWaterHeaterAirInletNodeNum = 0;
if (state.dataWaterThermalTanks->getWaterThermalTankInputFlag) {
GetWaterThermalTankInput(state);
state.dataWaterThermalTanks->getWaterThermalTankInputFlag = false;
}

if (HPNum > 0 && HPNum <= state.dataWaterThermalTanks->numHeatPumpWaterHeater) {
HeatPumpWaterHeaterAirInletNodeNum = state.dataWaterThermalTanks->HPWaterHeater(HPNum).HeatPumpAirInletNode;
}

return HeatPumpWaterHeaterAirInletNodeNum;
}

int GetHeatPumpWaterHeaterAirOutletNodeNum(EnergyPlusData &state, int HPNum)
{
int HeatPumpWaterHeaterAirOutletNodeNum = 0;
if (state.dataWaterThermalTanks->getWaterThermalTankInputFlag) {
GetWaterThermalTankInput(state);
state.dataWaterThermalTanks->getWaterThermalTankInputFlag = false;
}

if (HPNum > 0 && HPNum <= state.dataWaterThermalTanks->numHeatPumpWaterHeater) {
HeatPumpWaterHeaterAirOutletNodeNum = state.dataWaterThermalTanks->HPWaterHeater(HPNum).HeatPumpAirOutletNode;
}

return HeatPumpWaterHeaterAirOutletNodeNum;
}

int getHeatPumpWaterHeaterIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag)
{
if (state.dataWaterThermalTanks->getWaterThermalTankInputFlag) {
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/WaterThermalTanks.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,10 +988,6 @@ namespace WaterThermalTanks {

bool GetHeatPumpWaterHeaterNodeNumber(EnergyPlusData &state, int NodeNumber);

int GetHeatPumpWaterHeaterAirInletNodeNum(EnergyPlusData &state, int HPNum);

int GetHeatPumpWaterHeaterAirOutletNodeNum(EnergyPlusData &state, int HPNum);

int getHeatPumpWaterHeaterIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag);

} // namespace WaterThermalTanks
Expand Down
30 changes: 0 additions & 30 deletions src/EnergyPlus/ZoneDehumidifier.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1179,36 +1179,6 @@ namespace ZoneDehumidifier {
return FindZoneDehumidifierNodeNumber;
}

int GetZoneDehumidifierAirOutletNodeNum(EnergyPlusData &state, int ZoneDehumidNum)
{
int ZoneDehumidifierAirOutletNodeNum = 0;
if (state.dataZoneDehumidifier->GetInputFlag) {
GetZoneDehumidifierInput(state);
state.dataZoneDehumidifier->GetInputFlag = false;
}

if (ZoneDehumidNum > 0 && ZoneDehumidNum <= (int)state.dataZoneDehumidifier->ZoneDehumid.size()) {
ZoneDehumidifierAirOutletNodeNum = state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidNum).AirOutletNodeNum;
}

return ZoneDehumidifierAirOutletNodeNum;
}

int GetZoneDehumidifierAirInletNodeNum(EnergyPlusData &state, int ZoneDehumidNum)
{
int ZoneDehumidifierAirInletNodeNum = 0;
if (state.dataZoneDehumidifier->GetInputFlag) {
GetZoneDehumidifierInput(state);
state.dataZoneDehumidifier->GetInputFlag = false;
}

if (ZoneDehumidNum > 0 && ZoneDehumidNum <= (int)state.dataZoneDehumidifier->ZoneDehumid.size()) {
ZoneDehumidifierAirInletNodeNum = state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidNum).AirInletNodeNum;
}

return ZoneDehumidifierAirInletNodeNum;
}

int getZoneDehumidifierIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag)
{
if (state.dataZoneDehumidifier->GetInputFlag) {
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/ZoneDehumidifier.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,6 @@ namespace ZoneDehumidifier {

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

int GetZoneDehumidifierAirOutletNodeNum(EnergyPlusData &state, int ZoneDehumidNum);

int GetZoneDehumidifierAirInletNodeNum(EnergyPlusData &state, int ZoneDehumidNum);

int getZoneDehumidifierIndex(EnergyPlusData &state, std::string_view CompName, bool &errFlag);

} // namespace ZoneDehumidifier
Expand Down
Loading

1 comment on commit 01c2a82

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RAFN-CheckEquipName-Issue (lgu1234) - Win64-Windows-10-VisualStudio-16: OK (2803 of 2803 tests passed, 0 test warnings)

Build Badge Test Badge

Please sign in to comment.