From a0cff9a04860e25e5091e1048f18b31a36038ba7 Mon Sep 17 00:00:00 2001 From: Rick Strand Date: Wed, 24 Jul 2024 15:25:33 -0500 Subject: [PATCH] 10299 Request to Improve Variable Name Addressed review request to change the name of a variable to be more descriptive. --- src/EnergyPlus/DataSystemVariables.hh | 4 ++-- src/EnergyPlus/SolarShading.cc | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/EnergyPlus/DataSystemVariables.hh b/src/EnergyPlus/DataSystemVariables.hh index e8506ce2439..5d4eedc1c54 100644 --- a/src/EnergyPlus/DataSystemVariables.hh +++ b/src/EnergyPlus/DataSystemVariables.hh @@ -115,8 +115,8 @@ struct SystemVarsData : BaseGlobalStruct bool DisableSelfShadingWithinGroup = false; bool DisableSelfShadingBetweenGroup = false; - int shadingGroupsNum = 0; // number of shading groups - Array1D_string zoneName; // array of zone names in user input + int shadingGroupsNum = 0; // number of shading groups + Array1D_string shadingGroupZoneListNames; // array of zone names in user input bool TrackAirLoopEnvFlag = false; // If TRUE generates a file with runtime statistics for each HVAC // controller on each air loop diff --git a/src/EnergyPlus/SolarShading.cc b/src/EnergyPlus/SolarShading.cc index 638d1b57f25..6c95f90459a 100644 --- a/src/EnergyPlus/SolarShading.cc +++ b/src/EnergyPlus/SolarShading.cc @@ -658,9 +658,9 @@ void GetShadowingInput(EnergyPlusData &state) aNum++; state.dataSysVars->shadingGroupsNum = NumAlphas - (aNum - 1); - state.dataSysVars->zoneName.allocate(state.dataSysVars->shadingGroupsNum); + state.dataSysVars->shadingGroupZoneListNames.allocate(state.dataSysVars->shadingGroupsNum); for (int numZone = 1; numZone <= state.dataSysVars->shadingGroupsNum; ++numZone) { - state.dataSysVars->zoneName(numZone) = state.dataIPShortCut->cAlphaArgs(aNum - 1 + numZone); + state.dataSysVars->shadingGroupZoneListNames(numZone) = state.dataIPShortCut->cAlphaArgs(aNum - 1 + numZone); } if (!state.dataSysVars->DetailedSolarTimestepIntegration && state.dataSurface->ShadingTransmittanceVaries && @@ -757,7 +757,8 @@ void processShadowingInput(EnergyPlusData &state) if (NumOfShadingGroups > 0) { DisableSelfShadingGroups.allocate(NumOfShadingGroups); for (int i = 1; i <= NumOfShadingGroups; i++) { - Found = Util::FindItemInList(state.dataSysVars->zoneName(i), state.dataHeatBal->ZoneList, state.dataHeatBal->NumOfZoneLists); + Found = Util::FindItemInList( + state.dataSysVars->shadingGroupZoneListNames(i), state.dataHeatBal->ZoneList, state.dataHeatBal->NumOfZoneLists); if (Found != 0) DisableSelfShadingGroups(i) = Found; }