diff --git a/src/EnergyPlus/ExternalInterface.cc b/src/EnergyPlus/ExternalInterface.cc index 8c00d9f1a12..cdc0550b54a 100644 --- a/src/EnergyPlus/ExternalInterface.cc +++ b/src/EnergyPlus/ExternalInterface.cc @@ -1229,18 +1229,6 @@ void InitExternalInterfaceFMUImport(EnergyPlusData &state) cCurrentModuleObject, fmuInst.Name, state.dataExternalInterface->ErrorsFound); - // Util::VerifyName( state.dataExternalInterface->FMU( i ).Instance( j - // ).fmuInputVariable( - // k - //).Name, state.dataExternalInterface->FMU( - // i - //).Instance( - // j - //).checkfmuInputVariable, NumFMUInputVariables, IsNotOK, IsBlank, "The FMU input variable \"" + - // state.dataExternalInterface->FMU( i ).Instance( j - //).fmuInputVariable( k ).Name + "\" of instance \"" + state.dataExternalInterface->FMU( i ).Instance( j ).Name + "\" of FMU - //\"" + state.dataExternalInterface->FMU( i ).Name + "\" - // has duplicates. Please check the input file again and delete duplicated entries." ); if (state.dataExternalInterface->ErrorsFound) { StopExternalInterfaceIfError(state); } else { diff --git a/src/EnergyPlus/GeneralRoutines.cc b/src/EnergyPlus/GeneralRoutines.cc index 13fcaefcda9..3c1cf1466e9 100644 --- a/src/EnergyPlus/GeneralRoutines.cc +++ b/src/EnergyPlus/GeneralRoutines.cc @@ -196,7 +196,7 @@ void ControlCompOutput(EnergyPlusData &state, if (ControlCompTypeNum != 0) { SimCompNum = ControlCompTypeNum; } else { - SimCompNum = Util::FindItemInSortedList(CompType, ListOfComponents, NumComponents); + SimCompNum = Util::FindItem(CompType, ListOfComponents, NumComponents); ControlCompTypeNum = SimCompNum; } diff --git a/src/EnergyPlus/HVACSingleDuctInduc.cc b/src/EnergyPlus/HVACSingleDuctInduc.cc index a5d0c93c636..b74ab784aea 100644 --- a/src/EnergyPlus/HVACSingleDuctInduc.cc +++ b/src/EnergyPlus/HVACSingleDuctInduc.cc @@ -248,7 +248,6 @@ namespace HVACSingleDuctInduc { ErrorObjectHeader eoh{routineName, CurrentModuleObject, Alphas(1)}; int IUNum = IUIndex; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); state.dataHVACSingleDuctInduc->IndUnit(IUNum).Name = Alphas(1); state.dataHVACSingleDuctInduc->IndUnit(IUNum).UnitType = CurrentModuleObject; diff --git a/src/EnergyPlus/HVACVariableRefrigerantFlow.cc b/src/EnergyPlus/HVACVariableRefrigerantFlow.cc index 6aa2dd9306e..e3c4e92770d 100644 --- a/src/EnergyPlus/HVACVariableRefrigerantFlow.cc +++ b/src/EnergyPlus/HVACVariableRefrigerantFlow.cc @@ -1551,7 +1551,6 @@ void GetVRFInputData(EnergyPlusData &state, bool &ErrorsFound) lAlphaFieldBlanks, cAlphaFieldNames, cNumericFieldNames); - Util::IsNameEmpty(state, cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); auto &thisTUList = state.dataHVACVarRefFlow->TerminalUnitList(TUListNum); thisTUList.Name = cAlphaArgs(1); @@ -3305,7 +3304,6 @@ void GetVRFInputData(EnergyPlusData &state, bool &ErrorsFound) state.dataHVACVarRefFlow->VRFTUNumericFields(VRFTUNum).FieldNames.allocate(NumNums); state.dataHVACVarRefFlow->VRFTUNumericFields(VRFTUNum).FieldNames = cNumericFieldNames; - Util::IsNameEmpty(state, cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); auto &thisVrfTU = state.dataHVACVarRefFlow->VRFTU(VRFTUNum); thisVrfTU.Name = cAlphaArgs(1); diff --git a/src/EnergyPlus/HeatBalanceManager.cc b/src/EnergyPlus/HeatBalanceManager.cc index 6d2ec8c791e..3bbaca5ccbd 100644 --- a/src/EnergyPlus/HeatBalanceManager.cc +++ b/src/EnergyPlus/HeatBalanceManager.cc @@ -1880,7 +1880,7 @@ namespace HeatBalanceManager { TMP = index(state.dataIPShortCut->cAlphaArgs(1), char(2)); } - if (Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataHeatBalMgr->CurrentModuleObject, ErrorsFound)) { + if (state.dataIPShortCut->cAlphaArgs(1).empty()) { continue; } diff --git a/src/EnergyPlus/HybridUnitaryAirConditioners.cc b/src/EnergyPlus/HybridUnitaryAirConditioners.cc index d7a0529f881..313d915aeaa 100644 --- a/src/EnergyPlus/HybridUnitaryAirConditioners.cc +++ b/src/EnergyPlus/HybridUnitaryAirConditioners.cc @@ -493,16 +493,6 @@ void GetInputZoneHybridUnitaryAirConditioners(EnergyPlusData &state, bool &Error cAlphaFields, cNumericFields); - bool IsNotOK = false; - bool IsBlank = false; - Util::VerifyName(state, - Alphas(1), - state.dataHybridUnitaryAC->ZoneHybridUnitaryAirConditioner, - UnitLoop - 1, - IsNotOK, - IsBlank, - cCurrentModuleObject + " Name"); - ErrorObjectHeader eoh{routineName, cCurrentModuleObject, Alphas(1)}; auto &hybridUnitaryAC = state.dataHybridUnitaryAC->ZoneHybridUnitaryAirConditioner(UnitLoop); diff --git a/src/EnergyPlus/IceThermalStorage.cc b/src/EnergyPlus/IceThermalStorage.cc index e4271e0ecc3..ccc5f323807 100644 --- a/src/EnergyPlus/IceThermalStorage.cc +++ b/src/EnergyPlus/IceThermalStorage.cc @@ -736,7 +736,6 @@ namespace IceThermalStorage { _, _, state.dataIPShortCut->cNumericFieldNames); - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, ErrorsFound); state.dataIceThermalStorage->ThermalStorageSizing(sizingNum).name = state.dataIPShortCut->cAlphaArgs(1); state.dataIceThermalStorage->ThermalStorageSizing(sizingNum).onPeakStart = state.dataIPShortCut->rNumericArgs(1); @@ -777,7 +776,6 @@ namespace IceThermalStorage { state.dataIPShortCut->lAlphaFieldBlanks, state.dataIPShortCut->cAlphaFieldNames, state.dataIPShortCut->cNumericFieldNames); - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, ErrorsFound); ++state.dataIceThermalStorage->TotalNumIceStorage; state.dataIceThermalStorage->SimpleIceStorage(iceNum).MapNum = state.dataIceThermalStorage->TotalNumIceStorage; @@ -899,8 +897,6 @@ namespace IceThermalStorage { ErrorObjectHeader eoh{routineName, state.dataIPShortCut->cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, ErrorsFound); - ++state.dataIceThermalStorage->TotalNumIceStorage; state.dataIceThermalStorage->DetailedIceStorage(iceNum).MapNum = state.dataIceThermalStorage->TotalNumIceStorage; diff --git a/src/EnergyPlus/IndoorGreen.cc b/src/EnergyPlus/IndoorGreen.cc index 808dba5bbb7..81969d6e152 100644 --- a/src/EnergyPlus/IndoorGreen.cc +++ b/src/EnergyPlus/IndoorGreen.cc @@ -137,7 +137,6 @@ namespace IndoorGreen { s_ipsc->cAlphaFieldNames, s_ipsc->cNumericFieldNames); ErrorObjectHeader eoh{RoutineName, cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); ig.Name = s_ipsc->cAlphaArgs(1); ig.SurfName = s_ipsc->cAlphaArgs(2); ig.SurfPtr = Util::FindItemInList(s_ipsc->cAlphaArgs(2), state.dataSurface->Surface); diff --git a/src/EnergyPlus/InternalHeatGains.cc b/src/EnergyPlus/InternalHeatGains.cc index 509f74a578b..e4e91a988dc 100644 --- a/src/EnergyPlus/InternalHeatGains.cc +++ b/src/EnergyPlus/InternalHeatGains.cc @@ -2542,7 +2542,6 @@ namespace InternalHeatGains { IHGNumericFieldNames); ErrorObjectHeader eoh{routineName, contamSSModuleObject, IHGAlphas(1)}; - Util::IsNameEmpty(state, IHGAlphas(1), contamSSModuleObject, ErrorsFound); state.dataHeatBal->ZoneCO2Gen(Loop).Name = IHGAlphas(1); diff --git a/src/EnergyPlus/MatrixDataManager.cc b/src/EnergyPlus/MatrixDataManager.cc index 4c4a6a7114a..6f0422707a9 100644 --- a/src/EnergyPlus/MatrixDataManager.cc +++ b/src/EnergyPlus/MatrixDataManager.cc @@ -148,7 +148,6 @@ namespace MatrixDataManager { state.dataIPShortCut->cAlphaFieldNames, state.dataIPShortCut->cNumericFieldNames); ++MatNum; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); state.dataMatrixDataManager->MatData(MatNum).Name = state.dataIPShortCut->cAlphaArgs(1); int NumRows = std::floor(state.dataIPShortCut->rNumericArgs(1)); diff --git a/src/EnergyPlus/MicroturbineElectricGenerator.cc b/src/EnergyPlus/MicroturbineElectricGenerator.cc index 4159934aa8d..261d4123740 100644 --- a/src/EnergyPlus/MicroturbineElectricGenerator.cc +++ b/src/EnergyPlus/MicroturbineElectricGenerator.cc @@ -158,7 +158,7 @@ void GetMTGeneratorInput(EnergyPlusData &state) state.dataIPShortCut->lAlphaFieldBlanks, state.dataIPShortCut->cAlphaFieldNames, state.dataIPShortCut->cNumericFieldNames); - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, ErrorsFound); + state.dataMircoturbElectGen->MTGenerator(GeneratorNum).Name = AlphArray(1); state.dataMircoturbElectGen->MTGenerator(GeneratorNum).RefElecPowerOutput = NumArray(1); diff --git a/src/EnergyPlus/MixerComponent.cc b/src/EnergyPlus/MixerComponent.cc index ced283d7ec7..577e67cd6d0 100644 --- a/src/EnergyPlus/MixerComponent.cc +++ b/src/EnergyPlus/MixerComponent.cc @@ -216,7 +216,6 @@ void GetMixerInput(EnergyPlusData &state) lAlphaBlanks, cAlphaFields, cNumericFields); - Util::IsNameEmpty(state, AlphArray(1), CurrentModuleObject, ErrorsFound); state.dataMixerComponent->MixerCond(MixerNum).MixerName = AlphArray(1); diff --git a/src/EnergyPlus/NodeInputManager.cc b/src/EnergyPlus/NodeInputManager.cc index d929524279d..28400b09acc 100644 --- a/src/EnergyPlus/NodeInputManager.cc +++ b/src/EnergyPlus/NodeInputManager.cc @@ -558,7 +558,7 @@ void GetNodeListsInput(EnergyPlusData &state, bool &ErrorsFound) // Set to true for (int Loop = 1; Loop <= state.dataNodeInputMgr->NumOfNodeLists; ++Loop) { state.dataInputProcessing->inputProcessor->getObjectItem( state, CurrentModuleObject, Loop, cAlphas, NumAlphas, rNumbers, NumNumbers, IOStatus); - if (Util::IsNameEmpty(state, cAlphas(1), CurrentModuleObject, localErrorsFound)) { + if (cAlphas(1).empty()) { continue; } diff --git a/src/EnergyPlus/OutdoorAirUnit.cc b/src/EnergyPlus/OutdoorAirUnit.cc index ca5bb4aeab4..d0756eb59e1 100644 --- a/src/EnergyPlus/OutdoorAirUnit.cc +++ b/src/EnergyPlus/OutdoorAirUnit.cc @@ -305,7 +305,6 @@ namespace OutdoorAirUnit { cNumericFields); ErrorObjectHeader eoh{routineName, CurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), CurrentModuleObject, ErrorsFound); // A1 thisOutAirUnit.Name = state.dataIPShortCut->cAlphaArgs(1); diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc index c8935fe6a58..493a17e1f7a 100644 --- a/src/EnergyPlus/OutputReportTabular.cc +++ b/src/EnergyPlus/OutputReportTabular.cc @@ -370,7 +370,6 @@ void GetInputTabularMonthly(EnergyPlusData &state) Array1D_string AlphArray; // character string data Array1D NumArray; // numeric data int IOStat = -1; // IO Status when calling get input subroutine - bool ErrorsFound = false; state.dataInputProcessing->inputProcessor->getObjectDefMaxArgs(state, CurrentModuleObject, NumParams, NumAlphas, NumNums); AlphArray.allocate(NumAlphas); @@ -378,12 +377,10 @@ void GetInputTabularMonthly(EnergyPlusData &state) for (int TabNum = 1, TabNum_end = ort->MonthlyInputCount; TabNum <= TabNum_end; ++TabNum) { // MonthlyInputCount is modified in the loop state.dataInputProcessing->inputProcessor->getObjectItem(state, CurrentModuleObject, TabNum, AlphArray, NumAlphas, NumArray, NumNums, IOStat); - if (TabNum - 1 > 0) { - Util::IsNameEmpty(state, AlphArray(1), CurrentModuleObject, ErrorsFound); - } if (NumAlphas < 2) { ShowSevereError(state, format("{}: No fields specified.", CurrentModuleObject)); } + // add to the data structure int const curTable = AddMonthlyReport(state, AlphArray(1), int(NumArray(1))); for (int jField = 2; jField <= NumAlphas; jField += 2) { diff --git a/src/EnergyPlus/PCMThermalStorage.cc b/src/EnergyPlus/PCMThermalStorage.cc index 501868f0b9f..706bf771516 100644 --- a/src/EnergyPlus/PCMThermalStorage.cc +++ b/src/EnergyPlus/PCMThermalStorage.cc @@ -509,8 +509,6 @@ namespace PCMStorage { state.dataIPShortCut->cAlphaFieldNames, state.dataIPShortCut->cNumericFieldNames); - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, ErrorsFound); - PCM.Name = state.dataIPShortCut->cAlphaArgs(1); PCM.AvailabilityScheduleName = state.dataIPShortCut->cAlphaArgs(2); diff --git a/src/EnergyPlus/PackagedThermalStorageCoil.cc b/src/EnergyPlus/PackagedThermalStorageCoil.cc index 5ca2c1a80f6..c154788f262 100644 --- a/src/EnergyPlus/PackagedThermalStorageCoil.cc +++ b/src/EnergyPlus/PackagedThermalStorageCoil.cc @@ -239,8 +239,6 @@ void GetTESCoilInput(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); - // ErrorsFound will be set to True if problem was found, left untouched otherwise VerifyUniqueCoilName(state, cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1), ErrorsFound, cCurrentModuleObject + " Name"); diff --git a/src/EnergyPlus/Photovoltaics.cc b/src/EnergyPlus/Photovoltaics.cc index 50431cfb775..b6b6689c471 100644 --- a/src/EnergyPlus/Photovoltaics.cc +++ b/src/EnergyPlus/Photovoltaics.cc @@ -331,7 +331,6 @@ namespace Photovoltaics { ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); state.dataPhotovoltaic->PVarray(PVnum).Name = s_ipsc->cAlphaArgs(1); state.dataPhotovoltaic->PVarray(PVnum).SurfaceName = s_ipsc->cAlphaArgs(2); @@ -472,7 +471,7 @@ namespace Photovoltaics { ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - if (Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound)) { + if (s_ipsc->cAlphaArgs(1).empty()) { continue; } tmpSimpleModuleParams(ModNum).Name = s_ipsc->cAlphaArgs(1); @@ -518,7 +517,7 @@ namespace Photovoltaics { s_ipsc->cNumericFieldNames); ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - if (Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound)) { + if (s_ipsc->cAlphaArgs(1).empty()) { continue; } tmpTRNSYSModuleParams(ModNum).Name = s_ipsc->cAlphaArgs(1); @@ -570,7 +569,7 @@ namespace Photovoltaics { s_ipsc->lAlphaFieldBlanks, s_ipsc->cAlphaFieldNames, s_ipsc->cNumericFieldNames); - if (Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound)) { + if (s_ipsc->cAlphaArgs(1).empty()) { continue; } diff --git a/src/EnergyPlus/Plant/PlantManager.cc b/src/EnergyPlus/Plant/PlantManager.cc index 8cbcb0b1e2f..0f9c8f3b4f9 100644 --- a/src/EnergyPlus/Plant/PlantManager.cc +++ b/src/EnergyPlus/Plant/PlantManager.cc @@ -389,7 +389,6 @@ void GetPlantLoopData(EnergyPlusData &state) eoh.objectName = Alpha(1); } - Util::IsNameEmpty(state, Alpha(1), CurrentModuleObject, ErrorsFound); this_loop.Name = Alpha(1); // Load the Plant Loop Name if (Util::SameString(Alpha(2), "STEAM")) { diff --git a/src/EnergyPlus/PlantCentralGSHP.cc b/src/EnergyPlus/PlantCentralGSHP.cc index b9aa9d3c0d4..681e00403ac 100644 --- a/src/EnergyPlus/PlantCentralGSHP.cc +++ b/src/EnergyPlus/PlantCentralGSHP.cc @@ -584,7 +584,7 @@ void GetWrapperInput(EnergyPlusData &state) state.dataPlantCentralGSHP->Wrapper(WrapperNum).Name = state.dataIPShortCut->cAlphaArgs(1); // initialize nth chiller heater index (including identical units) for current wrapper - if (Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, ErrorsFound)) { + if (state.dataIPShortCut->cAlphaArgs(1).empty()) { continue; } @@ -1202,7 +1202,6 @@ void GetChillerHeaterInput(EnergyPlusData &state) state.dataIPShortCut->cNumericFieldNames); state.dataPlantCentralGSHP->ChillerHeater(ChillerHeaterNum).Name = state.dataIPShortCut->cAlphaArgs(1); - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, CHErrorsFound); if (Util::SameString(state.dataIPShortCut->cAlphaArgs(4), "LEAVINGCONDENSER")) { state.dataPlantCentralGSHP->ChillerHeater(ChillerHeaterNum).CondModeCooling = CondenserModeTemperature::LeavingCondenser; diff --git a/src/EnergyPlus/PlantChillers.cc b/src/EnergyPlus/PlantChillers.cc index c56ba11d17b..2d276d65a3b 100644 --- a/src/EnergyPlus/PlantChillers.cc +++ b/src/EnergyPlus/PlantChillers.cc @@ -210,8 +210,6 @@ namespace PlantChillers { ErrorObjectHeader eoh{routineName, state.dataIPShortCut->cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, ErrorsFound); - // ErrorsFound will be set to True if problem was found, left untouched otherwise GlobalNames::VerifyUniqueChillerName(state, state.dataIPShortCut->cCurrentModuleObject, @@ -2216,8 +2214,6 @@ namespace PlantChillers { ErrorObjectHeader eoh{routineName, state.dataIPShortCut->cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, ErrorsFound); - // ErrorsFound will be set to True if problem was found, left untouched otherwise GlobalNames::VerifyUniqueChillerName(state, state.dataIPShortCut->cCurrentModuleObject, @@ -4237,8 +4233,6 @@ namespace PlantChillers { ErrorObjectHeader eoh{routineName, state.dataIPShortCut->cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, ErrorsFound); - // ErrorsFound will be set to True if problem was found, left untouched otherwise GlobalNames::VerifyUniqueChillerName(state, state.dataIPShortCut->cCurrentModuleObject, @@ -6176,7 +6170,6 @@ namespace PlantChillers { state.dataIPShortCut->cNumericFieldNames); ErrorObjectHeader eoh{routineName, state.dataIPShortCut->cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, ErrorsFound); // ErrorsFound will be set to True if problem was found, left untouched otherwise GlobalNames::VerifyUniqueChillerName(state, diff --git a/src/EnergyPlus/PlantComponentTemperatureSources.cc b/src/EnergyPlus/PlantComponentTemperatureSources.cc index 8d015bc7881..f52f4c49732 100644 --- a/src/EnergyPlus/PlantComponentTemperatureSources.cc +++ b/src/EnergyPlus/PlantComponentTemperatureSources.cc @@ -488,8 +488,6 @@ namespace PlantComponentTemperatureSources { ErrorObjectHeader eoh{routineName, cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); - state.dataPlantCompTempSrc->WaterSource(SourceNum).Name = state.dataIPShortCut->cAlphaArgs(1); state.dataPlantCompTempSrc->WaterSource(SourceNum).InletNodeNum = diff --git a/src/EnergyPlus/PlantCondLoopOperation.cc b/src/EnergyPlus/PlantCondLoopOperation.cc index 6c09ea88af2..c13b7d5505f 100644 --- a/src/EnergyPlus/PlantCondLoopOperation.cc +++ b/src/EnergyPlus/PlantCondLoopOperation.cc @@ -367,7 +367,7 @@ void GetPlantOperationInput(EnergyPlusData &state, bool &GetInputOK) for (OpNum = 1; OpNum <= NumPlantOpSchemes; ++OpNum) { state.dataInputProcessing->inputProcessor->getObjectItem( state, CurrentModuleObject, OpNum, state.dataIPShortCut->cAlphaArgs, NumAlphas, state.dataIPShortCut->rNumericArgs, NumNums, IOStat); - if (Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), CurrentModuleObject, ErrorsFound)) { + if (state.dataIPShortCut->cAlphaArgs(1).empty()) { continue; } } @@ -377,7 +377,7 @@ void GetPlantOperationInput(EnergyPlusData &state, bool &GetInputOK) for (OpNum = 1; OpNum <= NumCondOpSchemes; ++OpNum) { state.dataInputProcessing->inputProcessor->getObjectItem( state, CurrentModuleObject, OpNum, state.dataIPShortCut->cAlphaArgs, NumAlphas, state.dataIPShortCut->rNumericArgs, NumNums, IOStat); - if (Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), CurrentModuleObject, ErrorsFound)) { + if (state.dataIPShortCut->cAlphaArgs(1).empty()) { continue; } } diff --git a/src/EnergyPlus/PlantHeatExchangerFluidToFluid.cc b/src/EnergyPlus/PlantHeatExchangerFluidToFluid.cc index 3d444717ac1..3e8edbfdab2 100644 --- a/src/EnergyPlus/PlantHeatExchangerFluidToFluid.cc +++ b/src/EnergyPlus/PlantHeatExchangerFluidToFluid.cc @@ -272,8 +272,6 @@ void GetFluidHeatExchangerInput(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, cCurrentModuleObject, cAlphaArgs(1)}; - Util::IsNameEmpty(state, cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); - state.dataPlantHXFluidToFluid->FluidHX(CompLoop).Name = cAlphaArgs(1); if (lAlphaFieldBlanks(2)) { diff --git a/src/EnergyPlus/PlantLoadProfile.cc b/src/EnergyPlus/PlantLoadProfile.cc index db516703dc2..91b534e39c6 100644 --- a/src/EnergyPlus/PlantLoadProfile.cc +++ b/src/EnergyPlus/PlantLoadProfile.cc @@ -429,8 +429,6 @@ void GetPlantProfileInput(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); - state.dataPlantLoadProfile->PlantProfile(ProfileNum).Name = state.dataIPShortCut->cAlphaArgs(1); state.dataPlantLoadProfile->PlantProfile(ProfileNum).Type = DataPlant::PlantEquipmentType::PlantLoadProfile; // parameter assigned in DataPlant diff --git a/src/EnergyPlus/PlantPipingSystemsManager.cc b/src/EnergyPlus/PlantPipingSystemsManager.cc index 7af70f0e002..19c0045434f 100644 --- a/src/EnergyPlus/PlantPipingSystemsManager.cc +++ b/src/EnergyPlus/PlantPipingSystemsManager.cc @@ -543,7 +543,7 @@ namespace PlantPipingSystemsManager { // Get the name, validate thisDomain.Name = state.dataIPShortCut->cAlphaArgs(1); - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, ErrorsFound); + // Mesh extents, validated by IP thisDomain.Extents.xMax = state.dataIPShortCut->rNumericArgs(1); thisDomain.Extents.yMax = state.dataIPShortCut->rNumericArgs(2); @@ -1526,7 +1526,6 @@ namespace PlantPipingSystemsManager { // Get the name, validate thisCircuit.Name = s_ipsc->cAlphaArgs(1); - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); // Read pipe thermal properties, validated by IP thisCircuit.PipeProperties.Conductivity = s_ipsc->rNumericArgs(1); @@ -1800,7 +1799,7 @@ namespace PlantPipingSystemsManager { // Get the name, validate thisSegment.Name = s_ipsc->cAlphaArgs(1); - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); + // Read in the pipe location, validated as positive by IP // -- note that these values will be altered by the main GetInput routine in two ways: // 1) shift for basement wall if selected @@ -1883,7 +1882,6 @@ namespace PlantPipingSystemsManager { // Get the name, validate std::string thisTrenchName = s_ipsc->cAlphaArgs(1); - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); int const NumPipeSegments = static_cast(s_ipsc->rNumericArgs(3)); Real64 const thisInterPipeSpacing = s_ipsc->rNumericArgs(4); diff --git a/src/EnergyPlus/PurchasedAirManager.cc b/src/EnergyPlus/PurchasedAirManager.cc index 353cd3589a7..8200c2a66e2 100644 --- a/src/EnergyPlus/PurchasedAirManager.cc +++ b/src/EnergyPlus/PurchasedAirManager.cc @@ -282,7 +282,6 @@ void GetPurchasedAir(EnergyPlusData &state) state.dataPurchasedAirMgr->PurchAirNumericFields(purchAirNum).FieldNames.allocate(NumNums); state.dataPurchasedAirMgr->PurchAirNumericFields(purchAirNum).FieldNames = ""; state.dataPurchasedAirMgr->PurchAirNumericFields(purchAirNum).FieldNames = s_ipsc->cNumericFieldNames; - Util::IsNameEmpty(state, thisObjectName, s_ipsc->cCurrentModuleObject, ErrorsFound); PurchAir.Name = Util::makeUPPER(thisObjectName); std::string cAlphaFieldName = "Availability Schedule Name"; // get optional availability schedule diff --git a/src/EnergyPlus/RefrigeratedCase.cc b/src/EnergyPlus/RefrigeratedCase.cc index d69b380d083..9dacb3b238a 100644 --- a/src/EnergyPlus/RefrigeratedCase.cc +++ b/src/EnergyPlus/RefrigeratedCase.cc @@ -714,7 +714,7 @@ void GetRefrigerationInput(EnergyPlusData &state) ++NumDisplayCases; AlphaNum = 1; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); + RefrigCase(CaseNum).Name = Alphas(AlphaNum); AlphaNum = 2; @@ -1837,8 +1837,6 @@ void GetRefrigerationInput(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, CurrentModuleObject, Alphas(1)}; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); - WarehouseCoil(CoilID).Name = Alphas(AlphaNum); // A2 @@ -2475,7 +2473,6 @@ void GetRefrigerationInput(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, CurrentModuleObject, Alphas(1)}; AlphaNum = 1; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); AirChillerSet(SetID).Name = Alphas(AlphaNum); @@ -2597,7 +2594,7 @@ void GetRefrigerationInput(EnergyPlusData &state) lAlphaBlanks, cAlphaFieldNames, cNumericFieldNames); - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); + CaseAndWalkInList(ListNum).Name = Alphas(1); // CaseAndWalkInList alphas include CaseAndWalkInList name and one name for each Case or WalkIn in list @@ -2698,7 +2695,6 @@ void GetRefrigerationInput(EnergyPlusData &state) cNumericFieldNames); ErrorObjectHeader eoh{routineName, CurrentModuleObject, Alphas(1)}; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); RefrigRack(RackNum).Name = Alphas(1); RefrigRack(RackNum).MyIdx = RackNum; @@ -4177,7 +4173,6 @@ void GetRefrigerationInput(EnergyPlusData &state) cNumericFieldNames); ErrorObjectHeader eoh{routineName, CurrentModuleObject, Alphas(1)}; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); Secondary(SecondaryNum).Name = Alphas(1); @@ -5120,7 +5115,6 @@ void GetRefrigerationInput(EnergyPlusData &state) lAlphaBlanks, cAlphaFieldNames, cNumericFieldNames); - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); TransferLoadList(ListNum).Name = Alphas(1); @@ -5203,7 +5197,6 @@ void GetRefrigerationInput(EnergyPlusData &state) cAlphaFieldNames, cNumericFieldNames); CompressorLists(ListNum).NumCompressors = NumAlphas - 1; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); CompressorLists(ListNum).Name = Alphas(1); if (!allocated(CompressorLists(ListNum).CompItemNum)) { @@ -5248,7 +5241,6 @@ void GetRefrigerationInput(EnergyPlusData &state) cNumericFieldNames); ErrorObjectHeader eoh{routineName, CurrentModuleObject, Alphas(1)}; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); System(RefrigSysNum).Name = Alphas(1); @@ -6271,8 +6263,6 @@ void GetRefrigerationInput(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, CurrentModuleObject, Alphas(1)}; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); - TransSystem(TransRefrigSysNum).Name = Alphas(1); // Read refrigerant for this system diff --git a/src/EnergyPlus/ReturnAirPathManager.cc b/src/EnergyPlus/ReturnAirPathManager.cc index a0048eec597..9457d4c1265 100644 --- a/src/EnergyPlus/ReturnAirPathManager.cc +++ b/src/EnergyPlus/ReturnAirPathManager.cc @@ -142,7 +142,6 @@ namespace ReturnAirPathManager { state.dataIPShortCut->rNumericArgs, NumNums, IOStat); - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); state.dataZoneEquip->ReturnAirPath(PathNum).Name = state.dataIPShortCut->cAlphaArgs(1); state.dataZoneEquip->ReturnAirPath(PathNum).NumOfComponents = nint((NumAlphas - 2.0) / 2.0); diff --git a/src/EnergyPlus/RuntimeLanguageProcessor.cc b/src/EnergyPlus/RuntimeLanguageProcessor.cc index 095f9ab902a..8c3e5881231 100644 --- a/src/EnergyPlus/RuntimeLanguageProcessor.cc +++ b/src/EnergyPlus/RuntimeLanguageProcessor.cc @@ -3201,7 +3201,6 @@ void GetRuntimeLanguageUserInput(EnergyPlusData &state) lAlphaFieldBlanks, cAlphaFieldNames, cNumericFieldNames); - Util::IsNameEmpty(state, cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); ValidateEMSVariableName(state, cCurrentModuleObject, cAlphaArgs(1), cAlphaFieldNames(1), errFlag, ErrorsFound); if (!errFlag) { diff --git a/src/EnergyPlus/SimAirServingZones.cc b/src/EnergyPlus/SimAirServingZones.cc index ab4f0e9ea98..60bc552c124 100644 --- a/src/EnergyPlus/SimAirServingZones.cc +++ b/src/EnergyPlus/SimAirServingZones.cc @@ -445,7 +445,7 @@ void GetAirPathData(EnergyPlusData &state) // Assign the air system data to the simulation variables. // Data needed to simulate the system goes into PrimaryAirSystem. // Data connecting the air system to the zone equipment goes into AirToZoneNodeInfo (in DataLoopNode). - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); + primaryAirSystems.Name = Alphas(1); airLoopZoneInfo.AirLoopName = Alphas(1); if (NumAlphas < 9) { diff --git a/src/EnergyPlus/SingleDuct.cc b/src/EnergyPlus/SingleDuct.cc index 6e5d867e5a1..dad124a439f 100644 --- a/src/EnergyPlus/SingleDuct.cc +++ b/src/EnergyPlus/SingleDuct.cc @@ -5091,7 +5091,7 @@ void GetATMixers(EnergyPlusData &state) state.dataIPShortCut->cNumericFieldNames); auto &atMixer = state.dataSingleDuct->SysATMixer(ATMixerNum); - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); + state.dataSingleDuct->SysATMixer(ATMixerNum).Name = state.dataIPShortCut->cAlphaArgs(1); atMixer.type = static_cast(getEnumValue(HVAC::mixerTypeLocNamesUC, ipsc->cAlphaArgs(7))); diff --git a/src/EnergyPlus/SizingManager.cc b/src/EnergyPlus/SizingManager.cc index 2d3f44bb61a..4d513db1a13 100644 --- a/src/EnergyPlus/SizingManager.cc +++ b/src/EnergyPlus/SizingManager.cc @@ -2237,7 +2237,6 @@ void GetOARequirements(EnergyPlusData &state) lAlphaBlanks, cAlphaFields, cNumericFields); - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); state.dataSize->OARequirements(OAIndex).Name = Alphas(1); @@ -2488,7 +2487,6 @@ void GetZoneAirDistribution(EnergyPlusData &state) cNumericFields); ErrorObjectHeader eoh{routineName, CurrentModuleObject, Alphas(1)}; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); state.dataSize->ZoneAirDistribution(ZADIndex).Name = Alphas(1); @@ -2733,7 +2731,6 @@ void GetZoneSizingInput(EnergyPlusData &state) state.dataIPShortCut->lAlphaFieldBlanks, state.dataIPShortCut->cAlphaFieldNames, state.dataIPShortCut->cNumericFieldNames); - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); SizingZoneObjects(Item).Name = state.dataIPShortCut->cAlphaArgs(1); @@ -2818,10 +2815,6 @@ void GetZoneSizingInput(EnergyPlusData &state) state.dataSize->ZoneSizingInput(ZoneSizIndex).ZoneName = "Invalid Zone Name"; } } - bool const nameEmpty = Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); - if (nameEmpty && !SizingZoneObjects(Item).ZoneListActive) { - ShowContinueError(state, "Zone may have been entered in a ZoneList assignment."); - } // A2, \field Zone Cooling Design Supply Air Temperature Input Method // \required-field @@ -4038,7 +4031,6 @@ void GetPlantSizingInput(EnergyPlusData &state) state.dataIPShortCut->lAlphaFieldBlanks, state.dataIPShortCut->cAlphaFieldNames, state.dataIPShortCut->cNumericFieldNames); - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); state.dataSize->PlantSizData(PltSizIndex).PlantLoopName = state.dataIPShortCut->cAlphaArgs(1); state.dataSize->PlantSizData(PltSizIndex).ExitTemp = state.dataIPShortCut->rNumericArgs(1); @@ -4614,7 +4606,6 @@ void GetZoneHVACSizing(EnergyPlusData &state) lAlphaBlanks, cAlphaFields, cNumericFields); - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); state.dataSize->ZoneHVACSizing(zSIndex).Name = Alphas(1); @@ -5112,8 +5103,6 @@ void GetAirTerminalSizing(EnergyPlusData &state) state.dataIPShortCut->cAlphaFieldNames, state.dataIPShortCut->cNumericFieldNames); - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); - auto &thisATSizing = state.dataSize->AirTerminalSizingSpec(zSIndex); thisATSizing.Name = state.dataIPShortCut->cAlphaArgs(1); thisATSizing.DesSensCoolingFrac = state.dataIPShortCut->rNumericArgs(1); diff --git a/src/EnergyPlus/SplitterComponent.cc b/src/EnergyPlus/SplitterComponent.cc index d66cd807b7c..c8f45fa7d99 100644 --- a/src/EnergyPlus/SplitterComponent.cc +++ b/src/EnergyPlus/SplitterComponent.cc @@ -220,7 +220,6 @@ namespace SplitterComponent { lAlphaBlanks, cAlphaFields, cNumericFields); - Util::IsNameEmpty(state, AlphArray(1), CurrentModuleObject, ErrorsFound); state.dataSplitterComponent->SplitterCond(SplitterNum).SplitterName = AlphArray(1); state.dataSplitterComponent->SplitterCond(SplitterNum).InletNode = diff --git a/src/EnergyPlus/SteamBaseboardRadiator.cc b/src/EnergyPlus/SteamBaseboardRadiator.cc index 4abeb69782b..583a4e56ea6 100644 --- a/src/EnergyPlus/SteamBaseboardRadiator.cc +++ b/src/EnergyPlus/SteamBaseboardRadiator.cc @@ -331,8 +331,6 @@ namespace SteamBaseboardRadiator { state.dataIPShortCut->cAlphaFieldNames, state.dataIPShortCut->cNumericFieldNames); - Util::IsNameEmpty( - state, state.dataIPShortCut->cAlphaArgs(1), state.dataSteamBaseboardRadiator->cCMO_BBRadiator_Steam_Design, ErrorsFound); state.dataSteamBaseboardRadiator->SteamBaseboardDesignNumericFields(BaseboardDesignNum).FieldNames.allocate(NumNumbers); state.dataSteamBaseboardRadiator->SteamBaseboardDesignNumericFields(BaseboardDesignNum).FieldNames = ""; state.dataSteamBaseboardRadiator->SteamBaseboardDesignNumericFields(BaseboardDesignNum).FieldNames = @@ -518,7 +516,6 @@ namespace SteamBaseboardRadiator { ErrorObjectHeader eoh{routineName, state.dataSteamBaseboardRadiator->cCMO_BBRadiator_Steam, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataSteamBaseboardRadiator->cCMO_BBRadiator_Steam, ErrorsFound); state.dataSteamBaseboardRadiator->SteamBaseboardNumericFields(BaseboardNum).FieldNames.allocate(NumNumbers); state.dataSteamBaseboardRadiator->SteamBaseboardNumericFields(BaseboardNum).FieldNames = ""; state.dataSteamBaseboardRadiator->SteamBaseboardNumericFields(BaseboardNum).FieldNames = state.dataIPShortCut->cNumericFieldNames; diff --git a/src/EnergyPlus/SteamCoils.cc b/src/EnergyPlus/SteamCoils.cc index 5f8df6c03f7..506984ba4f7 100644 --- a/src/EnergyPlus/SteamCoils.cc +++ b/src/EnergyPlus/SteamCoils.cc @@ -273,7 +273,6 @@ namespace SteamCoils { cNumericFields); ErrorObjectHeader eoh{routineName, CurrentModuleObject, AlphArray(1)}; - Util::IsNameEmpty(state, AlphArray(1), CurrentModuleObject, ErrorsFound); // ErrorsFound will be set to True if problem was found, left untouched otherwise VerifyUniqueCoilName(state, CurrentModuleObject, AlphArray(1), ErrorsFound, CurrentModuleObject + " Name"); diff --git a/src/EnergyPlus/SurfaceGeometry.cc b/src/EnergyPlus/SurfaceGeometry.cc index 34761aff7cc..6635afb3648 100644 --- a/src/EnergyPlus/SurfaceGeometry.cc +++ b/src/EnergyPlus/SurfaceGeometry.cc @@ -3786,7 +3786,7 @@ namespace SurfaceGeometry { auto &s_ipsc = state.dataIPShortCut; GetOSCData(state, ErrorsFound); - GetOSCMData(state, ErrorsFound); + GetOSCMData(state); GetFoundationData(state, ErrorsFound); NeedToAddSurfaces = 0; @@ -7368,22 +7368,7 @@ namespace SurfaceGeometry { s_ipsc->lAlphaFieldBlanks, s_ipsc->cAlphaFieldNames, s_ipsc->cNumericFieldNames); - // first handle cAlphaArgs - bool ErrorInName = false; - bool IsBlank = false; - - Util::VerifyName(state, - s_ipsc->cAlphaArgs(1), - state.dataHeatBal->ExtVentedCavity, - Item - 1, - ErrorInName, - IsBlank, - s_ipsc->cCurrentModuleObject + " Name"); - if (ErrorInName) { - ShowContinueError(state, "...cannot not duplicate other names"); - ErrorsFound = true; - continue; - } + state.dataHeatBal->ExtVentedCavity(Item).Name = s_ipsc->cAlphaArgs(1); state.dataHeatBal->ExtVentedCavity(Item).OSCMName = s_ipsc->cAlphaArgs(2); @@ -7891,8 +7876,6 @@ namespace SurfaceGeometry { ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); - SurfLocalEnv.Name = s_ipsc->cAlphaArgs(1); // Assign surface number @@ -8068,8 +8051,6 @@ namespace SurfaceGeometry { ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); - // A1: Name SrdSurfsProp.Name = s_ipsc->cAlphaArgs(1); @@ -9602,21 +9583,6 @@ namespace SurfaceGeometry { ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - bool ErrorInName = false; - bool IsBlank = false; - - Util::VerifyName(state, - s_ipsc->cAlphaArgs(1), - state.dataSurface->WindowShadingControl, - ControlNum, - ErrorInName, - IsBlank, - s_ipsc->cCurrentModuleObject + " Name"); - if (ErrorInName) { - ErrorsFound = true; - continue; - } - ++ControlNum; auto &windowShadingControl = state.dataSurface->WindowShadingControl(ControlNum); @@ -10864,7 +10830,7 @@ namespace SurfaceGeometry { fndInput.name = s_ipsc->cAlphaArgs(alpF); alpF++; - Util::IsNameEmpty(state, fndInput.name, s_ipsc->cCurrentModuleObject, ErrorInName); + if (ErrorInName) { ErrorsFound = true; continue; @@ -11414,14 +11380,6 @@ namespace SurfaceGeometry { s_ipsc->cNumericFieldNames); ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - bool ErrorInName = false; - bool IsBlank = false; - Util::VerifyName( - state, s_ipsc->cAlphaArgs(1), state.dataSurface->OSC, OSCNum, ErrorInName, IsBlank, s_ipsc->cCurrentModuleObject + " Name"); - if (ErrorInName) { - ErrorsFound = true; - continue; - } ++OSCNum; state.dataSurface->OSC(OSCNum).Name = s_ipsc->cAlphaArgs(1); @@ -11523,7 +11481,7 @@ namespace SurfaceGeometry { } } - void GetOSCMData(EnergyPlusData &state, bool &ErrorsFound) + void GetOSCMData(EnergyPlusData &state) { // SUBROUTINE INFORMATION: @@ -11563,14 +11521,6 @@ namespace SurfaceGeometry { for (int Loop = 1; Loop <= state.dataSurface->TotOSCM; ++Loop) { state.dataInputProcessing->inputProcessor->getObjectItem( state, s_ipsc->cCurrentModuleObject, Loop, s_ipsc->cAlphaArgs, NumAlphas, s_ipsc->rNumericArgs, NumProps, IOStat); - bool ErrorInName = false; - bool IsBlank = false; - Util::VerifyName( - state, s_ipsc->cAlphaArgs(1), state.dataSurface->OSCM, OSCMNum, ErrorInName, IsBlank, s_ipsc->cCurrentModuleObject + " Name"); - if (ErrorInName) { - ErrorsFound = true; - continue; - } ++OSCMNum; state.dataSurface->OSCM(OSCMNum).Name = s_ipsc->cAlphaArgs(1); diff --git a/src/EnergyPlus/SurfaceGeometry.hh b/src/EnergyPlus/SurfaceGeometry.hh index 34c1e17f591..4020580d578 100644 --- a/src/EnergyPlus/SurfaceGeometry.hh +++ b/src/EnergyPlus/SurfaceGeometry.hh @@ -306,7 +306,7 @@ namespace SurfaceGeometry { void GetOSCData(EnergyPlusData &state, bool &ErrorsFound); - void GetOSCMData(EnergyPlusData &state, bool &ErrorsFound); + void GetOSCMData(EnergyPlusData &state); void GetFoundationData(EnergyPlusData &state, bool &ErrorsFound); diff --git a/src/EnergyPlus/SwimmingPool.cc b/src/EnergyPlus/SwimmingPool.cc index 95e380827f2..fd98ccda9c2 100644 --- a/src/EnergyPlus/SwimmingPool.cc +++ b/src/EnergyPlus/SwimmingPool.cc @@ -229,7 +229,6 @@ void GetSwimmingPool(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, CurrentModuleObject, Alphas(1)}; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); state.dataSwimmingPools->Pool(Item).Name = Alphas(1); state.dataSwimmingPools->Pool(Item).SurfaceName = Alphas(2); diff --git a/src/EnergyPlus/ThermalChimney.cc b/src/EnergyPlus/ThermalChimney.cc index d87f8e8f18b..3c997999c42 100644 --- a/src/EnergyPlus/ThermalChimney.cc +++ b/src/EnergyPlus/ThermalChimney.cc @@ -184,7 +184,7 @@ namespace ThermalChimney { ErrorObjectHeader eoh{routineName, state.dataIPShortCut->cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - if (Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), cCurrentModuleObject, ErrorsFound)) { + if (state.dataIPShortCut->cAlphaArgs(1).empty()) { continue; } diff --git a/src/EnergyPlus/UnitHeater.cc b/src/EnergyPlus/UnitHeater.cc index 5d0a024f4cc..b5216e6df4a 100644 --- a/src/EnergyPlus/UnitHeater.cc +++ b/src/EnergyPlus/UnitHeater.cc @@ -261,7 +261,6 @@ namespace UnitHeater { state.dataUnitHeaters->UnitHeatNumericFields(UnitHeatNum).FieldNames.allocate(NumNumbers); state.dataUnitHeaters->UnitHeatNumericFields(UnitHeatNum).FieldNames = ""; state.dataUnitHeaters->UnitHeatNumericFields(UnitHeatNum).FieldNames = cNumericFields; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); state.dataUnitHeaters->UnitHeat(UnitHeatNum).Name = Alphas(1); diff --git a/src/EnergyPlus/UnitVentilator.cc b/src/EnergyPlus/UnitVentilator.cc index 6ff051421de..5966e856829 100644 --- a/src/EnergyPlus/UnitVentilator.cc +++ b/src/EnergyPlus/UnitVentilator.cc @@ -273,7 +273,6 @@ namespace UnitVentilator { state.dataUnitVentilators->UnitVentNumericFields(UnitVentNum).FieldNames.allocate(NumNumbers); state.dataUnitVentilators->UnitVentNumericFields(UnitVentNum).FieldNames = ""; state.dataUnitVentilators->UnitVentNumericFields(UnitVentNum).FieldNames = cNumericFields; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); unitVent.Name = Alphas(1); if (lAlphaBlanks(2)) { diff --git a/src/EnergyPlus/UserDefinedComponents.cc b/src/EnergyPlus/UserDefinedComponents.cc index eb5a58b3211..828b43b77a1 100644 --- a/src/EnergyPlus/UserDefinedComponents.cc +++ b/src/EnergyPlus/UserDefinedComponents.cc @@ -604,7 +604,6 @@ namespace UserDefinedComponents { lAlphaFieldBlanks, cAlphaFieldNames, _); - Util::IsNameEmpty(state, cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); state.dataUserDefinedComponents->UserPlantComp(CompLoop).Name = cAlphaArgs(1); @@ -1079,7 +1078,6 @@ namespace UserDefinedComponents { lAlphaFieldBlanks, cAlphaFieldNames, _); - Util::IsNameEmpty(state, cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); // ErrorsFound will be set to True if problem was found, left untouched otherwise GlobalNames::VerifyUniqueCoilName(state, cCurrentModuleObject, cAlphaArgs(1), ErrorsFound, cCurrentModuleObject + " Name"); @@ -1484,7 +1482,7 @@ namespace UserDefinedComponents { lAlphaFieldBlanks, cAlphaFieldNames, _); - Util::IsNameEmpty(state, cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); + state.dataUserDefinedComponents->UserZoneAirHVAC(CompLoop).Name = cAlphaArgs(1); // now get program manager for model simulations @@ -1965,7 +1963,7 @@ namespace UserDefinedComponents { lAlphaFieldBlanks, cAlphaFieldNames, _); - Util::IsNameEmpty(state, cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); + state.dataUserDefinedComponents->UserAirTerminal(CompLoop).Name = cAlphaArgs(1); // now get program manager for model simulations diff --git a/src/EnergyPlus/UtilityRoutines.cc b/src/EnergyPlus/UtilityRoutines.cc index 3e8949c0483..36c21ea6fd3 100644 --- a/src/EnergyPlus/UtilityRoutines.cc +++ b/src/EnergyPlus/UtilityRoutines.cc @@ -216,40 +216,6 @@ namespace Util { return 0; // Not found } - int FindItemInSortedList(std::string_view const String, Array1S_string const ListOfItems, int const NumItems) - { - - // FUNCTION INFORMATION: - // AUTHOR Linda K. Lawrie - // DATE WRITTEN September 1997 - - // PURPOSE OF THIS FUNCTION: - // This function looks up a string in a similar list of - // items and returns the index of the item in the list, if - // found. This routine is case insensitive. - - // SUBROUTINE LOCAL VARIABLE DECLARATIONS: - int Probe = 0; - int LBnd = 0; - int UBnd = NumItems + 1; - while (true) { - Probe = (UBnd - LBnd) / 2; - if (Probe == 0) { - break; - } - Probe += LBnd; - if (equali(String, ListOfItems(Probe))) { - break; - } - if (lessthani(String, ListOfItems(Probe))) { - UBnd = Probe; - } else { - LBnd = Probe; - } - } - return Probe; - } - int FindItem(std::string_view const String, Array1D_string const &ListOfItems, int const NumItems) { @@ -302,89 +268,6 @@ namespace Util { return 0; // Not found } - void VerifyName(EnergyPlusData &state, - std::string const &NameToVerify, - Array1D_string const &NamesList, - int const NumOfNames, - bool &ErrorFound, - bool &IsBlank, - std::string const &StringToDisplay) - { - - // SUBROUTINE INFORMATION: - // AUTHOR Linda Lawrie - // DATE WRITTEN February 2000 - - // PURPOSE OF THIS SUBROUTINE: - // This subroutine verifies that a new name can be added to the - // list of names for this item (i.e., that there isn't one of that - // name already and that this name is not blank). - - ErrorFound = false; - if (NumOfNames > 0) { - int Found = FindItem(NameToVerify, NamesList, NumOfNames); - if (Found != 0) { - ShowSevereError(state, format("{}, duplicate name={}", StringToDisplay, NameToVerify)); - ErrorFound = true; - } - } - - if (NameToVerify.empty()) { - ShowSevereError(state, format("{}, cannot be blank", StringToDisplay)); - ErrorFound = true; - IsBlank = true; - } else { - IsBlank = false; - } - } - - void VerifyName(EnergyPlusData &state, - std::string const &NameToVerify, - Array1S_string const NamesList, - int const NumOfNames, - bool &ErrorFound, - bool &IsBlank, - std::string const &StringToDisplay) - { - - // SUBROUTINE INFORMATION: - // AUTHOR Linda Lawrie - // DATE WRITTEN February 2000 - - // PURPOSE OF THIS SUBROUTINE: - // This subroutine verifies that a new name can be added to the - // list of names for this item (i.e., that there isn't one of that - // name already and that this name is not blank). - - ErrorFound = false; - if (NumOfNames > 0) { - int Found = FindItem(NameToVerify, NamesList, NumOfNames); - if (Found != 0) { - ShowSevereError(state, format("{}, duplicate name={}", StringToDisplay, NameToVerify)); - ErrorFound = true; - } - } - - if (NameToVerify.empty()) { - ShowSevereError(state, format("{}, cannot be blank", StringToDisplay)); - ErrorFound = true; - IsBlank = true; - } else { - IsBlank = false; - } - } - - bool IsNameEmpty(EnergyPlusData &state, std::string &NameToVerify, std::string_view StringToDisplay, bool &ErrorFound) - { - if (NameToVerify.empty()) { - ShowSevereError(state, format("{} Name, cannot be blank", StringToDisplay)); - ErrorFound = true; - NameToVerify = "xxxxx"; - return true; - } - return false; - } - void setDesignObjectNameAndPointer(EnergyPlusData &state, std::string &nameToBeSet, int &ptrToBeSet, diff --git a/src/EnergyPlus/UtilityRoutines.hh b/src/EnergyPlus/UtilityRoutines.hh index dee8fb91945..234573fcdaa 100644 --- a/src/EnergyPlus/UtilityRoutines.hh +++ b/src/EnergyPlus/UtilityRoutines.hh @@ -475,44 +475,6 @@ namespace Util { return Util::FindItemInList(String, ListOfItems, name_p, ListOfItems.isize()); } - int FindItemInSortedList(std::string_view const string, Array1S_string const ListOfItems, int NumItems); - - inline int FindItemInSortedList(std::string_view const String, Array1S_string const ListOfItems) - { - return FindItemInSortedList(String, ListOfItems, ListOfItems.isize()); - } - - template - inline int FindItemInSortedList(std::string_view const String, MArray1 const &ListOfItems, int const NumItems) - { - int Probe(0); - int LBnd(0); - int UBnd(NumItems + 1); - bool Found(false); - while ((!Found) || (Probe != 0)) { - Probe = (UBnd - LBnd) / 2; - if (Probe == 0) { - break; - } - Probe += LBnd; - if (equali(String, ListOfItems(Probe))) { - Found = true; - break; - } - if (lessthani(String, ListOfItems(Probe))) { - UBnd = Probe; - } else { - LBnd = Probe; - } - } - return Probe; - } - - template inline int FindItemInSortedList(std::string_view const String, MArray1 const &ListOfItems) - { - return FindItemInSortedList(String, ListOfItems, ListOfItems.isize()); - } - template inline int FindItem(InputIterator first, InputIterator last, std::string_view const str, std::false_type) { using valueType = typename std::iterator_traits::value_type; @@ -671,134 +633,6 @@ namespace Util { return equali(s, t); } - template - inline void VerifyName(EnergyPlusData &state, - InputIterator first, - InputIterator last, - std::string const &NameToVerify, - bool &ErrorFound, - bool &IsBlank, - std::string const &StringToDisplay) - { - IsBlank = false; - ErrorFound = false; - if (NameToVerify.empty()) { - ShowSevereError(state, StringToDisplay + ", cannot be blank"); - ErrorFound = true; - IsBlank = true; - return; - } - int Found = FindItem(first, last, NameToVerify); - if (Found != 0) { - ShowSevereError(state, StringToDisplay + ", duplicate name=" + NameToVerify); - ErrorFound = true; - } - } - - void VerifyName(EnergyPlusData &state, - std::string const &NameToVerify, - Array1D_string const &NamesList, - int const NumOfNames, - bool &ErrorFound, - bool &IsBlank, - std::string const &StringToDisplay); - - void VerifyName(EnergyPlusData &state, - std::string const &NameToVerify, - Array1S_string const NamesList, - int const NumOfNames, - bool &ErrorFound, - bool &IsBlank, - std::string const &StringToDisplay); - - template - inline void VerifyName(EnergyPlusData &state, - std::string const &NameToVerify, - MArray1 const &NamesList, - int const NumOfNames, - bool &ErrorFound, - bool &IsBlank, - std::string const &StringToDisplay) - { // Overload for member arrays: Implemented here to avoid copy to Array_string to forward to other VerifyName - ErrorFound = false; - if (NumOfNames > 0) { - int const Found = FindItem(NameToVerify, NamesList, - NumOfNames); // Calls FindItem overload that accepts member arrays - if (Found != 0) { - ShowSevereError(state, StringToDisplay + ", duplicate name=" + NameToVerify); - ErrorFound = true; - } - } - - if (NameToVerify.empty()) { - ShowSevereError(state, StringToDisplay + ", cannot be blank"); - ErrorFound = true; - IsBlank = true; - } else { - IsBlank = false; - } - } - - template ::value>::type> - // Container needs size() and operator[i] and elements need Name - inline void VerifyName(EnergyPlusData &state, - std::string const &NameToVerify, - Container const &NamesList, - int const NumOfNames, - bool &ErrorFound, - bool &IsBlank, - std::string const &StringToDisplay) - { - ErrorFound = false; - if (NumOfNames > 0) { - int const Found = FindItem(NameToVerify, NamesList, - NumOfNames); // Calls FindItem overload that accepts member arrays - if (Found != 0) { - ShowSevereError(state, StringToDisplay + ", duplicate name=" + NameToVerify); - ErrorFound = true; - } - } - - if (NameToVerify.empty()) { - ShowSevereError(state, StringToDisplay + ", cannot be blank"); - ErrorFound = true; - IsBlank = true; - } else { - IsBlank = false; - } - } - - template ::value>::type> - // Container needs size() and operator[i] and value_type - inline void VerifyName(EnergyPlusData &state, - std::string const &NameToVerify, - Container const &NamesList, - std::string Container::value_type::*name_p, - int const NumOfNames, - bool &ErrorFound, - bool &IsBlank, - std::string const &StringToDisplay) - { - ErrorFound = false; - if (NumOfNames > 0) { - int const Found = FindItem(NameToVerify, NamesList, name_p, NumOfNames); - if (Found != 0) { - ShowSevereError(state, StringToDisplay + ", duplicate name=" + NameToVerify); - ErrorFound = true; - } - } - - if (NameToVerify.empty()) { - ShowSevereError(state, StringToDisplay + ", cannot be blank"); - ErrorFound = true; - IsBlank = true; - } else { - IsBlank = false; - } - } - - bool IsNameEmpty(EnergyPlusData &state, std::string &NameToVerify, std::string_view StringToDisplay, bool &ErrorFound); - void setDesignObjectNameAndPointer(EnergyPlusData &state, std::string &nameToBeSet, // field that is being set once a match is found int &ptrToBeSet, // pointer that is being set once a match is found diff --git a/src/EnergyPlus/VentilatedSlab.cc b/src/EnergyPlus/VentilatedSlab.cc index 8ea9f6226fd..d5cf695c9b7 100644 --- a/src/EnergyPlus/VentilatedSlab.cc +++ b/src/EnergyPlus/VentilatedSlab.cc @@ -301,7 +301,6 @@ namespace VentilatedSlab { state.dataVentilatedSlab->VentSlabNumericFields(Item).FieldNames.allocate(NumNumbers); state.dataVentilatedSlab->VentSlabNumericFields(Item).FieldNames = cNumericFields; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), CurrentModuleObject, ErrorsFound); auto &ventSlab = state.dataVentilatedSlab->VentSlab(Item); ventSlab.Name = state.dataIPShortCut->cAlphaArgs(1); diff --git a/src/EnergyPlus/WaterCoils.cc b/src/EnergyPlus/WaterCoils.cc index 992525cda57..6b9ab433ffd 100644 --- a/src/EnergyPlus/WaterCoils.cc +++ b/src/EnergyPlus/WaterCoils.cc @@ -306,7 +306,6 @@ void GetWaterCoilInput(EnergyPlusData &state) NumArray.dimension(MaxNums, 0.0); lAlphaBlanks.dimension(MaxAlphas, true); lNumericBlanks.dimension(MaxNums, true); - auto &cCurrentModuleObject = state.dataIPShortCut->cCurrentModuleObject; CurrentModuleObject = "Coil:Heating:Water"; // Get the data for simple heating coils for (SimpHeatNum = 1; SimpHeatNum <= NumSimpHeat; ++SimpHeatNum) { @@ -331,7 +330,6 @@ void GetWaterCoilInput(EnergyPlusData &state) state.dataWaterCoils->WaterCoilNumericFields(CoilNum).FieldNames.allocate(MaxNums); state.dataWaterCoils->WaterCoilNumericFields(CoilNum).FieldNames = ""; state.dataWaterCoils->WaterCoilNumericFields(CoilNum).FieldNames = cNumericFields; - Util::IsNameEmpty(state, AlphArray(1), cCurrentModuleObject, ErrorsFound); // ErrorsFound will be set to True if problem was found, left untouched otherwise GlobalNames::VerifyUniqueCoilName(state, CurrentModuleObject, AlphArray(1), ErrorsFound, CurrentModuleObject + " Name"); @@ -501,7 +499,6 @@ void GetWaterCoilInput(EnergyPlusData &state) state.dataWaterCoils->WaterCoilNumericFields(CoilNum).FieldNames.allocate(MaxNums); state.dataWaterCoils->WaterCoilNumericFields(CoilNum).FieldNames = ""; state.dataWaterCoils->WaterCoilNumericFields(CoilNum).FieldNames = cNumericFields; - Util::IsNameEmpty(state, AlphArray(1), cCurrentModuleObject, ErrorsFound); // ErrorsFound will be set to True if problem was found, left untouched otherwise GlobalNames::VerifyUniqueCoilName(state, CurrentModuleObject, AlphArray(1), ErrorsFound, CurrentModuleObject + " Name"); @@ -725,7 +722,6 @@ void GetWaterCoilInput(EnergyPlusData &state) state.dataWaterCoils->WaterCoilNumericFields(CoilNum).FieldNames.allocate(MaxNums); state.dataWaterCoils->WaterCoilNumericFields(CoilNum).FieldNames = ""; state.dataWaterCoils->WaterCoilNumericFields(CoilNum).FieldNames = cNumericFields; - Util::IsNameEmpty(state, AlphArray(1), cCurrentModuleObject, ErrorsFound); // ErrorsFound will be set to True if problem was found, left untouched otherwise GlobalNames::VerifyUniqueCoilName(state, CurrentModuleObject, AlphArray(1), ErrorsFound, CurrentModuleObject + " Name"); diff --git a/src/EnergyPlus/WaterManager.cc b/src/EnergyPlus/WaterManager.cc index a24486bdf08..8c0068cbc6e 100644 --- a/src/EnergyPlus/WaterManager.cc +++ b/src/EnergyPlus/WaterManager.cc @@ -270,7 +270,6 @@ namespace WaterManager { state.dataWaterData->AnyWaterSystemsInModel = true; state.dataWaterData->WaterStorage(Item).Name = cAlphaArgs(1); - Util::IsNameEmpty(state, cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); state.dataWaterData->WaterStorage(Item).QualitySubCategoryName = cAlphaArgs(2); @@ -420,7 +419,6 @@ namespace WaterManager { ErrorObjectHeader eoh{routineName, cCurrentModuleObject, cAlphaArgs(1)}; state.dataWaterData->RainCollector(Item).Name = cAlphaArgs(1); - Util::IsNameEmpty(state, cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); state.dataWaterData->RainCollector(Item).StorageTankName = cAlphaArgs(2); state.dataWaterData->RainCollector(Item).StorageTankID = Util::FindItemInList(cAlphaArgs(2), state.dataWaterData->WaterStorage); @@ -534,7 +532,7 @@ namespace WaterManager { ErrorObjectHeader eoh{routineName, cCurrentModuleObject, cAlphaArgs(1)}; state.dataWaterData->GroundwaterWell(Item).Name = cAlphaArgs(1); - Util::IsNameEmpty(state, cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); + state.dataWaterData->GroundwaterWell(Item).StorageTankName = cAlphaArgs(2); InternalSetupTankSupplyComponent(state, diff --git a/src/EnergyPlus/WaterThermalTanks.cc b/src/EnergyPlus/WaterThermalTanks.cc index c98015f3a88..700262e116b 100644 --- a/src/EnergyPlus/WaterThermalTanks.cc +++ b/src/EnergyPlus/WaterThermalTanks.cc @@ -706,8 +706,6 @@ bool getDesuperHtrInput(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, cCurrentModuleObject, cAlphaArgs(1)}; - Util::IsNameEmpty(state, cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); - // ErrorsFound will be set to True if problem was found, left untouched otherwise GlobalNames::VerifyUniqueCoilName(state, cCurrentModuleObject, cAlphaArgs(1), ErrorsFound, cCurrentModuleObject + " Name"); @@ -1226,7 +1224,6 @@ bool getHPWaterHeaterInput(EnergyPlusData &state) for (int i = NumAlphas + 1; i <= nNumPossibleAlphaArgs; ++i) { hpwhAlphaBlank[i] = true; } - Util::IsNameEmpty(state, hpwhAlpha[1], state.dataIPShortCut->cCurrentModuleObject, ErrorsFound); // Name and type HPWH.Name = hpwhAlpha[1]; diff --git a/src/EnergyPlus/WaterUse.cc b/src/EnergyPlus/WaterUse.cc index e33a6aca2cb..c5f2b44deba 100644 --- a/src/EnergyPlus/WaterUse.cc +++ b/src/EnergyPlus/WaterUse.cc @@ -319,7 +319,7 @@ namespace WaterUse { state.dataIPShortCut->cNumericFieldNames); ErrorObjectHeader eoh{routineName, state.dataIPShortCut->cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, ErrorsFound); + thisWEq.Name = state.dataIPShortCut->cAlphaArgs(1); thisWEq.EndUseSubcatName = state.dataIPShortCut->cAlphaArgs(2); @@ -398,7 +398,6 @@ namespace WaterUse { ErrorObjectHeader eoh{routineName, state.dataIPShortCut->cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), state.dataIPShortCut->cCurrentModuleObject, ErrorsFound); auto &waterConnection = state.dataWaterUse->WaterConnections(WaterConnNum); waterConnection.Name = state.dataIPShortCut->cAlphaArgs(1); diff --git a/src/EnergyPlus/WindTurbine.cc b/src/EnergyPlus/WindTurbine.cc index 48c5e514e51..3b62380a2a4 100644 --- a/src/EnergyPlus/WindTurbine.cc +++ b/src/EnergyPlus/WindTurbine.cc @@ -252,8 +252,6 @@ namespace WindTurbine { ErrorObjectHeader eoh{routineName, CurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), CurrentModuleObject, ErrorsFound); - auto &windTurbine = state.dataWindTurbine->WindTurbineSys(WindTurbineNum); windTurbine.Name = state.dataIPShortCut->cAlphaArgs(1); // Name of wind turbine diff --git a/src/EnergyPlus/WindowAC.cc b/src/EnergyPlus/WindowAC.cc index 2401bccab3b..bca98830427 100644 --- a/src/EnergyPlus/WindowAC.cc +++ b/src/EnergyPlus/WindowAC.cc @@ -294,7 +294,6 @@ namespace WindowAC { state.dataWindowAC->WindACNumericFields(WindACNum).FieldNames.allocate(NumNumbers); state.dataWindowAC->WindACNumericFields(WindACNum).FieldNames = ""; state.dataWindowAC->WindACNumericFields(WindACNum).FieldNames = cNumericFields; - Util::IsNameEmpty(state, Alphas(1), CurrentModuleObject, ErrorsFound); state.dataWindowAC->WindAC(WindACNum).Name = Alphas(1); state.dataWindowAC->WindAC(WindACNum).UnitType = state.dataWindowAC->WindowAC_UnitType; // 'ZoneHVAC:WindowAirConditioner' diff --git a/src/EnergyPlus/ZoneAirLoopEquipmentManager.cc b/src/EnergyPlus/ZoneAirLoopEquipmentManager.cc index ffd2accc3ec..fddbd41aec6 100644 --- a/src/EnergyPlus/ZoneAirLoopEquipmentManager.cc +++ b/src/EnergyPlus/ZoneAirLoopEquipmentManager.cc @@ -249,7 +249,6 @@ namespace ZoneAirLoopEquipmentManager { lAlphaBlanks, cAlphaFields, cNumericFields); // data for one zone - Util::IsNameEmpty(state, AlphArray(1), CurrentModuleObject, ErrorsFound); airDistUnit.Name = AlphArray(1); // Input Outlet Node Num diff --git a/src/EnergyPlus/ZoneContaminantPredictorCorrector.cc b/src/EnergyPlus/ZoneContaminantPredictorCorrector.cc index ea3fb14c481..053b0663922 100644 --- a/src/EnergyPlus/ZoneContaminantPredictorCorrector.cc +++ b/src/EnergyPlus/ZoneContaminantPredictorCorrector.cc @@ -240,8 +240,6 @@ void GetZoneContaminanInputs(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, CurrentModuleObject, AlphaName(1)}; - Util::IsNameEmpty(state, AlphaName(1), CurrentModuleObject, ErrorsFound); - auto &contam = state.dataContaminantBalance->ZoneContamGenericConstant(Loop); contam.Name = AlphaName(1); contam.ZoneName = AlphaName(2); @@ -342,8 +340,6 @@ void GetZoneContaminanInputs(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, CurrentModuleObject, AlphaName(1)}; - Util::IsNameEmpty(state, AlphaName(1), CurrentModuleObject, ErrorsFound); - auto &contam = state.dataContaminantBalance->ZoneContamGenericPDriven(Loop); contam.Name = AlphaName(1); @@ -477,8 +473,6 @@ void GetZoneContaminanInputs(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, CurrentModuleObject, AlphaName(1)}; - Util::IsNameEmpty(state, AlphaName(1), CurrentModuleObject, ErrorsFound); - auto &contam = state.dataContaminantBalance->ZoneContamGenericCutoff(Loop); contam.Name = AlphaName(1); @@ -588,7 +582,6 @@ void GetZoneContaminanInputs(EnergyPlusData &state) auto &contam = state.dataContaminantBalance->ZoneContamGenericDecay(Loop); - Util::IsNameEmpty(state, AlphaName(1), CurrentModuleObject, ErrorsFound); contam.Name = AlphaName(1); contam.ZoneName = AlphaName(2); @@ -702,8 +695,6 @@ void GetZoneContaminanInputs(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, CurrentModuleObject, AlphaName(1)}; - Util::IsNameEmpty(state, AlphaName(1), CurrentModuleObject, ErrorsFound); - auto &contam = state.dataContaminantBalance->ZoneContamGenericBLDiff(Loop); contam.Name = AlphaName(1); contam.SurfName = AlphaName(2); @@ -818,7 +809,6 @@ void GetZoneContaminanInputs(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, CurrentModuleObject, AlphaName(1)}; - Util::IsNameEmpty(state, AlphaName(1), CurrentModuleObject, ErrorsFound); auto &contam = state.dataContaminantBalance->ZoneContamGenericDVS(Loop); contam.Name = AlphaName(1); @@ -914,8 +904,6 @@ void GetZoneContaminanInputs(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, CurrentModuleObject, AlphaName(1)}; - Util::IsNameEmpty(state, AlphaName(1), CurrentModuleObject, ErrorsFound); - auto &contam = state.dataContaminantBalance->ZoneContamGenericDRS(Loop); contam.Name = AlphaName(1); @@ -1068,8 +1056,6 @@ void GetZoneContaminanSetPoints(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)}; - Util::IsNameEmpty(state, state.dataIPShortCut->cAlphaArgs(1), cCurrentModuleObject, ErrorsFound); - auto &controlledZone = state.dataContaminantBalance->ContaminantControlledZone(ContControlledZoneNum); controlledZone.Name = state.dataIPShortCut->cAlphaArgs(1); controlledZone.ZoneName = state.dataIPShortCut->cAlphaArgs(2); diff --git a/src/EnergyPlus/ZonePlenum.cc b/src/EnergyPlus/ZonePlenum.cc index c283683c5dc..3ce64b07c84 100644 --- a/src/EnergyPlus/ZonePlenum.cc +++ b/src/EnergyPlus/ZonePlenum.cc @@ -293,7 +293,6 @@ void GetZonePlenumInput(EnergyPlusData &state) lAlphaBlanks, cAlphaFields, cNumericFields); - Util::IsNameEmpty(state, AlphArray(1), CurrentModuleObject, ErrorsFound); auto &thisRetPlenum = state.dataZonePlenum->ZoneRetPlenCond(ZonePlenumNum); thisRetPlenum.ZonePlenumName = AlphArray(1); @@ -478,7 +477,6 @@ void GetZonePlenumInput(EnergyPlusData &state) lAlphaBlanks, cAlphaFields, cNumericFields); - Util::IsNameEmpty(state, AlphArray(1), CurrentModuleObject, ErrorsFound); auto &thisSupPlenum = state.dataZonePlenum->ZoneSupPlenCond(ZonePlenumNum); thisSupPlenum.ZonePlenumName = AlphArray(1); diff --git a/src/EnergyPlus/ZoneTempPredictorCorrector.cc b/src/EnergyPlus/ZoneTempPredictorCorrector.cc index 47a964cb273..2161d817326 100644 --- a/src/EnergyPlus/ZoneTempPredictorCorrector.cc +++ b/src/EnergyPlus/ZoneTempPredictorCorrector.cc @@ -343,7 +343,6 @@ void GetZoneAirSetPoints(EnergyPlusData &state) s_ipsc->cNumericFieldNames); ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); TStatObjects(Item).Name = s_ipsc->cAlphaArgs(1); Item1 = Util::FindItemInList(s_ipsc->cAlphaArgs(2), Zone); @@ -541,7 +540,6 @@ void GetZoneAirSetPoints(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); auto &setpt = s_ztpc->tempSetptScheds[(int)HVAC::SetptType::SingleHeat](idx); setpt.Name = s_ipsc->cAlphaArgs(1); @@ -578,7 +576,6 @@ void GetZoneAirSetPoints(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); auto &setpt = s_ztpc->tempSetptScheds[(int)HVAC::SetptType::SingleCool](idx); setpt.Name = s_ipsc->cAlphaArgs(1); @@ -650,7 +647,7 @@ void GetZoneAirSetPoints(EnergyPlusData &state) s_ipsc->cNumericFieldNames); ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); + auto &setpt = s_ztpc->tempSetptScheds[(int)HVAC::SetptType::DualHeatCool](idx); setpt.Name = s_ipsc->cAlphaArgs(1); @@ -828,8 +825,6 @@ void GetZoneAirSetPoints(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); - auto &humidControlledZone = state.dataZoneCtrls->HumidityControlZone(HumidControlledZoneNum); humidControlledZone.ControlName = s_ipsc->cAlphaArgs(1); GlobalNames::IntraObjUniquenessCheck(state, @@ -891,7 +886,6 @@ void GetZoneAirSetPoints(EnergyPlusData &state) s_ipsc->lAlphaFieldBlanks, s_ipsc->cAlphaFieldNames, s_ipsc->cNumericFieldNames); - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); Item1 = Util::FindItemInList(s_ipsc->cAlphaArgs(2), Zone); ZLItem = 0; @@ -1184,7 +1178,6 @@ void GetZoneAirSetPoints(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); auto &setpt = s_ztpc->comfortSetptScheds[(int)HVAC::SetptType::SingleHeat](idx); setpt.Name = s_ipsc->cAlphaArgs(1); @@ -1223,7 +1216,6 @@ void GetZoneAirSetPoints(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); auto &setpt = s_ztpc->comfortSetptScheds[(int)HVAC::SetptType::SingleCool](idx); setpt.Name = s_ipsc->cAlphaArgs(1); @@ -1263,7 +1255,6 @@ void GetZoneAirSetPoints(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); auto &setpt = s_ztpc->comfortSetptScheds[(int)HVAC::SetptType::SingleHeatCool](idx); setpt.Name = s_ipsc->cAlphaArgs(1); @@ -1303,7 +1294,6 @@ void GetZoneAirSetPoints(EnergyPlusData &state) ErrorObjectHeader eoh{routineName, s_ipsc->cCurrentModuleObject, s_ipsc->cAlphaArgs(1)}; - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); auto &setpt = s_ztpc->comfortSetptScheds[(int)HVAC::SetptType::DualHeatCool](idx); setpt.Name = s_ipsc->cAlphaArgs(1); @@ -1937,7 +1927,6 @@ void GetZoneAirSetPoints(EnergyPlusData &state) s_ipsc->lAlphaFieldBlanks, s_ipsc->cAlphaFieldNames, s_ipsc->cNumericFieldNames); - Util::IsNameEmpty(state, s_ipsc->cAlphaArgs(1), s_ipsc->cCurrentModuleObject, ErrorsFound); state.dataZoneCtrls->StagedTStatObjects(Item).Name = s_ipsc->cAlphaArgs(1); Item1 = Util::FindItemInList(s_ipsc->cAlphaArgs(2), Zone); diff --git a/tst/EnergyPlus/unit/BranchInputManager.unit.cc b/tst/EnergyPlus/unit/BranchInputManager.unit.cc index d9b1b21b5b7..753bbfa4916 100644 --- a/tst/EnergyPlus/unit/BranchInputManager.unit.cc +++ b/tst/EnergyPlus/unit/BranchInputManager.unit.cc @@ -91,8 +91,6 @@ TEST_F(EnergyPlusFixture, GetBranchInput_One_SingleComponentBranch) int NumParams; int NumAlphas; // Used to retrieve names from IDF int NumNumbers; // Used to retrieve numbers from IDF - bool IsNotOK; // Flag to verify name - bool IsBlank; // Flag for blank name Array1D_string Alphas; // Used to retrieve names from IDF Array1D_int NodeNums; // Possible Array of Node Numbers (only 1 allowed) Array1D Numbers; // Used to retrieve numbers from IDF @@ -131,15 +129,6 @@ TEST_F(EnergyPlusFixture, GetBranchInput_One_SingleComponentBranch) lAlphaBlanks, cAlphaFields, cNumericFields); - IsNotOK = false; - IsBlank = false; - Util::VerifyName(*state, Alphas(1), state->dataBranchInputManager->Branch, BCount, IsNotOK, IsBlank, CurrentModuleObject + " Name"); - if (IsNotOK) { - if (IsBlank) { - continue; - } - Alphas(1) = Alphas(1) + "--dup"; - } ++BCount; GetSingleBranchInput(*state, RoutineName, BCount, Alphas, cAlphaFields, NumAlphas, NodeNums, lAlphaBlanks); @@ -256,8 +245,6 @@ TEST_F(EnergyPlusFixture, GetBranchInput_One_FourComponentBranch) int NumParams; int NumAlphas; // Used to retrieve names from IDF int NumNumbers; // Used to retrieve numbers from IDF - bool IsNotOK; // Flag to verify name - bool IsBlank; // Flag for blank name Array1D_string Alphas; // Used to retrieve names from IDF Array1D_int NodeNums; // Possible Array of Node Numbers (only 1 allowed) Array1D Numbers; // Used to retrieve numbers from IDF @@ -296,15 +283,7 @@ TEST_F(EnergyPlusFixture, GetBranchInput_One_FourComponentBranch) lAlphaBlanks, cAlphaFields, cNumericFields); - IsNotOK = false; - IsBlank = false; - Util::VerifyName(*state, Alphas(1), state->dataBranchInputManager->Branch, BCount, IsNotOK, IsBlank, CurrentModuleObject + " Name"); - if (IsNotOK) { - if (IsBlank) { - continue; - } - Alphas(1) = Alphas(1) + "--dup"; - } + ++BCount; GetSingleBranchInput(*state, RoutineName, BCount, Alphas, cAlphaFields, NumAlphas, NodeNums, lAlphaBlanks); diff --git a/tst/EnergyPlus/unit/PlantPipingSystemsManager.unit.cc b/tst/EnergyPlus/unit/PlantPipingSystemsManager.unit.cc index df287851223..52cd664f4ab 100644 --- a/tst/EnergyPlus/unit/PlantPipingSystemsManager.unit.cc +++ b/tst/EnergyPlus/unit/PlantPipingSystemsManager.unit.cc @@ -133,7 +133,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_CheckInputs_CorrectInputs) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -203,7 +203,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_CheckInputs_BadOSCMName) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -273,7 +273,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_CheckInputs_BadSlabLocation) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -343,7 +343,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_CheckInputs_BadSlabMaterialName) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -413,7 +413,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_CheckInputs_BadHorizInsSelection) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -483,7 +483,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_CheckInputs_BadHorizInsMaterialNa bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -553,7 +553,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_CheckInputs_BadHorizInsExtentsSel bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -623,7 +623,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_CheckInputs_PerimeterInsulationWi bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -693,7 +693,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_CheckInputs_BadVertInsSelection) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -763,7 +763,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_CheckInputs_BadVertInsMaterialNam bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -833,7 +833,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_CheckInputs_BadVertInsDepth) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -904,7 +904,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_CheckInputs_BadTimeStepSelection) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -975,7 +975,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainBasement_CheckInputs_CorrectInputs) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -1045,7 +1045,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainBasement_CheckInputs_BadOSCMName) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -1115,7 +1115,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainBasement_CheckInputs_BadHorizInsSelect bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -1185,7 +1185,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainBasement_CheckInputs_BadHorizInsMateri bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -1255,7 +1255,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainBasement_CheckInputs_BadHorizInsExtent bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -1325,7 +1325,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainBasement_CheckInputs_BadBasementDepth) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -1395,7 +1395,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainBasement_CheckInputs_BadFloorOSCMName) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -1465,7 +1465,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainBasement_CheckInputs_BadVertInsSelecti bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -1535,7 +1535,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainBasement_CheckInputs_BadVertInsName) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -1606,7 +1606,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainBasement_CheckInputs_BadTimestepSelect bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -1762,7 +1762,7 @@ TEST_F(EnergyPlusFixture, PipingSystemFullSimulation) // Other necessary inputs bool errorsFound = false; - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); // first call the factory, it will call GetInput @@ -2052,7 +2052,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_Fix_HorizInsDepth) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -2180,7 +2180,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_Fix_HorizInsDepth_Test2) bool errorsFound = false; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); @@ -2317,7 +2317,7 @@ TEST_F(EnergyPlusFixture, SiteGroundDomainSlab_FiniteDifference) state->dataSurface->Surface(1).Area = 100; // Other necessary inputs - GetOSCMData(*state, errorsFound); + GetOSCMData(*state); GetMaterialData(*state, errorsFound); state->dataPlantPipingSysMgr->domains.resize(1); diff --git a/tst/EnergyPlus/unit/WeatherManager.unit.cc b/tst/EnergyPlus/unit/WeatherManager.unit.cc index d62fed06c12..df1f1b7b093 100644 --- a/tst/EnergyPlus/unit/WeatherManager.unit.cc +++ b/tst/EnergyPlus/unit/WeatherManager.unit.cc @@ -338,7 +338,7 @@ TEST_F(EnergyPlusFixture, UnderwaterBoundaryConditionFullyPopulated) // need to populate the OSCM array by calling the get input for it bool errorsFound = false; - SurfaceGeometry::GetOSCMData(*state, errorsFound); + SurfaceGeometry::GetOSCMData(*state); EXPECT_FALSE(errorsFound); EXPECT_EQ(state->dataSurface->TotOSCM, 1); @@ -363,7 +363,7 @@ TEST_F(EnergyPlusFixture, UnderwaterBoundaryConditionMissingVelocityOK) // need to populate the OSCM array by calling the get input for it bool errorsFound = false; - SurfaceGeometry::GetOSCMData(*state, errorsFound); + SurfaceGeometry::GetOSCMData(*state); EXPECT_FALSE(errorsFound); EXPECT_EQ(state->dataSurface->TotOSCM, 1);