diff --git a/src/EnergyPlus/Autosizing/All_Simple_Sizing.cc b/src/EnergyPlus/Autosizing/All_Simple_Sizing.cc index d488687e08f..29cfeda99b7 100644 --- a/src/EnergyPlus/Autosizing/All_Simple_Sizing.cc +++ b/src/EnergyPlus/Autosizing/All_Simple_Sizing.cc @@ -283,7 +283,7 @@ Real64 DesiccantDehumidifierBFPerfDataFaceVelocitySizer::size(EnergyPlusData &st this->autoSizedValue = min(6.0, this->autoSizedValue); } if (this->isEpJSON) { - this->sizingString = "nominal_air_face_velocity [m/s]"; + this->sizingString = "Nominal Air Face Velocity [m/s]"; } this->selectSizerOutput(state, errorsFound); return this->autoSizedValue; diff --git a/src/EnergyPlus/Autosizing/Base.cc b/src/EnergyPlus/Autosizing/Base.cc index c5d7205555e..b360c96344e 100644 --- a/src/EnergyPlus/Autosizing/Base.cc +++ b/src/EnergyPlus/Autosizing/Base.cc @@ -651,7 +651,29 @@ bool BaseSizer::checkInitialized(EnergyPlusData &state, bool &errorsFound) void BaseSizer::overrideSizingString(std::string_view const string) { - this->sizingString = string; + // some strings are set inside loops where field names are read in and change slightly. + // (e.g., at Speed 1, at Speed 2, or high_speed vs low_speed) + // these cannot easily be set in a component model's sizing function + // for those corner cases convert snake_case to Camel Case here: + std::string word, result; + std::string str{string.data(), string.size()}; // convert string_view to string + std::istringstream iss(str); + // blank strings will jump to end, Camel Case strings will pass through loop once + while (std::getline(iss, word, '_')) { + if (word == "for" || word == "per" || word == "at") { // don't Capitalize certain words + result += word; + } else if (word == "ua") { // Capitalize all letters of certain words + std::transform(word.begin(), word.end(), word.begin(), ::toupper); + result += word; + } else { + result += toupper(word[0]); // Capitalize the first letter + result += word.substr(1); // Append the rest of the word + } + if (result.size() != str.size()) { + result.insert(result.size(), " "); // insert space between words but not at end of string + } + } + this->sizingString = result; this->overrideSizeString = false; } diff --git a/src/EnergyPlus/Autosizing/CoolingAirFlowSizing.cc b/src/EnergyPlus/Autosizing/CoolingAirFlowSizing.cc index 44847d83ced..e75105f5d49 100644 --- a/src/EnergyPlus/Autosizing/CoolingAirFlowSizing.cc +++ b/src/EnergyPlus/Autosizing/CoolingAirFlowSizing.cc @@ -336,25 +336,14 @@ Real64 CoolingAirFlowSizer::size(EnergyPlusData &state, Real64 _originalValue, b if (this->overrideSizeString) { if (Util::SameString(this->compType, "ZoneHVAC:FourPipeFanCoil")) { this->sizingString = "Maximum Supply Air Flow Rate [m3/s]"; - if (this->isEpJSON) { - this->sizingString = "maximum_supply_air_flow_rate [m3/s]"; - } } else if (this->coilType == HVAC::CoilType::CoolingDXTwoSpeed) { if (this->dataDXSpeedNum == 1) { // mode 1 is high speed in DXCoils loop - if (this->isEpJSON) { - this->sizingString = "high_speed_rated_air_flow_rate [m3/s]"; - } else { - this->sizingString = "High Speed Rated Air Flow Rate [m3/s]"; - } + this->sizingString = "High Speed Rated Air Flow Rate [m3/s]"; } else if (this->dataDXSpeedNum == 2) { - if (this->isEpJSON) { - this->sizingString = "low_speed_rated_air_flow_rate [m3/s]"; - } else { - this->sizingString = "Low Speed Rated Air Flow Rate [m3/s]"; - } + this->sizingString = "Low Speed Rated Air Flow Rate [m3/s]"; } } else if (this->isEpJSON) { - this->sizingString = "cooling_supply_air_flow_rate [m3/s]"; + this->sizingString = "Cooling Supply Air Flow Rate [m3/s]"; } } if (this->dataScalableSizingON) { diff --git a/src/EnergyPlus/Autosizing/CoolingCapacitySizing.cc b/src/EnergyPlus/Autosizing/CoolingCapacitySizing.cc index c03cb43c07f..96b4d87d53e 100644 --- a/src/EnergyPlus/Autosizing/CoolingCapacitySizing.cc +++ b/src/EnergyPlus/Autosizing/CoolingCapacitySizing.cc @@ -551,9 +551,7 @@ Real64 CoolingCapacitySizer::size(EnergyPlusData &state, Real64 _originalValue, // override sizing string if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "cooling_design_capacity [W]"; - } + this->sizingString = "Cooling Design Capacity [W]"; } if (this->dataScalableCapSizingON) { int const SELECT_CASE_var(this->zoneEqSizing(this->curZoneEqNum).SizingMethod(HVAC::CoolingCapacitySizing)); diff --git a/src/EnergyPlus/Autosizing/CoolingSHRSizing.cc b/src/EnergyPlus/Autosizing/CoolingSHRSizing.cc index fc28902e654..d555c70f084 100644 --- a/src/EnergyPlus/Autosizing/CoolingSHRSizing.cc +++ b/src/EnergyPlus/Autosizing/CoolingSHRSizing.cc @@ -137,40 +137,18 @@ void CoolingSHRSizer::updateSizingString(EnergyPlusData &state) // override sizingString to match existing text if (this->coilType == HVAC::CoilType::CoolingDXTwoSpeed) { if (this->dataDXSpeedNum == 1) { // mode 1 is high speed in DXCoils loop - if (this->isEpJSON) { - this->sizingString = "high_speed_rated_sensible_heat_ratio"; - } else { - this->sizingString = "High Speed Rated Sensible Heat Ratio"; - } + this->sizingString = "High Speed Rated Sensible Heat Ratio"; } else if (this->dataDXSpeedNum == 2) { - if (this->isEpJSON) { - this->sizingString = "low_speed_gross_rated_sensible_heat_ratio"; - } else { - this->sizingString = "Low Speed Gross Rated Sensible Heat Ratio"; - } + this->sizingString = "Low Speed Gross Rated Sensible Heat Ratio"; } } else if (this->coilType == HVAC::CoilType::CoolingDXMultiSpeed) { - if (this->isEpJSON) { - this->sizingString = fmt::format("speed_{}_rated_sensible_heat_ratio", state.dataSize->DataDXSpeedNum); - } else { - this->sizingString = fmt::format("Speed {} Rated Sensible Heat Ratio", state.dataSize->DataDXSpeedNum); - } + this->sizingString = fmt::format("Speed {} Rated Sensible Heat Ratio", state.dataSize->DataDXSpeedNum); } else if (this->coilType == HVAC::CoilType::CoolingVRFFluidTCtrl) { - if (this->isEpJSON) { - this->sizingString = "rated_sensible_heat_ratio"; - } else { - this->sizingString = "Rated Sensible Heat Ratio"; - } + this->sizingString = "Rated Sensible Heat Ratio"; } else if (this->coilType == HVAC::CoilType::CoolingDXCurveFit) { - if (this->isEpJSON) { - this->sizingString = "gross_sensible_heat_ratio"; - } else { - this->sizingString = "Gross Sensible Heat Ratio"; - } + this->sizingString = "Gross Sensible Heat Ratio"; } else { - if (this->isEpJSON) { - this->sizingString = "gross_rated_sensible_heat_ratio"; - } + this->sizingString = "Gross Rated Sensible Heat Ratio"; } } diff --git a/src/EnergyPlus/Autosizing/CoolingWaterDesAirInletHumRatSizing.cc b/src/EnergyPlus/Autosizing/CoolingWaterDesAirInletHumRatSizing.cc index 0d5cc35cdbf..29e9fa062d7 100644 --- a/src/EnergyPlus/Autosizing/CoolingWaterDesAirInletHumRatSizing.cc +++ b/src/EnergyPlus/Autosizing/CoolingWaterDesAirInletHumRatSizing.cc @@ -101,9 +101,7 @@ Real64 CoolingWaterDesAirInletHumRatSizer::size(EnergyPlusData &state, Real64 _o } } if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "design_inlet_air_humidity_ratio [kgWater/kgDryAir]"; - } + this->sizingString = "Design Inlet Air Humidity Ratio [kgWater/kgDryAir]"; } this->selectSizerOutput(state, errorsFound); if (this->isCoilReportObject) { diff --git a/src/EnergyPlus/Autosizing/CoolingWaterDesAirInletTempSizing.cc b/src/EnergyPlus/Autosizing/CoolingWaterDesAirInletTempSizing.cc index 2df208f92cf..8810472f04e 100644 --- a/src/EnergyPlus/Autosizing/CoolingWaterDesAirInletTempSizing.cc +++ b/src/EnergyPlus/Autosizing/CoolingWaterDesAirInletTempSizing.cc @@ -125,9 +125,7 @@ Real64 CoolingWaterDesAirInletTempSizer::size(EnergyPlusData &state, Real64 _ori } // override sizing string if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "design_inlet_air_temperature [C]"; - } + this->sizingString = "Design Inlet Air Temperature [C]"; } this->selectSizerOutput(state, errorsFound); if (this->isCoilReportObject) { diff --git a/src/EnergyPlus/Autosizing/CoolingWaterDesAirOutletHumRatSizing.cc b/src/EnergyPlus/Autosizing/CoolingWaterDesAirOutletHumRatSizing.cc index 7105c253db9..645d906d007 100644 --- a/src/EnergyPlus/Autosizing/CoolingWaterDesAirOutletHumRatSizing.cc +++ b/src/EnergyPlus/Autosizing/CoolingWaterDesAirOutletHumRatSizing.cc @@ -155,9 +155,7 @@ Real64 CoolingWaterDesAirOutletHumRatSizer::size(EnergyPlusData &state, Real64 _ } } if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "design_outlet_air_humidity_ratio [kgWater/kgDryAir]"; - } + this->sizingString = "Design Outlet Air Humidity Ratio [kgWater/kgDryAir]"; } this->selectSizerOutput(state, errorsFound); if (this->isCoilReportObject) { diff --git a/src/EnergyPlus/Autosizing/CoolingWaterDesAirOutletTempSizing.cc b/src/EnergyPlus/Autosizing/CoolingWaterDesAirOutletTempSizing.cc index 41957522c11..a082dabf558 100644 --- a/src/EnergyPlus/Autosizing/CoolingWaterDesAirOutletTempSizing.cc +++ b/src/EnergyPlus/Autosizing/CoolingWaterDesAirOutletTempSizing.cc @@ -169,9 +169,7 @@ Real64 CoolingWaterDesAirOutletTempSizer::size(EnergyPlusData &state, Real64 _or } // override sizing string if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "design_outlet_air_temperature [C]"; - } + this->sizingString = "Design Outlet Air Temperature [C]"; } this->selectSizerOutput(state, errorsFound); if (this->isCoilReportObject) { diff --git a/src/EnergyPlus/Autosizing/CoolingWaterDesWaterInletTempSizing.cc b/src/EnergyPlus/Autosizing/CoolingWaterDesWaterInletTempSizing.cc index 166bee69edf..df35a08c3ae 100644 --- a/src/EnergyPlus/Autosizing/CoolingWaterDesWaterInletTempSizing.cc +++ b/src/EnergyPlus/Autosizing/CoolingWaterDesWaterInletTempSizing.cc @@ -66,9 +66,7 @@ Real64 CoolingWaterDesWaterInletTempSizer::size(EnergyPlusData &state, Real64 _o this->errorType = AutoSizingResultType::ErrorType1; } if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "design_inlet_water_temperature [C]"; - } + this->sizingString = "Design Inlet Water Temperature [C]"; } this->selectSizerOutput(state, errorsFound); if (this->isCoilReportObject) { diff --git a/src/EnergyPlus/Autosizing/CoolingWaterNumofTubesPerRowSizing.cc b/src/EnergyPlus/Autosizing/CoolingWaterNumofTubesPerRowSizing.cc index ab7602eefff..87c76b00d5d 100644 --- a/src/EnergyPlus/Autosizing/CoolingWaterNumofTubesPerRowSizing.cc +++ b/src/EnergyPlus/Autosizing/CoolingWaterNumofTubesPerRowSizing.cc @@ -68,9 +68,7 @@ Real64 CoolingWaterNumofTubesPerRowSizer::size(EnergyPlusData &state, Real64 _or this->errorType = AutoSizingResultType::ErrorType1; } if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "number_of_tubes_per_row"; - } + this->sizingString = "Number of Tubes per Row"; } this->selectSizerOutput(state, errorsFound); return this->autoSizedValue; diff --git a/src/EnergyPlus/Autosizing/CoolingWaterflowSizing.cc b/src/EnergyPlus/Autosizing/CoolingWaterflowSizing.cc index 1b039cbbc89..f3019d1ee52 100644 --- a/src/EnergyPlus/Autosizing/CoolingWaterflowSizing.cc +++ b/src/EnergyPlus/Autosizing/CoolingWaterflowSizing.cc @@ -140,15 +140,9 @@ Real64 CoolingWaterflowSizer::size(EnergyPlusData &state, Real64 _originalValue, // override sizing string for detailed coil model if (this->overrideSizeString) { if (this->coilType == HVAC::CoilType::CoolingWaterDetailed) { - if (this->isEpJSON) { - this->sizingString = "maximum_water_flow_rate [m3/s]"; - } else { - this->sizingString = "Maximum Water Flow Rate [m3/s]"; - } + this->sizingString = "Maximum Water Flow Rate [m3/s]"; } else { - if (this->isEpJSON) { - this->sizingString = "design_water_flow_rate [m3/s]"; - } + this->sizingString = "Design Water Flow Rate [m3/s]"; } } this->selectSizerOutput(state, errorsFound); diff --git a/src/EnergyPlus/Autosizing/HeatingAirFlowSizing.cc b/src/EnergyPlus/Autosizing/HeatingAirFlowSizing.cc index 7b48bd0978e..84886d5a4d0 100644 --- a/src/EnergyPlus/Autosizing/HeatingAirFlowSizing.cc +++ b/src/EnergyPlus/Autosizing/HeatingAirFlowSizing.cc @@ -258,9 +258,7 @@ Real64 HeatingAirFlowSizer::size(EnergyPlusData &state, Real64 _originalValue, b } // override sizing string if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "heating_supply_air_flow_rate [m3/s]"; - } + this->sizingString = "Heating Supply Air Flow Rate [m3/s]"; } if (this->dataScalableSizingON) { if (this->zoneAirFlowSizMethod == DataSizing::SupplyAirFlowRate || this->zoneAirFlowSizMethod == DataSizing::None) { diff --git a/src/EnergyPlus/Autosizing/HeatingAirflowUASizing.cc b/src/EnergyPlus/Autosizing/HeatingAirflowUASizing.cc index bdc2f0e9370..d602e3d47a1 100644 --- a/src/EnergyPlus/Autosizing/HeatingAirflowUASizing.cc +++ b/src/EnergyPlus/Autosizing/HeatingAirflowUASizing.cc @@ -205,9 +205,7 @@ Real64 HeatingAirflowUASizer::size(EnergyPlusData &state, Real64 _originalValue, this->autoSizedValue = 0.0; } if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "heating_coil_airflow_for_ua"; - } + this->sizingString = "Heating Coil Airflow for UA [m3/s]"; } this->selectSizerOutput(state, errorsFound); return this->autoSizedValue; diff --git a/src/EnergyPlus/Autosizing/HeatingAirflowUASizing.hh b/src/EnergyPlus/Autosizing/HeatingAirflowUASizing.hh index 0b514e31975..38b8c7f87f8 100644 --- a/src/EnergyPlus/Autosizing/HeatingAirflowUASizing.hh +++ b/src/EnergyPlus/Autosizing/HeatingAirflowUASizing.hh @@ -58,7 +58,7 @@ struct HeatingAirflowUASizer : BaseSizer HeatingAirflowUASizer() { this->sizingType = AutoSizingType::HeatingAirflowUASizing; - this->sizingString = "Heating Coil Airflow For UA"; + this->sizingString = "Heating Coil Airflow for UA"; } ~HeatingAirflowUASizer() = default; diff --git a/src/EnergyPlus/Autosizing/HeatingCapacitySizing.cc b/src/EnergyPlus/Autosizing/HeatingCapacitySizing.cc index 2aab698d5f3..1c1f6a71b44 100644 --- a/src/EnergyPlus/Autosizing/HeatingCapacitySizing.cc +++ b/src/EnergyPlus/Autosizing/HeatingCapacitySizing.cc @@ -441,9 +441,7 @@ Real64 HeatingCapacitySizer::size(EnergyPlusData &state, Real64 _originalValue, // override sizing string if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "nominal_capacity [W]"; - } + this->sizingString = "Heating Capacity [W]"; } if (this->dataScalableCapSizingON) { switch (this->zoneEqSizing(this->curZoneEqNum).SizingMethod(HVAC::HeatingCapacitySizing)) { diff --git a/src/EnergyPlus/Autosizing/HeatingWaterDesAirInletHumRatSizing.cc b/src/EnergyPlus/Autosizing/HeatingWaterDesAirInletHumRatSizing.cc index b07105c82c0..b923c7bcf1e 100644 --- a/src/EnergyPlus/Autosizing/HeatingWaterDesAirInletHumRatSizing.cc +++ b/src/EnergyPlus/Autosizing/HeatingWaterDesAirInletHumRatSizing.cc @@ -111,9 +111,7 @@ Real64 HeatingWaterDesAirInletHumRatSizer::size(EnergyPlusData &state, Real64 _o } } if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "design_inlet_air_humidity_ratio [kgWater/kgDryAir]"; - } + this->sizingString = "Design Inlet Air Humidity Ratio [kgWater/kgDryAir]"; } this->selectSizerOutput(state, errorsFound); if (this->isCoilReportObject) { diff --git a/src/EnergyPlus/Autosizing/HeatingWaterDesAirInletTempSizing.cc b/src/EnergyPlus/Autosizing/HeatingWaterDesAirInletTempSizing.cc index 7fa37f18516..5143a89e489 100644 --- a/src/EnergyPlus/Autosizing/HeatingWaterDesAirInletTempSizing.cc +++ b/src/EnergyPlus/Autosizing/HeatingWaterDesAirInletTempSizing.cc @@ -118,9 +118,7 @@ Real64 HeatingWaterDesAirInletTempSizer::size(EnergyPlusData &state, Real64 _ori } } if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "rated_inlet_air_temperature"; - } + this->sizingString = "Rated Inlet Air Temperature [C]"; } this->selectSizerOutput(state, errorsFound); // report not written for OA coils and needs to be corrected diff --git a/src/EnergyPlus/Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.cc b/src/EnergyPlus/Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.cc index af9edf957f5..7ce3a0359b6 100644 --- a/src/EnergyPlus/Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.cc +++ b/src/EnergyPlus/Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.cc @@ -168,9 +168,7 @@ Real64 HeatingWaterDesCoilLoadUsedForUASizer::size(EnergyPlusData &state, Real64 // heating coil can't have negative capacity this->autoSizedValue = std::max(0.0, this->autoSizedValue) * this->dataHeatSizeRatio * this->dataFracOfAutosizedHeatingCapacity; if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "water_heating_design_coil_load_for_ua_sizing"; - } + this->sizingString = "Water Heating Design Coil Load for UA Sizing [W]"; } this->selectSizerOutput(state, errorsFound); if (this->isCoilReportObject && this->curSysNum <= this->numPrimaryAirSys) { diff --git a/src/EnergyPlus/Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.hh b/src/EnergyPlus/Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.hh index 69ddd353e4a..e1b41bc0bb1 100644 --- a/src/EnergyPlus/Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.hh +++ b/src/EnergyPlus/Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.hh @@ -61,7 +61,7 @@ struct HeatingWaterDesCoilLoadUsedForUASizer : BaseSizerWithScalableInputs HeatingWaterDesCoilLoadUsedForUASizer() { this->sizingType = AutoSizingType::HeatingWaterDesCoilLoadUsedForUASizing; - this->sizingString = "Water Heating Design Coil Load for UA Sizing"; + this->sizingString = "Water Heating Design Coil Load for UA Sizing [W]"; } ~HeatingWaterDesCoilLoadUsedForUASizer() = default; diff --git a/src/EnergyPlus/Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.cc b/src/EnergyPlus/Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.cc index 22fb6fd9bfc..223342bad60 100644 --- a/src/EnergyPlus/Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.cc +++ b/src/EnergyPlus/Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.cc @@ -77,9 +77,7 @@ Real64 HeatingWaterDesCoilWaterVolFlowUsedForUASizer::size(EnergyPlusData &state } } if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "design_water_volume_flow_rate_used_for_ua_sizing"; - } + this->sizingString = "Design Water Volume Flow Rate Used for UA Sizing [m3/s]"; } this->selectSizerOutput(state, errorsFound); if (this->isCoilReportObject) { diff --git a/src/EnergyPlus/Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.hh b/src/EnergyPlus/Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.hh index 1568530677d..db7e5d468f9 100644 --- a/src/EnergyPlus/Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.hh +++ b/src/EnergyPlus/Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.hh @@ -57,7 +57,7 @@ struct HeatingWaterDesCoilWaterVolFlowUsedForUASizer : BaseSizer HeatingWaterDesCoilWaterVolFlowUsedForUASizer() { this->sizingType = AutoSizingType::HeatingWaterDesCoilWaterVolFlowUsedForUASizing; - this->sizingString = "Design Water Volume Flow Rate Used for UA Sizing"; + this->sizingString = "Design Water Volume Flow Rate Used for UA Sizing [m3/s]"; } ~HeatingWaterDesCoilWaterVolFlowUsedForUASizer() = default; diff --git a/src/EnergyPlus/Autosizing/HeatingWaterflowSizing.cc b/src/EnergyPlus/Autosizing/HeatingWaterflowSizing.cc index 95726f1908b..0d07865087c 100644 --- a/src/EnergyPlus/Autosizing/HeatingWaterflowSizing.cc +++ b/src/EnergyPlus/Autosizing/HeatingWaterflowSizing.cc @@ -139,9 +139,7 @@ Real64 HeatingWaterflowSizer::size(EnergyPlusData &state, Real64 _originalValue, } } if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "maximum_water_flow_rate [m3/s]"; - } + this->sizingString = "Maximum Water Flow Rate [m3/s]"; } this->selectSizerOutput(state, errorsFound); if (this->isCoilReportObject) { diff --git a/src/EnergyPlus/Autosizing/SystemAirFlowSizing.cc b/src/EnergyPlus/Autosizing/SystemAirFlowSizing.cc index 49ced2b7e91..2e1241d3357 100644 --- a/src/EnergyPlus/Autosizing/SystemAirFlowSizing.cc +++ b/src/EnergyPlus/Autosizing/SystemAirFlowSizing.cc @@ -988,21 +988,12 @@ Real64 SystemAirFlowSizer::size(EnergyPlusData &state, Real64 _originalValue, bo if (this->overrideSizeString) { if (Util::SameString(this->compType, "ZoneHVAC:FourPipeFanCoil")) { this->sizingString = "Maximum Supply Air Flow Rate [m3/s]"; - if (this->isEpJSON) { - this->sizingString = "maximum_supply_air_flow_rate [m3/s]"; - } } else if (Util::SameString(this->compType, "ZoneHVAC:UnitVentilator")) { this->sizingString = "Maximum Supply Air Flow Rate [m3/s]"; - if (this->isEpJSON) { - this->sizingString = "maximum_supply_air_flow_rate [m3/s]"; - } } else if (Util::SameString(this->compType, "Fan:SystemModel")) { this->sizingString = "Design Maximum Air Flow Rate [m3/s]"; - // if (this->isEpJSON) this->sizingString = "design_maximum_air_flow_rate [m3/s]"; } else { - if (this->isEpJSON) { - this->sizingString = "supply_air_maximum_flow_rate [m3/s]"; - } + this->sizingString = "Supply Air Maximum Flow Rate [m3/s]"; } } diff --git a/src/EnergyPlus/Autosizing/WaterHeatingCapacitySizing.cc b/src/EnergyPlus/Autosizing/WaterHeatingCapacitySizing.cc index 7bac6c13fde..502631420ed 100644 --- a/src/EnergyPlus/Autosizing/WaterHeatingCapacitySizing.cc +++ b/src/EnergyPlus/Autosizing/WaterHeatingCapacitySizing.cc @@ -144,9 +144,7 @@ Real64 WaterHeatingCapacitySizer::size(EnergyPlusData &state, Real64 _originalVa } } if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "rated_capacity"; - } + this->sizingString = "Rated Capacity [W]"; } this->selectSizerOutput(state, errorsFound); if (this->isCoilReportObject) { diff --git a/src/EnergyPlus/Autosizing/WaterHeatingCoilUASizing.cc b/src/EnergyPlus/Autosizing/WaterHeatingCoilUASizing.cc index bd3bcab3ade..857835d358a 100644 --- a/src/EnergyPlus/Autosizing/WaterHeatingCoilUASizing.cc +++ b/src/EnergyPlus/Autosizing/WaterHeatingCoilUASizing.cc @@ -402,9 +402,7 @@ Real64 WaterHeatingCoilUASizer::size(EnergyPlusData &state, Real64 _originalValu state.dataSize->DataErrorsFound = true; } if (this->overrideSizeString) { - if (this->isEpJSON) { - this->sizingString = "u-factor_times_area_value [W/K]"; - } + this->sizingString = "U-Factor Times Area Value [W/K]"; } this->selectSizerOutput(state, errorsFound); if (this->isCoilReportObject && this->curSysNum <= state.dataHVACGlobal->NumPrimaryAirSys) { diff --git a/src/EnergyPlus/ChillerElectricASHRAE205.cc b/src/EnergyPlus/ChillerElectricASHRAE205.cc index 62edc4c143e..22f2aa7f5f9 100644 --- a/src/EnergyPlus/ChillerElectricASHRAE205.cc +++ b/src/EnergyPlus/ChillerElectricASHRAE205.cc @@ -848,9 +848,6 @@ void ASHRAE205ChillerSpecs::size([[maybe_unused]] EnergyPlusData &state) bool bPRINT = true; // TRUE if sizing is reported to output (eio) AutoCalculateSizer sizerCondAirFlow; std::string stringOverride = "Condenser Maximum Requested Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "condenser_maximum_requested_flow_rate [m3/s]"; - } sizerCondAirFlow.overrideSizingString(stringOverride); sizerCondAirFlow.initializeWithinEP(state, CompType, this->Name, bPRINT, RoutineName); this->CondVolFlowRate = sizerCondAirFlow.size(state, TempSize, ErrorsFound); diff --git a/src/EnergyPlus/ChillerElectricEIR.cc b/src/EnergyPlus/ChillerElectricEIR.cc index 30301cd7c10..44ad84ecf87 100644 --- a/src/EnergyPlus/ChillerElectricEIR.cc +++ b/src/EnergyPlus/ChillerElectricEIR.cc @@ -1579,9 +1579,6 @@ void ElectricEIRChillerSpecs::size(EnergyPlusData &state) bool bPRINT = true; // TRUE if sizing is reported to output (eio) AutoCalculateSizer sizerCondAirFlow; std::string stringOverride = "Reference Condenser Fluid Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "reference_condenser_fluid_flow_rate [m3/s]"; - } sizerCondAirFlow.overrideSizingString(stringOverride); sizerCondAirFlow.initializeWithinEP(state, CompType, this->Name, bPRINT, RoutineName); this->CondVolFlowRate = sizerCondAirFlow.size(state, TempSize, ErrorsFound); diff --git a/src/EnergyPlus/Coils/CoilCoolingDXCurveFitOperatingMode.cc b/src/EnergyPlus/Coils/CoilCoolingDXCurveFitOperatingMode.cc index 77abf4e61d1..f9a0cc50c1a 100644 --- a/src/EnergyPlus/Coils/CoilCoolingDXCurveFitOperatingMode.cc +++ b/src/EnergyPlus/Coils/CoilCoolingDXCurveFitOperatingMode.cc @@ -209,9 +209,6 @@ void CoilCoolingDXCurveFitOperatingMode::size(EnergyPlus::EnergyPlusData &state) Real64 TempSize = this->original_input_specs.rated_evaporator_air_flow_rate; CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Rated Evaporator Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "rated_evaporator_air_flow_rate"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); this->ratedEvapAirFlowRate = sizingCoolingAirFlow.size(state, TempSize, errorsFound); @@ -238,9 +235,6 @@ void CoilCoolingDXCurveFitOperatingMode::size(EnergyPlus::EnergyPlusData &state) AutoCalculateSizer sizerCondAirFlow; stringOverride = "Rated Condenser Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "rated_condenser_air_flow_rate"; - } sizerCondAirFlow.overrideSizingString(stringOverride); sizerCondAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); this->ratedCondAirFlowRate = sizerCondAirFlow.size(state, TempSize, errorsFound); diff --git a/src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc b/src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc index 7c3c990e480..0073f83df21 100644 --- a/src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc +++ b/src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc @@ -361,9 +361,6 @@ void CoilCoolingDXCurveFitSpeed::size(EnergyPlus::EnergyPlusData &state) CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Rated Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "rated_air_flow_rate [m3/s]"; - } std::string preFixString; // if (maxSpeeds > 1) preFixString = "Speed " + std::to_string(speedNum + 1) + " "; // stringOverride = preFixString + stringOverride; diff --git a/src/EnergyPlus/DXCoils.cc b/src/EnergyPlus/DXCoils.cc index 17159c7d426..7a9697c17cb 100644 --- a/src/EnergyPlus/DXCoils.cc +++ b/src/EnergyPlus/DXCoils.cc @@ -7562,9 +7562,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum) TempSize = AutoSize; AutoCalculateSizer sizerHPRatedAirVolFlow; std::string stringOverride = "Rated Evaporator Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "rated_evaporator_air_flow_rate [m3/s]"; - } sizerHPRatedAirVolFlow.overrideSizingString(stringOverride); sizerHPRatedAirVolFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); thisDXCoil.RatedAirVolFlowRate(1) = sizerHPRatedAirVolFlow.size(state, TempSize, ErrorsFound); @@ -7582,9 +7579,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum) TempSize = AutoSize; AutoCalculateSizer sizerHPWHCondWaterFlow; std::string stringOverride = "Rated Condenser Water Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "rated_condenser_water_flow_rate [m3/s]"; - } sizerHPWHCondWaterFlow.overrideSizingString(stringOverride); sizerHPWHCondWaterFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); thisDXCoil.RatedHPWHCondWaterFlow = sizerHPWHCondWaterFlow.size(state, TempSize, ErrorsFound); @@ -7829,23 +7823,14 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum) AutoCalculateSizer sizerEvapCondAirFlow; std::string stringOverride = "Evaporative Condenser Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "evaporative_condenser_air_flow_rate [m3/s]"; - } if (thisDXCoil.coilType == HVAC::CoilType::CoolingDXTwoStageWHumControl) { CompName = thisDXCoil.Name + ":" + thisDXCoil.CoilPerformanceName(Mode); } else { CompName = thisDXCoil.Name; if (thisDXCoil.coilType == HVAC::CoilType::CoolingDXTwoSpeed) { stringOverride = "High Speed Evaporative Condenser Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "high_speed_evaporative_condenser_air_flow_rate [m3/s]"; - } } else { stringOverride = "Evaporative Condenser Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "evaporative_condenser_air_flow_rate [m3/s]"; - } } } CompType = HVAC::coilTypeNames[(int)thisDXCoil.coilType]; @@ -7915,9 +7900,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum) TempSize = thisDXCoil.EvapCondAirFlow2; AutoCalculateSizer sizerEvapCondAirFlow2; std::string stringOverride = "Low Speed Evaporative Condenser Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "low_speed_evaporative_condenser_air_flow_rate [m3/s]"; - } sizerEvapCondAirFlow2.overrideSizingString(stringOverride); sizerEvapCondAirFlow2.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); thisDXCoil.EvapCondAirFlow2 = sizerEvapCondAirFlow2.size(state, TempSize, ErrorsFound); @@ -7930,23 +7912,14 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum) AutoCalculateSizer sizerEvapCondPumpPower; std::string stringOverride = "Evaporative Condenser Pump Rated Power Consumption [W]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "evaporative_condenser_pump_rated_power_consumption [W]"; - } if (thisDXCoil.coilType == HVAC::CoilType::CoolingDXTwoStageWHumControl) { CompName = thisDXCoil.Name + ":" + thisDXCoil.CoilPerformanceName(Mode); } else { CompName = thisDXCoil.Name; if (thisDXCoil.coilType == HVAC::CoilType::CoolingDXTwoSpeed) { stringOverride = "High Speed Evaporative Condenser Pump Rated Power Consumption [W]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "high_speed_evaporative_condenser_pump_rated_power_consumption [W]"; - } } else { stringOverride = "Evaporative Condenser Pump Rated Power Consumption [W]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "evaporative_condenser_pump_rated_power_consumption [W]"; - } } } CompType = HVAC::coilTypeNames[(int)thisDXCoil.coilType]; @@ -7970,9 +7943,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum) TempSize = thisDXCoil.EvapCondPumpElecNomPower2; AutoCalculateSizer sizerEvapCondPumpPower2; std::string stringOverride = "Low Speed Evaporative Condenser Pump Rated Power Consumption [W]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "low_speed_evaporative_condenser_pump_rated_power_consumption [W]"; - } sizerEvapCondPumpPower2.overrideSizingString(stringOverride); sizerEvapCondPumpPower2.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); thisDXCoil.EvapCondPumpElecNomPower2 = sizerEvapCondPumpPower2.size(state, TempSize, ErrorsFound); @@ -7988,9 +7958,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum) TempSize = thisDXCoil.RatedAirVolFlowRate2; AutoCalculateSizer sizerLowSpdAirFlow; std::string stringOverride = "Low Speed Rated Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "low_speed_rated_air_flow_rate [m3/s]"; - } sizerLowSpdAirFlow.overrideSizingString(stringOverride); sizerLowSpdAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); thisDXCoil.RatedAirVolFlowRate2 = sizerLowSpdAirFlow.size(state, TempSize, ErrorsFound); @@ -8006,9 +7973,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum) TempSize = thisDXCoil.RatedTotCap2; AutoCalculateSizer sizerLowSpdCap; std::string stringOverride = "Low Speed Gross Rated Total Cooling Capacity [W]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "low_speed_gross_rated_total_cooling_capacity [W]"; - } sizerLowSpdCap.overrideSizingString(stringOverride); sizerLowSpdCap.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); thisDXCoil.RatedTotCap2 = sizerLowSpdCap.size(state, TempSize, ErrorsFound); @@ -8097,9 +8061,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum) TempSize = thisDXCoil.DefrostCapacity; AutoCalculateSizer sizerResDefCap; std::string stringOverride = "Resistive Defrost Heater Capacity [W]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "resistive_defrost_heater_capacity [W]"; - } sizerResDefCap.overrideSizingString(stringOverride); sizerResDefCap.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); thisDXCoil.DefrostCapacity = sizerResDefCap.size(state, TempSize, ErrorsFound); diff --git a/src/EnergyPlus/EvaporativeCoolers.cc b/src/EnergyPlus/EvaporativeCoolers.cc index 6a33e50bc77..dbb2acc660a 100644 --- a/src/EnergyPlus/EvaporativeCoolers.cc +++ b/src/EnergyPlus/EvaporativeCoolers.cc @@ -3974,9 +3974,6 @@ void SizeZoneEvaporativeCoolerUnit(EnergyPlusData &state, int const UnitNum) // CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Design Supply Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "design_supply_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); zoneEvapUnit.DesignAirVolumeFlowRate = sizingCoolingAirFlow.size(state, TempSize, errorsFound); @@ -3999,9 +3996,6 @@ void SizeZoneEvaporativeCoolerUnit(EnergyPlusData &state, int const UnitNum) // CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Design Supply Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "design_supply_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); zoneEvapUnit.DesignAirVolumeFlowRate = sizingCoolingAirFlow.size(state, TempSize, errorsFound); @@ -4019,9 +4013,6 @@ void SizeZoneEvaporativeCoolerUnit(EnergyPlusData &state, int const UnitNum) // TempSize = zoneEvapUnit.DesignAirVolumeFlowRate; CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Design Supply Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "design_supply_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); zoneEvapUnit.DesignAirVolumeFlowRate = sizingCoolingAirFlow.size(state, TempSize, errorsFound); diff --git a/src/EnergyPlus/FanCoilUnits.cc b/src/EnergyPlus/FanCoilUnits.cc index 9fa4eeb1391..352cf5467be 100644 --- a/src/EnergyPlus/FanCoilUnits.cc +++ b/src/EnergyPlus/FanCoilUnits.cc @@ -1249,7 +1249,7 @@ namespace FanCoilUnits { int SAFMethod; // supply air flow rate sizing method (SupplyAirFlowRate, FlowPerFloorArea, FractionOfAutosizedCoolingAirflow, SizingString = state.dataFanCoilUnits->FanCoilNumericFields(FanCoilNum).FieldNames(FieldNum) + " [m3/s]"; if (state.dataGlobal->isEpJSON) { - SizingString = "maximum_supply_air_flow_rate [m3/s]"; + SizingString = "Maximum Supply Air Flow Rate [m3/s]"; } if (state.dataSize->ZoneHVACSizing(zoneHVACIndex).CoolingSAFMethod > 0) { SizingMethod = HVAC::CoolingAirflowSizing; diff --git a/src/EnergyPlus/HVACVariableRefrigerantFlow.cc b/src/EnergyPlus/HVACVariableRefrigerantFlow.cc index 63bc20f3145..3a6f491ed85 100644 --- a/src/EnergyPlus/HVACVariableRefrigerantFlow.cc +++ b/src/EnergyPlus/HVACVariableRefrigerantFlow.cc @@ -7654,9 +7654,6 @@ void SizeVRF(EnergyPlusData &state, int const VRFTUNum) CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Cooling Supply Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "cooling_supply_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); @@ -7679,9 +7676,6 @@ void SizeVRF(EnergyPlusData &state, int const VRFTUNum) TempSize = AutoSize; CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Cooling Supply Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "cooling_supply_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); @@ -7821,9 +7815,6 @@ void SizeVRF(EnergyPlusData &state, int const VRFTUNum) } CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "No Cooling Supply Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "no_cooling_supply_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); @@ -7918,9 +7909,6 @@ void SizeVRF(EnergyPlusData &state, int const VRFTUNum) bool errorsFound = false; CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Cooling Supply Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "cooling_supply_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); @@ -8241,9 +8229,6 @@ void SizeVRF(EnergyPlusData &state, int const VRFTUNum) TempSize = vrfTU.MaxSATFromSuppHeatCoil; MaxHeaterOutletTempSizer sizerMaxHeaterOutTemp; std::string stringOverride = "Maximum Supply Air Temperature from Supplemental Heater [C]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "maximum_supply_air_temperature_from_supplemental_heater [C]"; - } sizerMaxHeaterOutTemp.overrideSizingString(stringOverride); sizerMaxHeaterOutTemp.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); vrfTU.MaxSATFromSuppHeatCoil = sizerMaxHeaterOutTemp.size(state, TempSize, ErrorsFound); @@ -8265,9 +8250,6 @@ void SizeVRF(EnergyPlusData &state, int const VRFTUNum) WaterHeatingCapacitySizer sizerWaterHeatingCapacity; bool ErrorsFound = false; std::string stringOverride = "Supplemental Heating Coil Nominal Capacity [W]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "supplemental_heating_coil_nominal_capacity [W]"; - } sizerWaterHeatingCapacity.overrideSizingString(stringOverride); sizerWaterHeatingCapacity.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); vrfTU.DesignSuppHeatingCapacity = sizerWaterHeatingCapacity.size(state, TempSize, ErrorsFound); diff --git a/src/EnergyPlus/PurchasedAirManager.cc b/src/EnergyPlus/PurchasedAirManager.cc index 180302dc595..72db8f69ef2 100644 --- a/src/EnergyPlus/PurchasedAirManager.cc +++ b/src/EnergyPlus/PurchasedAirManager.cc @@ -1574,9 +1574,6 @@ void SizePurchasedAir(EnergyPlusData &state, int const PurchAirNum) state.dataSize->DataScalableSizingON = true; CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Maximum Cooling Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "maximum_cooling_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); @@ -1590,9 +1587,6 @@ void SizePurchasedAir(EnergyPlusData &state, int const PurchAirNum) state.dataSize->DataScalableSizingON = true; CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Maximum Cooling Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "maximum_cooling_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); @@ -1617,9 +1611,6 @@ void SizePurchasedAir(EnergyPlusData &state, int const PurchAirNum) state.dataSize->DataScalableSizingON = true; CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Maximum Cooling Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "maximum_cooling_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); @@ -1806,9 +1797,6 @@ void SizePurchasedAir(EnergyPlusData &state, int const PurchAirNum) if (PurchAir.MaxCoolVolFlowRate > 0.0) { CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Maximum Cooling Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "maximum_cooling_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); @@ -1819,9 +1807,6 @@ void SizePurchasedAir(EnergyPlusData &state, int const PurchAirNum) TempSize = PurchAir.MaxCoolVolFlowRate; CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Maximum Cooling Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "maximum_cooling_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); diff --git a/src/EnergyPlus/UnitVentilator.cc b/src/EnergyPlus/UnitVentilator.cc index bfc50a2d280..f6a6be1f3f1 100644 --- a/src/EnergyPlus/UnitVentilator.cc +++ b/src/EnergyPlus/UnitVentilator.cc @@ -1373,8 +1373,7 @@ namespace UnitVentilator { } bool errorsFound = false; CoolingAirFlowSizer sizingCoolingAirFlow; - sizingCoolingAirFlow.overrideSizingString(state.dataGlobal->isEpJSON ? "maximum_supply_air_flow_rate [m3/s]" - : "Maximum Supply Air Flow Rate [m3/s]"); + sizingCoolingAirFlow.overrideSizingString("Maximum Supply Air Flow Rate [m3/s]"); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); CoolingAirVolFlowScalable = sizingCoolingAirFlow.size(state, TempSize, errorsFound); @@ -1393,8 +1392,7 @@ namespace UnitVentilator { TempSize = DataSizing::AutoSize; bool errorsFound = false; CoolingAirFlowSizer sizingCoolingAirFlow; - sizingCoolingAirFlow.overrideSizingString(state.dataGlobal->isEpJSON ? "maximum_supply_air_flow_rate [m3/s]" - : "Maximum Supply Air Flow Rate [m3/s]"); + sizingCoolingAirFlow.overrideSizingString("Maximum Supply Air Flow Rate [m3/s]"); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); CoolingAirVolFlowScalable = sizingCoolingAirFlow.size(state, TempSize, errorsFound); @@ -1439,8 +1437,7 @@ namespace UnitVentilator { } bool errorsFound = false; HeatingAirFlowSizer sizingHeatingAirFlow; - sizingHeatingAirFlow.overrideSizingString(state.dataGlobal->isEpJSON ? "maximum_supply_air_flow_rate [m3/s]" - : "Maximum Supply Air Flow Rate [m3/s]"); + sizingHeatingAirFlow.overrideSizingString("Maximum Supply Air Flow Rate [m3/s]"); // sizingHeatingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingHeatingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); HeatingAirVolFlowScalable = sizingHeatingAirFlow.size(state, TempSize, errorsFound); @@ -1459,8 +1456,7 @@ namespace UnitVentilator { TempSize = DataSizing::AutoSize; errorsFound = false; HeatingAirFlowSizer sizingHeatingAirFlow; - sizingHeatingAirFlow.overrideSizingString(state.dataGlobal->isEpJSON ? "maximum_supply_air_flow_rate [m3/s]" - : "Maximum Supply Air Flow Rate [m3/s]"); + sizingHeatingAirFlow.overrideSizingString("Maximum Supply Air Flow Rate [m3/s]"); // sizingHeatingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingHeatingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); HeatingAirVolFlowScalable = sizingHeatingAirFlow.size(state, TempSize, errorsFound); @@ -1507,8 +1503,7 @@ namespace UnitVentilator { } bool errorsFound = false; CoolingAirFlowSizer sizingCoolingAirFlow; - sizingCoolingAirFlow.overrideSizingString(state.dataGlobal->isEpJSON ? "maximum_supply_air_flow_rate [m3/s]" - : "Maximum Supply Air Flow Rate [m3/s]"); + sizingCoolingAirFlow.overrideSizingString("Maximum Supply Air Flow Rate [m3/s]"); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); CoolingAirVolFlowScalable = sizingCoolingAirFlow.size(state, TempSize, errorsFound); @@ -1527,8 +1522,7 @@ namespace UnitVentilator { TempSize = DataSizing::AutoSize; bool errorsFound = false; CoolingAirFlowSizer sizingCoolingAirFlow; - sizingCoolingAirFlow.overrideSizingString(state.dataGlobal->isEpJSON ? "maximum_supply_air_flow_rate [m3/s]" - : "Maximum Supply Air Flow Rate [m3/s]"); + sizingCoolingAirFlow.overrideSizingString("Maximum Supply Air Flow Rate [m3/s]"); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); CoolingAirVolFlowScalable = sizingCoolingAirFlow.size(state, TempSize, errorsFound); @@ -1571,8 +1565,7 @@ namespace UnitVentilator { } bool errorsFound = false; HeatingAirFlowSizer sizingHeatingAirFlow; - sizingHeatingAirFlow.overrideSizingString(state.dataGlobal->isEpJSON ? "maximum_supply_air_flow_rate [m3/s]" - : "Maximum Supply Air Flow Rate [m3/s]"); + sizingHeatingAirFlow.overrideSizingString("Maximum Supply Air Flow Rate [m3/s]"); // sizingHeatingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingHeatingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); HeatingAirVolFlowScalable = sizingHeatingAirFlow.size(state, TempSize, errorsFound); @@ -1591,8 +1584,7 @@ namespace UnitVentilator { TempSize = DataSizing::AutoSize; errorsFound = false; HeatingAirFlowSizer sizingHeatingAirFlow; - sizingHeatingAirFlow.overrideSizingString(state.dataGlobal->isEpJSON ? "maximum_supply_air_flow_rate [m3/s]" - : "Maximum Supply Air Flow Rate [m3/s]"); + sizingHeatingAirFlow.overrideSizingString("Maximum Supply Air Flow Rate [m3/s]"); // sizingHeatingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingHeatingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); HeatingAirVolFlowScalable = sizingHeatingAirFlow.size(state, TempSize, errorsFound); @@ -1613,8 +1605,7 @@ namespace UnitVentilator { bool errorsFound = false; SystemAirFlowSizer sizerSystemAirFlow; // sizerSystemAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); - sizerSystemAirFlow.overrideSizingString(state.dataGlobal->isEpJSON ? "maximum_supply_air_flow_rate [m3/s]" - : "Maximum Supply Air Flow Rate [m3/s]"); + sizerSystemAirFlow.overrideSizingString("Maximum Supply Air Flow Rate [m3/s]"); sizerSystemAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); HeatingAirVolFlowScalable = sizerSystemAirFlow.size(state, TempSize, errorsFound); } @@ -1640,8 +1631,7 @@ namespace UnitVentilator { bool errorsFound = false; SystemAirFlowSizer sizerSystemAirFlow; // sizerSystemAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); - sizerSystemAirFlow.overrideSizingString(state.dataGlobal->isEpJSON ? "maximum_supply_air_flow_rate [m3/s]" - : "Maximum Supply Air Flow Rate [m3/s]"); + sizerSystemAirFlow.overrideSizingString("Maximum Supply Air Flow Rate [m3/s]"); sizerSystemAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); unitVent.MaxAirVolFlow = sizerSystemAirFlow.size(state, TempSize, errorsFound); } diff --git a/src/EnergyPlus/UnitarySystem.cc b/src/EnergyPlus/UnitarySystem.cc index d29831351e2..f38a5c11a46 100644 --- a/src/EnergyPlus/UnitarySystem.cc +++ b/src/EnergyPlus/UnitarySystem.cc @@ -2120,9 +2120,6 @@ namespace UnitarySystems { bool errorsFound = false; CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Cooling Supply Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "cooling_supply_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); @@ -2203,9 +2200,6 @@ namespace UnitarySystems { bool errorsFound = false; CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Cooling Supply Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "cooling_supply_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); @@ -3662,9 +3656,6 @@ namespace UnitarySystems { state.dataSize->DataFlowUsedForSizing = this->m_MaxNoCoolHeatAirVolFlow; ASHRAEMinSATCoolingSizer sizerASHRAEMinSATCooling; std::string stringOverride = "Minimum Supply Air Temperature [C]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "minimum_supply_air_temperature [C]"; - } sizerASHRAEMinSATCooling.overrideSizingString(stringOverride); sizerASHRAEMinSATCooling.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); this->DesignMinOutletTemp = sizerASHRAEMinSATCooling.size(state, this->DesignMinOutletTemp, ErrFound); @@ -3678,9 +3669,6 @@ namespace UnitarySystems { state.dataSize->DataFlowUsedForSizing = this->m_MaxNoCoolHeatAirVolFlow; ASHRAEMaxSATHeatingSizer sizerASHRAEMaxSATHeating; stringOverride = "Maximum Supply Air Temperature [C]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "maximum_supply_air_temperature [C]"; - } sizerASHRAEMaxSATHeating.overrideSizingString(stringOverride); sizerASHRAEMaxSATHeating.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); this->DesignMaxOutletTemp = sizerASHRAEMaxSATHeating.size(state, this->DesignMaxOutletTemp, ErrFound); diff --git a/src/EnergyPlus/VentilatedSlab.cc b/src/EnergyPlus/VentilatedSlab.cc index 97d5954d23d..3d4d7edb3c8 100644 --- a/src/EnergyPlus/VentilatedSlab.cc +++ b/src/EnergyPlus/VentilatedSlab.cc @@ -1784,9 +1784,6 @@ namespace VentilatedSlab { } CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Maximum Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "maximum_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); @@ -1806,9 +1803,6 @@ namespace VentilatedSlab { TempSize = DataSizing::AutoSize; CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Maximum Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "maximum_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); diff --git a/src/EnergyPlus/WaterCoils.cc b/src/EnergyPlus/WaterCoils.cc index b977ce3de9e..4da636491e1 100644 --- a/src/EnergyPlus/WaterCoils.cc +++ b/src/EnergyPlus/WaterCoils.cc @@ -2305,9 +2305,6 @@ void SizeWaterCoil(EnergyPlusData &state, int const CoilNum) TempSize = waterCoil.DesAirVolFlowRate; CoolingAirFlowSizer sizingCoolingAirFlow2; std::string stringOverride = "Design Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "design_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow2.overrideSizingString(stringOverride); // sizingCoolingAirFlow2.setHVACSizingIndexData(FanCoil(FanCoilNum).HVACSizingIndex); sizingCoolingAirFlow2.initializeWithinEP(state, CompType, CompName, bPRINT, RoutineName); @@ -2339,9 +2336,6 @@ void SizeWaterCoil(EnergyPlusData &state, int const CoilNum) AutoCalculateSizer sizerFinDiameter; stringOverride = "Fin Diameter [m]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "fin_diameter [m]"; - } sizerFinDiameter.overrideSizingString(stringOverride); sizerFinDiameter.initializeWithinEP(state, CompType, CompName, bPRINT, RoutineName); waterCoil.FinDiam = sizerFinDiameter.size(state, TempSize, ErrorsFound); @@ -2353,9 +2347,6 @@ void SizeWaterCoil(EnergyPlusData &state, int const CoilNum) AutoCalculateSizer sizerMinAirFlowArea; stringOverride = "Minimum Airflow Area [m2]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "minimum_airflow_area [m2]"; - } sizerMinAirFlowArea.overrideSizingString(stringOverride); sizerMinAirFlowArea.initializeWithinEP(state, CompType, CompName, bPRINT, RoutineName); waterCoil.MinAirFlowArea = sizerMinAirFlowArea.size(state, TempSize, ErrorsFound); @@ -2375,9 +2366,6 @@ void SizeWaterCoil(EnergyPlusData &state, int const CoilNum) AutoCalculateSizer sizerFinSurfaceArea; stringOverride = "Fin Surface Area [m2]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "fin_surface_area [m2]"; - } sizerFinSurfaceArea.overrideSizingString(stringOverride); sizerFinSurfaceArea.initializeWithinEP(state, CompType, CompName, bPRINT, RoutineName); waterCoil.FinSurfArea = sizerFinSurfaceArea.size(state, TempSize, ErrorsFound); @@ -2390,9 +2378,6 @@ void SizeWaterCoil(EnergyPlusData &state, int const CoilNum) AutoCalculateSizer sizerTubeInsideArea; stringOverride = "Total Tube Inside Area [m2]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "total_tube_inside_area [m2]"; - } sizerTubeInsideArea.overrideSizingString(stringOverride); sizerTubeInsideArea.initializeWithinEP(state, CompType, CompName, bPRINT, RoutineName); waterCoil.TotTubeInsideArea = sizerTubeInsideArea.size(state, TempSize, ErrorsFound); @@ -2405,9 +2390,6 @@ void SizeWaterCoil(EnergyPlusData &state, int const CoilNum) AutoCalculateSizer sizerTubeOutsideArea; stringOverride = "Tube Outside Surface Area [m2]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "tube_outside_surface_area [m2]"; - } sizerTubeOutsideArea.overrideSizingString(stringOverride); sizerTubeOutsideArea.initializeWithinEP(state, CompType, CompName, bPRINT, RoutineName); waterCoil.TubeOutsideSurfArea = sizerTubeOutsideArea.size(state, TempSize, ErrorsFound); @@ -2429,9 +2411,6 @@ void SizeWaterCoil(EnergyPlusData &state, int const CoilNum) AutoCalculateSizer sizerCoilDepth; stringOverride = "Coil Depth [m]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "coil_depth [m]"; - } sizerCoilDepth.overrideSizingString(stringOverride); sizerCoilDepth.initializeWithinEP(state, CompType, CompName, bPRINT, RoutineName); waterCoil.CoilDepth = sizerCoilDepth.size(state, TempSize, ErrorsFound); @@ -2547,25 +2526,22 @@ void SizeWaterCoil(EnergyPlusData &state, int const CoilNum) } else { TempSize = DataSizing::AutoSize; } + FieldNum = 3; // N3 , \field Rated Capacity + SizingString = state.dataWaterCoils->WaterCoilNumericFields(CoilNum).FieldNames(FieldNum) + " [W]"; + ErrorsFound = false; if (state.dataSize->CurSysNum > 0) { - FieldNum = 3; // N3 , \field Rated Capacity - SizingString = state.dataWaterCoils->WaterCoilNumericFields(CoilNum).FieldNames(FieldNum) + " [W]"; - ErrorsFound = false; HeatingCapacitySizer sizerHeatingCapacity; sizerHeatingCapacity.overrideSizingString(SizingString); sizerHeatingCapacity.initializeWithinEP(state, CompType, CompName, bPRINT, RoutineName); - TempSize = sizerHeatingCapacity.size(state, TempSize, ErrorsFound); - waterCoil.DesWaterHeatingCoilRate = TempSize; - waterCoil.DesTotWaterCoilLoad = TempSize; - state.dataSize->DataCapacityUsedForSizing = waterCoil.DesWaterHeatingCoilRate; + waterCoil.DesWaterHeatingCoilRate = sizerHeatingCapacity.size(state, TempSize, ErrorsFound); } else { WaterHeatingCapacitySizer sizerWaterHeatingCapacity; - ErrorsFound = false; + sizerWaterHeatingCapacity.overrideSizingString(SizingString); sizerWaterHeatingCapacity.initializeWithinEP(state, CompType, CompName, bPRINT, RoutineName); waterCoil.DesWaterHeatingCoilRate = sizerWaterHeatingCapacity.size(state, TempSize, ErrorsFound); - waterCoil.DesTotWaterCoilLoad = waterCoil.DesWaterHeatingCoilRate; - state.dataSize->DataCapacityUsedForSizing = waterCoil.DesWaterHeatingCoilRate; } + waterCoil.DesTotWaterCoilLoad = waterCoil.DesWaterHeatingCoilRate; + state.dataSize->DataCapacityUsedForSizing = waterCoil.DesWaterHeatingCoilRate; // We now have the design load if it was autosized. For the case of CoilPerfInpMeth == NomCap, calculate the air flow rate // specified by the NomCap inputs. This overrides all previous values diff --git a/src/EnergyPlus/WindowAC.cc b/src/EnergyPlus/WindowAC.cc index 4fc5846491a..5e7dcf85a69 100644 --- a/src/EnergyPlus/WindowAC.cc +++ b/src/EnergyPlus/WindowAC.cc @@ -916,9 +916,6 @@ namespace WindowAC { bool errorsFound = false; CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Maximum Supply Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "maximum_supply_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(windowAC.HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); @@ -944,9 +941,6 @@ namespace WindowAC { errorsFound = false; CoolingAirFlowSizer sizingCoolingAirFlow; std::string stringOverride = "Maximum Supply Air Flow Rate [m3/s]"; - if (state.dataGlobal->isEpJSON) { - stringOverride = "maximum_supply_air_flow_rate [m3/s]"; - } sizingCoolingAirFlow.overrideSizingString(stringOverride); // sizingCoolingAirFlow.setHVACSizingIndexData(windowAC.HVACSizingIndex); sizingCoolingAirFlow.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName); diff --git a/tst/EnergyPlus/unit/Autosizing/HeatingAirflowUASizing.unit.cc b/tst/EnergyPlus/unit/Autosizing/HeatingAirflowUASizing.unit.cc index 7e9ad7525c5..4cca2694ff6 100644 --- a/tst/EnergyPlus/unit/Autosizing/HeatingAirflowUASizing.unit.cc +++ b/tst/EnergyPlus/unit/Autosizing/HeatingAirflowUASizing.unit.cc @@ -126,7 +126,7 @@ TEST_F(AutoSizingFixture, HeatingAirflowUASizingGauntlet) std::string eiooutput = std::string("! , Component Type, Component Name, Input Field Description, Value\n" - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Heating Coil Airflow For UA, 5.00000\n"); + " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Heating Coil Airflow for UA [m3/s], 5.00000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); @@ -156,7 +156,8 @@ TEST_F(AutoSizingFixture, HeatingAirflowUASizingGauntlet) EXPECT_NEAR(0.0008, state->dataSize->TermUnitSizing(1).AirVolFlow, 0.0001); EXPECT_NEAR(1.2, state->dataEnvrn->StdRhoAir, 0.01); - eiooutput = std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Heating Coil Airflow For UA, 0.00000\n"); + eiooutput = + std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Heating Coil Airflow for UA [m3/s], 0.00000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); @@ -319,7 +320,8 @@ TEST_F(AutoSizingFixture, HeatingAirflowUASizingGauntlet) sizer.autoSizedValue = 0.0; // reset for next test // header already reported above (and flag set false). Only coil sizing information reported here. - eiooutput = std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Heating Coil Airflow For UA, 6.00000\n"); + eiooutput = + std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Heating Coil Airflow for UA [m3/s], 6.00000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); @@ -459,8 +461,9 @@ TEST_F(AutoSizingFixture, HeatingAirflowUASizingGauntlet) EXPECT_FALSE(errorsFound); // header already reported above (and flag set false). Only coil sizing information reported here. - eiooutput = std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Heating Coil Airflow For UA, 3.00000\n" - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Heating Coil Airflow For UA, 5.00000\n"); + eiooutput = + std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Heating Coil Airflow for UA [m3/s], 3.00000\n" + " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Heating Coil Airflow for UA [m3/s], 5.00000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); } diff --git a/tst/EnergyPlus/unit/Autosizing/HeatingWaterDesAirInletTempSizing.unit.cc b/tst/EnergyPlus/unit/Autosizing/HeatingWaterDesAirInletTempSizing.unit.cc index 5f467099ead..409f8dab39b 100644 --- a/tst/EnergyPlus/unit/Autosizing/HeatingWaterDesAirInletTempSizing.unit.cc +++ b/tst/EnergyPlus/unit/Autosizing/HeatingWaterDesAirInletTempSizing.unit.cc @@ -104,7 +104,7 @@ TEST_F(AutoSizingFixture, HeatingWaterDesAirInletTempSizingGauntlet) std::string eiooutput = std::string("! , Component Type, Component Name, Input Field Description, Value\n" - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Rated Inlet Air Temperature, 5.00000\n"); + " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Rated Inlet Air Temperature [C], 5.00000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); @@ -269,7 +269,8 @@ TEST_F(AutoSizingFixture, HeatingWaterDesAirInletTempSizingGauntlet) sizer.autoSizedValue = 0.0; // reset for next test // header already reported above (and flag set false). Only coil sizing information reported here. - eiooutput = std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Rated Inlet Air Temperature, 10.00000\n"); + eiooutput = + std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Rated Inlet Air Temperature [C], 10.00000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); @@ -394,8 +395,9 @@ TEST_F(AutoSizingFixture, HeatingWaterDesAirInletTempSizingGauntlet) EXPECT_FALSE(errorsFound); // header already reported above (and flag set false). Only coil sizing information reported here. - eiooutput = std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Rated Inlet Air Temperature, 12.00000\n" - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Rated Inlet Air Temperature, 5.00000\n"); + eiooutput = + std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Rated Inlet Air Temperature [C], 12.00000\n" + " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Rated Inlet Air Temperature [C], 5.00000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); } diff --git a/tst/EnergyPlus/unit/Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.unit.cc b/tst/EnergyPlus/unit/Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.unit.cc index f5a0e94c87d..2042e8461c5 100644 --- a/tst/EnergyPlus/unit/Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.unit.cc +++ b/tst/EnergyPlus/unit/Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.unit.cc @@ -103,9 +103,9 @@ TEST_F(AutoSizingFixture, HeatingWaterDesCoilLoadUsedForUASizingGauntlet) EXPECT_NEAR(5125.3, sizedValue, 0.01); // hard-sized value sizer.autoSizedValue = 0.0; // reset for next test - std::string eiooutput = std::string( - "! , Component Type, Component Name, Input Field Description, Value\n" - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Water Heating Design Coil Load for UA Sizing, 5125.30000\n"); + std::string eiooutput = std::string("! , Component Type, Component Name, Input Field Description, Value\n" + " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Water Heating Design Coil " + "Load for UA Sizing [W], 5125.30000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); @@ -275,8 +275,9 @@ TEST_F(AutoSizingFixture, HeatingWaterDesCoilLoadUsedForUASizingGauntlet) // header already reported above (and flag set false). Only coil sizing information reported here. eiooutput = std::string( - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Water Heating Design Coil Load for UA Sizing, 2024.55160\n" - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Water Heating Design Coil Load for UA Sizing, 1500.00000\n"); + " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Water Heating Design Coil Load for UA Sizing [W], 2024.55160\n" + " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Water Heating Design Coil Load for UA Sizing [W], " + "1500.00000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); // reset eio stream @@ -336,8 +337,8 @@ TEST_F(AutoSizingFixture, HeatingWaterDesCoilLoadUsedForUASizingGauntlet) sizer.autoSizedValue = 0.0; // reset for next test // header already reported above (and flag set false). Only coil sizing information reported here. - eiooutput = std::string( - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Water Heating Design Coil Load for UA Sizing, 14469.96369\n"); + eiooutput = std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Water Heating Design Coil Load for UA " + "Sizing [W], 14469.96369\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); @@ -362,8 +363,8 @@ TEST_F(AutoSizingFixture, HeatingWaterDesCoilLoadUsedForUASizingGauntlet) EXPECT_FALSE(errorsFound); // header already reported above (and flag set false). Only coil sizing information reported here. - eiooutput = std::string( - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Water Heating Design Coil Load for UA Sizing, 18087.45461\n"); + eiooutput = std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Water Heating Design Coil Load for UA " + "Sizing [W], 18087.45461\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); // reset eio stream @@ -472,8 +473,9 @@ TEST_F(AutoSizingFixture, HeatingWaterDesCoilLoadUsedForUASizingGauntlet) // header already reported above (and flag set false). Only coil sizing information reported here. eiooutput = std::string( - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Water Heating Design Coil Load for UA Sizing, 5064.48729\n" - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Water Heating Design Coil Load for UA Sizing, 7000.00000\n"); + " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Water Heating Design Coil Load for UA Sizing [W], 5064.48729\n" + " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Water Heating Design Coil Load for UA Sizing [W], " + "7000.00000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); } diff --git a/tst/EnergyPlus/unit/Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.unit.cc b/tst/EnergyPlus/unit/Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.unit.cc index 1c852eb01f7..970c3b024a2 100644 --- a/tst/EnergyPlus/unit/Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.unit.cc +++ b/tst/EnergyPlus/unit/Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.unit.cc @@ -97,7 +97,7 @@ TEST_F(AutoSizingFixture, HeatingWaterDesCoilWaterVolFlowUsedForUASizingGauntlet std::string eiooutput = std::string("! , Component Type, Component Name, Input Field Description, Value\n" " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Design Water Volume Flow " - "Rate Used for UA Sizing, 5.00000E-004\n"); + "Rate Used for UA Sizing [m3/s], 5.00000E-004\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); @@ -205,7 +205,7 @@ TEST_F(AutoSizingFixture, HeatingWaterDesCoilWaterVolFlowUsedForUASizingGauntlet // header already reported above (and flag set false). Only coil sizing information reported here. eiooutput = std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Design Water Volume Flow " - "Rate Used for UA Sizing, 4.00000E-004\n"); + "Rate Used for UA Sizing [m3/s], 4.00000E-004\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); @@ -261,9 +261,9 @@ TEST_F(AutoSizingFixture, HeatingWaterDesCoilWaterVolFlowUsedForUASizingGauntlet // header already reported above (and flag set false). Only coil sizing information reported here. eiooutput = std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Design Water Volume Flow " - "Rate Used for UA Sizing, 4.00000E-004\n" + "Rate Used for UA Sizing [m3/s], 4.00000E-004\n" " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Design Water Volume Flow " - "Rate Used for UA Sizing, 5.00000E-004\n"); + "Rate Used for UA Sizing [m3/s], 5.00000E-004\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); } diff --git a/tst/EnergyPlus/unit/Autosizing/SystemAirFlowSizing.unit.cc b/tst/EnergyPlus/unit/Autosizing/SystemAirFlowSizing.unit.cc index d61d05e83f5..5ee6a6744d2 100644 --- a/tst/EnergyPlus/unit/Autosizing/SystemAirFlowSizing.unit.cc +++ b/tst/EnergyPlus/unit/Autosizing/SystemAirFlowSizing.unit.cc @@ -101,7 +101,7 @@ TEST_F(AutoSizingFixture, SystemAirFlowSizingGauntlet) std::string eiooutput = std::string("! , Component Type, Component Name, Input Field Description, Value\n" - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Maximum Flow Rate [m3/s], 5.00000\n"); + " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Supply Air Maximum Flow Rate [m3/s], 5.00000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); @@ -144,7 +144,8 @@ TEST_F(AutoSizingFixture, SystemAirFlowSizingGauntlet) EXPECT_NEAR(1.6, sizedValue, 0.0001); sizer.autoSizedValue = 0.0; // reset for next test - eiooutput = std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Maximum Flow Rate [m3/s], 1.60000\n"); + eiooutput = + std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Supply Air Maximum Flow Rate [m3/s], 1.60000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); @@ -692,7 +693,8 @@ TEST_F(AutoSizingFixture, SystemAirFlowSizingGauntlet) state->dataSize->DataEMSOverrideON = false; // header already reported above (and flag set false). Only coil sizing information reported here. - eiooutput = std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Maximum Flow Rate [m3/s], 1.33000\n"); + eiooutput = + std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Supply Air Maximum Flow Rate [m3/s], 1.33000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); @@ -932,8 +934,9 @@ TEST_F(AutoSizingFixture, SystemAirFlowSizingGauntlet) EXPECT_FALSE(errorsFound); // header already reported above (and flag set false). Only coil sizing information reported here. - eiooutput = std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Maximum Flow Rate [m3/s], 5.00000\n" - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Maximum Flow Rate [m3/s], 2.00000\n"); + eiooutput = + std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Supply Air Maximum Flow Rate [m3/s], 5.00000\n" + " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Supply Air Maximum Flow Rate [m3/s], 2.00000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); // Test 57 - Air Loop HX Equipment, CurDuctType = RAB, hard-sized air flow rate @@ -957,8 +960,9 @@ TEST_F(AutoSizingFixture, SystemAirFlowSizingGauntlet) EXPECT_FALSE(errorsFound); // header already reported above (and flag set false). Only coil sizing information reported here. - eiooutput = std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Maximum Flow Rate [m3/s], 3.50000\n" - " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Maximum Flow Rate [m3/s], 2.20000\n"); + eiooutput = + std::string(" Component Sizing Information, Coil:Heating:Water, MyWaterCoil, Design Size Supply Air Maximum Flow Rate [m3/s], 3.50000\n" + " Component Sizing Information, Coil:Heating:Water, MyWaterCoil, User-Specified Supply Air Maximum Flow Rate [m3/s], 2.20000\n"); EXPECT_TRUE(compare_eio_stream(eiooutput, true)); // Test 58 - DOAS fan air flow rate autosizing