From d56c7f2e999f120a586d380c3fda67fb4df513cc Mon Sep 17 00:00:00 2001 From: Richard Raustad Date: Thu, 12 Sep 2024 21:17:38 -0400 Subject: [PATCH 1/8] if condition same as previous --- src/EnergyPlus/InternalHeatGains.cc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/EnergyPlus/InternalHeatGains.cc b/src/EnergyPlus/InternalHeatGains.cc index b7c816e8803..934da70f37f 100644 --- a/src/EnergyPlus/InternalHeatGains.cc +++ b/src/EnergyPlus/InternalHeatGains.cc @@ -367,8 +367,6 @@ namespace InternalHeatGains { format("Schedule=\"{}\". Minimum is [{:.1R}]. Values must be >= 0.0.", IHGAlphas(3), SchMin)); ErrorsFound = true; } - } - if (Item1 == 1) { if (SchMax < 0.0) { ShowSevereError(state, format("{}{}=\"{}\", {}, maximum is < 0.0", @@ -595,8 +593,6 @@ namespace InternalHeatGains { format("Schedule=\"{}\". Minimum is [{:.1R}]. Values must be >= 0.0.", IHGAlphas(5), SchMin)); ErrorsFound = true; } - } - if (Item1 == 1) { if (SchMax < 0.0) { ShowSevereError(state, format("{}{}=\"{}\", {} maximum is < 0.0", @@ -1264,8 +1260,6 @@ namespace InternalHeatGains { format("Schedule=\"{}\". Minimum is [{:.1R}]. Values must be >= 0.0.", IHGAlphas(3), SchMin)); ErrorsFound = true; } - } - if (Item1 == 1) { if (SchMax < 0.0) { ShowSevereError(state, format("{}{}=\"{}\", {}, maximum is < 0.0", @@ -1947,8 +1941,6 @@ namespace InternalHeatGains { format("Schedule=\"{}\". Minimum is [{:.1R}]. Values must be >= 0.0.", IHGAlphas(3), SchMin)); ErrorsFound = true; } - } - if (Item1 == 1) { if (SchMax < 0.0) { ShowSevereError(state, format("{}{}=\"{}\", {}, maximum is < 0.0", From 90c964c74876de80ae7c3bb057f5ede168d8a5d0 Mon Sep 17 00:00:00 2001 From: Richard Raustad Date: Thu, 12 Sep 2024 21:27:46 -0400 Subject: [PATCH 2/8] reduce --- src/EnergyPlus/InternalHeatGains.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/EnergyPlus/InternalHeatGains.cc b/src/EnergyPlus/InternalHeatGains.cc index 934da70f37f..dcd330d1f51 100644 --- a/src/EnergyPlus/InternalHeatGains.cc +++ b/src/EnergyPlus/InternalHeatGains.cc @@ -204,13 +204,12 @@ namespace InternalHeatGains { int IOStat; // Variables for reporting nominal internal gains - Real64 LightTot; // Total Lights for calculating lights per square meter - Real64 ElecTot; // Total Electric Load for calculating electric per square meter - Real64 GasTot; // Total Gas load for calculating gas per square meter - Real64 OthTot; // Total Other load for calculating other load per square meter - Real64 HWETot; // Total Hot Water Equipment for calculating HWE per square meter - Real64 StmTot; // Total Steam for calculating Steam per square meter - std::string BBHeatInd; // Yes if BBHeat in zone, no if not. + Real64 LightTot; // Total Lights for calculating lights per square meter + Real64 ElecTot; // Total Electric Load for calculating electric per square meter + Real64 GasTot; // Total Gas load for calculating gas per square meter + Real64 OthTot; // Total Other load for calculating other load per square meter + Real64 HWETot; // Total Hot Water Equipment for calculating HWE per square meter + Real64 StmTot; // Total Steam for calculating Steam per square meter Real64 SchMin; Real64 SchMax; std::string liteName; @@ -3651,7 +3650,7 @@ namespace InternalHeatGains { OthTot = 0.0; HWETot = 0.0; StmTot = 0.0; - BBHeatInd = "No"; + std::string BBHeatInd = "No"; // Yes if BBHeat in zone, no if not. for (int Loop1 = 1; Loop1 <= state.dataHeatBal->TotLights; ++Loop1) { if (state.dataHeatBal->Lights(Loop1).ZonePtr != Loop) continue; LightTot += state.dataHeatBal->Lights(Loop1).DesignLevel; From cdc6cfd50f47f811503ac51eef80a8b5f3bad7d4 Mon Sep 17 00:00:00 2001 From: Richard Raustad Date: Thu, 12 Sep 2024 21:37:49 -0400 Subject: [PATCH 3/8] reduce --- src/EnergyPlus/InternalHeatGains.cc | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/EnergyPlus/InternalHeatGains.cc b/src/EnergyPlus/InternalHeatGains.cc index dcd330d1f51..4a8282a477f 100644 --- a/src/EnergyPlus/InternalHeatGains.cc +++ b/src/EnergyPlus/InternalHeatGains.cc @@ -212,7 +212,6 @@ namespace InternalHeatGains { Real64 StmTot; // Total Steam for calculating Steam per square meter Real64 SchMin; Real64 SchMax; - std::string liteName; // Formats static constexpr std::string_view Format_720(" Zone Internal Gains Nominal, {},{:.2R},{:.1R},"); @@ -1566,7 +1565,7 @@ namespace InternalHeatGains { if (state.dataHeatBal->Lights(lightsNum).FractionReturnAir > 0) state.dataHeatBal->Zone(state.dataHeatBal->Lights(lightsNum).ZonePtr).HasLtsRetAirGain = true; // send values to predefined lighting summary report - liteName = state.dataHeatBal->Lights(lightsNum).Name; + std::string liteName = state.dataHeatBal->Lights(lightsNum).Name; Real64 mult = state.dataHeatBal->Zone(zoneNum).Multiplier * state.dataHeatBal->Zone(zoneNum).ListMultiplier; Real64 spaceArea = state.dataHeatBal->space(spaceNum).FloorArea; state.dataInternalHeatGains->sumArea += spaceArea * mult; @@ -4358,11 +4357,11 @@ namespace InternalHeatGains { // inputObjects is allocated here and filled with data for further input processing. constexpr std::string_view routineName = "setupIHGZonesAndSpaces: "; - bool localErrFlag = false; auto &ip = state.dataInputProcessing->inputProcessor; auto const instances = ip->epJSON.find(objectType); if (instances != ip->epJSON.end()) { + bool localErrFlag = false; auto const &objectSchemaProps = ip->getObjectSchemaProps(state, objectType); auto &instancesValue = instances.value(); numInputObjects = int(instancesValue.size()); @@ -7931,9 +7930,6 @@ namespace InternalHeatGains { 99.0, 80.0, 80.0, 85.0, 90.0, 80.0, 80.0, 80.0}; // Maximum relative humidity [%] static constexpr std::string_view RoutineName("CalcZoneITEq"); - int Loop; - int NZ; - int SupplyNodeNum; // Supply air node number (if zero, then not specified) Real64 OperSchedFrac; // Operating schedule fraction Real64 CPULoadSchedFrac; // CPU loading schedule fraction ITEInletConnection AirConnection; // Air connection type @@ -7963,7 +7959,7 @@ namespace InternalHeatGains { // Zero out time step variables // Object report variables - for (Loop = 1; Loop <= state.dataHeatBal->TotITEquip; ++Loop) { + for (int Loop = 1; Loop <= state.dataHeatBal->TotITEquip; ++Loop) { for (int i = 0; i < (int)PERptVars::Num; ++i) { state.dataHeatBal->ZoneITEq(Loop).PowerRpt[i] = 0.0; @@ -7994,7 +7990,7 @@ namespace InternalHeatGains { } // ZoneITEq init loop // Zone total report variables - for (Loop = 1; Loop <= state.dataGlobal->NumOfZones; ++Loop) { + for (int Loop = 1; Loop <= state.dataGlobal->NumOfZones; ++Loop) { for (int i = 0; i < (int)PERptVars::Num; ++i) { state.dataHeatBal->ZoneRpt(Loop).PowerRpt[i] = 0.0; @@ -8043,9 +8039,9 @@ namespace InternalHeatGains { state.dataHeatBal->spaceRpt(spaceNum).SumToutMinusTSup = 0.0; } // Space init spaceNum - for (Loop = 1; Loop <= state.dataHeatBal->TotITEquip; ++Loop) { + for (int Loop = 1; Loop <= state.dataHeatBal->TotITEquip; ++Loop) { // Get schedules - NZ = state.dataHeatBal->ZoneITEq(Loop).ZonePtr; + int NZ = state.dataHeatBal->ZoneITEq(Loop).ZonePtr; auto &thisZoneHB = state.dataZoneTempPredictorCorrector->zoneHeatBalance(NZ); int spaceNum = state.dataHeatBal->ZoneITEq(Loop).spaceIndex; OperSchedFrac = GetCurrentScheduleValue(state, state.dataHeatBal->ZoneITEq(Loop).OperSchedPtr); @@ -8054,7 +8050,7 @@ namespace InternalHeatGains { // Determine inlet air temperature and humidity AirConnection = state.dataHeatBal->ZoneITEq(Loop).AirConnectionType; RecircFrac = 0.0; - SupplyNodeNum = state.dataHeatBal->ZoneITEq(Loop).SupplyAirNodeNum; + int SupplyNodeNum = state.dataHeatBal->ZoneITEq(Loop).SupplyAirNodeNum; if (state.dataHeatBal->ZoneITEq(Loop).FlowControlWithApproachTemps) { TSupply = state.dataLoopNodes->Node(SupplyNodeNum).Temp; WSupply = state.dataLoopNodes->Node(SupplyNodeNum).HumRat; @@ -8290,7 +8286,7 @@ namespace InternalHeatGains { } // ZoneITEq calc loop // Zone and space-level sensible heat index - for (Loop = 1; Loop <= state.dataHeatBal->TotITEquip; ++Loop) { + for (int Loop = 1; Loop <= state.dataHeatBal->TotITEquip; ++Loop) { int ZN = state.dataHeatBal->ZoneITEq(Loop).ZonePtr; int spaceNum = state.dataHeatBal->ZoneITEq(Loop).spaceIndex; if (state.dataHeatBal->ZoneRpt(ZN).SumToutMinusTSup != 0.0) { From 57f3ecabe49ef372a65289d63367f486a7ff7bcf Mon Sep 17 00:00:00 2001 From: Richard Raustad Date: Thu, 12 Sep 2024 21:44:48 -0400 Subject: [PATCH 4/8] const --- src/EnergyPlus/InternalHeatGains.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/EnergyPlus/InternalHeatGains.cc b/src/EnergyPlus/InternalHeatGains.cc index 4a8282a477f..3eb88543995 100644 --- a/src/EnergyPlus/InternalHeatGains.cc +++ b/src/EnergyPlus/InternalHeatGains.cc @@ -7529,7 +7529,7 @@ namespace InternalHeatGains { auto &thisPeople = state.dataHeatBal->People(Loop); int NZ = state.dataHeatBal->People(Loop).ZonePtr; int spaceNum = thisPeople.spaceIndex; - auto &thisSpaceHB = state.dataZoneTempPredictorCorrector->spaceHeatBalance(spaceNum); + auto const &thisSpaceHB = state.dataZoneTempPredictorCorrector->spaceHeatBalance(spaceNum); NumberOccupants = thisPeople.NumberOfPeople * GetCurrentScheduleValue(state, thisPeople.NumberOfPeoplePtr); if (thisPeople.EMSPeopleOn) NumberOccupants = thisPeople.EMSNumberOfPeople; @@ -7838,12 +7838,12 @@ namespace InternalHeatGains { } for (int zoneNum = 1; zoneNum <= state.dataGlobal->NumOfZones; ++zoneNum) { // Loop through all surfaces... for (int spaceNum : state.dataHeatBal->Zone(zoneNum).spaceIndexes) { - auto &thisSpace = state.dataHeatBal->space(spaceNum); + auto const &thisSpace = state.dataHeatBal->space(spaceNum); int const firstSurf = thisSpace.HTSurfaceFirst; int const lastSurf = thisSpace.HTSurfaceLast; if (firstSurf <= 0) continue; for (int SurfNum = firstSurf; SurfNum <= lastSurf; ++SurfNum) { - auto &thisEnclosure = state.dataViewFactor->EnclRadInfo(state.dataSurface->Surface(SurfNum).RadEnclIndex); + auto const &thisEnclosure = state.dataViewFactor->EnclRadInfo(state.dataSurface->Surface(SurfNum).RadEnclIndex); if (!state.dataGlobal->doLoadComponentPulseNow) { state.dataHeatBal->SurfQdotRadIntGainsInPerArea(SurfNum) = From c3d9f8b9108e172e64b0b47024268164a91ed248 Mon Sep 17 00:00:00 2001 From: Richard Raustad Date: Thu, 12 Sep 2024 22:06:37 -0400 Subject: [PATCH 5/8] shadow --- src/EnergyPlus/InternalHeatGains.cc | 92 +++++++++++++++-------------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/src/EnergyPlus/InternalHeatGains.cc b/src/EnergyPlus/InternalHeatGains.cc index 3eb88543995..d6d7315043e 100644 --- a/src/EnergyPlus/InternalHeatGains.cc +++ b/src/EnergyPlus/InternalHeatGains.cc @@ -1090,35 +1090,35 @@ namespace InternalHeatGains { } } - for (int peopleNum = 1; peopleNum <= state.dataHeatBal->TotPeople; ++peopleNum) { + for (int peopleNum2 = 1; peopleNum2 <= state.dataHeatBal->TotPeople; ++peopleNum2) { if (state.dataGlobal->AnyEnergyManagementSystemInModel) { SetupEMSActuator(state, "People", - state.dataHeatBal->People(peopleNum).Name, + state.dataHeatBal->People(peopleNum2).Name, "Number of People", "[each]", - state.dataHeatBal->People(peopleNum).EMSPeopleOn, - state.dataHeatBal->People(peopleNum).EMSNumberOfPeople); + state.dataHeatBal->People(peopleNum2).EMSPeopleOn, + state.dataHeatBal->People(peopleNum2).EMSNumberOfPeople); SetupEMSInternalVariable(state, "People Count Design Level", - state.dataHeatBal->People(peopleNum).Name, + state.dataHeatBal->People(peopleNum2).Name, "[each]", - state.dataHeatBal->People(peopleNum).NumberOfPeople); + state.dataHeatBal->People(peopleNum2).NumberOfPeople); } // setup internal gains if (!ErrorsFound) { SetupSpaceInternalGain(state, - state.dataHeatBal->People(peopleNum).spaceIndex, + state.dataHeatBal->People(peopleNum2).spaceIndex, 1.0, - state.dataHeatBal->People(peopleNum).Name, + state.dataHeatBal->People(peopleNum2).Name, DataHeatBalance::IntGainType::People, - &state.dataHeatBal->People(peopleNum).ConGainRate, + &state.dataHeatBal->People(peopleNum2).ConGainRate, nullptr, - &state.dataHeatBal->People(peopleNum).RadGainRate, - &state.dataHeatBal->People(peopleNum).LatGainRate, + &state.dataHeatBal->People(peopleNum2).RadGainRate, + &state.dataHeatBal->People(peopleNum2).LatGainRate, nullptr, - &state.dataHeatBal->People(peopleNum).CO2GainRate); + &state.dataHeatBal->People(peopleNum2).CO2GainRate); } } @@ -1522,39 +1522,39 @@ namespace InternalHeatGains { } } if (state.dataGlobal->AnyEnergyManagementSystemInModel) { - for (int lightsNum = 1; lightsNum <= state.dataHeatBal->TotLights; ++lightsNum) { + for (int lightsNum2 = 1; lightsNum2 <= state.dataHeatBal->TotLights; ++lightsNum2) { SetupEMSActuator(state, "Lights", - state.dataHeatBal->Lights(lightsNum).Name, + state.dataHeatBal->Lights(lightsNum2).Name, "Electricity Rate", "[W]", - state.dataHeatBal->Lights(lightsNum).EMSLightsOn, - state.dataHeatBal->Lights(lightsNum).EMSLightingPower); + state.dataHeatBal->Lights(lightsNum2).EMSLightsOn, + state.dataHeatBal->Lights(lightsNum2).EMSLightingPower); SetupEMSInternalVariable(state, "Lighting Power Design Level", - state.dataHeatBal->Lights(lightsNum).Name, + state.dataHeatBal->Lights(lightsNum2).Name, "[W]", - state.dataHeatBal->Lights(lightsNum).DesignLevel); + state.dataHeatBal->Lights(lightsNum2).DesignLevel); } // EMS } - for (int lightsNum = 1; lightsNum <= state.dataHeatBal->TotLights; ++lightsNum) { - int spaceNum = state.dataHeatBal->Lights(lightsNum).spaceIndex; - int zoneNum = state.dataHeatBal->Lights(lightsNum).ZonePtr; + for (int lightsNum2 = 1; lightsNum2 <= state.dataHeatBal->TotLights; ++lightsNum2) { + int spaceNum = state.dataHeatBal->Lights(lightsNum2).spaceIndex; + int zoneNum = state.dataHeatBal->Lights(lightsNum2).ZonePtr; // setup internal gains int returnNodeNum = 0; - if ((state.dataHeatBal->Lights(lightsNum).ZoneReturnNum > 0) && - (state.dataHeatBal->Lights(lightsNum).ZoneReturnNum <= state.dataZoneEquip->ZoneEquipConfig(zoneNum).NumReturnNodes)) { - returnNodeNum = state.dataZoneEquip->ZoneEquipConfig(zoneNum).ReturnNode(state.dataHeatBal->Lights(lightsNum).ZoneReturnNum); + if ((state.dataHeatBal->Lights(lightsNum2).ZoneReturnNum > 0) && + (state.dataHeatBal->Lights(lightsNum2).ZoneReturnNum <= state.dataZoneEquip->ZoneEquipConfig(zoneNum).NumReturnNodes)) { + returnNodeNum = state.dataZoneEquip->ZoneEquipConfig(zoneNum).ReturnNode(state.dataHeatBal->Lights(lightsNum2).ZoneReturnNum); } if (!ErrorsFound) { SetupSpaceInternalGain(state, - state.dataHeatBal->Lights(lightsNum).spaceIndex, + state.dataHeatBal->Lights(lightsNum2).spaceIndex, 1.0, - state.dataHeatBal->Lights(lightsNum).Name, + state.dataHeatBal->Lights(lightsNum2).Name, DataHeatBalance::IntGainType::Lights, - &state.dataHeatBal->Lights(lightsNum).ConGainRate, - &state.dataHeatBal->Lights(lightsNum).RetAirGainRate, - &state.dataHeatBal->Lights(lightsNum).RadGainRate, + &state.dataHeatBal->Lights(lightsNum2).ConGainRate, + &state.dataHeatBal->Lights(lightsNum2).RetAirGainRate, + &state.dataHeatBal->Lights(lightsNum2).RadGainRate, nullptr, nullptr, nullptr, @@ -1562,30 +1562,34 @@ namespace InternalHeatGains { returnNodeNum); } - if (state.dataHeatBal->Lights(lightsNum).FractionReturnAir > 0) - state.dataHeatBal->Zone(state.dataHeatBal->Lights(lightsNum).ZonePtr).HasLtsRetAirGain = true; + if (state.dataHeatBal->Lights(lightsNum2).FractionReturnAir > 0) + state.dataHeatBal->Zone(state.dataHeatBal->Lights(lightsNum2).ZonePtr).HasLtsRetAirGain = true; // send values to predefined lighting summary report - std::string liteName = state.dataHeatBal->Lights(lightsNum).Name; + std::string liteName = state.dataHeatBal->Lights(lightsNum2).Name; Real64 mult = state.dataHeatBal->Zone(zoneNum).Multiplier * state.dataHeatBal->Zone(zoneNum).ListMultiplier; Real64 spaceArea = state.dataHeatBal->space(spaceNum).FloorArea; state.dataInternalHeatGains->sumArea += spaceArea * mult; - state.dataInternalHeatGains->sumPower += state.dataHeatBal->Lights(lightsNum).DesignLevel * mult; + state.dataInternalHeatGains->sumPower += state.dataHeatBal->Lights(lightsNum2).DesignLevel * mult; PreDefTableEntry(state, state.dataOutRptPredefined->pdchInLtZone, liteName, state.dataHeatBal->Zone(zoneNum).Name); PreDefTableEntry(state, state.dataOutRptPredefined->pdchInLtSpace, liteName, state.dataHeatBal->space(spaceNum).Name); PreDefTableEntry(state, state.dataOutRptPredefined->pdchInLtSpaceType, liteName, state.dataHeatBal->space(spaceNum).spaceType); if (spaceArea > 0.0) { PreDefTableEntry( - state, state.dataOutRptPredefined->pdchInLtDens, liteName, state.dataHeatBal->Lights(lightsNum).DesignLevel / spaceArea, 4); + state, state.dataOutRptPredefined->pdchInLtDens, liteName, state.dataHeatBal->Lights(lightsNum2).DesignLevel / spaceArea, 4); } else { PreDefTableEntry(state, state.dataOutRptPredefined->pdchInLtDens, liteName, DataPrecisionGlobals::constant_zero, 4); } PreDefTableEntry(state, state.dataOutRptPredefined->pdchInLtArea, liteName, spaceArea * mult); - PreDefTableEntry(state, state.dataOutRptPredefined->pdchInLtPower, liteName, state.dataHeatBal->Lights(lightsNum).DesignLevel * mult); - PreDefTableEntry(state, state.dataOutRptPredefined->pdchInLtEndUse, liteName, state.dataHeatBal->Lights(lightsNum).EndUseSubcategory); PreDefTableEntry( - state, state.dataOutRptPredefined->pdchInLtSchd, liteName, GetScheduleName(state, state.dataHeatBal->Lights(lightsNum).SchedPtr)); + state, state.dataOutRptPredefined->pdchInLtPower, liteName, state.dataHeatBal->Lights(lightsNum2).DesignLevel * mult); PreDefTableEntry( - state, state.dataOutRptPredefined->pdchInLtRetAir, liteName, state.dataHeatBal->Lights(lightsNum).FractionReturnAir, 4); + state, state.dataOutRptPredefined->pdchInLtEndUse, liteName, state.dataHeatBal->Lights(lightsNum2).EndUseSubcategory); + PreDefTableEntry(state, + state.dataOutRptPredefined->pdchInLtSchd, + liteName, + GetScheduleName(state, state.dataHeatBal->Lights(lightsNum2).SchedPtr)); + PreDefTableEntry( + state, state.dataOutRptPredefined->pdchInLtRetAir, liteName, state.dataHeatBal->Lights(lightsNum2).FractionReturnAir, 4); } // Item1 - Number of Lights instances if (CheckSharedExhaustFlag) { DataZoneEquipment::CheckSharedExhaust(state); @@ -4428,9 +4432,9 @@ namespace InternalHeatGains { int numSpaces = 0; for (int const listZoneIdx : state.dataHeatBal->ZoneList(zoneListNum).Zone) { numSpaces += state.dataHeatBal->Zone(listZoneIdx).numSpaces; - for (int const spaceNum : state.dataHeatBal->Zone(listZoneIdx).spaceIndexes) { - inputObjects(objNum).spaceNums.emplace_back(spaceNum); - inputObjects(objNum).names.emplace_back(state.dataHeatBal->space(spaceNum).Name + ' ' + inputObjects(objNum).Name); + for (int const spaceNum2 : state.dataHeatBal->Zone(listZoneIdx).spaceIndexes) { + inputObjects(objNum).spaceNums.emplace_back(spaceNum2); + inputObjects(objNum).names.emplace_back(state.dataHeatBal->space(spaceNum2).Name + ' ' + inputObjects(objNum).Name); } } numGainInstances += numSpaces; @@ -4453,9 +4457,9 @@ namespace InternalHeatGains { inputObjects(objNum).numOfSpaces = numSpaces; inputObjects(objNum).spaceListActive = true; inputObjects(objNum).spaceOrSpaceListPtr = spaceListNum; - for (int const spaceNum : state.dataHeatBal->spaceList(spaceListNum).spaces) { - inputObjects(objNum).spaceNums.emplace_back(spaceNum); - inputObjects(objNum).names.emplace_back(state.dataHeatBal->space(spaceNum).Name + ' ' + inputObjects(objNum).Name); + for (int const spaceNum2 : state.dataHeatBal->spaceList(spaceListNum).spaces) { + inputObjects(objNum).spaceNums.emplace_back(spaceNum2); + inputObjects(objNum).names.emplace_back(state.dataHeatBal->space(spaceNum2).Name + ' ' + inputObjects(objNum).Name); } } continue; From 1fd4e836cd5ce429155d06e6cba69d1492c89d03 Mon Sep 17 00:00:00 2001 From: Richard Raustad Date: Thu, 12 Sep 2024 22:18:19 -0400 Subject: [PATCH 6/8] reduce --- .../InputProcessing/InputProcessor.cc | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/EnergyPlus/InputProcessing/InputProcessor.cc b/src/EnergyPlus/InputProcessing/InputProcessor.cc index e3f84d37aad..b66d70f7d01 100644 --- a/src/EnergyPlus/InputProcessing/InputProcessor.cc +++ b/src/EnergyPlus/InputProcessing/InputProcessor.cc @@ -1064,9 +1064,9 @@ void InputProcessor::getObjectItem(EnergyPlusData &state, NumericFieldNames); } - size_t extensible_count = 0; auto const legacy_idd_extensibles_iter = legacy_idd.find("extensibles"); if (legacy_idd_extensibles_iter != legacy_idd.end()) { + size_t extensible_count = 0; auto const epJSON_extensions_array_itr = obj_val.find(extension_key); if (epJSON_extensions_array_itr != obj_val.end()) { auto const &legacy_idd_extensibles = legacy_idd_extensibles_iter.value(); @@ -1738,21 +1738,18 @@ void InputProcessor::preProcessorCheck(EnergyPlusData &state, bool &PreP_Fatal) // A11, \field message line 9 // A12; \field message line 10 - int NumAlphas; // Used to retrieve names from IDF - int NumNumbers; // Used to retrieve rNumericArgs from IDF - int IOStat; // Could be used in the Get Routines, not currently checked - int NumParams; // Total Number of Parameters in 'Output:PreprocessorMessage' Object - int NumPrePM; // Number of Preprocessor Message objects in IDF - int CountP; - int CountM; - std::string Multiples; - state.dataIPShortCut->cCurrentModuleObject = "Output:PreprocessorMessage"; - NumPrePM = getNumObjectsFound(state, state.dataIPShortCut->cCurrentModuleObject); + int NumPrePM = getNumObjectsFound(state, state.dataIPShortCut->cCurrentModuleObject); if (NumPrePM > 0) { + int NumAlphas; // Used to retrieve names from IDF + int NumNumbers; // Used to retrieve rNumericArgs from IDF + int IOStat; // Could be used in the Get Routines, not currently checked + int NumParams; // Total Number of Parameters in 'Output:PreprocessorMessage' Object + std::string Multiples; + getObjectDefMaxArgs(state, state.dataIPShortCut->cCurrentModuleObject, NumParams, NumAlphas, NumNumbers); state.dataIPShortCut->cAlphaArgs({1, NumAlphas}) = BlankString; - for (CountP = 1; CountP <= NumPrePM; ++CountP) { + for (int CountP = 1; CountP <= NumPrePM; ++CountP) { getObjectItem(state, state.dataIPShortCut->cCurrentModuleObject, CountP, @@ -1797,7 +1794,7 @@ void InputProcessor::preProcessorCheck(EnergyPlusData &state, bool &PreP_Fatal) "\" has the following " + state.dataIPShortCut->cAlphaArgs(2) + " condition" + Multiples + ':'); } } - CountM = 3; + int CountM = 3; if (CountM > NumAlphas) { ShowContinueError(state, state.dataIPShortCut->cCurrentModuleObject + " was blank. Check " + state.dataIPShortCut->cAlphaArgs(1) + From 7e73788165e1e46ef102159dd520de04b71b8d97 Mon Sep 17 00:00:00 2001 From: Richard Raustad Date: Thu, 12 Sep 2024 22:22:11 -0400 Subject: [PATCH 7/8] reduce --- src/EnergyPlus/InputProcessing/IdfParser.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/EnergyPlus/InputProcessing/IdfParser.cc b/src/EnergyPlus/InputProcessing/IdfParser.cc index 23f3da8994d..f6a3869db05 100644 --- a/src/EnergyPlus/InputProcessing/IdfParser.cc +++ b/src/EnergyPlus/InputProcessing/IdfParser.cc @@ -659,14 +659,13 @@ std::string IdfParser::parse_string(std::string_view idf, size_t &index) eat_whitespace(idf, index); std::string str; - char c; while (true) { if (index == idf_size) { break; } - c = idf[index]; + char c = idf[index]; increment_both_index(index, index_into_cur_line); if (c == ',' || c == ';' || c == '!') { decrement_both_index(index, index_into_cur_line); From c41c753878ec787da3cfcd5560ba4b4fa7719416 Mon Sep 17 00:00:00 2001 From: Richard Raustad Date: Thu, 12 Sep 2024 22:36:24 -0400 Subject: [PATCH 8/8] const/shadow --- src/EnergyPlus/Material.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/EnergyPlus/Material.cc b/src/EnergyPlus/Material.cc index 812ec2f07d9..a57f813c2b7 100644 --- a/src/EnergyPlus/Material.cc +++ b/src/EnergyPlus/Material.cc @@ -86,7 +86,7 @@ constexpr std::array ecoRoofCalcM int GetMaterialNum(EnergyPlusData &state, std::string const &matName) { - auto &s_mat = state.dataMaterial; + auto const &s_mat = state.dataMaterial; auto found = s_mat->materialMap.find(Util::makeUPPER(matName)); return (found != s_mat->materialMap.end()) ? found->second : 0; } @@ -1216,7 +1216,7 @@ void GetMaterialData(EnergyPlusData &state, bool &ErrorsFound) // set to true if matGas->ROnly = true; for (NumGas = 0; NumGas < NumGases; ++NumGas) { - GasType gasType = matGas->gases[NumGas].type; + gasType = matGas->gases[NumGas].type; if (gasType != GasType::Custom) { matGas->gasFracts[NumGas] = s_ipsc->rNumericArgs(3 + NumGas); matGas->gases[NumGas] = gases[(int)gasType];