-
EnergyPlus
+
+ EnergyPlus
Version @CMAKE_VERSION_MAJOR@.@CMAKE_VERSION_MINOR@.@CMAKE_VERSION_PATCH@
@CMAKE_PROJECTED_RELEASE_DATE@
@@ -90,12 +91,41 @@
Using EnergyPlus
* Python Ecosystem *
- While EnergyPlus will continue to provide users with current workflows and installation methods, we are pushing
- toward a more flexible EnergyPlus that behaves like a standard Python library. An upcoming version will allow
- users to pip install energyplus, which will bring down the EnergyPlus native libraries plus the Python API
- bindings, ready to be used by the user's desired Python environment. This should make setting up EnergyPlus
- much easier for many use cases!
+ The EnergyPlus-Python connections continue to grow. The Python-focused deployment via PyPi is still coming,
+ but will remain on the test server on PyPi for now.
+ Once official releases are ready, they will be on the
+ main PyPi page, so check there if interested.
+ The pip install energyplus experience will bring EnergyPlus native libraries plus the Python API
+ bindings, ready to be used by the user's desired Python environment. This should make setting up EnergyPlus
+ much easier for many Python-facing use cases!
+
+ In addition to the Pip Install work coming along, we are also working to improve our Python integration for
+ traditional EnergyPlus use cases. As of 24.2, when a user downloads the install package onto their machine,
+ they will get the new cross-platform Python-based EP-Launch. The classic EP-Launch is still packaged for now,
+ but will likely be deprecated in favor of the Python tools soon. There are two ways to launch this new
+ EP-Launch:
+
+ -
+ For Windows, there is a batch file right inside the EnergyPlus install folder called
+
EPLaunchPython that will launch the EP-Launch application:
+ 
+ Just double click it! It will open a terminal window before launching the Python app, but
+ you can ignore that for now. Once we get some testing feedback, we'll include it as a proper shortcut
+ on the Start Menu and other locations.
+
+ -
+ On all platforms, you can launch the new EP-Launch right from the command line using a new auxiliary
+ command class. Simply launch a terminal, and execute a single command. On Windows, it would be
+
C:\Path\To\EnergyPlusV24-2-0\energyplus.exe auxiliary eplaunch. On POSIX-y systems, it would
+ be /path/to/energyplus auxiliary eplaunch. Give it a try and let us know how it goes. As
+ always, we appreciate issue reports on our
+ GitHub repository.
+
+
+
What’s going on in V@CMAKE_VERSION_MAJOR@.@CMAKE_VERSION_MINOR@?
@@ -158,23 +188,21 @@
No, they are different
aria-expanded="false"
aria-controls="collapseCompatible">
Is version @CMAKE_VERSION_MAJOR@.@CMAKE_VERSION_MINOR@ backward compatible?
- Can I run v@PREV_VERSION_MAJOR@.@PREV_VERSION_MINOR@ file in v@CMAKE_VERSION_MAJOR@.@CMAKE_VERSION_MINOR@?
+ Can I run v@PREV_VERSION_MAJOR@.@PREV_VERSION_MINOR@ file in
+ v@CMAKE_VERSION_MAJOR@.@CMAKE_VERSION_MINOR@?
Some objects require transition
There have been changes in the following objects which require conversion. Either read and follow
- the Rules document or use the IDFVersionUpdater utility. The “Rules” document contains information
+ the "Rules" document or use the IDFVersionUpdater utility. The “Rules” document contains information
on exact object changes that you can do by hand. The updater program is described more fully in the
Auxiliary Programs document.
- - AirLoopHVAC:UnitarySystem
- - ComfortViewFactorAngles
- - HeatExchanger:AirToAir:SensibleAndLatent
- - People
- - ZoneHVAC:PackagedTerminalAirConditioner
- - ZoneHVAC:PackagedTerminalHeatPump
- - ZoneHVAC:WaterToAirHeatPump
+ - HeatPump:PlantLoop:EIR:Cooling
+ - HeatPump:PlantLoop:EIR:Heating
+ - OutputControl:Files
+ - ZoneHVAC:TerminalUnit:VariableRefrigerantFlow
@@ -215,7 +243,7 @@
Documentation
href="https://energyplus.net/documentation">online. For
new users of EnergyPlus, a
guide called the EnergyPlus Essentials was developed and is available with the installed pdf documentation.
Big Ladder Software is also hosting html versions of the
- EnergyPlus Documentation
online.
+ EnergyPlus Documentation
online.
There are some other documents of interest available on the EnergyPlus web site including:
@@ -246,31 +274,32 @@
New Features
Description |
- | 10081 |
- API Enhancements |
+ 10311 |
+ NewFeature: Additional ASHRAE Metrics for E+ 24-1 |
- | 10277 |
- Enhancement for Heat Exchanger for Variable-Speed Heat Recovery Ventilation |
+ 10372 |
+ Add Reports to Support createRMD - ruleset model description |
- | 10363 |
- Add E+ API demo to the install |
+ 10379 |
+ Air-To-Water Heat Pump with Heat Recovery |
- | 10385 |
- Indoor living wall module |
+ 10415 |
+ Chiller economizing using thermosiphon or fluid heat exchanger free cooling |
-
-
Runtime Performance Enhancing Developments
-
- | PR # |
- Description |
+ 10511 |
+ Variable flow condenser plant control |
- | 10231 |
- SetupOutputVariable wrapper to use enum type parameters (endUseCategory, ReportingFrequency, and eResouceType) |
+ 10658 |
+ A couple API Endpoints |
+
+
+ | 10716 |
+ Initial Python App Packaging |
Targeted Refactoring Efforts
@@ -280,24 +309,20 @@
Targeted Refactoring Efforts
Description |
- | 10281 |
- Initial WeatherManager refactor |
-
-
- | 10289 |
- First (and only?) Pollution module refactor |
+ 10323 |
+ Reformat eplusout.dbg file for easier excel viewing |
- | 10347 |
- OutputProcessor Refactor |
+ 10474 |
+ Fans Refactor |
- | 10351 |
- DaylightingManager Refactor -- Part 2 |
+ 10720 |
+ Material Refactor |
- | 10404 |
- Heat Pump Plant Loop EIR refactoring |
+ Many PRs |
+ Addressing CppCheck warnings and suggestions across our codebase |
@@ -316,18 +341,18 @@
Targeted Refactoring Efforts
Platforms
- We test and develop on Windows 10 and 11, and currently produce 32 and 64 bit builds on Windows. The 32-bit
- build is likely to be removed at some point soon. For Linux, we provide packages for
- Ubuntu 20.04 and 22.04. This release also includes an Ubuntu 18.04 build, but moving forward we will be
- eliminating that. On Mac, we are releasing an installer for OSX 10.15, 11, and 12, but the 10.15 will be
+ We test and develop on Windows 10 and 11, and currently produce 32 and 64 bit builds on Windows. The 32-bit
+ build is likely to be removed at some point soon. For Linux, we provide packages for
+ Ubuntu 20.04 and 22.04. This release also includes an Ubuntu 18.04 build, but moving forward we will be
+ eliminating that. On Mac, we are releasing an installer for OSX 10.15, 11, and 12, but the 10.15 will be
eliminated soon.
- - Windows 10 and 11
+ - Windows 11
-
- Linux (Ubuntu 18.04, 20.04, 22.04) 64 bit versions
+ Linux (Ubuntu 22.04 and 24.04) 64 bit versions
- - Mac OSX 10.15, 11, and 12 64 bit versions
+ - Mac OSX 12 x64 and 13 arm64
-
EnergyPlus V@CMAKE_VERSION_MAJOR@.@CMAKE_VERSION_MINOR@ has been tested on all of these platforms
@@ -412,7 +437,8 @@ Additional steps you may want to consider:
University of California through Ernest Orlando Lawrence Berkeley National Laboratory, Oak Ridge National
Laboratory, managed by
UT-Battelle, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
- Other Notices and Acknowledgments are found in the Other Notices and Acknowledgments are found in the
+ Acknowledgments
document.
diff --git a/scripts/dev/build_regression_summary.py b/scripts/dev/build_regression_summary.py
index 641a228fa3a..2228284517a 100644
--- a/scripts/dev/build_regression_summary.py
+++ b/scripts/dev/build_regression_summary.py
@@ -54,7 +54,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-from sys import argv
+from os import path
+from sys import argv, exit
summary_input_md_file = argv[1]
summary_output_js_file = argv[2]
@@ -63,6 +64,12 @@
github_run_id = argv[5]
artifact_url = argv[6]
+if not path.exists(summary_input_md_file):
+ print("Regression script shows failure exit code, but could not find summary file.")
+ print("This generally indicates that the regression script had an unhandled failure.")
+ print("Check the 'Run Regressions' GitHub Action step above for more helpful information")
+ exit(1)
+
with open(summary_input_md_file) as md:
md_contents = md.read()
diff --git a/scripts/dev/create_shortcut.ps1 b/scripts/dev/create_shortcut.ps1
new file mode 100644
index 00000000000..eefe9b38f61
--- /dev/null
+++ b/scripts/dev/create_shortcut.ps1
@@ -0,0 +1,11 @@
+param (
+ [string]$TargetPath,
+ [string]$ShortcutPath,
+ [string]$Arguments
+)
+
+$WScriptShell = New-Object -ComObject WScript.Shell
+$Shortcut = $WScriptShell.CreateShortcut($ShortcutPath)
+$Shortcut.TargetPath = $TargetPath
+$Shortcut.Arguments = $Arguments
+$Shortcut.Save()
diff --git a/scripts/dev/gha_regressions.py b/scripts/dev/gha_regressions.py
index b3de9964190..46c8db4c34d 100644
--- a/scripts/dev/gha_regressions.py
+++ b/scripts/dev/gha_regressions.py
@@ -71,6 +71,7 @@ class RegressionManager:
def __init__(self):
self.root_index_files_no_diff = []
self.root_index_files_diffs = []
+ self.root_index_files_failed = []
self.diffs_by_idf = defaultdict(list)
self.diffs_by_type = defaultdict(list)
self.summary_results = {}
@@ -243,6 +244,11 @@ def bundle_root_index_html(self, header_info: list[str]) -> str:
diff_content = ""
for d in self.root_index_files_diffs:
diff_content += f"""{d}\n"""
+ num_failed = len(self.root_index_files_failed)
+ nfs = 's' if num_failed == 0 or num_failed > 1 else ''
+ failed_content = ""
+ for nf in self.root_index_files_failed:
+ failed_content += f"""- {nf}
\n"""
# set up diff type listing
diff_type_keys = sorted(self.diffs_by_type.keys())
@@ -370,6 +376,24 @@ def bundle_root_index_html(self, header_info: list[str]) -> str:
+
+
+
Summary by Diff Type
@@ -446,37 +470,42 @@ def check_all_regressions(self, base_testfiles: Path, mod_testfiles: Path, bundl
modified = mod_testfiles / baseline.name
if not modified.exists():
continue # TODO: Should we warn that it is missing?
- entry, diffs = self.single_file_regressions(baseline, modified)
- if diffs:
- self.root_index_files_diffs.append(baseline.name)
+ try:
+ entry, diffs = self.single_file_regressions(baseline, modified)
+ if diffs:
+ self.root_index_files_diffs.append(baseline.name)
+ any_diffs = True
+ potential_diff_files = baseline.glob("*.*.*") # TODO: Could try to get this from the regression tool
+ target_dir_for_this_file_diffs = bundle_root / baseline.name
+ if potential_diff_files:
+ if target_dir_for_this_file_diffs.exists():
+ rmtree(target_dir_for_this_file_diffs)
+ target_dir_for_this_file_diffs.mkdir()
+ index_contents_this_file = ""
+ for potential_diff_file in potential_diff_files:
+ copy(potential_diff_file, target_dir_for_this_file_diffs)
+ diff_file_with_html = target_dir_for_this_file_diffs / (potential_diff_file.name + '.html')
+ if potential_diff_file.name.endswith('.htm'):
+ # already a html file, just upload the raw contents but renamed as ...htm.html
+ copy(potential_diff_file, diff_file_with_html)
+ else:
+ # it's not an HTML file, wrap it inside an HTML wrapper in a temp file and send it
+ contents = potential_diff_file.read_text()
+ wrapped_contents = self.single_diff_html(contents)
+ diff_file_with_html.write_text(wrapped_contents)
+ index_contents_this_file += self.regression_row_in_single_test_case_html(potential_diff_file.name)
+ index_file = target_dir_for_this_file_diffs / 'index.html'
+ index_this_file = self.single_test_case_html(index_contents_this_file)
+ index_file.write_text(index_this_file)
+ else:
+ self.root_index_files_no_diff.append(baseline.name)
+ so_far = ' Diffs! ' if any_diffs else 'No diffs'
+ if entry_num % 40 == 0:
+ print(f"On file #{entry_num}/{len(entries)} ({baseline.name}), Diff status so far: {so_far}")
+ except Exception as e:
any_diffs = True
- potential_diff_files = baseline.glob("*.*.*") # TODO: Could try to get this from the regression tool
- target_dir_for_this_file_diffs = bundle_root / baseline.name
- if potential_diff_files:
- if target_dir_for_this_file_diffs.exists():
- rmtree(target_dir_for_this_file_diffs)
- target_dir_for_this_file_diffs.mkdir()
- index_contents_this_file = ""
- for potential_diff_file in potential_diff_files:
- copy(potential_diff_file, target_dir_for_this_file_diffs)
- diff_file_with_html = target_dir_for_this_file_diffs / (potential_diff_file.name + '.html')
- if potential_diff_file.name.endswith('.htm'):
- # already a html file, just upload the raw contents but renamed as ...htm.html
- copy(potential_diff_file, diff_file_with_html)
- else:
- # it's not an HTML file, wrap it inside an HTML wrapper in a temp file and send it
- contents = potential_diff_file.read_text()
- wrapped_contents = self.single_diff_html(contents)
- diff_file_with_html.write_text(wrapped_contents)
- index_contents_this_file += self.regression_row_in_single_test_case_html(potential_diff_file.name)
- index_file = target_dir_for_this_file_diffs / 'index.html'
- index_this_file = self.single_test_case_html(index_contents_this_file)
- index_file.write_text(index_this_file)
- else:
- self.root_index_files_no_diff.append(baseline.name)
- so_far = ' Diffs! ' if any_diffs else 'No diffs'
- if entry_num % 40 == 0:
- print(f"On file #{entry_num}/{len(entries)} ({baseline.name}), Diff status so far: {so_far}")
+ print(f"Regression run *failed* trying to process file: {baseline.name}; reason: {e}")
+ self.root_index_files_failed.append(baseline.name)
meta_data = [
f"Regression time stamp in UTC: {datetime.now(UTC)}",
f"Regression time stamp in Central Time: {datetime.now(ZoneInfo('America/Chicago'))}",
diff --git a/scripts/dev/verify_signature.py b/scripts/dev/verify_signature.py
index 4edde9aa175..c264ba028ce 100644
--- a/scripts/dev/verify_signature.py
+++ b/scripts/dev/verify_signature.py
@@ -73,7 +73,6 @@ class Generator(Enum):
BUNDLED_APPS = [
"PreProcess/EP-Launch-Lite.app",
"PreProcess/IDFVersionUpdater/IDFVersionUpdater.app",
- "PostProcess/EP-Compare/EP-Compare.app",
]
diff --git a/src/EnergyPlus/AirLoopHVACDOAS.cc b/src/EnergyPlus/AirLoopHVACDOAS.cc
index 29894d377c8..d2d1fd5a776 100644
--- a/src/EnergyPlus/AirLoopHVACDOAS.cc
+++ b/src/EnergyPlus/AirLoopHVACDOAS.cc
@@ -788,7 +788,7 @@ namespace AirLoopHVACDOAS {
thisDOAS.m_CompPointerAirLoopSplitter =
thisAirLoopSplitter.factory(state, thisDOAS.m_AirLoopSplitterIndex, thisDOAS.AirLoopSplitterName);
- // get pretreated desing conditions
+ // get pretreated design conditions
thisDOAS.PreheatTemp = fields.at("preheat_design_temperature").get();
thisDOAS.PreheatHumRat = fields.at("preheat_design_humidity_ratio").get();
thisDOAS.PrecoolTemp = fields.at("precool_design_temperature").get();
diff --git a/src/EnergyPlus/AirflowNetwork/src/Solver.cpp b/src/EnergyPlus/AirflowNetwork/src/Solver.cpp
index f7100fba27c..d723f952b8d 100644
--- a/src/EnergyPlus/AirflowNetwork/src/Solver.cpp
+++ b/src/EnergyPlus/AirflowNetwork/src/Solver.cpp
@@ -10482,8 +10482,6 @@ namespace AirflowNetwork {
} else {
ShowSevereError(m_state, "SetDXCoilAirLoopNumber: Could not find Coil \"Name=\"" + DisSysCompCoilData(i).name + "\"");
}
- // SetDXCoilAirLoopNumber(DisSysCompCoilData(i).name,
- // DisSysCompCoilData(i).AirLoopNum);
}
} else if (SELECT_CASE_var == "COIL:COOLING:DX:SINGLESPEED") {
ValidateComponent(
@@ -10574,6 +10572,26 @@ namespace AirflowNetwork {
SetDXCoilAirLoopNumber(m_state, DisSysCompCoilData(i).name, DisSysCompCoilData(i).AirLoopNum);
}
+ } else if (SELECT_CASE_var == "COIL:COOLING:DX:VARIABLESPEED") {
+ ValidateComponent(
+ m_state, "Coil:Cooling:DX:VariableSpeed", DisSysCompCoilData(i).name, IsNotOK, format(RoutineName) + CurrentModuleObject);
+ ++MultiSpeedHPIndicator;
+ if (IsNotOK) {
+ ErrorsFound = true;
+ } else {
+ SetDXCoilAirLoopNumber(m_state, DisSysCompCoilData(i).name, DisSysCompCoilData(i).AirLoopNum);
+ }
+
+ } else if (SELECT_CASE_var == "COIL:HEATING:DX:VARIABLESPEED") {
+ ValidateComponent(
+ m_state, "Coil:Heating:DX:VariableSpeed", DisSysCompCoilData(i).name, IsNotOK, format(RoutineName) + CurrentModuleObject);
+ ++MultiSpeedHPIndicator;
+ if (IsNotOK) {
+ ErrorsFound = true;
+ } else {
+ SetDXCoilAirLoopNumber(m_state, DisSysCompCoilData(i).name, DisSysCompCoilData(i).AirLoopNum);
+ }
+
} else if (SELECT_CASE_var == "COIL:HEATING:DESUPERHEATER") {
ValidateComponent(
m_state, "Coil:Heating:Desuperheater", DisSysCompCoilData(i).name, IsNotOK, format(RoutineName) + CurrentModuleObject);
@@ -11180,13 +11198,15 @@ namespace AirflowNetwork {
found = true;
}
}
- if (!found) {
- ShowSevereError(m_state, format("{}Fan:ZoneExhaust is not defined in {}", RoutineName, CurrentModuleObject));
- ShowContinueError(m_state,
- "Zone Air Exhaust Node in ZoneHVAC:EquipmentConnections =" +
- m_state.dataLoopNodes->NodeID(m_state.dataZoneEquip->ZoneEquipConfig(j).ExhaustNode(k)));
- ErrorsFound = true;
- }
+ }
+ if (!found) {
+ ShowSevereError(m_state, format("{}Fan:ZoneExhaust is not defined in {}", RoutineName, CurrentModuleObject));
+ ShowContinueError(
+ m_state,
+ format("The inlet node of the {} Fan:ZoneExhaust is not defined in the {}'s ZoneHVAC:EquipmentConnections",
+ m_state.dataZoneEquip->ZoneEquipList(j).EquipName,
+ m_state.dataZoneEquip->ZoneEquipConfig(j).ZoneName));
+ ErrorsFound = true;
}
}
}
diff --git a/src/EnergyPlus/BaseboardRadiator.cc b/src/EnergyPlus/BaseboardRadiator.cc
index a61d790461f..d68c003555d 100644
--- a/src/EnergyPlus/BaseboardRadiator.cc
+++ b/src/EnergyPlus/BaseboardRadiator.cc
@@ -410,6 +410,8 @@ namespace BaseboardRadiator {
thisBaseboard.ZonePtr = DataZoneEquipment::GetZoneEquipControlledZoneNum(
state, DataZoneEquipment::ZoneEquipType::BaseboardConvectiveWater, thisBaseboard.EquipID);
+
+ thisBaseboard.checkForZoneSizing(state); // check if any autosizing is being done
}
if (ErrorsFound) {
@@ -601,9 +603,9 @@ namespace BaseboardRadiator {
bool ErrorsFound(false); // If errors detected in input
Real64 rho; // local fluid density
Real64 Cp; // local fluid specific heat
- Real64 WaterVolFlowRateMaxDes(0.0); // Design water volume flow for reproting
+ Real64 WaterVolFlowRateMaxDes(0.0); // Design water volume flow for reporting
Real64 WaterVolFlowRateMaxUser(0.0); // User hard-sized volume flow for reporting
- Real64 UADes(0.0); // Design UA value for reproting
+ Real64 UADes(0.0); // Design UA value for reporting
Real64 UAUser(0.0); // User hard-sized value for reporting
Real64 TempSize; // autosized value of coil input field
@@ -615,8 +617,6 @@ namespace BaseboardRadiator {
state.dataSize->DataScalableCapSizingON = false;
if (state.dataSize->CurZoneEqNum > 0) {
- auto &zoneEqSizing = state.dataSize->ZoneEqSizing(state.dataSize->CurZoneEqNum);
- auto const &finalZoneSizing = state.dataSize->FinalZoneSizing(state.dataSize->CurZoneEqNum);
bool FlowAutoSize = false; // Indicator to autosizing water volume flow
if (this->WaterVolFlowRateMax == DataSizing::AutoSize) {
@@ -628,7 +628,8 @@ namespace BaseboardRadiator {
state, cCMO_BBRadiator_Water, this->EquipID, "User-Specified Maximum Water Flow Rate [m3/s]", this->WaterVolFlowRateMax);
}
} else {
- CheckZoneSizing(state, cCMO_BBRadiator_Water, this->EquipID);
+ auto &zoneEqSizing = state.dataSize->ZoneEqSizing(state.dataSize->CurZoneEqNum);
+ auto const &finalZoneSizing = state.dataSize->FinalZoneSizing(state.dataSize->CurZoneEqNum);
std::string_view const CompType = cCMO_BBRadiator_Water;
std::string_view const CompName = this->EquipID;
state.dataSize->DataFracOfAutosizedHeatingCapacity = 1.0;
@@ -643,7 +644,6 @@ namespace BaseboardRadiator {
if (CapSizingMethod == DataSizing::HeatingDesignCapacity) {
if (this->ScaledHeatingCapacity == DataSizing::AutoSize) {
- CheckZoneSizing(state, CompType, CompName);
zoneEqSizing.DesHeatingLoad = finalZoneSizing.NonAirSysDesHeatLoad;
} else {
zoneEqSizing.DesHeatingLoad = this->ScaledHeatingCapacity;
@@ -657,7 +657,6 @@ namespace BaseboardRadiator {
TempSize = zoneEqSizing.DesHeatingLoad;
state.dataSize->DataScalableCapSizingON = true;
} else if (CapSizingMethod == DataSizing::FractionOfAutosizedHeatingCapacity) {
- CheckZoneSizing(state, CompType, CompName);
zoneEqSizing.HeatingCapacity = true;
state.dataSize->DataFracOfAutosizedHeatingCapacity = this->ScaledHeatingCapacity;
zoneEqSizing.DesHeatingLoad = finalZoneSizing.NonAirSysDesHeatLoad;
@@ -729,7 +728,7 @@ namespace BaseboardRadiator {
// UA sizing
bool UAAutoSize = false; // Indicator to autosizing UA
- // Set hard-sized values to the local variable to correct a false indication aftet SolFla function calculation
+ // Set hard-sized values to the local variable to correct a false indication after SolFla function calculation
if (this->UA == DataSizing::AutoSize) {
UAAutoSize = true;
} else {
@@ -741,6 +740,8 @@ namespace BaseboardRadiator {
state, cCMO_BBRadiator_Water, this->EquipID, "User-Specified U-Factor Times Area Value [W/K]", this->UA);
}
} else {
+ auto &zoneEqSizing = state.dataSize->ZoneEqSizing(state.dataSize->CurZoneEqNum);
+ auto const &finalZoneSizing = state.dataSize->FinalZoneSizing(state.dataSize->CurZoneEqNum);
this->WaterInletTemp = state.dataSize->PlantSizData(PltSizHeatNum).ExitTemp;
this->AirInletTemp = finalZoneSizing.ZoneTempAtHeatPeak;
this->AirInletHumRat = finalZoneSizing.ZoneHumRatAtHeatPeak;
@@ -764,7 +765,6 @@ namespace BaseboardRadiator {
CapSizingMethod == DataSizing::FractionOfAutosizedHeatingCapacity) {
if (CapSizingMethod == DataSizing::HeatingDesignCapacity) {
if (this->ScaledHeatingCapacity == DataSizing::AutoSize) {
- CheckZoneSizing(state, CompType, CompName);
zoneEqSizing.DesHeatingLoad = finalZoneSizing.NonAirSysDesHeatLoad;
} else {
zoneEqSizing.DesHeatingLoad = this->ScaledHeatingCapacity;
@@ -778,7 +778,6 @@ namespace BaseboardRadiator {
TempSize = zoneEqSizing.DesHeatingLoad;
state.dataSize->DataScalableCapSizingON = true;
} else if (CapSizingMethod == DataSizing::FractionOfAutosizedHeatingCapacity) {
- CheckZoneSizing(state, CompType, CompName);
zoneEqSizing.HeatingCapacity = true;
state.dataSize->DataFracOfAutosizedHeatingCapacity = this->ScaledHeatingCapacity;
zoneEqSizing.DesHeatingLoad = finalZoneSizing.NonAirSysDesHeatLoad;
@@ -917,7 +916,7 @@ namespace BaseboardRadiator {
}
}
} else {
- // if there is no heating Sizing:Plant object and autosizng was requested, issue an error message
+ // if there is no heating Sizing:Plant object and autosizing was requested, issue an error message
if (this->WaterVolFlowRateMax == DataSizing::AutoSize || this->UA == DataSizing::AutoSize) {
ShowSevereError(state, format("SizeBaseboard: {}=\"{}\"", cCMO_BBRadiator_Water, this->EquipID));
ShowContinueError(state, "...Autosizing of hot water baseboard requires a heating loop Sizing:Plant object");
@@ -933,6 +932,20 @@ namespace BaseboardRadiator {
}
}
+ void BaseboardParams::checkForZoneSizing(EnergyPlusData &state)
+ {
+ // If any sizing is requested, check that zone sizing has been done
+ // Condition 1: Is UA autosized)?
+ // Condition 2: Is max flow rate autosized?
+ // Condition 3: Is HeatingDesignCapacity used and autosized)
+ // Condition 4: Is FractionOfAutosizedHeatingCapacity used and heating capacity is autosized
+ if ((this->UA == DataSizing::AutoSize) || (this->WaterVolFlowRateMax == DataSizing::AutoSize) ||
+ ((this->HeatingCapMethod == DataSizing::HeatingDesignCapacity) && (this->ScaledHeatingCapacity == DataSizing::AutoSize)) ||
+ ((this->HeatingCapMethod == DataSizing::FractionOfAutosizedHeatingCapacity) && (this->ScaledHeatingCapacity == DataSizing::AutoSize))) {
+ CheckZoneSizing(state, cCMO_BBRadiator_Water, this->EquipID);
+ }
+ }
+
void SimHWConvective(EnergyPlusData &state, int &BaseboardNum, Real64 &LoadMet)
{
// SUBROUTINE INFORMATION:
diff --git a/src/EnergyPlus/BaseboardRadiator.hh b/src/EnergyPlus/BaseboardRadiator.hh
index 08f073f08f6..17ba3951ec9 100644
--- a/src/EnergyPlus/BaseboardRadiator.hh
+++ b/src/EnergyPlus/BaseboardRadiator.hh
@@ -107,6 +107,8 @@ namespace BaseboardRadiator {
void InitBaseboard(EnergyPlusData &state, int baseboardNum);
void SizeBaseboard(EnergyPlusData &state, int baseboardNum);
+
+ void checkForZoneSizing(EnergyPlusData &state);
};
void SimBaseboard(
diff --git a/src/EnergyPlus/BranchInputManager.cc b/src/EnergyPlus/BranchInputManager.cc
index 4e7c1508110..aa90b28e25b 100644
--- a/src/EnergyPlus/BranchInputManager.cc
+++ b/src/EnergyPlus/BranchInputManager.cc
@@ -1322,7 +1322,7 @@ namespace BranchInputManager {
} else {
state.dataBranchInputManager->BranchList(BCount).BranchNames({1, NumAlphas - 1}) = Alphas({2, NumAlphas});
for (Loop = 1; Loop <= state.dataBranchInputManager->BranchList(BCount).NumOfBranchNames; ++Loop) {
- // If NumOfBranches = 0 then Branches havent been read yet.
+ // If NumOfBranches = 0 then Branches haven't been read yet.
if ((int)state.dataBranchInputManager->Branch.size() == 0) {
GetBranchInput(state);
}
@@ -2251,7 +2251,7 @@ namespace BranchInputManager {
// DATE WRITTEN February 2008
// PURPOSE OF THIS SUBROUTINE:
- // An auxiliary routine locate a Airenser loop and type from a BranchListName
+ // An auxiliary routine to locate a Air condenser loop and type from a BranchListName
// METHODOLOGY EMPLOYED:
// calls GetObject for PRIMARY AIR LOOP
diff --git a/src/EnergyPlus/CMakeLists.txt b/src/EnergyPlus/CMakeLists.txt
index cfb928e00dc..174e2f0d693 100644
--- a/src/EnergyPlus/CMakeLists.txt
+++ b/src/EnergyPlus/CMakeLists.txt
@@ -17,6 +17,9 @@ configure_file(ConfiguredFunctions.in.cc "${CMAKE_CURRENT_BINARY_DIR}/Configured
if(LINK_WITH_PYTHON)
add_compile_definitions(LINK_WITH_PYTHON)
+ if(PYTHON_CLI)
+ add_compile_definitions(PYTHON_CLI)
+ endif()
endif()
if(USE_PSYCHROMETRICS_CACHING)
@@ -521,6 +524,8 @@ set(SRC
Pumps.hh
PurchasedAirManager.cc
PurchasedAirManager.hh
+ PythonEngine.cc
+ PythonEngine.hh
RefrigeratedCase.cc
RefrigeratedCase.hh
ReportCoilSelection.cc
@@ -965,7 +970,17 @@ if(LINK_WITH_PYTHON)
add_custom_command(
TARGET energyplusapi
POST_BUILD # TODO: I don't think we want to quote the generator expression
- COMMAND ${Python_EXECUTABLE} "${PROJECT_SOURCE_DIR}/cmake/PythonCopyStandardLib.py" "$" "python_standard_lib")
+ COMMAND ${Python_EXECUTABLE} "${PROJECT_SOURCE_DIR}/cmake/PythonCopyStandardLib.py" "$" "python_lib"
+ )
+ if (PYTHON_CLI)
+ add_custom_command(
+ TARGET energyplusapi
+ POST_BUILD # TODO: I don't think we want to quote the generator expression
+ COMMAND ${CMAKE_COMMAND} -E env --unset=PIP_REQUIRE_VIRTUALENV
+ ${Python_EXECUTABLE} -m pip install --target="$/python_lib" --upgrade energyplus-launch==3.7.2
+ COMMAND ${Python_EXECUTABLE} "${PROJECT_SOURCE_DIR}/cmake/PythonFixUpTclTk.py" "$/python_lib"
+ )
+ endif()
endif()
if(BUILD_PACKAGE)
@@ -973,7 +988,13 @@ if(BUILD_PACKAGE)
if(LINK_WITH_PYTHON)
# we'll want to grab the standard lib for python plugins
# TODO: I don't think we want to quote the generator expression
- install(DIRECTORY "$/python_standard_lib/" DESTINATION "./python_standard_lib")
+ install(DIRECTORY "$/python_lib/" DESTINATION "./python_lib")
+ if(WIN32 AND PYTHON_CLI)
+ # on Windows, with Build Package, and also Link With Python, we can also drop in shortcuts to the new auxiliary CLI
+ # NOTE: The install command COMPONENTS should line up so that they are run at the same packaging step
+ install(CODE "execute_process(COMMAND powershell.exe -ExecutionPolicy Bypass -File ${PROJECT_SOURCE_DIR}/scripts/dev/create_shortcut.ps1 -TargetPath \"$\" -ShortcutPath \"$/EPLaunchPython.lnk\" -Arguments \"auxiliary eplaunch\")" COMPONENT Auxiliary)
+ install(FILES $/EPLaunchPython.lnk DESTINATION "./" COMPONENT Auxiliary)
+ endif()
endif()
# we'll want to always provide the C API headers
install(FILES ${API_HEADERS} DESTINATION "./include/EnergyPlus/api")
@@ -1126,6 +1147,17 @@ if(BUILD_TESTING)
COMMAND energyplus -D -d "${CLI_TEST_DIR}/PythonPlugin.FromOutside/out-${NON_ASCII_DIRNAME}" ${NON_ASCII_DIRNAME}/${TEST_CASE}.idf
WORKING_DIRECTORY "${CLI_TEST_DIR}"
)
+
+ set(TEST_DIR "${PROJECT_BINARY_DIR}/tst/api/TestRuntimeReleasesTheGIL")
+ file(MAKE_DIRECTORY ${TEST_DIR})
+ add_test(NAME "API.Runtime.PythonPlugin.TestRuntimeReleasesTheGIL"
+ COMMAND "${Python_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestRuntimeReleasesTheGIL.py" -d "${TEST_DIR}" -w "${EPW_FILE}" -D "${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestRuntimeReleasesTheGIL/mcve_gil.idf"
+ )
+ set_tests_properties("API.Runtime.PythonPlugin.TestRuntimeReleasesTheGIL"
+ PROPERTIES
+ ENVIRONMENT PYTHONPATH=${DIR_WITH_PY_ENERGYPLUS}
+ TIMEOUT 10 # This used to timeout! and we expect it NOT to
+ )
endif()
endif()
diff --git a/src/EnergyPlus/ChilledCeilingPanelSimple.cc b/src/EnergyPlus/ChilledCeilingPanelSimple.cc
index bbc2320608c..1f6514b9d28 100644
--- a/src/EnergyPlus/ChilledCeilingPanelSimple.cc
+++ b/src/EnergyPlus/ChilledCeilingPanelSimple.cc
@@ -776,7 +776,7 @@ void InitCoolingPanel(EnergyPlusData &state, int const CoolingPanelNum, int cons
// This subroutine initializes the cooling panel units, and determines the UA values during simulation.
// METHODOLOGY EMPLOYED:
- // The initialization subrotines borrowed from other sources and heat exchanger formulation for cooling panel.
+ // The initialization subroutines borrowed from other sources and heat exchanger formulation for cooling panel.
// REFERENCES:
// Incropera and DeWitt, Fundamentals of Heat and Mass Transfer
@@ -1558,7 +1558,7 @@ void DistributeCoolingPanelRadGains(EnergyPlusData &state)
// DATE WRITTEN Sept 2014
// PURPOSE OF THIS SUBROUTINE:
- // To distribute the gains from the hot water basebaord heater
+ // To distribute the gains from the hot water baseboard heater
// as specified in the user input file. This includes distribution
// of long wavelength radiant gains to surfaces and "people."
diff --git a/src/EnergyPlus/ChillerAbsorption.cc b/src/EnergyPlus/ChillerAbsorption.cc
index 879e1725eda..b345c27184c 100644
--- a/src/EnergyPlus/ChillerAbsorption.cc
+++ b/src/EnergyPlus/ChillerAbsorption.cc
@@ -1222,7 +1222,7 @@ void BLASTAbsorberSpecs::sizeChiller(EnergyPlusData &state)
BaseSizer::reportSizerOutput(state,
moduleObjectType,
this->Name,
- "Iniital Design Size Design Generator Fluid Flow Rate [m3/s]",
+ "Initial Design Size Design Generator Fluid Flow Rate [m3/s]",
tmpGeneratorVolFlowRate);
}
} else {
@@ -1512,7 +1512,7 @@ void BLASTAbsorberSpecs::calculate(EnergyPlusData &state, Real64 &MyLoad, bool R
// limit by max capacity
this->QEvaporator = min(this->QEvaporator, (this->MaxPartLoadRat * this->NomCap));
- // Either set the flow to the Constant value or caluclate the flow for the variable volume
+ // Either set the flow to the Constant value or calculate the flow for the variable volume
if ((this->FlowMode == DataPlant::FlowMode::Constant) || (this->FlowMode == DataPlant::FlowMode::NotModulated)) {
this->EvapMassFlowRate = state.dataLoopNodes->Node(this->EvapInletNodeNum).MassFlowRate;
@@ -1728,6 +1728,9 @@ void BLASTAbsorberSpecs::calculate(EnergyPlusData &state, Real64 &MyLoad, bool R
this->CondOutletTemp = state.dataLoopNodes->Node(this->CondInletNodeNum).Temp;
this->CondMassFlowRate = 0.0;
this->QCondenser = 0.0;
+ MyLoad = 0.0;
+ this->EvapMassFlowRate = 0.0;
+ PlantUtilities::SetComponentFlowRate(state, this->EvapMassFlowRate, this->EvapInletNodeNum, this->EvapOutletNodeNum, this->CWPlantLoc);
return;
// V7 plant upgrade, no longer fatal here anymore, set some things and return
}
@@ -1746,7 +1749,7 @@ void BLASTAbsorberSpecs::calculate(EnergyPlusData &state, Real64 &MyLoad, bool R
if ((this->FlowMode == DataPlant::FlowMode::Constant) || (this->FlowMode == DataPlant::FlowMode::NotModulated)) {
GenMassFlowRate = this->GenMassFlowRateMax;
} else { // LeavingSetpointModulated
- // since the .FlowMode applies to the chiller evaporator, the generater mass flow rate will be proportional to the evaporator
+ // since the .FlowMode applies to the chiller evaporator, the generator mass flow rate will be proportional to the evaporator
// mass flow rate
Real64 GenFlowRatio = this->EvapMassFlowRate / this->EvapMassFlowRateMax;
GenMassFlowRate = min(this->GenMassFlowRateMax, GenFlowRatio * this->GenMassFlowRateMax);
diff --git a/src/EnergyPlus/ChillerElectricASHRAE205.cc b/src/EnergyPlus/ChillerElectricASHRAE205.cc
index 11ba018ab30..27c6aa32ac8 100644
--- a/src/EnergyPlus/ChillerElectricASHRAE205.cc
+++ b/src/EnergyPlus/ChillerElectricASHRAE205.cc
@@ -1339,7 +1339,14 @@ void ASHRAE205ChillerSpecs::calculate(EnergyPlusData &state, Real64 &MyLoad, boo
PlantUtilities::PullCompInterconnectTrigger(
state, this->CWPlantLoc, this->CondMassFlowIndex, this->CDPlantLoc, DataPlant::CriteriaType::MassFlowRate, this->CondMassFlowRate);
- if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) return;
+ if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
+ MyLoad = 0.0;
+ this->Power = standbyPower;
+ this->AmbientZoneGain = standbyPower;
+ this->EvapMassFlowRate = 0.0;
+ PlantUtilities::SetComponentFlowRate(state, this->EvapMassFlowRate, this->EvapInletNodeNum, this->EvapOutletNodeNum, this->CWPlantLoc);
+ return;
+ }
}
Real64 EvapOutletTempSetPoint(0.0); // Evaporator outlet temperature setpoint [C]
switch (state.dataPlnt->PlantLoop(PlantLoopNum).LoopDemandCalcScheme) {
diff --git a/src/EnergyPlus/ChillerElectricEIR.cc b/src/EnergyPlus/ChillerElectricEIR.cc
index c3bf642fc0c..dd268c8e30e 100644
--- a/src/EnergyPlus/ChillerElectricEIR.cc
+++ b/src/EnergyPlus/ChillerElectricEIR.cc
@@ -1948,11 +1948,11 @@ void ElectricEIRChillerSpecs::calculate(EnergyPlusData &state, Real64 &MyLoad, b
state, this->CWPlantLoc, this->CondMassFlowIndex, this->CDPlantLoc, DataPlant::CriteriaType::MassFlowRate, this->CondMassFlowRate);
if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
- if (this->EvapMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
- // Use PlantUtilities::SetComponentFlowRate to decide actual flow
- PlantUtilities::SetComponentFlowRate(
- state, this->EvapMassFlowRate, this->EvapInletNodeNum, this->EvapOutletNodeNum, this->CWPlantLoc);
- }
+ // Shut chiller off if there is no condenser water flow
+ MyLoad = 0.0;
+ this->EvapMassFlowRate = 0.0;
+ // Use PlantUtilities::SetComponentFlowRate to decide actual flow
+ PlantUtilities::SetComponentFlowRate(state, this->EvapMassFlowRate, this->EvapInletNodeNum, this->EvapOutletNodeNum, this->CWPlantLoc);
return;
}
}
diff --git a/src/EnergyPlus/ChillerExhaustAbsorption.cc b/src/EnergyPlus/ChillerExhaustAbsorption.cc
index bdf19121c02..acd74c9cd8a 100644
--- a/src/EnergyPlus/ChillerExhaustAbsorption.cc
+++ b/src/EnergyPlus/ChillerExhaustAbsorption.cc
@@ -86,7 +86,7 @@ namespace EnergyPlus::ChillerExhaustAbsorption {
// for Gas Research Institute (Original module GasAbsoptionChiller)
// DATE WRITTEN March 2001
// MODIFIED Brent Griffith, Nov 2010 plant upgrades, generalize fluid properties
-// Mahabir Bhandari, ORNL, Aug 2011, modified to accomodate Exhaust Fired Absorption Chiller
+// Mahabir Bhandari, ORNL, Aug 2011, modified to accommodate Exhaust Fired Absorption Chiller
// PURPOSE OF THIS MODULE:
// This module simulates the performance of the Exhaust fired double effect
@@ -238,7 +238,7 @@ void ExhaustAbsorberSpecs::getDesignCapacities(
if (!matchfound) {
// Error, nodes do not match
- ShowSevereError(state, format("SimExhaustAbsorber: Invalid call to Exhaust Absorbtion Chiller-Heater {}", this->Name));
+ ShowSevereError(state, format("SimExhaustAbsorber: Invalid call to Exhaust Absorption Chiller-Heater {}", this->Name));
ShowContinueError(state, "Node connections in branch are not consistent with object nodes.");
ShowFatalError(state, "Preceding conditions cause termination.");
} // Operate as Chiller or Heater
@@ -442,7 +442,7 @@ void GetExhaustAbsorberInput(EnergyPlusData &state)
ShowContinueError(state, format("Entered in {}={}", cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)));
ShowContinueError(state, "resetting to ENTERING-CONDENSER, simulation continues");
}
- // Assign Other Paramters
+ // Assign Other Parameters
if (Util::SameString(state.dataIPShortCut->cAlphaArgs(16), "AirCooled")) {
thisChiller.isWaterCooled = false;
} else if (Util::SameString(state.dataIPShortCut->cAlphaArgs(16), "WaterCooled")) {
@@ -937,7 +937,7 @@ void ExhaustAbsorberSpecs::initialize(EnergyPlusData &state)
// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Real64 rho; // local fluid density
- Real64 mdot; // lcoal fluid mass flow rate
+ Real64 mdot; // local fluid mass flow rate
int CondInletNode = this->CondReturnNodeNum;
int CondOutletNode = this->CondSupplyNodeNum;
@@ -1448,7 +1448,7 @@ void ExhaustAbsorberSpecs::calcChiller(EnergyPlusData &state, Real64 &MyLoad)
// SUBROUTINE INFORMATION:
// AUTHOR Jason Glazer
// DATE WRITTEN March 2001
- // MODIFIED Mahabir Bhandari, ORNL, Aug 2011, modified to accomodate exhaust fired chiller
+ // MODIFIED Mahabir Bhandari, ORNL, Aug 2011, modified to accommodate exhaust fired chiller
// PURPOSE OF THIS SUBROUTINE:
// Simulate a Exhaust fired (Exhaust consuming) absorption chiller using
@@ -1515,7 +1515,7 @@ void ExhaustAbsorberSpecs::calcChiller(EnergyPlusData &state, Real64 &MyLoad)
int lThermalEnergyCoolFPLRCurve = this->ThermalEnergyCoolFPLRCurve;
int lElecCoolFTCurve = this->ElecCoolFTCurve;
int lElecCoolFPLRCurve = this->ElecCoolFPLRCurve;
- bool lIsEnterCondensTemp = this->isEnterCondensTemp; // if using entering conderser water temperature is TRUE, exiting is FALSE
+ bool lIsEnterCondensTemp = this->isEnterCondensTemp; // if using entering condenser water temperature is TRUE, exiting is FALSE
bool lIsWaterCooled = this->isWaterCooled; // if water cooled it is TRUE
Real64 lCHWLowLimitTemp = this->CHWLowLimitTemp;
Real64 lHeatElectricPower = this->HeatElectricPower; // parasitic electric power used for heating
@@ -1722,7 +1722,7 @@ void ExhaustAbsorberSpecs::calcChiller(EnergyPlusData &state, Real64 &MyLoad)
Curve::CurveValue(state, lElecCoolFTCurve, lChillSupplyTemp, calcCondTemp) *
Curve::CurveValue(state, lElecCoolFPLRCurve, lCoolPartLoadRatio);
- // determine conderser load which is cooling load plus the
+ // determine condenser load which is cooling load plus the
// ThermalEnergy used for cooling plus
// the electricity used
lTowerLoad = lCoolingLoad + lCoolThermalEnergyUseRate / lThermalEnergyHeatRatio + lCoolElectricPower;
@@ -1754,7 +1754,7 @@ void ExhaustAbsorberSpecs::calcChiller(EnergyPlusData &state, Real64 &MyLoad)
this->ExhTempLTAbsLeavingTempIndex,
lExhaustInTemp,
AbsLeavingTemp);
- // If exhaust is not available, it means the avilable thermal energy is 0.0 and Chiller is not available
+ // If exhaust is not available, it means the available thermal energy is 0.0 and Chiller is not available
lCoolThermalEnergyUseRate = 0.0;
lTowerLoad = 0.0;
lCoolElectricPower = 0.0;
@@ -1835,7 +1835,7 @@ void ExhaustAbsorberSpecs::calcHeater(EnergyPlusData &state, Real64 &MyLoad, boo
// SUBROUTINE INFORMATION:
// AUTHOR Jason Glazer and Michael J. Witte
// DATE WRITTEN March 2001
- // MODIFIED Mahabir Bhandari, ORNL, Aug 2011, modified to accomodate exhaust fired double effect absorption chiller
+ // MODIFIED Mahabir Bhandari, ORNL, Aug 2011, modified to accommodate exhaust fired double effect absorption chiller
// PURPOSE OF THIS SUBROUTINE:
// Simulate a Exhaust fired (Exhaust consuming) absorption chiller using
@@ -1967,7 +1967,7 @@ void ExhaustAbsorberSpecs::calcHeater(EnergyPlusData &state, Real64 &MyLoad, boo
// Calculate electric parasitics used
// for heating based on nominal capacity not available capacity
lHeatElectricPower = this->NomCoolingCap * this->NomHeatCoolRatio * this->ElecHeatRatio * lFractionOfPeriodRunning;
- // Coodinate electric parasitics for heating and cooling to avoid double counting
+ // Coordinate electric parasitics for heating and cooling to avoid double counting
// Total electric is the max of heating electric or cooling electric
// If heating electric is greater, leave cooling electric and subtract if off of heating elec
// If cooling electric is greater, set heating electric to zero
@@ -1997,7 +1997,7 @@ void ExhaustAbsorberSpecs::calcHeater(EnergyPlusData &state, Real64 &MyLoad, boo
this->ExhTempLTAbsLeavingHeatingTempIndex,
lExhaustInTemp,
AbsLeavingTemp);
- // If exhaust is not available, it means the avilable thermal energy is 0.0 and Chiller is not available
+ // If exhaust is not available, it means the available thermal energy is 0.0 and Chiller is not available
lHeatThermalEnergyUseRate = 0.0;
lHeatElectricPower = 0.0;
lHotWaterSupplyTemp = heatReturnNode.Temp;
diff --git a/src/EnergyPlus/ChillerIndirectAbsorption.cc b/src/EnergyPlus/ChillerIndirectAbsorption.cc
index 9a60e43c688..cdc74e92ba0 100644
--- a/src/EnergyPlus/ChillerIndirectAbsorption.cc
+++ b/src/EnergyPlus/ChillerIndirectAbsorption.cc
@@ -1604,7 +1604,7 @@ void IndirectAbsorberSpecs::sizeChiller(EnergyPlusData &state)
}
}
-void IndirectAbsorberSpecs::calculate(EnergyPlusData &state, Real64 const MyLoad, bool const RunFlag)
+void IndirectAbsorberSpecs::calculate(EnergyPlusData &state, Real64 MyLoad, bool const RunFlag)
{
// SUBROUTINE INFORMATION:
// AUTHOR R. Raustad (FSEC)
@@ -1768,7 +1768,7 @@ void IndirectAbsorberSpecs::calculate(EnergyPlusData &state, Real64 const MyLoad
this->PossibleSubcooling = false;
this->QEvaporator = std::abs(MyLoad);
- // Either set the flow to the Constant value or caluclate the flow for the variable volume
+ // Either set the flow to the Constant value or calculate the flow for the variable volume
if ((this->FlowMode == DataPlant::FlowMode::Constant) || (this->FlowMode == DataPlant::FlowMode::NotModulated)) {
this->EvapMassFlowRate = state.dataLoopNodes->Node(this->EvapInletNodeNum).MassFlowRate;
@@ -1999,6 +1999,9 @@ void IndirectAbsorberSpecs::calculate(EnergyPlusData &state, Real64 const MyLoad
this->CondOutletTemp = CondInletTemp;
this->CondMassFlowRate = 0.0;
this->QCondenser = 0.0;
+ MyLoad = 0.0;
+ this->EvapMassFlowRate = 0.0;
+ PlantUtilities::SetComponentFlowRate(state, this->EvapMassFlowRate, this->EvapInletNodeNum, this->EvapOutletNodeNum, this->CWPlantLoc);
return;
// V7 plant upgrade, no longer fatal here anymore... set some things and return
}
diff --git a/src/EnergyPlus/ChillerReformulatedEIR.cc b/src/EnergyPlus/ChillerReformulatedEIR.cc
index 192511d4a92..58b39f94ccd 100644
--- a/src/EnergyPlus/ChillerReformulatedEIR.cc
+++ b/src/EnergyPlus/ChillerReformulatedEIR.cc
@@ -2137,7 +2137,12 @@ void ReformulatedEIRChillerSpecs::calculate(EnergyPlusData &state, Real64 &MyLoa
PlantUtilities::PullCompInterconnectTrigger(
state, this->CWPlantLoc, this->CondMassFlowIndex, this->CDPlantLoc, DataPlant::CriteriaType::MassFlowRate, this->CondMassFlowRate);
- if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) return;
+ if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
+ MyLoad = 0.0;
+ this->EvapMassFlowRate = 0.0;
+ PlantUtilities::SetComponentFlowRate(state, this->EvapMassFlowRate, this->EvapInletNodeNum, this->EvapOutletNodeNum, this->CWPlantLoc);
+ return;
+ }
}
Real64 FRAC = 1.0;
Real64 EvapOutletTempSetPoint(0.0); // Evaporator outlet temperature setpoint [C]
diff --git a/src/EnergyPlus/Coils/CoilCoolingDXCurveFitOperatingMode.cc b/src/EnergyPlus/Coils/CoilCoolingDXCurveFitOperatingMode.cc
index 0d4976bbcde..0067efabb32 100644
--- a/src/EnergyPlus/Coils/CoilCoolingDXCurveFitOperatingMode.cc
+++ b/src/EnergyPlus/Coils/CoilCoolingDXCurveFitOperatingMode.cc
@@ -291,7 +291,7 @@ void CoilCoolingDXCurveFitOperatingMode::CalcOperatingMode(EnergyPlus::EnergyPlu
// Currently speedNum is 1-based, while this->speeds are zero-based
auto &thisspeed(this->speeds[max(speedNum - 1, 0)]);
- if (((speedNum == 1) && (PLR == 0.0)) || (inletNode.MassFlowRate == 0.0)) {
+ if ((speedNum == 0) || ((speedNum == 1) && (PLR == 0.0)) || (inletNode.MassFlowRate == 0.0)) {
outletNode.Temp = inletNode.Temp;
outletNode.HumRat = inletNode.HumRat;
outletNode.Enthalpy = inletNode.Enthalpy;
diff --git a/src/EnergyPlus/Coils/CoilCoolingDXCurveFitPerformance.cc b/src/EnergyPlus/Coils/CoilCoolingDXCurveFitPerformance.cc
index b6c0d9d79a8..f366bc567b1 100644
--- a/src/EnergyPlus/Coils/CoilCoolingDXCurveFitPerformance.cc
+++ b/src/EnergyPlus/Coils/CoilCoolingDXCurveFitPerformance.cc
@@ -446,7 +446,7 @@ void CoilCoolingDXCurveFitPerformance::calcStandardRatings210240(EnergyPlus::Ene
Real64 ElecPowerReducedCap(0.0); // Net power consumption (Cond Fan+Compressor) at reduced test condition [W]
Real64 NetCoolingCapReduced(0.0); // Net Cooling Coil capacity at reduced conditions, accounting for supply fan heat [W]
Real64 LoadFactor(0.0); // Fractional "on" time for last stage at the desired reduced capacity, (dimensionless)
- Real64 DegradationCoeff(0.0); // Degradation coeficient, (dimenssionless)
+ Real64 DegradationCoeff(0.0); // Degradation coefficient, (dimensionless)
Real64 OutdoorUnitInletAirDryBulbTempReduced; // Outdoor unit entering air dry-bulb temperature at reduced capacity [C]
// *** SOME CONSTANTS FROM THE STANDARD
diff --git a/src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc b/src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc
index ec56fbabc15..7e2af833675 100644
--- a/src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc
+++ b/src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc
@@ -838,7 +838,7 @@ Real64 CoilCoolingDXCurveFitSpeed::calcEffectiveSHR(const DataLoopNode::NodeData
To1 = aa + Tcl;
Error = 1.0;
while (Error > 0.001) {
- To2 = aa - Tcl * (std::exp(-To1 / Tcl) - 1.0);
+ To2 = aa - Tcl * std::expm1(-To1 / Tcl);
Error = std::abs((To2 - To1) / To1);
To1 = To2;
}
diff --git a/src/EnergyPlus/CommandLineInterface.cc b/src/EnergyPlus/CommandLineInterface.cc
index 87a0f00abd0..c25c82f4819 100644
--- a/src/EnergyPlus/CommandLineInterface.cc
+++ b/src/EnergyPlus/CommandLineInterface.cc
@@ -61,6 +61,10 @@
#include
#include
+#if LINK_WITH_PYTHON
+#include
+#endif
+
namespace EnergyPlus {
namespace CommandLineInterface {
@@ -230,6 +234,58 @@ Built on Platform: {}
// bool debugCLI = false;
app.add_flag("--debug-cli", debugCLI, "Print the result of the CLI assignments to the console and exit")->group(""); // Empty group to hide it
+#if LINK_WITH_PYTHON
+#ifdef PYTHON_CLI
+ auto *auxiliaryToolsSubcommand = app.add_subcommand("auxiliary", "Run Auxiliary Python Tools");
+ auxiliaryToolsSubcommand->require_subcommand(); // should default to requiring 1 or more additional args?
+
+ std::vector python_fwd_args;
+ auto *epLaunchSubCommand = auxiliaryToolsSubcommand->add_subcommand("eplaunch", "EnergyPlus Launch");
+ epLaunchSubCommand->add_option("args", python_fwd_args, "Extra Arguments forwarded to EnergyPlus Launch")->option_text("ARG ...");
+ epLaunchSubCommand->positionals_at_end(true);
+ epLaunchSubCommand->footer("You can pass extra arguments after the eplaunch keyword, they will be forwarded to EnergyPlus Launch.");
+
+ epLaunchSubCommand->callback([&state, &python_fwd_args] {
+ EnergyPlus::Python::PythonEngine engine(state);
+ // There's probably better to be done, like instantiating the pythonEngine with the argc/argv then calling PyRun_SimpleFile but whatever
+ std::string cmd = R"python(import sys
+sys.argv.clear()
+sys.argv.append("energyplus")
+)python";
+ for (const auto &arg : python_fwd_args) {
+ cmd += fmt::format("sys.argv.append(\"{}\")\n", arg);
+ }
+
+ fs::path programDir = FileSystem::getParentDirectoryPath(FileSystem::getAbsolutePath(FileSystem::getProgramPath()));
+ fs::path const pathToPythonPackages = programDir / "python_lib";
+ std::string sPathToPythonPackages = std::string(pathToPythonPackages.string());
+ std::replace(sPathToPythonPackages.begin(), sPathToPythonPackages.end(), '\\', '/');
+ cmd += fmt::format("sys.path.insert(0, \"{}\")\n", sPathToPythonPackages);
+
+ std::string tclConfigDir = "";
+ for (auto &p : std::filesystem::directory_iterator(pathToPythonPackages)) {
+ if (p.is_directory()) {
+ std::string dirName = p.path().filename().string();
+ if (dirName.find("tcl", 0) == 0 && dirName.find(".", 0) > 0) {
+ tclConfigDir = dirName;
+ break;
+ }
+ }
+ }
+ cmd += "from os import environ\n";
+ cmd += fmt::format("environ[\'TCL_LIBRARY\'] = \"{}/{}\"\n", sPathToPythonPackages, tclConfigDir);
+
+ cmd += R"python(
+from eplaunch.tk_runner import main_gui
+main_gui()
+)python";
+ // std::cout << "Trying to execute this python snippet: " << std::endl << cmd << std::endl;
+ engine.exec(cmd);
+ exit(0);
+ });
+#endif
+#endif
+
app.footer("Example: energyplus -w weather.epw -r input.idf");
const bool eplusRunningViaAPI = state.dataGlobal->eplusRunningViaAPI;
@@ -695,33 +751,16 @@ state.dataStrGlobals->inputFilePath='{:g}',
// Duplicate the kind of reading the Windows "GetINISetting" would
// do.
- // REFERENCES:
- // na
-
// Using/Aliasing
using namespace EnergyPlus;
using namespace DataStringGlobals;
- // Locals
- // SUBROUTINE ARGUMENT DEFINITIONS:
-
- // SUBROUTINE PARAMETER DEFINITIONS:
-
- // INTERFACE BLOCK SPECIFICATIONS
- // na
-
- // DERIVED TYPE DEFINITIONS
- // na
-
- // SUBROUTINE LOCAL VARIABLE DECLARATIONS:
-
std::string Param;
std::string::size_type ILB;
std::string::size_type IRB;
std::string::size_type IEQ;
std::string::size_type IPAR;
std::string::size_type IPOS;
- std::string::size_type ILEN;
// Formats
@@ -731,7 +770,6 @@ state.dataStrGlobals->inputFilePath='{:g}',
Param = KindofParameter;
strip(Param);
- ILEN = len(Param);
inputFile.rewind();
bool Found = false;
bool NewHeading = false;
diff --git a/src/EnergyPlus/CondenserLoopTowers.cc b/src/EnergyPlus/CondenserLoopTowers.cc
index 7289fd987a4..72e118bd8cb 100644
--- a/src/EnergyPlus/CondenserLoopTowers.cc
+++ b/src/EnergyPlus/CondenserLoopTowers.cc
@@ -2237,7 +2237,7 @@ namespace CondenserLoopTowers {
Real64 DesTowerExitWaterTemp; // design tower exit water temperature
Real64 DesTowerWaterDeltaT; // design tower temperature range
Real64 DesTowerApproachFromPlant; // design tower approach temperature from plant sizing object
- Real64 TolTemp(0.04); // DeltaT and DesApproach diffs tollerance between plant sizing data and user input in cooling tower
+ Real64 TolTemp(0.04); // DeltaT and DesApproach diffs tolerance between plant sizing data and user input in cooling tower
// for warning message reporting purpose only
Real64 tmpDesignWaterFlowRate = this->DesignWaterFlowRate;
@@ -3268,7 +3268,7 @@ namespace CondenserLoopTowers {
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchCTFCRange, this->Name, this->DesignRange);
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchCTFCApproach, this->Name, this->DesignApproach);
OutputReportPredefined::PreDefTableEntry(
- state, state.dataOutRptPredefined->pdchCTFCDesFanPwr, this->Name, this->HighSpeedFanPower); // eqival to Design Fan Power?
+ state, state.dataOutRptPredefined->pdchCTFCDesFanPwr, this->Name, this->HighSpeedFanPower); // equivalent to Design Fan Power?
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchCTFCDesInletAirWBT, this->Name, this->DesInletAirWBTemp);
OutputReportPredefined::PreDefTableEntry(
state, state.dataOutRptPredefined->pdchCTFCDesWaterFlowRate, this->Name, this->DesignWaterFlowRate);
@@ -3357,7 +3357,7 @@ namespace CondenserLoopTowers {
Real64 DesTowerExitWaterTemp; // design tower exit water temperature
Real64 DesTowerWaterDeltaT; // design tower temperature range
Real64 DesTowerApproachFromPlant; // design tower approach temperature from plant sizing object
- Real64 TolTemp(0.04); // DeltaT and DesApproach diffs tollerance between plant sizing data and user input in cooling tower
+ Real64 TolTemp(0.04); // DeltaT and DesApproach diffs tolerance between plant sizing data and user input in cooling tower
// for warning message reporting purpose only
// Find the appropriate Plant Sizing object
@@ -3402,9 +3402,9 @@ namespace CondenserLoopTowers {
format("is inconsistent with Design Loop Delta Temperature specified in Sizing:Plant object = {}.",
PlantSizData(PltSizCondNum).PlantLoopName));
ShowContinueError(state, format("..The Design Range Temperature specified in tower is = {:.2T}", this->DesRange));
- ShowContinueError(state,
- format("..The Design Loop Delta Temperature specified iin plant sizing data is = {:.2T}",
- PlantSizData(PltSizCondNum).DeltaT));
+ ShowContinueError(
+ state,
+ format("..The Design Loop Delta Temperature specified in plant sizing data is = {:.2T}", PlantSizData(PltSizCondNum).DeltaT));
}
// check if the tower approach is different from plant sizing data
DesTowerApproachFromPlant = PlantSizData(PltSizCondNum).ExitTemp - this->DesInletAirWBTemp;
@@ -3706,7 +3706,7 @@ namespace CondenserLoopTowers {
}
}
- // now calcuate UA values from nominal capacities and flow rates
+ // now calculate UA values from nominal capacities and flow rates
if (state.dataPlnt->PlantFirstSizesOkayToFinalize) {
if (PltSizCondNum > 0) { // user has a plant sizing object
Cp = FluidProperties::GetSpecificHeatGlycol(state,
@@ -4044,7 +4044,7 @@ namespace CondenserLoopTowers {
}
}
}
- // now calcuate UA values from nominal capacities and flow rates
+ // now calculate UA values from nominal capacities and flow rates
if (state.dataPlnt->PlantFirstSizesOkayToFinalize) {
rho = FluidProperties::GetDensityGlycol(state,
state.dataPlnt->PlantLoop(this->plantLoc.loopNum).FluidName,
@@ -4604,7 +4604,7 @@ namespace CondenserLoopTowers {
}
// Calculate bypass fraction since OWTLowerLimit < OutletWaterTemp < TempSetPoint.
- // The iteraction ends when the numer of iteraction exceeds the limit or the difference
+ // The iteration ends when the number of iterations exceeds the limit or the difference
// between the new and old bypass fractions is less than the threshold.
if (BypassFlag == 1) {
// Inlet water temperature lower than setpoint, assume 100% bypass, tower fan off
@@ -4642,7 +4642,7 @@ namespace CondenserLoopTowers {
this->OutletWaterTemp = this->calculateSimpleTowerOutletTemp(
state, WaterMassFlowRatePerCell * (1.0 - BypassFraction2), AirFlowRate, UAdesign);
if (this->OutletWaterTemp < OWTLowerLimit) {
- // Use previous iteraction values
+ // Use previous iteration values
BypassFraction2 = BypassFractionPrev;
this->OutletWaterTemp = OutletWaterTempPrev;
}
@@ -4706,7 +4706,7 @@ namespace CondenserLoopTowers {
// Cyclic losses are neglected. The period of time required to meet the
// leaving water temperature setpoint is used to determine the required
// fan power and energy. Free convection regime is also modeled. This
- // occures when the pump is operating and the fan is off. If free convection
+ // occurs when the pump is operating and the fan is off. If free convection
// regime cooling is all that is required for a given time step, the leaving
// water temperature is allowed to fall below the leaving water temperature
// setpoint (free cooling). At times when the cooling tower fan is required,
@@ -5502,7 +5502,7 @@ namespace CondenserLoopTowers {
}
}
- // now rerun to get peformance with AirFlowRateRatio
+ // now rerun to get performance with AirFlowRateRatio
AirFlowRatePerCell = this->airFlowRateRatio * this->HighSpeedAirFlowRate / this->NumCell;
UAairflowAdjFac = Curve::CurveValue(state, this->UAModFuncAirFlowRatioCurvePtr, this->airFlowRateRatio);
@@ -5822,7 +5822,7 @@ namespace CondenserLoopTowers {
// calculate end time of current time step
Real64 CurrentEndTime = state.dataGlobal->CurrentTime + state.dataHVACGlobal->SysTimeElapsed;
- // Print warning messages only when valid and only for the first ocurrance. Let summary provide statistics.
+ // Print warning messages only when valid and only for the first occurrence. Let summary provide statistics.
// Wait for next time step to print warnings. If simulation iterates, print out
// the warning for the last iteration only. Must wait for next time step to accomplish this.
// If a warning occurs and the simulation down shifts, the warning is not valid.
@@ -6046,7 +6046,7 @@ namespace CondenserLoopTowers {
// A Flament, July 2010. Added multi-cell capability
// PURPOSE OF THIS SUBROUTINE:
- // Collect tower water useage calculations for reuse by all the tower models.
+ // Collect tower water usage calculations for reuse by all the tower models.
// REFERENCES:
// Code for this routine started from VariableSpeedTower
@@ -6186,7 +6186,7 @@ namespace CondenserLoopTowers {
state.dataGlobal->WarmupFlag)
return;
- // Check flow rate through tower and compare to design flow rate, show warning if greater than Design * Mulitplier
+ // Check flow rate through tower and compare to design flow rate, show warning if greater than Design * Multiplier
if (state.dataLoopNodes->Node(this->WaterOutletNodeNum).MassFlowRate > this->DesWaterMassFlowRate * this->TowerMassFlowRateMultiplier) {
++this->HighMassFlowErrorCount;
if (this->HighMassFlowErrorCount < 2) {
diff --git a/src/EnergyPlus/ConvectionCoefficients.cc b/src/EnergyPlus/ConvectionCoefficients.cc
index 752906c1012..e9cfd9817da 100644
--- a/src/EnergyPlus/ConvectionCoefficients.cc
+++ b/src/EnergyPlus/ConvectionCoefficients.cc
@@ -4046,7 +4046,9 @@ void DynamicIntConvSurfaceClassification(EnergyPlusData &state, int const SurfNu
}
} break;
case DataZoneEquipment::ZoneEquipType::VentilatedSlab:
- case DataZoneEquipment::ZoneEquipType::LowTemperatureRadiant: {
+ case DataZoneEquipment::ZoneEquipType::LowTemperatureRadiantConstFlow:
+ case DataZoneEquipment::ZoneEquipType::LowTemperatureRadiantVarFlow:
+ case DataZoneEquipment::ZoneEquipType::LowTemperatureRadiantElectric: {
if (zoneEquipConfig.InFloorActiveElement) {
for (int spaceNumLoop : zone.spaceIndexes) {
auto const &thisSpace = state.dataHeatBal->space(spaceNumLoop);
@@ -6291,7 +6293,7 @@ Real64 CalcClearRoof(EnergyPlusData &state,
Real64 Rf = RoughnessMultiplier[(int)RoughnessIndex];
if (Rex > 0.1) { // avoid zero and crazy small denominators
- Real64 tmp = std::log(1.0 + GrLn / pow_2(Rex));
+ Real64 tmp = std::log1p(GrLn / pow_2(Rex));
eta = tmp / (1.0 + tmp);
} else {
eta = 1.0; // forced convection gone because no wind
diff --git a/src/EnergyPlus/DElightManagerF.cc b/src/EnergyPlus/DElightManagerF.cc
index 0c0926870a7..dff1e3c56a6 100644
--- a/src/EnergyPlus/DElightManagerF.cc
+++ b/src/EnergyPlus/DElightManagerF.cc
@@ -333,7 +333,7 @@ namespace DElightManagerF {
// Write each opaque bounding Surface to the DElight input file
for (int spaceNum : zn.spaceIndexes) {
- auto &thisSpace = state.dataHeatBal->space(spaceNum);
+ auto const &thisSpace = state.dataHeatBal->space(spaceNum);
int const iSurfaceFirst = thisSpace.HTSurfaceFirst;
int const iSurfaceLast = thisSpace.HTSurfaceLast;
for (int isurf = iSurfaceFirst; isurf <= iSurfaceLast; ++isurf) {
diff --git a/src/EnergyPlus/DXCoils.cc b/src/EnergyPlus/DXCoils.cc
index eed19f4d915..17abf875b48 100644
--- a/src/EnergyPlus/DXCoils.cc
+++ b/src/EnergyPlus/DXCoils.cc
@@ -228,7 +228,7 @@ void SimDXCoil(EnergyPlusData &state,
CalcDXHeatingCoil(state, DXCoilNum, PartLoadRatio, fanOp, AirFlowRatio, MaxCap);
} break;
case HVAC::CoilVRF_FluidTCtrl_Cooling: {
- CalcVRFCoolingCoil_FluidTCtrl(state, DXCoilNum, HVAC::CompressorOp::On, FirstHVACIteration, PartLoadRatio, fanOp, CompCycRatio, _, _);
+ CalcVRFCoolingCoil_FluidTCtrl(state, DXCoilNum, HVAC::CompressorOp::On, FirstHVACIteration, PartLoadRatio, fanOp, CompCycRatio, _, _, MaxCap);
} break;
case HVAC::CoilVRF_FluidTCtrl_Heating: {
CalcVRFHeatingCoil_FluidTCtrl(state, compressorOp, DXCoilNum, PartLoadRatio, fanOp, _, MaxCap);
@@ -252,7 +252,7 @@ void SimDXCoilMultiSpeed(EnergyPlusData &state,
Real64 const SpeedRatio, // = (CompressorSpeed - CompressorSpeedMin) /
Real64 const CycRatio, // cycling part load ratio for variable speed
int &CompIndex,
- ObjexxFCL::Optional_int_const SpeedNum, // Speed number for multispeed cooling coil onlyn
+ ObjexxFCL::Optional_int_const SpeedNum, // Speed number for multispeed cooling coil only
ObjexxFCL::Optional fanOp, // Fan operation mode
HVAC::CompressorOp compressorOp, // Compressor on/off; 1=on, 0=off
ObjexxFCL::Optional_int_const SingleMode // Single mode operation Yes/No; 1=Yes, 0=No
@@ -1800,7 +1800,7 @@ void GetDXCoils(EnergyPlusData &state)
thisDXCoil.RatedEIR(PerfModeNum) = 1.0 / thisDXCoil.RatedCOP(PerfModeNum);
- // read in user specified SHR modifer curves
+ // read in user specified SHR modifier curves
if (!lAlphaBlanks2(9) && NumAlphas2 > 8) {
thisDXCoil.SHRFTemp(PerfModeNum) = GetCurveIndex(state, Alphas2(9)); // convert curve name to number
if (thisDXCoil.SHRFTemp(PerfModeNum) == 0) {
@@ -5214,7 +5214,7 @@ void GetDXCoils(EnergyPlusData &state)
thisDXCoil.RatedSHR(1) = Numbers(2);
thisDXCoil.SH = Numbers(3);
// @@ DXCoil( DXCoilNum ).RateBFVRFIUEvap = 0.0592; there will be a new field for this, which will be handled in a separate issue to
- // update VRF-HP idd. It is not hanlded here to avoide tranistion issues for VRF-HP.
+ // update VRF-HP idd. It is not handled here to avoid transition issues for VRF-HP.
int indexSHCurve = GetCurveIndex(state, Alphas(5)); // convert curve name to index number
// Verify curve name and type
@@ -6789,7 +6789,7 @@ void InitDXCoil(EnergyPlusData &state, int const DXCoilNum) // number of the cur
thisDXCoil.RatedAirVolFlowRate(Mode),
thisDXCoil.RatedSHR(Mode));
- // call coil model with everthing set at rating point
+ // call coil model with everything set at rating point
thisDXCoil.InletAirMassFlowRate = thisDXCoil.RatedAirMassFlowRate(Mode);
thisDXCoil.InletAirMassFlowRateMax = thisDXCoil.RatedAirMassFlowRate(Mode);
thisDXCoil.InletAirTemp = RatedInletAirTemp;
@@ -6826,7 +6826,8 @@ void InitDXCoil(EnergyPlusData &state, int const DXCoilNum) // number of the cur
} else if (thisDXCoil.DXCoilType_Num == HVAC::CoilVRF_Cooling) {
CalcVRFCoolingCoil(state, DXCoilNum, HVAC::CompressorOp::On, false, 1.0, HVAC::FanOp::Cycling, 1.0, _, _, _);
} else if (thisDXCoil.DXCoilType_Num == HVAC::CoilVRF_FluidTCtrl_Cooling) {
- CalcVRFCoolingCoil_FluidTCtrl(state, DXCoilNum, HVAC::CompressorOp::On, false, 1.0, HVAC::FanOp::Cycling, 1.0, _, _);
+ CalcVRFCoolingCoil_FluidTCtrl(
+ state, DXCoilNum, HVAC::CompressorOp::On, false, 1.0, HVAC::FanOp::Cycling, 1.0, _, _, Constant::MaxCap);
}
// coil outlets
@@ -6950,7 +6951,7 @@ void InitDXCoil(EnergyPlusData &state, int const DXCoilNum) // number of the cur
}
}
- // call coil model with everthing set at rating point
+ // call coil model with everything set at rating point
thisDXCoil.InletAirMassFlowRate = thisDXCoil.RatedAirMassFlowRate(Mode);
thisDXCoil.InletAirMassFlowRateMax = thisDXCoil.RatedAirMassFlowRate(Mode);
@@ -7048,7 +7049,7 @@ void InitDXCoil(EnergyPlusData &state, int const DXCoilNum) // number of the cur
thisDXCoil.RatedAirVolFlowRate2,
thisDXCoil.RatedSHR2);
- // call for standard ratings for two-speeed DX coil
+ // call for standard ratings for two-speed DX coil
if (thisDXCoil.CondenserType(1) == DataHeatBalance::RefrigCondenserType::Air) {
CalcTwoSpeedDXCoilStandardRating(state, DXCoilNum);
}
@@ -7193,7 +7194,7 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
// Feb 2005, M. J. Witte, GARD Analytics, Inc. Add new coil type COIL:DX:MultiMode:CoolingEmpirical.
// Jul 2005, R. Raustad, FSEC. Add new coil type COIL:DX:HEATPUMPWATERHEATER
// Jun 2007, L. Gu, FSEC. Add new coil type COIL:DX:MULTISPEED:COOLING and HEATING
- // Jan 2011, B. Griffithn, NREL. add EMS overrides for autosized fields
+ // Jan 2011, B. Griffith, NREL. add EMS overrides for autosized fields
// Aug 2013, D. Kang. add component sizing table entries
// May 2014, R. Raustad, FSEC. moved sizing calculations to common routine
// Aug 2015, R. Zhang, LBNL. Add new coil types for VRF_FluidTCtrl
@@ -7223,60 +7224,29 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
int Mode; // Operating mode for MultiMode DX coil; Always 1 for other coil types
int NumOfSpeedCompanion; // Number of speed for a companion cooling coil (Multispeed HO heating coil only
std::string equipName;
- Real64 RatedAirVolFlowRateDes; // Design rated air volume flow for reporting
- Real64 RatedAirVolFlowRateUser; // Hard-sized rated air volume flow for reporting
- Real64 RatedAirVolFlowRate2Des; // Design rated low speed air volume flow for reporting
- Real64 RatedAirVolFlowRate2User; // Hard-sized rated low speed air volume flow for reporting
- Real64 RatedTotCapDes; // Design rated total capacity for reproting
- Real64 RatedTotCapUser; // Hard-sized rated total capacity for reproting
- Real64 RatedTotCap2Des; // Design rated low speed total capacity for reproting
- Real64 RatedTotCap2User; // Hard-sized rated low speed total capacity for reproting
- Real64 RatedSHRDes; // Design ratd SHR for reporting
- Real64 RatedSHRUser; // Hard-sized ratd SHR for reporting
- Real64 RatedSHR2Des; // Design ratd low speed SHR for reporting
- Real64 RatedSHR2User; // Hard-sized ratd low speed SHR for reporting
- Real64 EvapCondAirFlowDes; // Design evaporative condenser air flow for reporting
- Real64 EvapCondAirFlowUser; // Hard-sized evaporative condenser air flow for reporting
- Real64 EvapCondAirFlow2Des; // Design low speed evaporative condenser air flow for reporting
- Real64 EvapCondAirFlow2User; // Hard-sized low speed evaporative condenser air flow for reporting
- Real64 EvapCondPumpElecNomPowerDes; // Design evaporative condenser pump rated power consumption for reporting
- Real64 EvapCondPumpElecNomPowerUser; // Hard-sized evaporative condenser pump rated power consumption for reporting
- Real64 EvapCondPumpElecNomPower2Des; // Design low speed condenser pump rated power consumption for reporting
- Real64 EvapCondPumpElecNomPower2User; // Hard-sized low speed condenser pump rated power consumption for reporting
- Real64 DefrostCapacityDes; // Design defrost heater capacity for reporting
- Real64 DefrostCapacityUser; // Hard-sized defrost heater capacity for reporting
- Real64 MSRatedAirVolFlowRateDes; // Design multispeed rated air volume flow rate for reporting
- Real64 MSRatedAirVolFlowRateUser; // Hard-sized multispeed rated air volume flow rate for reporting
- Real64 MSRatedTotCapDesAtMaxSpeed; // Design multispeed rated total capacity for reporting (at maximum speed)
- Real64 MSRatedTotCapUser; // Hard-sized multispeed rated total capacity for reporting
- Real64 MSRatedSHRDes; // Design multispeed rated SHR for reporting
- Real64 MSRatedSHRUser; // Hard-sized multispeed rated SHR for reporting
- Real64 MSEvapCondAirFlowDes; // Design evaporative condenser air flow for reporting
- Real64 MSEvapCondAirFlowUser; // Hard-sized evaporative condenser air flow for reporting
- Real64 MSEvapCondAirFlow2Des; // Design low speed evaporative condenser air flow for reporting
- Real64 MSEvapCondAirFlow2User; // Hard-sized low speed evaporative condenser air flow for reporting
- Real64 MSEvapCondPumpElecNomPowerDes; // Design evaporative condenser pump rated power consumption for reporting
- Real64 MSEvapCondPumpElecNomPowerUser; // Hard-sized evaporative condenser pump rated power consumption for reporting
- Real64 MSEvapCondPumpElecNomPower2Des; // Design low speed condenser pump rated power consumption for reporting
- Real64 MSEvapCondPumpElecNomPower2User; // Hard-sized low speed condenser pump rated power consumption for reporting
- Real64 MSDefrostCapacityDes; // Design defrost heater capacity for reporting
- Real64 MSDefrostCapacityUser; // Hard-sized defrost heater capacity for reporting
- bool HardSizeNoDesRun; // Indicator to a hard-sized field with no design sizing data
- bool IsAutoSize; // Indicator to autosize for reporting
- bool IsCoolCoilCapAutoSize; // Indicator to cooling capacity autosize for reporting
- bool SizingDesRunThisAirSys; // true if a particular air system had a Sizing:System object and system sizing done
- bool SizingDesRunThisZone; // true if a particular zone had a Sizing:Zone object and zone sizing was done
- std::string CompName; // component name
- std::string CompType; // component type
- std::string SizingString; // input field sizing description (e.g., Nominal Capacity)
- bool bPRINT = true; // TRUE if sizing is reported to output (eio)
- Real64 TempSize; // autosized value of coil input field
- int FieldNum = 2; // IDD numeric field number where input field description is found
- int SizingMethod; // Integer representation of sizing method (e.g., CoolingAirflowSizing, HeatingCapacitySizing, etc.)
- bool PrintFlag; // TRUE when sizing information is reported in the eio file
- bool SizeSecDXCoil; // if true do sizing calculation for secondary coil
- Real64 SecCoilAirFlowDes; // Design secondary DX coil air flow for reporting
- Real64 SecCoilAirFlowUser; // Hard-sized secondary DX coil air flow for reporting
+ Real64 DefrostCapacityDes; // Design defrost heater capacity for reporting
+ Real64 DefrostCapacityUser; // Hard-sized defrost heater capacity for reporting
+ Real64 MSRatedAirVolFlowRateDes; // Design multispeed rated air volume flow rate for reporting
+ Real64 MSRatedTotCapDesAtMaxSpeed; // Design multispeed rated total capacity for reporting (at maximum speed)
+ Real64 MSRatedSHRDes; // Design multispeed rated SHR for reporting
+ Real64 MSEvapCondAirFlowDes; // Design evaporative condenser air flow for reporting
+ Real64 MSEvapCondAirFlowUser; // Hard-sized evaporative condenser air flow for reporting
+ Real64 MSEvapCondPumpElecNomPowerDes; // Design evaporative condenser pump rated power consumption for reporting
+ Real64 MSEvapCondPumpElecNomPowerUser; // Hard-sized evaporative condenser pump rated power consumption for reporting
+ bool HardSizeNoDesRun; // Indicator to a hard-sized field with no design sizing data
+ bool IsAutoSize; // Indicator to autosize for reporting
+ bool SizingDesRunThisAirSys; // true if a particular air system had a Sizing:System object and system sizing done
+ bool SizingDesRunThisZone; // true if a particular zone had a Sizing:Zone object and zone sizing was done
+ std::string CompName; // component name
+ std::string CompType; // component type
+ std::string SizingString; // input field sizing description (e.g., Nominal Capacity)
+ bool bPRINT = true; // TRUE if sizing is reported to output (eio)
+ Real64 TempSize; // autosized value of coil input field
+ int FieldNum = 2; // IDD numeric field number where input field description is found
+ bool PrintFlag; // TRUE when sizing information is reported in the eio file
+ bool SizeSecDXCoil; // if true do sizing calculation for secondary coil
+ Real64 SecCoilAirFlowDes; // Design secondary DX coil air flow for reporting
+ Real64 SecCoilAirFlowUser; // Hard-sized secondary DX coil air flow for reporting
// Initiate all reporting variables
if (state.dataSize->SysSizingRunDone || state.dataSize->ZoneSizingRunDone) {
@@ -7297,47 +7267,16 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
}
IsAutoSize = false;
- IsCoolCoilCapAutoSize = false;
SizeSecDXCoil = false;
- RatedAirVolFlowRateDes = 0.0;
- RatedAirVolFlowRateUser = 0.0;
- RatedAirVolFlowRate2Des = 0.0;
- RatedAirVolFlowRate2User = 0.0;
- RatedTotCapDes = 0.0;
- RatedTotCapUser = 0.0;
- RatedTotCap2Des = 0.0;
- RatedTotCap2User = 0.0;
MSRatedTotCapDesAtMaxSpeed = 0.0;
- RatedSHRDes = 0.0;
- RatedSHRUser = 0.0;
- RatedSHR2Des = 0.0;
- RatedSHR2User = 0.0;
- EvapCondAirFlowDes = 0.0;
- EvapCondAirFlowUser = 0.0;
- EvapCondAirFlow2Des = 0.0;
- EvapCondAirFlow2User = 0.0;
- EvapCondPumpElecNomPowerDes = 0.0;
- EvapCondPumpElecNomPowerUser = 0.0;
- EvapCondPumpElecNomPower2Des = 0.0;
- EvapCondPumpElecNomPower2User = 0.0;
DefrostCapacityDes = 0.0;
DefrostCapacityUser = 0.0;
MSRatedAirVolFlowRateDes = 0.0;
- MSRatedAirVolFlowRateUser = 0.0;
- // MSRatedTotCapDes = 0.0;
- MSRatedTotCapUser = 0.0;
MSRatedSHRDes = 0.0;
- MSRatedSHRUser = 0.0;
MSEvapCondAirFlowDes = 0.0;
MSEvapCondAirFlowUser = 0.0;
- MSEvapCondAirFlow2Des = 0.0;
- MSEvapCondAirFlow2User = 0.0;
MSEvapCondPumpElecNomPowerDes = 0.0;
MSEvapCondPumpElecNomPowerUser = 0.0;
- MSEvapCondPumpElecNomPower2Des = 0.0;
- MSEvapCondPumpElecNomPower2User = 0.0;
- MSDefrostCapacityDes = 0.0;
- MSDefrostCapacityUser = 0.0;
SecCoilAirFlowDes = 0.0;
SecCoilAirFlowUser = 0.0;
@@ -7405,7 +7344,7 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
state.dataSize->DXCoolCap; // pass global variable used only for heat pumps (i.e., DX cooling and heating coils)
if ((thisDXCoil.IsSecondaryDXCoilInZone) &&
(thisDXCoil.CondenserType(1) ==
- DataHeatBalance::RefrigCondenserType::Air)) { // seconday DX coil in secondary zone is specified
+ DataHeatBalance::RefrigCondenserType::Air)) { // secondary DX coil in secondary zone is specified
SizeSecDXCoil = true;
}
} else if (thisDXCoil.DXCoilType_Num == HVAC::CoilVRF_Heating) {
@@ -7502,14 +7441,12 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
PrintFlag = true;
state.dataSize->DataTotCapCurveIndex = thisDXCoil.CCapFTemp(Mode);
if (thisDXCoil.DXCoilType_Num == HVAC::CoilDX_CoolingTwoStageWHumControl) {
- SizingMethod = HVAC::CoolingCapacitySizing;
CompName = thisDXCoil.Name + ":" + thisDXCoil.CoilPerformanceName(Mode);
FieldNum = 1;
TempSize = thisDXCoil.RatedTotCap(Mode);
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(Mode).FieldNames(FieldNum) + " [W]";
} else if (thisDXCoil.DXCoilType_Num == HVAC::CoilDX_HeatingEmpirical || thisDXCoil.DXCoilType_Num == HVAC::CoilVRF_Heating ||
thisDXCoil.DXCoilType_Num == HVAC::CoilVRF_FluidTCtrl_Heating) {
- SizingMethod = HVAC::HeatingCapacitySizing;
CompName = thisDXCoil.Name;
FieldNum = 1;
TempSize = thisDXCoil.RatedTotCap(Mode);
@@ -7517,7 +7454,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
state.dataSize->DataCoolCoilCap = state.dataSize->DXCoolCap;
} else if (thisDXCoil.DXCoilType_Num == HVAC::CoilDX_HeatPumpWaterHeaterPumped ||
thisDXCoil.DXCoilType_Num == HVAC::CoilDX_HeatPumpWaterHeaterWrapped) {
- SizingMethod = HVAC::CoolingCapacitySizing;
CompName = thisDXCoil.Name;
FieldNum = 1;
TempSize = thisDXCoil.RatedTotCap(Mode);
@@ -7526,7 +7462,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
state.dataLoopNodes->Node(thisDXCoil.WaterInNode).Temp =
thisDXCoil.RatedInletWaterTemp; // set the rated water inlet node for HPWHs for use in CalcHPWHDXCoil
} else if (thisDXCoil.DXCoilType_Num == HVAC::CoilVRF_FluidTCtrl_Cooling) {
- SizingMethod = HVAC::CoolingCapacitySizing;
CompName = thisDXCoil.Name;
FieldNum = 1;
TempSize = thisDXCoil.RatedTotCap(Mode);
@@ -7545,7 +7480,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
}
CalcVRFCoilCapModFac(state, 0, _, CompName, CoilInTemp, _, _, _, state.dataSize->DataTotCapCurveValue);
} else if (thisDXCoil.DXCoilType_Num == HVAC::CoilDX_MultiSpeedCooling) {
- SizingMethod = HVAC::CoolingCapacitySizing;
CompName = thisDXCoil.Name;
FieldNum = 7 + (thisDXCoil.NumOfSpeeds - 1) * 13;
state.dataSize->DataTotCapCurveIndex = thisDXCoil.MSCCapFTemp(thisDXCoil.NumOfSpeeds);
@@ -7553,15 +7487,13 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
PrintFlag = false;
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(Mode).FieldNames(FieldNum) + " [W]";
} else if (thisDXCoil.DXCoilType_Num == HVAC::CoilDX_MultiSpeedHeating) {
- SizingMethod = HVAC::HeatingCapacitySizing;
CompName = thisDXCoil.Name;
- FieldNum = 10 + (thisDXCoil.NumOfSpeeds - 1) * 5;
+ FieldNum = 10 + (thisDXCoil.NumOfSpeeds - 1) * 6;
state.dataSize->DataTotCapCurveIndex = thisDXCoil.MSCCapFTemp(thisDXCoil.NumOfSpeeds);
TempSize = thisDXCoil.MSRatedTotCap(thisDXCoil.NumOfSpeeds);
PrintFlag = false;
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(Mode).FieldNames(FieldNum) + " [W]";
} else {
- SizingMethod = HVAC::CoolingCapacitySizing;
CompName = thisDXCoil.Name;
FieldNum = 1;
TempSize = thisDXCoil.RatedTotCap(Mode);
@@ -7702,7 +7634,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
CompName = thisDXCoil.Name;
FieldNum = 15; // Low Speed Evaporative Condenser Air Flow Rate
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(Mode).FieldNames(FieldNum) + " [m3/s]";
- SizingMethod = HVAC::AutoCalculateSizing;
CompType = thisDXCoil.DXCoilType;
// Autosize low speed condenser air flow to 1/3 Total Capacity * 0.000114 m3/s/w (850 cfm/ton)
state.dataSize->DataConstantUsedForSizing = thisDXCoil.RatedTotCap(Mode);
@@ -7736,7 +7667,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
if (state.dataGlobal->isEpJSON) stringOverride = "evaporative_condenser_pump_rated_power_consumption [W]";
}
}
- SizingMethod = HVAC::AutoCalculateSizing;
CompType = thisDXCoil.DXCoilType;
// Autosize high speed evap condenser pump power to Total Capacity * 0.004266 w/w (15 w/ton)
state.dataSize->DataConstantUsedForSizing = thisDXCoil.RatedTotCap(Mode);
@@ -7845,7 +7775,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
CompName = thisDXCoil.Name;
FieldNum = 7;
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(Mode).FieldNames(FieldNum);
- SizingMethod = HVAC::AutoCalculateSizing;
CompType = thisDXCoil.DXCoilType;
// Autosize low speed SHR to be the same as high speed SHR
state.dataSize->DataConstantUsedForSizing = thisDXCoil.RatedSHR(Mode);
@@ -7927,7 +7856,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
FieldNum = 10 + (Mode - 1) * 14;
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(1).FieldNames(FieldNum) + " [m3/s]";
if (IsAutoSize || !HardSizeNoDesRun) {
- SizingMethod = HVAC::AutoCalculateSizing;
// Autosize low speed flow to fraction of the highest speed flow
state.dataSize->DataConstantUsedForSizing = thisDXCoil.MSRatedAirVolFlowRate(thisDXCoil.NumOfSpeeds);
if (!IsAutoSize && !HardSizeNoDesRun) state.dataSize->DataConstantUsedForSizing = MSRatedAirVolFlowRateDes;
@@ -7950,7 +7878,7 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
state.dataSize->DataFractionUsedForSizing = 0.0;
}
- // Ensure flow rate at lower speed must be lower or equal to the flow rate at higher speed. Otherwise, a severe error is isssued.
+ // Ensure flow rate at lower speed must be lower or equal to the flow rate at higher speed. Otherwise, a severe error is issued.
for (Mode = 1; Mode <= thisDXCoil.NumOfSpeeds - 1; ++Mode) {
if (thisDXCoil.MSRatedAirVolFlowRate(Mode) > thisDXCoil.MSRatedAirVolFlowRate(Mode + 1)) {
ShowWarningError(state,
@@ -7978,7 +7906,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
if (Mode == thisDXCoil.NumOfSpeeds) {
PrintFlag = true;
state.dataSize->DataFlowUsedForSizing = thisDXCoil.MSRatedAirVolFlowRate(Mode);
- SizingMethod = HVAC::CoolingCapacitySizing;
FieldNum = 7 + (Mode - 1) * 14;
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(1).FieldNames(FieldNum) + " [W]";
state.dataSize->DataEMSOverrideON = thisDXCoil.RatedTotCapEMSOverrideOn(Mode);
@@ -7992,7 +7919,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
sizerCoolingCapacity.overrideSizingString(SizingString);
sizerCoolingCapacity.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName);
TempSize = sizerCoolingCapacity.size(state, TempSize, ErrorsFound);
- SizingMethod = HVAC::AutoCalculateSizing;
state.dataSize->DataConstantUsedForSizing = TempSize;
state.dataSize->DataFractionUsedForSizing = 1.0;
MSRatedTotCapDesAtMaxSpeed = TempSize;
@@ -8012,11 +7938,9 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
} else {
// cooling capacity at lower speeds
PrintFlag = true;
- SizingMethod = HVAC::CoolingCapacitySizing;
FieldNum = 7 + (Mode - 1) * 14;
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(1).FieldNames(FieldNum) + " [W]";
if (IsAutoSize || !HardSizeNoDesRun) {
- SizingMethod = HVAC::AutoCalculateSizing;
// autosize low speed capacity to fraction of the highest speed capacity
if (!HardSizeNoDesRun) {
state.dataSize->DataConstantUsedForSizing = MSRatedTotCapDesAtMaxSpeed;
@@ -8078,7 +8002,7 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
thisDXCoil.MSRatedSHR(Mode) = sizerCoolingSHR.size(state, TempSize, ErrorsFound);
// added for rated sensible cooling capacity estimate for html reporting, issue #7381
thisDXCoil.RatedSHR(1) = thisDXCoil.MSRatedSHR(Mode);
- // design SHR value at the maxiumum speed calculated above was supposed to be used for all speeds
+ // design SHR value at the maximum speed calculated above was supposed to be used for all speeds
// Now user specified SHR value is used when the SHR field is not autosized and design day run is
// set to yes unless the code below is commented out
MSRatedSHRDes = thisDXCoil.MSRatedSHR(Mode);
@@ -8100,7 +8024,7 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
state.dataSize->DataFractionUsedForSizing = 0.0;
state.dataSize->DataConstantUsedForSizing = 0.0;
- // Rated Evapovative condenser airflow rates
+ // Rated Evaporative condenser airflow rates
for (Mode = 1; Mode <= thisDXCoil.NumOfSpeeds; ++Mode) {
IsAutoSize = false;
if (thisDXCoil.MSEvapCondAirFlow(Mode) == AutoSize) {
@@ -8163,7 +8087,7 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
}
}
- // Sizing multispeed rated evapovative condenser pump power
+ // Sizing multispeed rated evaporative condenser pump power
for (Mode = 1; Mode <= thisDXCoil.NumOfSpeeds; ++Mode) {
IsAutoSize = false;
if (thisDXCoil.MSEvapCondPumpElecNomPower(Mode) == AutoSize) {
@@ -8214,7 +8138,7 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
}
}
- // Ensure evaporative condesner pump power at lower speed must be lower or equal to one at higher speed.
+ // Ensure evaporative condenser pump power at lower speed must be lower or equal to one at higher speed.
for (Mode = 1; Mode <= thisDXCoil.NumOfSpeeds - 1; ++Mode) {
if (thisDXCoil.MSEvapCondPumpElecNomPower(Mode) > thisDXCoil.MSEvapCondPumpElecNomPower(Mode + 1)) {
ShowWarningError(state,
@@ -8271,7 +8195,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
FieldNum = 12 + (Mode - 1) * 6;
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(1).FieldNames(FieldNum) + " [m3/s]";
if (IsAutoSize || !HardSizeNoDesRun) {
- SizingMethod = HVAC::AutoCalculateSizing;
// Auto-size low speed flow to fraction of the highest speed capacity
state.dataSize->DataConstantUsedForSizing = thisDXCoil.MSRatedAirVolFlowRate(thisDXCoil.NumOfSpeeds);
if (!IsAutoSize && !HardSizeNoDesRun) state.dataSize->DataConstantUsedForSizing = MSRatedAirVolFlowRateDes;
@@ -8293,7 +8216,7 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
state.dataSize->DataFractionUsedForSizing = 0.0;
}
- // Ensure flow rate at lower speed must be lower or equal to the flow rate at higher speed. Otherwise, a severe error is isssued.
+ // Ensure flow rate at lower speed must be lower or equal to the flow rate at higher speed. Otherwise, a severe error is issued.
for (Mode = 1; Mode <= thisDXCoil.NumOfSpeeds - 1; ++Mode) {
if (thisDXCoil.MSRatedAirVolFlowRate(Mode) > thisDXCoil.MSRatedAirVolFlowRate(Mode + 1)) {
ShowWarningError(state,
@@ -8360,7 +8283,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
CompName = thisDXCoil.Name;
CompType = thisDXCoil.DXCoilType;
if (Mode == thisDXCoil.NumOfSpeeds) {
- SizingMethod = HVAC::HeatingCapacitySizing;
state.dataSize->DataFlowUsedForSizing = thisDXCoil.MSRatedAirVolFlowRate(Mode);
FieldNum = 10 + (Mode - 1) * 6;
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(1).FieldNames(FieldNum) + " [W]";
@@ -8368,7 +8290,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
if (IsAutoSize || !HardSizeNoDesRun) {
// Heating capacity is assumed to be equal to the cooling capacity
PrintFlag = false;
- SizingMethod = HVAC::AutoCalculateSizing;
state.dataSize->DataFractionUsedForSizing = 1.0;
if (thisDXCoil.CompanionUpstreamDXCoil > 0) {
NumOfSpeedCompanion = state.dataDXCoils->DXCoil(thisDXCoil.CompanionUpstreamDXCoil).NumOfSpeeds;
@@ -8384,7 +8305,6 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
sizerHeatingCapacity.overrideSizingString(SizingString);
sizerHeatingCapacity.initializeWithinEP(state, CompType, CompName, PrintFlag, RoutineName);
MSRatedTotCapDesAtMaxSpeed = sizerHeatingCapacity.size(state, TempSize, ErrorsFound);
- SizingMethod = HVAC::AutoCalculateSizing;
state.dataSize->DataConstantUsedForSizing = MSRatedTotCapDesAtMaxSpeed;
state.dataSize->DataFractionUsedForSizing = 1.0;
}
@@ -8402,11 +8322,9 @@ void SizeDXCoil(EnergyPlusData &state, int const DXCoilNum)
}
} else {
PrintFlag = true;
- SizingMethod = HVAC::HeatingCapacitySizing;
FieldNum = 10 + (Mode - 1) * 6;
SizingString = state.dataDXCoils->DXCoilNumericFields(DXCoilNum).PerfMode(1).FieldNames(FieldNum) + " [W]";
if (IsAutoSize || !HardSizeNoDesRun) {
- SizingMethod = HVAC::AutoCalculateSizing;
// autosize low speed capacity to fraction of the highest speed capacity
if (!HardSizeNoDesRun) {
state.dataSize->DataConstantUsedForSizing = MSRatedTotCapDesAtMaxSpeed;
@@ -9269,7 +9187,7 @@ void CalcDoe2DXCoil(EnergyPlusData &state,
// calculate end time of current time step to determine if error messages should be printed
state.dataDXCoils->CurrentEndTime = state.dataGlobal->CurrentTime + SysTimeElapsed;
- // Print warning messages only when valid and only for the first ocurrance. Let summary provide statistics.
+ // Print warning messages only when valid and only for the first occurrence. Let summary provide statistics.
// Wait for next time step to print warnings. If simulation iterates, print out
// the warning for the last iteration only. Must wait for next time step to accomplish this.
// If a warning occurs and the simulation down shifts, the warning is not valid.
@@ -9472,7 +9390,7 @@ void CalcDoe2DXCoil(EnergyPlusData &state,
}
// Get total capacity modifying factor (function of temperature) for off-rated conditions
- // InletAirHumRat may be modified in this ADP/BF loop, use temporary varible for calculations
+ // InletAirHumRat may be modified in this ADP/BF loop, use temporary variable for calculations
InletAirHumRatTemp = InletAirHumRat;
AirMassFlowRatio = AirMassFlow / thisDXCoil.RatedAirMassFlowRate(Mode);
while (true) {
@@ -10084,7 +10002,7 @@ void CalcVRFCoolingCoil(EnergyPlusData &state,
// of entering air temperatures and supply air flow rate (actual vs rated flow). The model
// does NOT employ the exact same methodology to calculate performance as DOE-2.
// This VRF cooling coil model adjusts the rated total cooling capacity by the CAPFT
- // and CAP funciton of flow curve/model currently used by the existing DX coil model.
+ // and CAP function of flow curve/model currently used by the existing DX coil model.
// The part-load ratio is then applied to the total operating capacity to find the capacity
// required to meet the load. This VRF model then uses the ADP/bypass method to find the
// SHR and resulting outlet conditions given that total capacity (or delta H).
@@ -10256,7 +10174,7 @@ void CalcVRFCoolingCoil(EnergyPlusData &state,
// calculate end time of current time step to determine if error messages should be printed
state.dataDXCoils->CalcVRFCoolingCoilCurrentEndTime = state.dataGlobal->CurrentTime + SysTimeElapsed;
- // Print warning messages only when valid and only for the first ocurrance. Let summary provide statistics.
+ // Print warning messages only when valid and only for the first occurrence. Let summary provide statistics.
// Wait for next time step to print warnings. If simulation iterates, print out
// the warning for the last iteration only. Must wait for next time step to accomplish this.
// If a warning occurs and the simulation down shifts, the warning is not valid.
@@ -10437,7 +10355,7 @@ void CalcVRFCoolingCoil(EnergyPlusData &state,
}
// Get total capacity modifying factor (function of temperature) for off-rated conditions
- // InletAirHumRat may be modified in this ADP/BF loop, use temporary varible for calculations
+ // InletAirHumRat may be modified in this ADP/BF loop, use temporary variable for calculations
InletAirHumRatTemp = InletAirHumRat;
Label50:;
@@ -10777,7 +10695,7 @@ void CalcDXHeatingCoil(EnergyPlusData &state,
// REFERENCES:
// Winkelmann, F.C., Birdsall, B.E., Buhl W.F., Ellington, K.L., Erdem, A.E. 1993.
- // DOE-2 Supplement Version 2.1E. Energy and Environment Division, Larwence Berkely
+ // DOE-2 Supplement Version 2.1E. Energy and Environment Division, Lawrence Berkeley
// Laboratory.
// Henderson, H.I. Jr., Y.J. Huang and Danny Parker. 1999. Residential Equipment Part
// Load Curves for Use in DOE-2. Environmental Energy Technologies Division, Ernest
@@ -10947,7 +10865,7 @@ void CalcDXHeatingCoil(EnergyPlusData &state,
// Get total capacity modifying factor (function of temperature) for off-rated conditions
// Model was extended to accept bi-quadratic curves. This allows sensitivity of the heating capacity
// to the entering dry-bulb temperature as well as the outside dry-bulb temperature. User is
- // advised to use the bi-quaratic curve if sufficient manufacturer data is available.
+ // advised to use the bi-quadratic curve if sufficient manufacturer data is available.
if (state.dataCurveManager->PerfCurve(thisDXCoil.CCapFTemp(Mode))->numDims == 2) {
switch (thisDXCoil.HeatingPerformanceOATType) {
case HVAC::OATType::DryBulb: {
@@ -11086,7 +11004,7 @@ void CalcDXHeatingCoil(EnergyPlusData &state,
// Calculate electricity consumed. First, get EIR modifying factors for off-rated conditions
// Model was extended to accept bi-quadratic curves. This allows sensitivity of the EIR
// to the entering dry-bulb temperature as well as the outside dry-bulb temperature. User is
- // advised to use the bi-quaratic curve if sufficient manufacturer data is available.
+ // advised to use the bi-quadratic curve if sufficient manufacturer data is available.
if (thisDXCoil.DXCoilType_Num != HVAC::CoilVRF_Heating && thisDXCoil.DXCoilType_Num != HVAC::CoilVRF_FluidTCtrl_Heating) {
if (state.dataCurveManager->PerfCurve(thisDXCoil.EIRFTemp(Mode))->numDims == 1) {
EIRTempModFac = CurveValue(state, thisDXCoil.EIRFTemp(Mode), OutdoorDryBulb);
@@ -11658,7 +11576,7 @@ void CalcMultiSpeedDXCoil(EnergyPlusData &state,
if (thisDXCoil.CoolingCoilRuntimeFraction > 1.0) {
thisDXCoil.CoolingCoilRuntimeFraction = 1.0; // Reset coil runtime fraction to 1.0
}
- // get the eletrical power consumption
+ // get the electrical power consumption
thisDXCoil.ElecCoolingPower = TotCapLS * EIRLS * thisDXCoil.CoolingCoilRuntimeFraction;
// Coil total/sensible/latent cooling rates and electrical power
@@ -12087,7 +12005,7 @@ Real64 ValidateADP(EnergyPlusData &state,
// DATE WRITTEN December 2015
// PURPOSE OF THIS FUNCTION:
- // Validates that the calcualted bypass factor represents valid SHR based on total capacity and air mass flow rate.
+ // Validates that the calculated bypass factor represents valid SHR based on total capacity and air mass flow rate.
// METHODOLOGY EMPLOYED:
// With model parameters autosized by the user, the SHR is selected based on an empirical model.
@@ -12258,7 +12176,7 @@ Real64 CalcEffectiveSHR(EnergyPlusData &state,
Twet = min(Twet_Rated * QLatRated / (QLatActual + 1.e-10), Twet_max);
Gamma = Gamma_Rated * QLatRated * (EnteringDB - EnteringWB) / ((26.7 - 19.4) * QLatActual + 1.e-10);
- // Calculate the compressor on and off times using a converntional thermostat curve
+ // Calculate the compressor on and off times using a conventional thermostat curve
Ton = 3600.0 / (4.0 * Nmax * (1.0 - RTF)); // duration of cooling coil on-cycle (sec)
Toff = 3600.0 / (4.0 * Nmax * RTF); // duration of cooling coil off-cycle (sec)
@@ -12274,7 +12192,7 @@ Real64 CalcEffectiveSHR(EnergyPlusData &state,
// and real world applications would use a single heating coil for both purposes, the actual
// fan operation is based on HeatingPLR + ReheatPLR. For cycling fan RH control, latent
// degradation only occurs when a heating load exists, in this case the reheat load is
- // equal to and oposite in magnitude to the cooling coil sensible output but the reheat
+ // equal to and opposite in magnitude to the cooling coil sensible output but the reheat
// coil is not always active. This additional fan run time has not been accounted for at this time.
// Recalculate Toff for cycling fan systems when heating is active
if (present(HeatingRTF)) {
@@ -12287,7 +12205,7 @@ Real64 CalcEffectiveSHR(EnergyPlusData &state,
}
}
- // Use sucessive substitution to solve for To
+ // Use successive substitution to solve for To
aa = (Gamma * Toffa) - (0.25 / Twet) * pow_2(Gamma) * pow_2(Toffa);
To1 = aa + Tcl;
Error = 1.0;
@@ -12506,7 +12424,7 @@ void CalcMultiSpeedDXCoilCooling(EnergyPlusData &state,
Real64 LSOutletAirDryBulbTemp; // low speed outlet air dry bulb temperature [C]
Real64 LSOutletAirEnthalpy; // low speed outlet air enthalpy [J/kg]
Real64 LSOutletAirHumRat; // low speed outlet air humidity ratio [kg/kg]
- Real64 HSOutletAirDryBulbTemp; // hihg speed outlet air dry bulb temperature [C]
+ Real64 HSOutletAirDryBulbTemp; // high speed outlet air dry bulb temperature [C]
Real64 HSOutletAirEnthalpy; // high speed outlet air enthalpy [J/kg]
Real64 HSOutletAirHumRat; // high speed outlet air humidity ratio [kg/kg]
Real64 hDelta; // Change in air enthalpy across the cooling coil [J/kg]
@@ -13182,7 +13100,7 @@ void CalcMultiSpeedDXCoilCooling(EnergyPlusData &state,
EIRFlowModFacLS = CurveValue(state, thisDXCoil.MSEIRFFlow(SpeedNum), AirMassFlowRatioLS);
EIRLS = 1.0 / thisDXCoil.MSRatedCOP(SpeedNum) * EIRTempModFacLS * EIRFlowModFacLS;
- // get the eletrical power consumption
+ // get the electrical power consumption
thisDXCoil.ElecCoolingPower = TotCapLS * EIRLS * thisDXCoil.CoolingCoilRuntimeFraction;
// calculate cooling output power
// AirMassFlow = DXCoil(DXCoilNum)%InletAirMassFlowRate
@@ -13376,22 +13294,22 @@ void CalcMultiSpeedDXCoilHeating(EnergyPlusData &state,
Real64 CrankcaseHeatingPower; // Power due to crank case heater
Real64 AirVolumeFlowRate; // Air volume flow rate across the heating coil
Real64 VolFlowperRatedTotCap; // Air volume flow rate divided by rated total heating capacity
- Real64 TotCapTempModFac(0.0); // Total capacity modifier as a function ot temperature
+ Real64 TotCapTempModFac(0.0); // Total capacity modifier as a function of temperature
Real64 TotCapFlowModFac; // Total capacity modifier as a function of flow ratio
Real64 OutdoorCoilT; // Outdoor coil temperature
Real64 OutdoorCoildw; // Outdoor coil delta w assuming coil temperature of OutdoorCoilT
- Real64 LoadDueToDefrost; // Additonal load due to defrost
- Real64 LoadDueToDefrostLS; // Additonal load due to defrost at low speed
- Real64 LoadDueToDefrostHS; // Additonal load due to defrost at high speed
+ Real64 LoadDueToDefrost; // Additional load due to defrost
+ Real64 LoadDueToDefrostLS; // Additional load due to defrost at low speed
+ Real64 LoadDueToDefrostHS; // Additional load due to defrost at high speed
Real64 HeatingCapacityMultiplier; // Multiplier for heating capacity when system is in defrost
Real64 FractionalDefrostTime; // Fraction of time step when system is in defrost
- Real64 InputPowerMultiplier; // Multiplier for poer when system is in defrost
+ Real64 InputPowerMultiplier; // Multiplier for power when system is in defrost
Real64 DefrostEIRTempModFac; // EIR modifier for defrost
Real64 FullLoadOutAirEnth; // Outlet full load enthalpy
Real64 FullLoadOutAirHumRat; // Outlet humidity ratio at full load
Real64 FullLoadOutAirTemp; // Outlet temperature at full load
- Real64 FullLoadOutAirRH; // Outler relative humidity at full load
- Real64 OutletAirTemp; // Supply ari temperature
+ Real64 FullLoadOutAirRH; // Outlet relative humidity at full load
+ Real64 OutletAirTemp; // Supply air temperature
Real64 EIRTempModFac(0.0); // EIR modifier as a function of temperature
Real64 EIRFlowModFac; // EIR modifier as a function of airflow ratio
Real64 WasteHeatLS; // Waste heat at low speed
@@ -13588,7 +13506,7 @@ void CalcMultiSpeedDXCoilHeating(EnergyPlusData &state,
// Get total capacity modifying factor (function of temperature) for off-rated conditions
// Model was extended to accept bi-quadratic curves. This allows sensitivity of the heating capacity
// to the entering dry-bulb temperature as well as the outside dry-bulb temperature. User is
- // advised to use the bi-quaratic curve if sufficient manufacturer data is available.
+ // advised to use the bi-quadratic curve if sufficient manufacturer data is available.
// Low speed
if (state.dataCurveManager->PerfCurve(thisDXCoil.MSCCapFTemp(SpeedNumLS))->numDims == 1) {
TotCapTempModFac = CurveValue(state, thisDXCoil.MSCCapFTemp(SpeedNumLS), OutdoorDryBulb);
@@ -13612,7 +13530,7 @@ void CalcMultiSpeedDXCoilHeating(EnergyPlusData &state,
// Calculate electricity consumed. First, get EIR modifying factors for off-rated conditions
// Model was extended to accept bi-quadratic curves. This allows sensitivity of the EIR
// to the entering dry-bulb temperature as well as the outside dry-bulb temperature. User is
- // advised to use the bi-quaratic curve if sufficient manufacturer data is available.
+ // advised to use the bi-quadratic curve if sufficient manufacturer data is available.
// Low Speed
if (state.dataCurveManager->PerfCurve(thisDXCoil.MSEIRFTemp(SpeedNumLS))->numDims == 1) {
EIRTempModFac = CurveValue(state, thisDXCoil.MSEIRFTemp(SpeedNumLS), OutdoorDryBulb);
@@ -13833,7 +13751,7 @@ void CalcMultiSpeedDXCoilHeating(EnergyPlusData &state,
// Get total capacity modifying factor (function of temperature) for off-rated conditions
// Model was extended to accept bi-quadratic curves. This allows sensitivity of the heating capacity
// to the entering dry-bulb temperature as well as the outside dry-bulb temperature. User is
- // advised to use the bi-quaratic curve if sufficient manufacturer data is available.
+ // advised to use the bi-quadratic curve if sufficient manufacturer data is available.
if (state.dataCurveManager->PerfCurve(thisDXCoil.MSCCapFTemp(SpeedNum))->numDims == 1) {
TotCapTempModFac = CurveValue(state, thisDXCoil.MSCCapFTemp(SpeedNum), OutdoorDryBulb);
} else {
@@ -14737,7 +14655,7 @@ void CalcTwoSpeedDXCoilStandardRating(EnergyPlusData &state, int const DXCoilNum
newPreDefSubTable(state, state.dataOutRptPredefined->pdrEquip, "VAV DX Cooling Standard Rating Details");
state.dataOutRptPredefined->pdchVAVDXCoolCoilType =
newPreDefColumn(state, state.dataOutRptPredefined->pdstVAVDXCoolCoil, "DX Cooling Coil Type");
- state.dataOutRptPredefined->pdchVAVDXFanName = newPreDefColumn(state, state.dataOutRptPredefined->pdstVAVDXCoolCoil, "Assocated Fan");
+ state.dataOutRptPredefined->pdchVAVDXFanName = newPreDefColumn(state, state.dataOutRptPredefined->pdstVAVDXCoolCoil, "Associated Fan");
state.dataOutRptPredefined->pdchVAVDXCoolCoilNetCapSI =
newPreDefColumn(state, state.dataOutRptPredefined->pdstVAVDXCoolCoil, "Net Cooling Capacity [W]");
state.dataOutRptPredefined->pdchVAVDXCoolCoilCOP = newPreDefColumn(state, state.dataOutRptPredefined->pdstVAVDXCoolCoil, "COP [W/W]");
@@ -15752,7 +15670,7 @@ int GetDXCoilCapFTCurveIndex(EnergyPlusData &state,
default: {
// CALL ShowSevereError(state, 'GetDXCoilCapFTCurveIndex: Could not find Coil, Type="'// &
// TRIM(cAllCoilTypes(DXCoil(CoilIndex)%DXCoilType_Num))//'" Name="'//TRIM(DXCoil(CoilIndex)%Name)// &
- // '" when accessing coil capacity as a function of temperture curve.')
+ // '" when accessing coil capacity as a function of temperature curve.')
ErrorsFound = true;
CapFTCurveIndex = 0;
} break;
@@ -15996,14 +15914,14 @@ Real64 CalcSHRUserDefinedCurves(EnergyPlusData &state,
// DATE WRITTEN December 2012
// PURPOSE OF THIS FUNCTION:
- // Returns the oprating sensible heat ratio for a given Rated SHR abd coil entering
+ // Returns the operating sensible heat ratio for a given Rated SHR and coil entering
// air DBT and WBT, and supply air mass flow fraction.
// METHODOLOGY EMPLOYED:
// Model uses user specified rated SHR, and SHR modifying curves for temperature and flow
// fraction. The curves adjust the rated SHR based on biquadratic curve for temperatures
// and quadratic function for supply air mass flow ratio (actual vs rated).
- // The biquadratic and quadratic curves are normalized caurves generated from manufacturer's
+ // The biquadratic and quadratic curves are normalized curves generated from manufacturer's
// performance data
// Using/Aliasing
@@ -16116,10 +16034,10 @@ void CalcSecondaryDXCoils(EnergyPlusData &state, int const DXCoilNum)
Real64 TotalHeatRejectionRate; // secondary coil total heat rejection rate
int SecCoilSHRFT; // index of the SHR modifier curve for temperature of a secondary DX coil
int SecCoilSHRFF; // index of the sHR modifier curve for flow fraction of a secondary DX coil
- int MSSpeedNumLS; // current low speed number of multspeed HP
- int MSSpeedNumHS; // current high speed number of multspeed HP
- Real64 MSSpeedRatio; // current speed ratio of multspeed HP
- Real64 MSCycRatio; // current cycling ratio of multspeed HP
+ int MSSpeedNumLS; // current low speed number of multispeed HP
+ int MSSpeedNumHS; // current high speed number of multispeed HP
+ Real64 MSSpeedRatio; // current speed ratio of multispeed HP
+ Real64 MSCycRatio; // current cycling ratio of multispeed HP
Real64 SHRHighSpeed; // sensible heat ratio at high speed
Real64 SHRLowSpeed; // sensible heat ratio at low speed
@@ -16364,9 +16282,9 @@ Real64 CalcSecondaryDXCoilsSHR(EnergyPlusData &state,
// METHODOLOGY EMPLOYED:
// Energy balance:
- // (1) checks if the seconday coil operation is dry and calculates appliavle SHR.
+ // (1) checks if the secondary coil operation is dry and calculates applicable SHR.
// (2) determines SHR from user specified rated SHR values and SHR modifier curves for
- // temperature and flor fraction.
+ // temperature and flow fraction.
// (3) if secondary coil operates dry then the larger of the user SHR value and dry
// coil operation SHR is selected.
@@ -16385,13 +16303,13 @@ Real64 CalcSecondaryDXCoilsSHR(EnergyPlusData &state,
Real64 DryCoilTestEvapInletWetBulb; // evaporator coil inlet dry bulb temperature test for dry coil
Real64 FullLoadOutAirEnth; // evaporator outlet full load enthalpy [J/kg]
Real64 FullLoadOutAirTemp; // evaporator outlet air temperature at full load [C]
- Real64 hTinwADP; // enthaly of air at secondary coil entering temperature and Humidity ratio at ADP
+ Real64 hTinwADP; // enthalpy of air at secondary coil entering temperature and Humidity ratio at ADP
Real64 SHRadp; // Sensible heat ratio
- Real64 hADP; // enthaly of air at secondary coil at ADP
+ Real64 hADP; // enthalpy of air at secondary coil at ADP
Real64 tADP; // dry bulb temperature of air at secondary coil at ADP
Real64 wADP; // humidity ratio of air at secondary coil at ADP
Real64 HumRatError; // humidity ratio error
- bool CoilMightBeDry; // TRUE means the secondary DX coi runs dry
+ bool CoilMightBeDry; // TRUE means the secondary DX coil runs dry
int Counter; // iteration counter
bool Converged; // convergence flag
Real64 SHR; // current time step sensible heat ratio of secondary coil
@@ -16454,7 +16372,8 @@ void CalcVRFCoolingCoil_FluidTCtrl(EnergyPlusData &state,
HVAC::FanOp const fanOp, // Allows parent object to control fan operation
Real64 const CompCycRatio, // cycling ratio of VRF condenser
ObjexxFCL::Optional_int_const PerfMode, // Performance mode for MultiMode DX coil; Always 1 for other coil types
- ObjexxFCL::Optional OnOffAirFlowRatio // ratio of compressor on airflow to compressor off airflow
+ ObjexxFCL::Optional OnOffAirFlowRatio, // ratio of compressor on airflow to compressor off airflow
+ Real64 MaxCoolCap // maximum allowed cooling capacity
)
{
// SUBROUTINE INFORMATION:
@@ -16679,7 +16598,8 @@ void CalcVRFCoolingCoil_FluidTCtrl(EnergyPlusData &state,
ShowFatalError(state, format("{} \"{}\" - Rated total cooling capacity is zero or less.", thisDXCoil.DXCoilType, thisDXCoil.Name));
}
- TotCap = thisDXCoil.RatedTotCap(Mode);
+ TotCap = min(MaxCoolCap, thisDXCoil.RatedTotCap(Mode));
+
QCoilReq = -PartLoadRatio * TotCap;
if (PartLoadRatio == 0.0) {
AirMassFlowMin = state.dataHVACVarRefFlow->OACompOffMassFlow;
@@ -16817,7 +16737,7 @@ void CalcVRFCoolingCoil_FluidTCtrl(EnergyPlusData &state,
}
// If cycling fan, send coil part-load fraction to on/off fan via HVACDataGlobals
- if (fanOp == HVAC::FanOp::Cycling) state.dataHVACGlobal->OnOffFanPartLoadFraction = PLF;
+ if (fanOp == HVAC::FanOp::Cycling) state.dataHVACGlobal->OnOffFanPartLoadFraction = thisDXCoil.CoolingCoilRuntimeFraction;
// Check for saturation error and modify temperature at constant enthalpy
if (OutletAirTemp < PsyTsatFnHPb(state, OutletAirEnthalpy, OutdoorPressure)) {
@@ -16848,10 +16768,8 @@ void CalcVRFCoolingCoil_FluidTCtrl(EnergyPlusData &state,
}
}
- // Coil total cooling
- Real64 AirMassFlowRate = thisDXCoil.InletAirMassFlowRate;
// Coil total/sensible/latent cooling rates
- CalcComponentSensibleLatentOutput(AirMassFlowRate,
+ CalcComponentSensibleLatentOutput(AirMassFlow * PartLoadRatio,
InletAirDryBulbTemp,
InletAirHumRat,
OutletAirTemp,
@@ -17282,8 +17200,7 @@ void ControlVRFIUCoil(EnergyPlusData &state,
MaxSH = 15;
MaxSC = 20;
Garate = state.dataDXCoils->DXCoil(CoilIndex).RatedAirMassFlowRate(1);
- // why always limit the minimum fan speed ratio to 0.65?
- FanSpdRatioMin = min(max(OAMassFlow / Garate, 0.65), 1.0); // ensure that coil flow rate is higher than OA flow rate
+ FanSpdRatioMin = min(OAMassFlow / Garate, 1.0); // ensure that coil flow rate is higher than OA flow rate
if (QCoil == 0) {
// No Heating or Cooling
diff --git a/src/EnergyPlus/DXCoils.hh b/src/EnergyPlus/DXCoils.hh
index a110832b023..8f6b1620d17 100644
--- a/src/EnergyPlus/DXCoils.hh
+++ b/src/EnergyPlus/DXCoils.hh
@@ -540,7 +540,7 @@ namespace DXCoils {
ObjexxFCL::Optional PartLoadRatio = _, // part load ratio (for single speed cycling unit)
ObjexxFCL::Optional OnOffAFR = _, // ratio of compressor on airflow to compressor off airflow
ObjexxFCL::Optional CoilCoolingHeatingPLRRatio = _, // used for cycling fan RH control
- ObjexxFCL::Optional MaxCap = _, // maximum cooling capacity of VRF terminal units
+ ObjexxFCL::Optional MaxCap = Constant::MaxCap, // maximum cooling capacity of VRF terminal units
ObjexxFCL::Optional CompCyclingRatio = _ // cycling ratio of VRF condenser connected to this TU
);
@@ -877,7 +877,8 @@ namespace DXCoils {
HVAC::FanOp const fanOp, // Allows parent object to control fan operation
Real64 const CompCycRatio, // cycling ratio of VRF condenser
ObjexxFCL::Optional_int_const PerfMode, // Performance mode for MultiMode DX coil; Always 1 for other coil types
- ObjexxFCL::Optional OnOffAirFlowRatio // ratio of compressor on airflow to compressor off airflow
+ ObjexxFCL::Optional OnOffAirFlowRatio, // ratio of compressor on airflow to compressor off airflow
+ Real64 MaxCoolCap = Constant::MaxCap // maximum allowed cooling capacity
);
void
diff --git a/src/EnergyPlus/Data/BaseData.hh b/src/EnergyPlus/Data/BaseData.hh
index 5bfbee26b86..ecbf087fbae 100644
--- a/src/EnergyPlus/Data/BaseData.hh
+++ b/src/EnergyPlus/Data/BaseData.hh
@@ -54,6 +54,8 @@ struct EnergyPlusData; // Forward declaration
struct BaseGlobalStruct
{
+
+ virtual ~BaseGlobalStruct() = default;
virtual void init_constant_state([[maybe_unused]] EnergyPlusData &state) = 0;
virtual void init_state([[maybe_unused]] EnergyPlusData &state) = 0;
virtual void clear_state() = 0;
diff --git a/src/EnergyPlus/Data/CommonIncludes.hh b/src/EnergyPlus/Data/CommonIncludes.hh
index a7ba5bc5042..d880105ca97 100644
--- a/src/EnergyPlus/Data/CommonIncludes.hh
+++ b/src/EnergyPlus/Data/CommonIncludes.hh
@@ -159,7 +159,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/src/EnergyPlus/Data/EnergyPlusData.hh b/src/EnergyPlus/Data/EnergyPlusData.hh
index c985b31e5c5..4b73573ad40 100644
--- a/src/EnergyPlus/Data/EnergyPlusData.hh
+++ b/src/EnergyPlus/Data/EnergyPlusData.hh
@@ -50,8 +50,6 @@
// C++ Headers
#include
-#include
-#include
// EnergyPlus Headers
#include
diff --git a/src/EnergyPlus/DataAirLoop.hh b/src/EnergyPlus/DataAirLoop.hh
index 0340933a7ec..7c3e5e11829 100644
--- a/src/EnergyPlus/DataAirLoop.hh
+++ b/src/EnergyPlus/DataAirLoop.hh
@@ -85,7 +85,7 @@ namespace DataAirLoop {
Array1D_int TermUnitCoolSizingIndex; // Air terminal sizing numbers for zones cooled by this air loop
Array1D_int TermUnitHeatSizingIndex; // Air terminal sizing numbers for zones heated by this air loop
Array1D SupplyDuctType; // 1=main, 2=cooling, 3=heating, 4=other
- EPVector SupplyDuctBranchNum; // Supply duct branch number
+ EPVector SupplyDuctBranchNum; // Supply duct branch number (airloop branchnum, not the actual branch index)
EPVector SupplyAirPathNum; // Supply air path indexes
EPVector ReturnAirPathNum; // Return air path indexes
};
diff --git a/src/EnergyPlus/DataAirSystems.hh b/src/EnergyPlus/DataAirSystems.hh
index 7fdc0767d2d..4684ae306b2 100644
--- a/src/EnergyPlus/DataAirSystems.hh
+++ b/src/EnergyPlus/DataAirSystems.hh
@@ -190,7 +190,7 @@ namespace DataAirSystems {
AirLoopMixerData Mixer; // Data for mixer (if any)
Array1D_bool ControlConverged; // Convergence Parameter for controllers
int NumOutletBranches = 0;
- std::array OutletBranchNum = {0}; // branch numbers of system outlets
+ std::array OutletBranchNum = {0}; // airloop branch numbers of system outlets (not the actual branch index)
int NumInletBranches = 0;
std::array InletBranchNum = {0}; // branch number of system inlets
bool CentralHeatCoilExists = true; // true if there are central heating coils
diff --git a/src/EnergyPlus/DataGlobalConstants.hh b/src/EnergyPlus/DataGlobalConstants.hh
index 100343844f7..d0c62c859bf 100644
--- a/src/EnergyPlus/DataGlobalConstants.hh
+++ b/src/EnergyPlus/DataGlobalConstants.hh
@@ -630,6 +630,8 @@ namespace Constant {
Real64 constexpr UniversalGasConst = 8314.462175; // Universal Gas Constant (J/mol*K)
Real64 constexpr convertJtoGJ = 1.0E-9; // Conversion factor for J to GJ
+ Real64 constexpr MaxCap(1.0e+20); // limit of zone terminal unit capacity
+
} // namespace Constant
} // namespace EnergyPlus
diff --git a/src/EnergyPlus/DataHeatBalance.hh b/src/EnergyPlus/DataHeatBalance.hh
index ceb4184b556..4a89a953545 100644
--- a/src/EnergyPlus/DataHeatBalance.hh
+++ b/src/EnergyPlus/DataHeatBalance.hh
@@ -433,6 +433,7 @@ namespace DataHeatBalance {
Real64 Volume = Constant::AutoCalculate; // Volume entered by user [m3] or calculated
Real64 ExtGrossWallArea = 0.0; // Exterior Wall Area for Zone (Gross)
Real64 ExteriorTotalSurfArea = 0.0; // Total surface area of all exterior surfaces for Zone
+ Real64 extPerimeter = 0.0; // Total exposed perimeter (sum of width of exterior walls)
int SystemZoneNodeNumber = 0; // This is the zone or space node number for the system for a controlled zone
Real64 FloorArea = 0.0; // Floor area used for this space
Real64 TotOccupants = 0.0; // total design occupancy (sum of NumberOfPeople for the space People objects, not multiplied)
@@ -447,7 +448,6 @@ namespace DataHeatBalance {
int spaceTypeNum = 0; // Points to spaceType for this space
EPVector tags; // Optional tags for reporting
EPVector surfaces; // Pointers to surfaces in this space
- Real64 calcFloorArea = 0.0; // Calculated floor area used for this space
bool hasFloor = false; // Has "Floor" surface
Real64 fracZoneFloorArea = 0.0; // fraction of total floor area for all spaces in zone
Real64 fracZoneVolume = 0.0; // fraction of total volume for all spaces in zone
@@ -561,7 +561,6 @@ namespace DataHeatBalance {
// 2=Plenum Zone, 11=Solar Wall, 12=Roof Pond
Real64 UserEnteredFloorArea = Constant::AutoCalculate; // User input floor area for this zone
// Calculated after input
- Real64 CalcFloorArea = 0.0; // Calculated floor area excluding air boundary surfaces
Real64 geometricFloorArea = 0.0; // Calculated floor area including air boundary surfaces
Real64 CeilingArea = 0.0; // Ceiling area excluding air boundary surfaces
Real64 geometricCeilingArea = 0.0; // Ceiling area area including air boundary surfaces
diff --git a/src/EnergyPlus/DataSizing.cc b/src/EnergyPlus/DataSizing.cc
index c98c6b8bc32..8031a282611 100644
--- a/src/EnergyPlus/DataSizing.cc
+++ b/src/EnergyPlus/DataSizing.cc
@@ -622,13 +622,13 @@ Real64 ZoneAirDistributionData::calculateEz(EnergyPlusData &state, int const Zon
}
Real64 calcDesignSpecificationOutdoorAir(EnergyPlusData &state,
- int const DSOAPtr, // Pointer to DesignSpecification:OutdoorAir object
- int const ActualZoneNum, // Zone index
- bool const UseOccSchFlag, // Zone occupancy schedule will be used instead of using total zone occupancy
- bool const UseMinOASchFlag, // Use min OA schedule in DesignSpecification:OutdoorAir object
- bool const PerPersonNotSet, // when calculation should not include occupants (e.g., dual duct)
- bool const MaxOAVolFlowFlag // TRUE when calculation uses occupancy schedule (e.g., dual duct)
-)
+ int const DSOAPtr, // Pointer to DesignSpecification:OutdoorAir object
+ int const ActualZoneNum, // Zone index
+ bool const UseOccSchFlag, // Zone occupancy schedule will be used instead of using total zone occupancy
+ bool const UseMinOASchFlag, // Use min OA schedule in DesignSpecification:OutdoorAir object
+ bool const PerPersonNotSet, // when calculation should not include occupants (e.g., dual duct)
+ bool const MaxOAVolFlowFlag, // TRUE when calculation uses occupancy schedule (e.g., dual duct)
+ int const spaceNum)
{
Real64 totOAFlowRate = 0.0;
if (DSOAPtr == 0) return totOAFlowRate;
@@ -637,26 +637,26 @@ Real64 calcDesignSpecificationOutdoorAir(EnergyPlusData &state,
if (thisDSOA.numDSOA == 0) {
// This is a simple DesignSpecification:OutdoorAir
- return thisDSOA.calcOAFlowRate(state, ActualZoneNum, UseOccSchFlag, UseMinOASchFlag, PerPersonNotSet, MaxOAVolFlowFlag);
+ return thisDSOA.calcOAFlowRate(state, ActualZoneNum, UseOccSchFlag, UseMinOASchFlag, PerPersonNotSet, MaxOAVolFlowFlag, spaceNum);
} else {
// This is a DesignSpecification:OutdoorAir:SpaceList
for (int dsoaCount = 1; dsoaCount <= thisDSOA.numDSOA; ++dsoaCount) {
- totOAFlowRate += state.dataSize->OARequirements(thisDSOA.dsoaIndexes(dsoaCount))
- .calcOAFlowRate(state,
- ActualZoneNum,
- UseOccSchFlag,
- UseMinOASchFlag,
- PerPersonNotSet,
- MaxOAVolFlowFlag,
- thisDSOA.dsoaSpaceIndexes(dsoaCount));
+ if ((spaceNum == 0) || ((spaceNum > 0) && (spaceNum == thisDSOA.dsoaSpaceIndexes(dsoaCount)))) {
+ totOAFlowRate += state.dataSize->OARequirements(thisDSOA.dsoaIndexes(dsoaCount))
+ .calcOAFlowRate(state,
+ ActualZoneNum,
+ UseOccSchFlag,
+ UseMinOASchFlag,
+ PerPersonNotSet,
+ MaxOAVolFlowFlag,
+ thisDSOA.dsoaSpaceIndexes(dsoaCount));
+ }
}
return totOAFlowRate;
}
}
-Real64 OARequirementsData::desFlowPerZoneArea(EnergyPlusData &state,
- int const actualZoneNum // Zone index
-)
+Real64 OARequirementsData::desFlowPerZoneArea(EnergyPlusData &state, int const zoneNum, int const spaceNum)
{
Real64 desFlowPA = 0.0;
if (this->numDSOA == 0) {
@@ -668,24 +668,29 @@ Real64 OARequirementsData::desFlowPerZoneArea(EnergyPlusData &state,
} else {
// This is a DesignSpecification:OutdoorAir:SpaceList
Real64 sumAreaOA = 0.0;
+ Real64 sumArea = 0.0;
for (int dsoaCount = 1; dsoaCount <= this->numDSOA; ++dsoaCount) {
auto const &thisDSOA = state.dataSize->OARequirements(this->dsoaIndexes(dsoaCount));
+ int const dsoaSpaceNum = this->dsoaSpaceIndexes(dsoaCount);
if (thisDSOA.OAFlowMethod != OAFlowCalcMethod::PerPerson && thisDSOA.OAFlowMethod != OAFlowCalcMethod::PerZone &&
thisDSOA.OAFlowMethod != OAFlowCalcMethod::ACH) {
- Real64 spaceArea = state.dataHeatBal->space(this->dsoaSpaceIndexes(dsoaCount)).FloorArea;
- sumAreaOA += thisDSOA.OAFlowPerArea * spaceArea;
+ if ((spaceNum == 0) || (spaceNum == dsoaSpaceNum)) {
+ Real64 spaceArea = state.dataHeatBal->space(this->dsoaSpaceIndexes(dsoaCount)).FloorArea;
+ sumArea + -spaceArea;
+ sumAreaOA += thisDSOA.OAFlowPerArea * spaceArea;
+ }
}
}
- if (state.dataHeatBal->Zone(actualZoneNum).FloorArea) {
- desFlowPA = sumAreaOA / state.dataHeatBal->Zone(actualZoneNum).FloorArea;
+ if ((spaceNum == 0) && (state.dataHeatBal->Zone(zoneNum).FloorArea)) {
+ desFlowPA = sumAreaOA / state.dataHeatBal->Zone(zoneNum).FloorArea;
+ } else if (sumArea > 0.0) {
+ desFlowPA = sumAreaOA / sumArea;
}
}
return desFlowPA;
}
-Real64 OARequirementsData::desFlowPerZonePerson(EnergyPlusData &state,
- int const actualZoneNum // Zone index
-)
+Real64 OARequirementsData::desFlowPerZonePerson(EnergyPlusData &state, int const actualZoneNum, int const spaceNum)
{
Real64 desFlowPP = 0.0;
if (this->numDSOA == 0) {
@@ -697,16 +702,23 @@ Real64 OARequirementsData::desFlowPerZonePerson(EnergyPlusData &state,
} else {
// This is a DesignSpecification:OutdoorAir:SpaceList
Real64 sumPeopleOA = 0.0;
+ Real64 sumPeople = 0.0;
for (int dsoaCount = 1; dsoaCount <= this->numDSOA; ++dsoaCount) {
auto const &thisDSOA = state.dataSize->OARequirements(this->dsoaIndexes(dsoaCount));
+ int const dsoaSpaceNum = this->dsoaSpaceIndexes(dsoaCount);
if (thisDSOA.OAFlowMethod != OAFlowCalcMethod::PerArea && thisDSOA.OAFlowMethod != OAFlowCalcMethod::PerZone &&
thisDSOA.OAFlowMethod != OAFlowCalcMethod::ACH) {
- Real64 spacePeople = state.dataHeatBal->space(this->dsoaSpaceIndexes(dsoaCount)).TotOccupants;
- sumPeopleOA += thisDSOA.OAFlowPerPerson * spacePeople;
+ if ((spaceNum == 0) || (spaceNum == dsoaSpaceNum)) {
+ Real64 spacePeople = state.dataHeatBal->space(dsoaSpaceNum).TotOccupants;
+ sumPeople += spacePeople;
+ sumPeopleOA += thisDSOA.OAFlowPerPerson * spacePeople;
+ }
}
}
- if (state.dataHeatBal->Zone(actualZoneNum).TotOccupants > 0.0) {
+ if ((spaceNum == 0) && (state.dataHeatBal->Zone(actualZoneNum).TotOccupants > 0.0)) {
desFlowPP = sumPeopleOA / state.dataHeatBal->Zone(actualZoneNum).TotOccupants;
+ } else if (sumPeople > 0.0) {
+ desFlowPP = sumPeopleOA / sumPeople;
}
}
return desFlowPP;
@@ -762,16 +774,12 @@ Real64 OARequirementsData::calcOAFlowRate(EnergyPlusData &state,
Real64 curNumOccupants = 0.0;
Real64 maxOccupants = 0.0;
if (spaceNum > 0) {
- floorArea = state.dataHeatBal->space(spaceNum).FloorArea;
- // TODO MJW: For now just proportion space volume by floor area
- if (thisZone.FloorArea > 0.0) {
- volume = thisZone.Volume * state.dataHeatBal->space(spaceNum).FloorArea / thisZone.FloorArea;
- } else {
- volume = 0.0;
- }
- nomTotOccupants = state.dataHeatBal->space(spaceNum).TotOccupants;
+ auto &thisSpace = state.dataHeatBal->space(spaceNum);
+ floorArea = thisSpace.FloorArea;
+ volume = thisSpace.Volume;
+ nomTotOccupants = thisSpace.TotOccupants;
curNumOccupants = state.dataHeatBal->spaceIntGain(spaceNum).NOFOCC;
- maxOccupants = state.dataHeatBal->space(spaceNum).maxOccupants;
+ maxOccupants = thisSpace.maxOccupants;
} else {
floorArea = thisZone.FloorArea;
volume = thisZone.Volume;
diff --git a/src/EnergyPlus/DataSizing.hh b/src/EnergyPlus/DataSizing.hh
index f3082f3f78c..d951beafae5 100644
--- a/src/EnergyPlus/DataSizing.hh
+++ b/src/EnergyPlus/DataSizing.hh
@@ -1129,13 +1129,9 @@ namespace DataSizing {
int CO2GainErrorIndex = 0; // Index for recurring error message when CO2 generation from people is zero for SOAM_ProportionalControlSchOcc
bool myEnvrnFlag = true;
- Real64 desFlowPerZoneArea(EnergyPlusData &state,
- int const actualZoneNum // Zone index
- );
+ Real64 desFlowPerZoneArea(EnergyPlusData &state, int const zoneNum, int const spaceNum = 0);
- Real64 desFlowPerZonePerson(EnergyPlusData &state,
- int const actualZoneNum // Zone index
- );
+ Real64 desFlowPerZonePerson(EnergyPlusData &state, int const actualZoneNum, int const spaceNum = 0);
Real64 calcOAFlowRate(EnergyPlusData &state,
int ActualZoneNum, // Zone index
@@ -1187,9 +1183,9 @@ namespace DataSizing {
int const ActualZoneNum, // Zone index
bool const UseOccSchFlag, // Zone occupancy schedule will be used instead of using total zone occupancy
bool const UseMinOASchFlag, // Use min OA schedule in DesignSpecification:OutdoorAir object
- bool const PerPersonNotSet = false, // when calculation should not include occupants (e.g., dual duct)
- bool const MaxOAVolFlowFlag = false // TRUE when calculation uses occupancy schedule (e.g., dual duct)
- );
+ bool const PerPersonNotSet = false, // when calculation should not include occupants (e.g., dual duct)
+ bool const MaxOAVolFlowFlag = false, // TRUE when calculation uses occupancy schedule (e.g., dual duct)
+ int const spaceNum = 0);
} // namespace DataSizing
diff --git a/src/EnergyPlus/DataZoneEquipment.cc b/src/EnergyPlus/DataZoneEquipment.cc
index 498d13c9d89..161a2cc1acc 100644
--- a/src/EnergyPlus/DataZoneEquipment.cc
+++ b/src/EnergyPlus/DataZoneEquipment.cc
@@ -126,10 +126,13 @@ constexpr std::array(ZoneEquipType::Num)> zon
"ZONEHVAC:BASEBOARD:RADIANTCONVECTIVE:WATER", // BaseboardWater
"ZONEHVAC:BASEBOARD:RADIANTCONVECTIVE:ELECTRIC", // BaseboardElectric
"ZONEHVAC:HIGHTEMPERATURERADIANT", // HighTempRadiant
- "ZONEHVAC:LOWTEMPERATURERADIANT:VARIABLEFLOW", // LowTempRadiant
+ "ZONEHVAC:LOWTEMPERATURERADIANT:CONSTANTFLOW", // LowTempRadiantConstFlow
+ "ZONEHVAC:LOWTEMPERATURERADIANT:VARIABLEFLOW", // LowTempRadiantVarFlow
+ "ZONEHVAC:LOWTEMPERATURERADIANT:ELECTRIC", // LowTempRadiantElectric
"FAN:ZONEEXHAUST", // ExhaustFan
"HEATEXCHANGER:AIRTOAIR:FLATPLATE", // HeatExchanger
- "WATERHEATER:HEATPUMP:PUMPEDCONDENSER", // HeatPumpWaterHeater
+ "WATERHEATER:HEATPUMP:PUMPEDCONDENSER", // HeatPumpWaterHeaterPumpedCondenser
+ "WATERHEATER:HEATPUMP:WRAPPEDCONDENSER", // HeatPumpWaterHeaterWrappedCondenser
"ZONEHVAC:DEHUMIDIFIER:DX", // DXDehumidifier
"ZONEHVAC:REFRIGERATIONCHILLERSET", // RefrigerationAirChillerSet
"ZONEHVAC:FORCEDAIR:USERDEFINED", // UserDefinedVACForcedAir
@@ -969,16 +972,9 @@ void processZoneEquipmentInput(EnergyPlusData &state,
}
if (thisZoneEquipList.EquipType(ZoneEquipTypeNum) == ZoneEquipType::Invalid) {
- if (thisZoneEquipList.EquipTypeName(ZoneEquipTypeNum) == "ZONEHVAC:LOWTEMPERATURERADIANT:CONSTANTFLOW" ||
- thisZoneEquipList.EquipTypeName(ZoneEquipTypeNum) == "ZONEHVAC:LOWTEMPERATURERADIANT:ELECTRIC") {
- thisZoneEquipList.EquipType(ZoneEquipTypeNum) = ZoneEquipType::LowTemperatureRadiant;
- } else if (thisZoneEquipList.EquipTypeName(ZoneEquipTypeNum) == "WATERHEATER:HEATPUMP:WRAPPEDCONDENSER") {
- thisZoneEquipList.EquipType(ZoneEquipTypeNum) = DataZoneEquipment::ZoneEquipType::HeatPumpWaterHeater;
- } else {
- ShowSevereError(state, format("{}{} = {}", RoutineName, CurrentModuleObject, thisZoneEquipList.Name));
- ShowContinueError(state, format("..Invalid Equipment Type = {}", thisZoneEquipList.EquipType(ZoneEquipTypeNum)));
- state.dataZoneEquip->GetZoneEquipmentDataErrorsFound = true;
- }
+ ShowSevereError(state, format("{}{} = {}", RoutineName, CurrentModuleObject, thisZoneEquipList.Name));
+ ShowContinueError(state, format("..Invalid Equipment Type = {}", thisZoneEquipList.EquipType(ZoneEquipTypeNum)));
+ state.dataZoneEquip->GetZoneEquipmentDataErrorsFound = true;
}
}
} // End parsing all extensible Zone Equipment info
@@ -1201,17 +1197,10 @@ void processZoneEquipSplitterInput(EnergyPlusData &state,
auto &ip = state.dataInputProcessing->inputProcessor;
std::string const zeqTypeName = ip->getAlphaFieldValue(objectFields, objectSchemaProps, "zone_equipment_object_type");
thisZeqSplitter.zoneEquipType = DataZoneEquipment::ZoneEquipType(getEnumValue(zoneEquipTypeNamesUC, zeqTypeName));
- // SpaceHVAC TODO: Copied this block from processZoneEquipmentInput section for ZoneHVAC:EquipmentList - seems this could be simplified
if (thisZeqSplitter.zoneEquipType == ZoneEquipType::Invalid) {
- if (zeqTypeName == "ZONEHVAC:LOWTEMPERATURERADIANT:CONSTANTFLOW" || zeqTypeName == "ZONEHVAC:LOWTEMPERATURERADIANT:ELECTRIC") {
- thisZeqSplitter.zoneEquipType = ZoneEquipType::LowTemperatureRadiant;
- } else if (zeqTypeName == "WATERHEATER:HEATPUMP:WRAPPEDCONDENSER") {
- thisZeqSplitter.zoneEquipType = DataZoneEquipment::ZoneEquipType::HeatPumpWaterHeater;
- } else {
- ShowSevereError(state, format("{}{} = {}", RoutineName, zeqSplitterModuleObject, thisZeqSplitter.Name));
- ShowContinueError(state, format("..Invalid Equipment Type = {}", zeqTypeName));
- state.dataZoneEquip->GetZoneEquipmentDataErrorsFound = true;
- }
+ ShowSevereError(state, format("{}{} = {}", RoutineName, zeqSplitterModuleObject, thisZeqSplitter.Name));
+ ShowContinueError(state, format("..Invalid Equipment Type = {}", zeqTypeName));
+ state.dataZoneEquip->GetZoneEquipmentDataErrorsFound = true;
}
thisZeqSplitter.zoneEquipName = ip->getAlphaFieldValue(objectFields, objectSchemaProps, "zone_equipment_name");
@@ -1824,7 +1813,8 @@ void scaleInletFlows(EnergyPlusData &state, int const zoneNodeNum, int const spa
void ZoneEquipmentSplitterMixer::size(EnergyPlusData &state)
{
- bool anyAutoSize = std::any_of(spaces.begin(), spaces.end(), [](ZoneEquipSplitterMixerSpace &s) { return s.fraction == DataSizing::AutoSize; });
+ bool anyAutoSize =
+ std::any_of(spaces.begin(), spaces.end(), [](ZoneEquipSplitterMixerSpace const &s) { return s.fraction == DataSizing::AutoSize; });
if (!anyAutoSize) return;
// Calculate total of space fraction basis value across all spaces for this splitter or mixer
@@ -1852,11 +1842,9 @@ void ZoneEquipmentSplitterMixer::size(EnergyPlusData &state)
}
break;
case DataZoneEquipment::SpaceEquipSizingBasis::PerimeterLength:
- ShowFatalError(state,
- format("ZoneEquipmentSplitterMixer::size: Space Fraction Method={} not supported for {}={}",
- DataZoneEquipment::spaceEquipSizingBasisNamesUC[(int)this->spaceSizingBasis],
- BranchNodeConnections::ConnectionObjectTypeNames[(int)this->spaceEquipType],
- this->Name));
+ for (auto &thisSpace : this->spaces) {
+ spacesTotal += state.dataHeatBal->space(thisSpace.spaceIndex).extPerimeter;
+ }
break;
default:
// If method is not set, then return
@@ -1875,43 +1863,41 @@ void ZoneEquipmentSplitterMixer::size(EnergyPlusData &state)
for (auto &thisSpace : this->spaces) {
thisSpace.fraction = spaceFrac;
}
- return;
+ } else {
+ // Calculate space fractions
+ for (auto &thisSpace : this->spaces) {
+ if (thisSpace.fraction == DataSizing::AutoSize) {
+ switch (this->spaceSizingBasis) {
+ case DataZoneEquipment::SpaceEquipSizingBasis::DesignCoolingLoad:
+ thisSpace.fraction = state.dataSize->FinalSpaceSizing(thisSpace.spaceIndex).DesCoolLoad / spacesTotal;
+ break;
+ case DataZoneEquipment::SpaceEquipSizingBasis::DesignHeatingLoad:
+ thisSpace.fraction = state.dataSize->FinalSpaceSizing(thisSpace.spaceIndex).DesHeatLoad / spacesTotal;
+ break;
+ case DataZoneEquipment::SpaceEquipSizingBasis::FloorArea:
+ thisSpace.fraction = state.dataHeatBal->space(thisSpace.spaceIndex).FloorArea / spacesTotal;
+ break;
+ case DataZoneEquipment::SpaceEquipSizingBasis::Volume:
+ thisSpace.fraction = state.dataHeatBal->space(thisSpace.spaceIndex).Volume / spacesTotal;
+ break;
+ case DataZoneEquipment::SpaceEquipSizingBasis::PerimeterLength:
+ thisSpace.fraction = state.dataHeatBal->space(thisSpace.spaceIndex).extPerimeter / spacesTotal;
+ break;
+ default:
+ break;
+ }
+ }
+ }
}
-
- // Calculate space fractions
+ // Report sizing results
int spaceCounter = 0;
for (auto &thisSpace : this->spaces) {
++spaceCounter;
- if (thisSpace.fraction == DataSizing::AutoSize) {
- switch (this->spaceSizingBasis) {
- case DataZoneEquipment::SpaceEquipSizingBasis::DesignCoolingLoad:
- thisSpace.fraction = state.dataSize->FinalSpaceSizing(thisSpace.spaceIndex).DesCoolLoad / spacesTotal;
- break;
- case DataZoneEquipment::SpaceEquipSizingBasis::DesignHeatingLoad:
- thisSpace.fraction = state.dataSize->FinalSpaceSizing(thisSpace.spaceIndex).DesHeatLoad / spacesTotal;
- break;
- case DataZoneEquipment::SpaceEquipSizingBasis::FloorArea:
- thisSpace.fraction = state.dataHeatBal->space(thisSpace.spaceIndex).FloorArea / spacesTotal;
- break;
- case DataZoneEquipment::SpaceEquipSizingBasis::Volume:
- thisSpace.fraction = state.dataHeatBal->space(thisSpace.spaceIndex).Volume / spacesTotal;
- break;
- case DataZoneEquipment::SpaceEquipSizingBasis::PerimeterLength:
- ShowFatalError(state,
- format("ZoneEquipmentSplitterMixer::size: Space Fraction Method={} not supported for {}={}",
- DataZoneEquipment::spaceEquipSizingBasisNamesUC[(int)this->spaceSizingBasis],
- BranchNodeConnections::ConnectionObjectTypeNames[(int)this->spaceEquipType],
- this->Name));
- break;
- default:
- break;
- }
- BaseSizer::reportSizerOutput(state,
- BranchNodeConnections::ConnectionObjectTypeNames[(int)this->spaceEquipType],
- this->Name,
- format("Space {} Fraction", spaceCounter),
- thisSpace.fraction);
- }
+ BaseSizer::reportSizerOutput(state,
+ BranchNodeConnections::ConnectionObjectTypeNames[(int)this->spaceEquipType],
+ this->Name,
+ format("Space {} Fraction", spaceCounter),
+ thisSpace.fraction);
}
}
diff --git a/src/EnergyPlus/DataZoneEquipment.hh b/src/EnergyPlus/DataZoneEquipment.hh
index b370b4ed008..b0ef4847bc5 100644
--- a/src/EnergyPlus/DataZoneEquipment.hh
+++ b/src/EnergyPlus/DataZoneEquipment.hh
@@ -135,10 +135,13 @@ namespace DataZoneEquipment {
BaseboardWater,
BaseboardElectric,
HighTemperatureRadiant,
- LowTemperatureRadiant,
+ LowTemperatureRadiantConstFlow,
+ LowTemperatureRadiantVarFlow,
+ LowTemperatureRadiantElectric,
ExhaustFan,
HeatExchanger,
- HeatPumpWaterHeater,
+ HeatPumpWaterHeaterPumpedCondenser,
+ HeatPumpWaterHeaterWrappedCondenser,
DehumidifierDX,
RefrigerationChillerSet,
UserDefinedHVACForcedAir,
@@ -282,8 +285,9 @@ namespace DataZoneEquipment {
int InNode; // Air distribution unit inlet node
int OutNode; // Air distribution unit Outlet node
bool SupplyAirPathExists;
- int MainBranchIndex;
- int SupplyBranchIndex;
+ int AirLoopNum = 0; // airloop number serving this ADU
+ int MainBranchIndex; // airloop branch index (not the actual branch index)
+ int SupplyBranchIndex; // airloop branch index (not the actual branch index)
int AirDistUnitIndex; // equipment number in EquipList
int TermUnitSizingIndex; // Pointer to TermUnitSizing and TermUnitFinalZoneSizing data for this terminal unit
int SupplyAirPathIndex; // Pointer to SupplyAirPath serving this terminal unit
diff --git a/src/EnergyPlus/DaylightingDevices.cc b/src/EnergyPlus/DaylightingDevices.cc
index 24e9d533b18..46e5f88843a 100644
--- a/src/EnergyPlus/DaylightingDevices.cc
+++ b/src/EnergyPlus/DaylightingDevices.cc
@@ -159,7 +159,7 @@ namespace Dayltg {
// sky is conveniently given by SurfAnisoSkyMult. NOTE: The solar shading code was modified to allow sunlit
// fraction, sunlit area, SurfAnisoSkyMult, etc. to be calculated for attached shading surfaces.
// Future shelf model improvements:
- // 1. Allow beam and downgoing flux to pass the end of the inside shelf depending on actual shelf goemetry.
+ // 1. Allow beam and downgoing flux to pass the end of the inside shelf depending on actual shelf geometry.
// 2. Reduce outside shelf view factor to sky (for daylighting) by taking into account anisotropic sky
// distribution and shading, i.e. the daylighting equivalent of SurfAnisoSkyMult.
// 3. Expand view factor to shelf calculation to handle more complicated geometry.
@@ -1789,7 +1789,7 @@ namespace Dayltg {
// DATE WRITTEN Dec 2011
// PURPOSE OF THIS SUBROUTINE:
- // intialize zone gains at begin new environment
+ // initialize zone gains at begin new environment
// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
diff --git a/src/EnergyPlus/DaylightingManager.cc b/src/EnergyPlus/DaylightingManager.cc
index 04f4e95ef7e..81398cd9607 100644
--- a/src/EnergyPlus/DaylightingManager.cc
+++ b/src/EnergyPlus/DaylightingManager.cc
@@ -641,7 +641,7 @@ void CalcDayltgCoeffsRefMapPoints(EnergyPlusData &state)
// This subroutine does the daylighting coefficient calculation for the
// daylighting and illuminance map reference points.
auto &dl = state.dataDayltg;
- auto &s_surf = state.dataSurface;
+ auto const &s_surf = state.dataSurface;
if (dl->VeryFirstTime) {
// make sure all necessary surfaces match to pipes
@@ -707,7 +707,7 @@ void CalcDayltgCoeffsRefPoints(EnergyPlusData &state, int const daylightCtrlNum)
// PURPOSE OF THIS SUBROUTINE:
// Provides calculations for Daylighting Coefficients for daylighting reference points
auto &dl = state.dataDayltg;
- auto &s_surf = state.dataSurface;
+ auto const &s_surf = state.dataSurface;
// glare calculation (radians)
int IConst; // Construction counter
@@ -771,7 +771,7 @@ void CalcDayltgCoeffsRefPoints(EnergyPlusData &state, int const daylightCtrlNum)
}
auto &thisDayltgCtrl = dl->daylightControl(daylightCtrlNum);
- auto &thisEnclDaylight = dl->enclDaylight(thisDayltgCtrl.enclIndex);
+ auto const &thisEnclDaylight = dl->enclDaylight(thisDayltgCtrl.enclIndex);
int zoneNum = thisDayltgCtrl.zoneIndex;
// Azimuth of view vector in absolute coord sys
Real64 AZVIEW = (thisDayltgCtrl.ViewAzimuthForGlare + state.dataHeatBal->Zone(zoneNum).RelNorth + state.dataHeatBal->BuildingAzimuth +
@@ -811,7 +811,7 @@ void CalcDayltgCoeffsRefPoints(EnergyPlusData &state, int const daylightCtrlNum)
BRef = 0;
for (int IL = 1; IL <= thisDayltgCtrl.TotalDaylRefPoints; ++IL) {
- auto &refPt = thisDayltgCtrl.refPts(IL);
+ auto const &refPt = thisDayltgCtrl.refPts(IL);
// Reference point in absolute coordinate system
Vector3 RREF = refPt.absCoords;
@@ -1063,11 +1063,10 @@ void CalcDayltgCoeffsMapPoints(EnergyPlusData &state, int const mapNum)
// Was previously part of CalcDayltgCoeffsRefMapPoints -- broken out to all multiple
// maps per zone
auto &dl = state.dataDayltg;
- auto &s_surf = state.dataSurface;
+ auto const &s_surf = state.dataSurface;
// In the following four variables, I=1 for clear sky, 2 for overcast.
int numRefPts; // Number of daylighting reference points in a zone
- int IL; // Reference point counter
// glare calculation (radians)
int IConst; // Construction counter
int ICtrl; // Window control counter
@@ -1122,7 +1121,7 @@ void CalcDayltgCoeffsMapPoints(EnergyPlusData &state, int const mapNum)
Vector3 VIEWVC2;
if (dl->mapFirstTime && (int)dl->illumMaps.size() > 0) {
- IL = -999;
+ int IL = -999;
for (int MapNum = 1; MapNum <= (int)dl->illumMaps.size(); ++MapNum) {
IL = max(IL, dl->illumMaps(MapNum).TotalMapRefPoints);
}
@@ -1132,7 +1131,7 @@ void CalcDayltgCoeffsMapPoints(EnergyPlusData &state, int const mapNum)
auto &illumMap = dl->illumMaps(mapNum);
int enclNum = illumMap.enclIndex;
- auto &thisEnclDaylight = dl->enclDaylight(enclNum);
+ auto const &thisEnclDaylight = dl->enclDaylight(enclNum);
// Azimuth of view vector in absolute coord sys - set to zero here, because glare isn't calculated for map points
// but these are arguments to some of the functions that are shared with regular reference points, so initalize here.
@@ -1165,7 +1164,7 @@ void CalcDayltgCoeffsMapPoints(EnergyPlusData &state, int const mapNum)
}
for (int IL = 1; IL <= numRefPts; ++IL) {
- auto &refPt = illumMap.refPts(IL);
+ auto const &refPt = illumMap.refPts(IL);
Vector3 RREF = refPt.absCoords;
// -------------
@@ -1920,7 +1919,7 @@ void FigureDayltgCoeffsAtPointsForWindowElements(
TVISIntWin = 0.0;
Vector3 HitPtIntWin = {0.0, 0.0, 0.0};
- auto &surf = s_surf->Surface(IWin);
+ auto const &surf = s_surf->Surface(IWin);
if (surf.OriginalClass == SurfaceClass::TDD_Diffuser) {
// Look up the TDD:DOME object
int PipeNum = s_surf->SurfWinTDDPipeNum(IWin);
@@ -2295,7 +2294,7 @@ void InitializeCFSStateData(EnergyPlusData &state,
CFSRefPointPosFactor(state, RefPoint, StateRefPoint, iWin, CurFenState, NTrnBasis, AZVIEW);
- auto &surf = s_surf->Surface(iWin);
+ auto const &surf = s_surf->Surface(iWin);
curWinEl = 0;
// loop through window elements. This will calculate sky, ground and reflection bins for each window element
@@ -2407,7 +2406,7 @@ void InitializeCFSStateData(EnergyPlusData &state,
}
} // do JSurf = 1, TotSurfaces
if (TotHits <= 0) {
- auto &sIncRay = state.dataBSDFWindow->ComplexWind(iWin).Geom(CurFenState).sInc(IRay);
+ auto const &sIncRay = state.dataBSDFWindow->ComplexWind(iWin).Geom(CurFenState).sInc(IRay);
// This ray reached the sky or ground unobstructed
if (sIncRay.z < 0.0) {
// A ground ray
@@ -2665,8 +2664,8 @@ Real64 CalcObstrMultiplier(EnergyPlusData &state,
// Phi = 0 at the horizon; Phi = Pi/2 at the zenith.
// Locals
- auto &dl = state.dataDayltg;
- auto &s_surf = state.dataSurface;
+ auto const &dl = state.dataDayltg;
+ auto const &s_surf = state.dataSurface;
bool hitObs; // True iff obstruction is hit
@@ -3525,7 +3524,6 @@ void FigureRefPointDayltgFactorsToAddIllums(EnergyPlusData &state,
} // for (iSky)
if (dl->horIllum[iHour].sun > tmpDFCalc) {
- auto &daylFac = daylFacHr(loopwin, iRefPoint)[iWinCover];
daylFac[iLum_Illum].sun = (dl->dirIllum(iHour)[iWinCover].sun + dl->reflIllum(iHour)[iWinCover].sun) / (dl->horIllum[iHour].sun + 0.0001);
daylFac[iLum_Illum].sunDisk =
(dl->dirIllum(iHour)[iWinCover].sunDisk + dl->reflIllum(iHour)[iWinCover].sunDisk) / (dl->horIllum[iHour].sun + 0.0001);
@@ -3946,7 +3944,7 @@ void GetInputIlluminanceMap(EnergyPlusData &state, bool &ErrorsFound)
// Perform the GetInput function for the Output:IlluminanceMap
// Glazer - June 2016 (moved from GetDaylightingControls)
auto &dl = state.dataDayltg;
- auto &s_surf = state.dataSurface;
+ auto const &s_surf = state.dataSurface;
Array1D_bool ZoneMsgDone;
@@ -3973,6 +3971,7 @@ void GetInputIlluminanceMap(EnergyPlusData &state, bool &ErrorsFound)
int IOStat;
int NumAlpha;
int NumNumber;
+ auto &ip = state.dataInputProcessing->inputProcessor;
for (int MapNum = 1; MapNum <= TotIllumMaps; ++MapNum) {
ip->getObjectItem(state,
s_ipsc->cCurrentModuleObject,
@@ -4599,7 +4598,7 @@ void GeometryTransformForDaylighting(EnergyPlusData &state)
// MODIFIED Glazer - July 2016 - separated this from GetInput function
// For splitflux daylighting, transform the geometry
auto &dl = state.dataDayltg;
- auto &s_surf = state.dataSurface;
+ auto const &s_surf = state.dataSurface;
// Calc cos and sin of Building Relative North values for later use in transforming Reference Point coordinates
Real64 CosBldgRelNorth = std::cos(-(state.dataHeatBal->BuildingAzimuth + state.dataHeatBal->BuildingRotationAppendixG) * Constant::DegToRad);
@@ -4725,7 +4724,7 @@ void GetInputDayliteRefPt(EnergyPlusData &state, bool &ErrorsFound)
{
// Perform GetInput function for the Daylighting:ReferencePoint object
// Glazer - July 2016
- auto &dl = state.dataDayltg;
+ auto const &dl = state.dataDayltg;
auto &ip = state.dataInputProcessing->inputProcessor;
auto const &s_ipsc = state.dataIPShortCut;
s_ipsc->cCurrentModuleObject = "Daylighting:ReferencePoint";
@@ -4771,9 +4770,9 @@ void GetInputDayliteRefPt(EnergyPlusData &state, bool &ErrorsFound)
}
}
-bool doesDayLightingUseDElight(EnergyPlusData &state)
+bool doesDayLightingUseDElight(EnergyPlusData const &state)
{
- auto &dl = state.dataDayltg;
+ auto const &dl = state.dataDayltg;
for (auto const &znDayl : dl->daylightControl) {
if (znDayl.DaylightMethod == DaylightingMethod::DElight) {
return true;
@@ -5617,7 +5616,7 @@ void manageDaylighting(EnergyPlusData &state)
if (state.dataEnvrn->SunIsUp && (state.dataEnvrn->BeamSolarRad + state.dataEnvrn->GndSolarRad + state.dataEnvrn->DifSolarRad > 0.0)) {
for (int enclNum = 1; enclNum <= state.dataViewFactor->NumOfSolarEnclosures; ++enclNum) {
- auto &enclSol = state.dataViewFactor->EnclSolInfo(enclNum);
+ auto const &enclSol = state.dataViewFactor->EnclSolInfo(enclNum);
if (enclSol.TotalEnclosureDaylRefPoints == 0 || !enclSol.HasInterZoneWindow) continue;
DayltgInterReflIllFrIntWins(state, enclNum);
@@ -5686,7 +5685,6 @@ void DayltgInteriorIllum(EnergyPlusData &state,
int ISWFLG; // Switchable glazing flag: =1 if one or more windows in a zone
// has switchable glazing that adjusts visible transmittance to just meet
// daylighting setpoint; =0 otherwise.
- int ICtrl; // Window shading control pointer
Real64 VTRAT; // Ratio between switched and unswitched visible transmittance at normal incidence
Real64 BACL; // Window background (surround) luminance for glare calc (cd/m2)
Real64 SkyWeight; // Weighting factor used to average two different sky types
@@ -5924,22 +5922,22 @@ void DayltgInteriorIllum(EnergyPlusData &state,
auto &daylFromWinAtRefPt = thisDayltgCtrl.refPts(IL).extWins(loop).lums;
auto &tmpDayl = tmpDaylFromWinAtRefPt(IL, loop);
for (int iWinCover = 0; iWinCover < (int)WinCover::Num; ++iWinCover) {
- auto const &dfhr = DFHR[iWinCover];
- auto const &bfhr = BFHR[iWinCover];
- auto const &sfhr = SFHR[iWinCover];
+ auto const &dfhr3 = DFHR[iWinCover];
+ auto const &bfhr3 = BFHR[iWinCover];
+ auto const &sfhr3 = SFHR[iWinCover];
// What is this?
if (iWinCover == iWinCover_Shaded && !ShadedOrDiffusingGlassWin) break;
daylFromWinAtRefPt[iLum_Illum][iWinCover] =
- dfhr.sun * state.dataEnvrn->HISUNF +
- HorIllSkyFac * (dfhr.sky[iSky1] * SkyWeight * horIllSky1 + dfhr.sky[iSky2] * (1.0 - SkyWeight) * horIllSky2);
+ dfhr3.sun * state.dataEnvrn->HISUNF +
+ HorIllSkyFac * (dfhr3.sky[iSky1] * SkyWeight * horIllSky1 + dfhr3.sky[iSky2] * (1.0 - SkyWeight) * horIllSky2);
daylFromWinAtRefPt[iLum_Back][iWinCover] =
- bfhr.sun * state.dataEnvrn->HISUNF +
- HorIllSkyFac * (bfhr.sky[iSky1] * SkyWeight * horIllSky1 + bfhr.sky[iSky2] * (1.0 - SkyWeight) * horIllSky2);
+ bfhr3.sun * state.dataEnvrn->HISUNF +
+ HorIllSkyFac * (bfhr3.sky[iSky1] * SkyWeight * horIllSky1 + bfhr3.sky[iSky2] * (1.0 - SkyWeight) * horIllSky2);
daylFromWinAtRefPt[iLum_Source][iWinCover] =
- sfhr.sun * state.dataEnvrn->HISUNF +
- HorIllSkyFac * (sfhr.sky[iSky1] * SkyWeight * horIllSky1 + sfhr.sky[iSky2] * (1.0 - SkyWeight) * horIllSky2);
+ sfhr3.sun * state.dataEnvrn->HISUNF +
+ HorIllSkyFac * (sfhr3.sky[iSky1] * SkyWeight * horIllSky1 + sfhr3.sky[iSky2] * (1.0 - SkyWeight) * horIllSky2);
daylFromWinAtRefPt[iLum_Source][iWinCover] = max(daylFromWinAtRefPt[iLum_Source][iWinCover], 0.0);
@@ -6225,7 +6223,7 @@ void DayltgInteriorIllum(EnergyPlusData &state,
continueOuterLoop = false;
continue;
}
- ICtrl = s_surf->Surface(IWin).activeWindowShadingControl;
+ int ICtrl = s_surf->Surface(IWin).activeWindowShadingControl;
if (!s_surf->Surface(IWin).HasShadeControl) {
continueOuterLoop = false;
continue;
@@ -6258,7 +6256,7 @@ void DayltgInteriorIllum(EnergyPlusData &state,
rdayil[iLum_Back] = refPt.lums[iLum_Back] - wdayil[iLum_Back][iWinCover_Bare] + wdayil[iLum_Back][iWinCover_Shaded];
} else {
// switchable glazings already in partially switched state when calc the RDAYIL(IL) & RBACLU(IL)
- auto &tmpDayl = tmpDaylFromWinAtRefPt(loop, IL);
+ auto const &tmpDayl = tmpDaylFromWinAtRefPt(loop, IL);
rdayil[iLum_Illum] = dl->DaylIllum(IL) - wdayil[iLum_Illum][iWinCover_Shaded] + tmpDayl[iLum_Illum][iWinCover_Shaded];
rdayil[iLum_Back] = refPt.lums[iLum_Back] - wdayil[iLum_Back][iWinCover_Shaded] + tmpDayl[iLum_Back][iWinCover_Shaded];
}
@@ -6366,7 +6364,7 @@ void DayltgInteriorIllum(EnergyPlusData &state,
ANY_BLIND(s_surf->SurfWinShadingFlag(IWin)))
continue;
- ICtrl = s_surf->Surface(IWin).activeWindowShadingControl;
+ int ICtrl = s_surf->Surface(IWin).activeWindowShadingControl;
if (!s_surf->Surface(IWin).HasShadeControl) continue;
if (s_surf->WindowShadingControl(ICtrl).GlareControlIsActive) {
@@ -6919,8 +6917,6 @@ void DayltgInterReflectedIllum(EnergyPlusData &state,
Vector3 groundHitPt; // Coordinates of point that ray from window center hits the ground (m)
std::array FLCW = {Illums()}; // Sky-related upgoing luminous flux
std::array FLFW = {Illums()}; // Sky-related downgoing luminous flux
- Real64 transMult;
- Real64 transBmBmMult;
// 3=intermediate, 4=overcast
Real64 DPH; // Sky/ground element altitude and azimuth increments (radians)
@@ -7648,16 +7644,16 @@ void DayltgInterReflectedIllum(EnergyPlusData &state,
int idxLo = surfShade.blind.profAngIdxLo;
int idxHi = surfShade.blind.profAngIdxHi;
int interpFac = surfShade.blind.profAngInterpFac;
- Real64 TransBlBmDiffFront = Interp(btar.Vis.Ft.Bm[idxLo].DfTra, btar.Vis.Ft.Bm[idxHi].DfTra, interpFac);
+ TransBlBmDiffFront = Interp(btar.Vis.Ft.Bm[idxLo].DfTra, btar.Vis.Ft.Bm[idxHi].DfTra, interpFac);
if (ShType == WinShadingType::IntBlind) { // Interior blind
// TH CR 8121, 7/7/2010
// ReflBlBmDiffFront = WindowManager::InterpProfAng(ProfAng,Blind(BlNum)%VisFrontBeamDiffRefl)
- Real64 ReflBlBmDiffFront = Interp(btar.Vis.Ft.Bm[idxLo].DfRef, btar.Vis.Ft.Bm[idxHi].DfRef, interpFac);
+ ReflBlBmDiffFront = Interp(btar.Vis.Ft.Bm[idxLo].DfRef, btar.Vis.Ft.Bm[idxHi].DfRef, interpFac);
// TH added 7/12/2010 for CR 8121
- Real64 ReflBlDiffDiffFront = btar.Vis.Ft.Df.Ref;
- Real64 TransBlDiffDiffFront = btar.Vis.Ft.Df.Tra;
+ ReflBlDiffDiffFront = btar.Vis.Ft.Df.Ref;
+ TransBlDiffDiffFront = btar.Vis.Ft.Df.Tra;
transMult = TVISBSun * (TransBlBmDiffFront + ReflBlBmDiffFront * ReflGlDiffDiffBack * TransBlDiffDiffFront /
(1.0 - ReflBlDiffDiffFront * ReflGlDiffDiffBack));
@@ -7726,8 +7722,7 @@ void DayltgInterReflectedIllum(EnergyPlusData &state,
// -- Window with shade, blind or diffusing glass
if (ShadeOn || BlindOn || ScreenOn || s_surf->SurfWinSolarDiffusing(IWin)) {
- transBmBmMult = 0.0;
- transMult = 0.0;
+ Real64 transMult = 0.0;
if (ShadeOn || s_surf->SurfWinSolarDiffusing(IWin)) { // Shade on or diffusing glass
int IConstShaded = s_surf->SurfWinActiveShadedConstruction(IWin);
@@ -8311,7 +8306,7 @@ Real64 DayltgSkyLuminance(EnergyPlusData const &state,
// PHSKY ranges from 0 to Pi starting with 0 at the horizon and Pi/2 at the zenith.
// FUNCTION LOCAL VARIABLE DECLARATIONS:
- auto &dl = state.dataDayltg;
+ auto const &dl = state.dataDayltg;
Real64 G = 0.0; // Angle between sun and element of sky (radians)
Real64 COSG = 0.0; // Cosine of G
@@ -8753,11 +8748,11 @@ void DayltgInteriorMapIllum(EnergyPlusData &state)
if (s_surf->SurfWinWindowModelType(IWin) == WindowModel::BSDF) break;
if (NOT_SHADED(s_surf->SurfWinShadingFlag(IWin)) && !s_surf->SurfWinSolarDiffusing(IWin)) break;
}
- auto const &dfhr = DFHR[iWinCover];
+ auto const &dfhr3 = DFHR[iWinCover];
thisMap.refPts(ILB).winLums(loop)[iWinCover] = tmpDFHR[iWinCover].sun * state.dataEnvrn->HISUNF +
- HorIllSkyFac * (dfhr.sky[iSky1] * SkyWeight * tmpHorIll.sky[iSky1] +
- dfhr.sky[iSky2] * (1.0 - SkyWeight) * tmpHorIll.sky[iSky2]);
+ HorIllSkyFac * (dfhr3.sky[iSky1] * SkyWeight * tmpHorIll.sky[iSky1] +
+ dfhr3.sky[iSky2] * (1.0 - SkyWeight) * tmpHorIll.sky[iSky2]);
}
} // End of reference point loop
@@ -9284,7 +9279,7 @@ void DayltgSetupAdjZoneListsAndPointers(EnergyPlusData &state)
// Get exterior windows in EnclNumAdj -- there must be at least one, otherwise
// it would not be an "AdjIntWinEncl"
for (int SurfNumAdj : state.dataViewFactor->EnclSolInfo(adjEnclNum).SurfacePtr) {
- auto &surfAdj = s_surf->Surface(SurfNumAdj);
+ auto const &surfAdj = s_surf->Surface(SurfNumAdj);
if ((surfAdj.Class == SurfaceClass::Window && surfAdj.ExtBoundCond == ExternalEnvironment) ||
surfAdj.OriginalClass == SurfaceClass::TDD_Diffuser) {
++enclExtWinCtr;
@@ -9508,7 +9503,7 @@ void DayltgInterReflIllFrIntWins(EnergyPlusData &state, int const enclNum)
auto &s_surf = state.dataSurface;
auto &enclDayl = dl->enclDaylight(enclNum);
- auto &enclSol = state.dataViewFactor->EnclSolInfo(enclNum);
+ auto const &enclSol = state.dataViewFactor->EnclSolInfo(enclNum);
enclDayl.InterReflIllFrIntWins = 0.0;
@@ -9604,8 +9599,7 @@ void CalcMinIntWinSolidAngs(EnergyPlusData &state)
Vector3 W23 = W3 - W2;
Real64 HW = W21.magnitude();
Real64 WW = W23.magnitude();
- Vector3 WC =
- (is_Rectangle) ? (W2 + (W23 + W21) / 2.0) : (is_Triangle ? (W2 + (W23 + W21) / 3.0) : (W2 + (W23 + W21) / 3.0));
+ Vector3 WC = (is_Rectangle) ? (W2 + (W23 + W21) / 2.0) : (W2 + (W23 + W21) / 3.0);
// Vector from ref point to center of window
Vector3 REFWC = WC - RREF;
diff --git a/src/EnergyPlus/DaylightingManager.hh b/src/EnergyPlus/DaylightingManager.hh
index fcbd11dd9e0..4ed7909a212 100644
--- a/src/EnergyPlus/DaylightingManager.hh
+++ b/src/EnergyPlus/DaylightingManager.hh
@@ -317,7 +317,7 @@ namespace Dayltg {
void GetInputDayliteRefPt(EnergyPlusData &state, bool &ErrorsFound);
- bool doesDayLightingUseDElight(EnergyPlusData &state);
+ bool doesDayLightingUseDElight(EnergyPlusData const &state);
void CheckTDDsAndLightShelvesInDaylitZones(EnergyPlusData &state);
diff --git a/src/EnergyPlus/EcoRoofManager.cc b/src/EnergyPlus/EcoRoofManager.cc
index 4f42ba2cbbf..02f394610e3 100644
--- a/src/EnergyPlus/EcoRoofManager.cc
+++ b/src/EnergyPlus/EcoRoofManager.cc
@@ -194,7 +194,7 @@ namespace EcoRoofManager {
auto const &thisConstruct = state.dataConstruction->Construct(ConstrNum);
auto const *thisMaterial = state.dataMaterial->materials(thisConstruct.LayerPoint(1));
RoughSurf = thisMaterial->Roughness;
- Real64 AbsThermSurf = thisMaterial->AbsorpThermal; // Thermal absoptance of the exterior surface
+ Real64 AbsThermSurf = thisMaterial->AbsorpThermal; // Thermal absorptance of the exterior surface
Real64 HMovInsul = 0.0; // "Convection" coefficient of movable insulation
if (state.dataSurface->Surface(SurfNum).ExtWind) {
@@ -284,7 +284,7 @@ namespace EcoRoofManager {
// (Deardorff (1987)). Kelvin. based of the previous temperatures
Tafk = (1.0 - sigmaf) * Tak + sigmaf * (0.3 * Tak + 0.6 * (Tif + Constant::Kelvin) + 0.1 * Tgk);
- Taf = Tafk - Constant::Kelvin; // Air Temperature within canopy in Celcius (C).
+ Taf = Tafk - Constant::Kelvin; // Air Temperature within canopy in Celsius (C).
Rhof = state.dataEcoRoofMgr->Pa / (Rair * Tafk); // Density of air at the leaf temperature
Rhoaf = (Rhoa + Rhof) / 2.0; // Average of air density
Zd = 0.701 * std::pow(state.dataEcoRoofMgr->Zf, 0.979); // Zero displacement height
@@ -316,7 +316,7 @@ namespace EcoRoofManager {
ra = 1.0 / (Cf * Waf); // Aerodynamic Resistance. Resistance that is caused
// by the boundary layer on a leaf surface to transfer water vapor. It is measured in
// s/m and depends on wind speed, leaf's surface roughness,
- // and stability of atsmophere.
+ // and stability of atmosphere.
CalculateEcoRoofSolar(state, RS, f1, SurfNum);
if (state.dataEcoRoofMgr->MoistureMax == state.dataEcoRoofMgr->MoistureResidual) {
@@ -525,9 +525,9 @@ namespace EcoRoofManager {
thisEcoRoof->LAI = matER->LAI; // Leaf Area Index
thisEcoRoof->Alphag = 1.0 - matER->AbsorpSolar; // albedo rather than absorptivity
thisEcoRoof->Alphaf = matER->Lreflectivity; // Leaf Reflectivity
- thisEcoRoof->epsilonf = matER->LEmissitivity; // Leaf Emisivity
+ thisEcoRoof->epsilonf = matER->LEmissitivity; // Leaf Emissivity
thisEcoRoof->StomatalResistanceMin = matER->RStomata; // Leaf min stomatal resistance
- thisEcoRoof->epsilong = matER->AbsorpThermal; // Soil Emisivity
+ thisEcoRoof->epsilong = matER->AbsorpThermal; // Soil Emissivity
thisEcoRoof->MoistureMax = matER->Porosity; // Max moisture content in soil
thisEcoRoof->MoistureResidual = matER->MinMoisture; // Min moisture content in soil
thisEcoRoof->Moisture = matER->InitMoisture; // Initial moisture content in soil
@@ -886,7 +886,7 @@ namespace EcoRoofManager {
// the water will simply run right off the top and not penetrate at all!
// At the present time this limit is fairly small due to some minor stability issues
// in EnergyPlus. If the moisture changes too rapidly the code cannot handle the rapid changes in
- // surface characteristics and heat fluxes. The result that I've noticed is a non-physical fluctation
+ // surface characteristics and heat fluxes. The result that I've noticed is a non-physical fluctuation
// in ground surface temperature that oscillates up to 10 deg C from one hour to the next until the
// code catches up. The temporary solution is to simply limit how much moisture can enter the soil
// in any time step to 0.5"/hour. In the future this might be fixed by running with finer time steps
@@ -913,12 +913,12 @@ namespace EcoRoofManager {
if (matER->calcMethod == Material::EcoRoofCalcMethod::Simple) {
// THE SECTION BELOW WAS THE INITIAL MOISTURE DISTRIBUTION MODEL.
- // Any line with "!-" was code. A line with "!" was just a comment. This is done in case this code needs to be resurected in the future.
- // See below this commented out code for the new moisture distribution model.
+ // Any line with "!-" was code. A line with "!" was just a comment. This is done in case this code needs to be resurrected in the
+ // future. See below this commented out code for the new moisture distribution model.
//*********************************************************************************************************
//*********************************************************************************************************
// NEXT Redistribute moisture based on moisture diffusion.
- // The effective diffusivities should be revisted when better moisture transport data in ecoroof soils are
+ // The effective diffusivities should be revisited when better moisture transport data in ecoroof soils are
// available.
// Here the diffusion rate is in units of [1/s]
// A value of 0.0001 would be ~ 36% / hour
@@ -1072,7 +1072,7 @@ namespace EcoRoofManager {
// Note wet soil absorptance is generally 25-50% higher than dry soil absorptance (assume linear)
SoilAbsorpSolar = state.dataEcoRoofMgr->DryAbsorp +
(0.92 - state.dataEcoRoofMgr->DryAbsorp) * (Moisture - MoistureResidual) / (MoistureMax - MoistureResidual);
- // Limit solar absorptivity to 95% so soil abledo is always above 5%
+ // Limit solar absorptivity to 95% so soil albedo is always above 5%
if (SoilAbsorpSolar > 0.95) SoilAbsorpSolar = 0.95;
// Limit solar absorptivity to greater than 20% so that albedo is always less than 80%
if (SoilAbsorpSolar < 0.20) SoilAbsorpSolar = 0.20;
diff --git a/src/EnergyPlus/EconomicTariff.cc b/src/EnergyPlus/EconomicTariff.cc
index 8652bb5c03d..9b1647ccd87 100644
--- a/src/EnergyPlus/EconomicTariff.cc
+++ b/src/EnergyPlus/EconomicTariff.cc
@@ -472,8 +472,8 @@ void GetInputEconomicsTariff(EnergyPlusData &state, bool &ErrorsFound) // true i
}
// type of demand window
if (Util::SameString(s_ipsc->cAlphaArgs(7), "QuarterHour")) {
- // check to make sure that the demand window and the TIMESTEP IN HOUR are consistant.
- {
+ // check to make sure that the demand window and the TIMESTEP IN HOUR are consistent.
+ { // Why is this a nested scope?
switch (state.dataGlobal->TimeStepsInHour) {
case 1:
case 3:
@@ -1275,7 +1275,7 @@ void GetLastWord(std::string const &lineOfText, std::string::size_type &endOfSca
// Returns the last substring of the line of text to the
// left of the endOfSubStrg pointer. A substring is
- // delimitted by spaces. Quotes are not significant
+ // delimited by spaces. Quotes are not significant
// (they are treated just like any other non-space character)
// Scan the string from the end.
@@ -2210,7 +2210,7 @@ void CreateDefaultComputation(EnergyPlusData &state)
// into categories.
// category SUM chg1Name chg2Name chg3Name
// Since the dependency array has one target and multiple
- // parameters, remainingPt is shown as a seperate equation that
+ // parameters, remainingPt is shown as a separate equation that
// depends on namePt for Charge:Block. The equation will not be
// displayed or processed except in the sort.
// remainingPt NOOP namePt
@@ -2219,21 +2219,21 @@ void CreateDefaultComputation(EnergyPlusData &state)
// charge, ratchet or qualify.
// chg1Name
// It is also possible that two variables referenced within one
- // object could include a dependancy relationship also. For
+ // object could include a dependency relationship also. For
// example, the blkSzPt could be calculated using the same sourePt
// in Charge:Block.
// METHODOLOGY EMPLOYED:
// Since some ECONOMCIS:* objects depend on other variables
// first must create the order of when to perform the
- // computations. First a dependancy table is created that
- // indicates what variables are dependant on other variables.
+ // computations. First a dependency table is created that
+ // indicates what variables are dependent on other variables.
// A directed acyclic graph (DAG) describes the general
// problem which is usually solved using a topological
// sorting algorithm.
// Each line/step is generated and put into the depend
// array. Also in the array are counts of how many items it
- // depends on and a list of entries that are dependant on that
+ // depends on and a list of entries that are dependent on that
// line.
// for each tariff that does not have a UtilityCost:Computation object go through the variables
@@ -2251,7 +2251,7 @@ void CreateDefaultComputation(EnergyPlusData &state)
}
//"clear" the dependOn array
state.dataEconTariff->numOperand = 0;
- // Define the preset equations (category sumation)
+ // Define the preset equations (category summation)
int curTotal = tariff.ptTotal;
int curSubtotal = tariff.ptSubtotal;
int curBasis = tariff.ptBasis;
@@ -2284,7 +2284,7 @@ void CreateDefaultComputation(EnergyPlusData &state)
addOperand(state, tariff.ptEnergyCharges, tariff.nativeRealTimePriceCosts);
}
// now add equations with NOOP to represent each object with its
- // dependancies
+ // dependencies
// Qualify
for (int kObj = 1; kObj <= state.dataEconTariff->numQualify; ++kObj) {
auto const &qualify = state.dataEconTariff->qualify(kObj);
@@ -2351,7 +2351,7 @@ void CreateDefaultComputation(EnergyPlusData &state)
}
}
}
- // make sure no compuation is already user defined
+ // make sure no computation is already user defined
if (computation.firstStep != 0) {
ShowWarningError(state, format("In UtilityCost:Tariff: Overwriting user defined tariff {}", tariff.tariffName));
}
@@ -2361,13 +2361,13 @@ void CreateDefaultComputation(EnergyPlusData &state)
computation.lastStep = -1; // this will be incremented by addStep
computation.isUserDef = false;
// now all "equations" are defined, treat the variables with the list
- // of dependancies as a directed acyclic graph and use "count down" algorithm
+ // of dependencies as a directed acyclic graph and use "count down" algorithm
// to do a topological sort of the variables into the order for computation
// First, clear the counters
for (int jVar = 1; jVar <= state.dataEconTariff->numEconVar; ++jVar) {
state.dataEconTariff->econVar(jVar).cntMeDependOn = 0;
}
- // Second, add up the number of dependancies on each variable
+ // Second, add up the number of dependencies on each variable
for (int iVar = 1; iVar <= state.dataEconTariff->numEconVar; ++iVar) {
if (state.dataEconTariff->econVar(iVar).activeNow) {
if (state.dataEconTariff->econVar(iVar).lastOperand >= state.dataEconTariff->econVar(iVar).firstOperand) {
@@ -2384,7 +2384,7 @@ void CreateDefaultComputation(EnergyPlusData &state)
numNoDepend = 0;
for (int iVar = 1; iVar <= state.dataEconTariff->numEconVar; ++iVar) {
if (state.dataEconTariff->econVar(iVar).activeNow) {
- // find a variable that has no more dangling dependancies
+ // find a variable that has no more dangling dependencies
if (state.dataEconTariff->econVar(iVar).cntMeDependOn == 0) {
// If the variable is a native variable then
// IF (econVar(iVar)%kindOfObj .NE. iEconVarObjType::Native) THEN
@@ -2437,7 +2437,7 @@ void CreateDefaultComputation(EnergyPlusData &state)
}
if (loopCount > 100000) {
ShowWarningError(state,
- format("UtilityCost:Tariff: Loop count exceeded when counting dependancies in tariff: {}", tariff.tariffName));
+ format("UtilityCost:Tariff: Loop count exceeded when counting dependencies in tariff: {}", tariff.tariffName));
}
// make sure that all variables associated with the tariff are included
bool remainingVarFlag = false;
@@ -2450,7 +2450,7 @@ void CreateDefaultComputation(EnergyPlusData &state)
ShowWarningError(state,
format("CreateDefaultComputation: In UtilityCost:Computation: Circular or invalid dependencies found in tariff: {}",
tariff.tariffName));
- ShowContinueError(state, " UtilityCost variables that may have invalid dependencies and the variables they are dependant on.");
+ ShowContinueError(state, " UtilityCost variables that may have invalid dependencies and the variables they are dependent on.");
for (int iVar = 1; iVar <= state.dataEconTariff->numEconVar; ++iVar) {
if (state.dataEconTariff->econVar(iVar).tariffIndx == iTariff) {
if (state.dataEconTariff->econVar(iVar).activeNow) {
@@ -2484,7 +2484,7 @@ void addOperand(EnergyPlusData &state, int const varMe, int const varOperand)
// AUTHOR Jason Glazer of GARD Analytics, Inc.
// DATE WRITTEN July 2004
- // Used by CreateDefaultComputation to create the dependancy
+ // Used by CreateDefaultComputation to create the dependency
// relationship in the EconVar array
int constexpr sizeIncrement(100);
@@ -3132,7 +3132,7 @@ void pushStack(EnergyPlusData &state, Array1A const monthlyArray, int co
}
// if the serviceCharges are being evaluated add in the monthly charges
if (econVar(variablePointer).specific == catServiceCharges) addMonthlyCharge(state, variablePointer);
- // get the results of performing the evaulation - should have been
+ // get the results of performing the evaluation - should have been
// put into the econVar values
curMonthlyArray = econVar(variablePointer).values;
}
@@ -3282,7 +3282,7 @@ void evaluateChargeBlock(EnergyPlusData &state, int const usingVariable)
} else {
blkSzMult = chargeBlock.blkSzMultVal;
}
- // initially set the remaing energy or demand to the source
+ // initially set the remaining energy or demand to the source
remainVals = sourceVals;
// initially set the result (cost) to zero
resultChg = 0.0;
@@ -3591,7 +3591,7 @@ void evaluateQualify(EnergyPlusData &state, int const usingVariable)
}
}
// now update the tariff level qualifier - only update if the tariff is still qualified
- // and the current qualifer fails.
+ // and the current qualifier fails.
if (tariff.isQualified) {
if (!isQualified) {
tariff.isQualified = false;
@@ -4727,7 +4727,7 @@ void selectTariff(EnergyPlusData &state)
// DATE WRITTEN July 2004
// To select tariffs for each combination of meter and
- // group. If multipler tariffs have the same meter and
+ // group. If multiple tariffs have the same meter and
// group, then select the one with the lowest cost.
// For electric tariffs, since they may have buy, sell, or
// netmetering, they need to be combined more carefully.
diff --git a/src/EnergyPlus/ElectricBaseboardRadiator.cc b/src/EnergyPlus/ElectricBaseboardRadiator.cc
index 4b1ae6d681c..aa6776c2fb2 100644
--- a/src/EnergyPlus/ElectricBaseboardRadiator.cc
+++ b/src/EnergyPlus/ElectricBaseboardRadiator.cc
@@ -84,7 +84,7 @@ namespace ElectricBaseboardRadiator {
// PURPOSE OF THIS MODULE:
// This module is to calculate the actual convective heat addition that an electrical baseboard heater
- // deliveres to a space.
+ // delivers to a space.
// METHODOLOGY EMPLOYED:
// Based on the convective-only electric baseboard module (Object: ZoneHVAC:Baseboard:Convective:Electric)
@@ -887,7 +887,7 @@ namespace ElectricBaseboardRadiator {
// April 2010 Brent Griffith, max limit to protect surface temperature calcs
// PURPOSE OF THIS SUBROUTINE:
- // To distribute the gains from the electric basebaord heater
+ // To distribute the gains from the electric baseboard heater
// as specified in the user input file. This includes distribution
// of long wavelength radiant gains to surfaces and "people."
diff --git a/src/EnergyPlus/EvaporativeCoolers.cc b/src/EnergyPlus/EvaporativeCoolers.cc
index 44fb87a60f6..5761f713dca 100644
--- a/src/EnergyPlus/EvaporativeCoolers.cc
+++ b/src/EnergyPlus/EvaporativeCoolers.cc
@@ -93,7 +93,7 @@ namespace EnergyPlus::EvaporativeCoolers {
// AUTHOR Richard J. Liesen
// DATE WRITTEN Oct 2000
// MODIFIED BG July 2003 ResearchSpecial Indirect
-// BG Febraury 2007 outside air nodes
+// BG February 2007 outside air nodes
// BG March 2009 ResearchSpecial Direct
// RE-ENGINEERED na
@@ -1185,7 +1185,7 @@ void SizeEvapCooler(EnergyPlusData &state, int const EvapCoolNum)
if (CurSysNum > 0) {
CheckThisAirSystemForSizing(state, CurSysNum, SizingDesRunThisAirSys);
if (SizingDesRunThisAirSys) {
- HardSizeNoDesRun = false; // Check if design infomation is available
+ HardSizeNoDesRun = false; // Check if design information is available
}
}
if (CurZoneEqNum > 0) {
@@ -1195,7 +1195,7 @@ void SizeEvapCooler(EnergyPlusData &state, int const EvapCoolNum)
// This check was commented to get back to original code and an issue is needed to correct.
// Why no check for zone equipment?
// if (SizingDesRunThisZone) {
- // HardSizeNoDesRun = false; // Check if design infomation is available
+ // HardSizeNoDesRun = false; // Check if design information is available
//}
}
// I don't think the sizing logic is correct when it comes to autosized vs hard-sized inputs
@@ -1396,7 +1396,7 @@ void SizeEvapCooler(EnergyPlusData &state, int const EvapCoolNum)
if (CurSysNum > 0 && !IsAutoSize && !SizingDesRunThisAirSys) {
HardSizeNoDesRun = true;
}
- if (SizingDesRunThisAirSys) HardSizeNoDesRun = false; // Check if design infomation is available
+ if (SizingDesRunThisAirSys) HardSizeNoDesRun = false; // Check if design information is available
// Design air flow rate
if (CurSysNum > 0) { // central system
if (!IsAutoSize && !SizingDesRunThisAirSys) {
@@ -1512,7 +1512,7 @@ void SizeEvapCooler(EnergyPlusData &state, int const EvapCoolNum)
IsAutoSize = true;
}
if (SizingDesRunThisAirSys) {
- HardSizeNoDesRun = false; // Check if design infomation is available
+ HardSizeNoDesRun = false; // Check if design information is available
}
// Design air flow rate
if (CurSysNum > 0) { // central system
@@ -1731,7 +1731,7 @@ void CalcDirectEvapCooler(EnergyPlusData &state, int EvapCoolNum, Real64 const P
//***************************************************************************
// ENERGY CONSUMED BY THE RECIRCULATING PUMP
- // Add the pump energy to the total Evap Cooler energy comsumption
+ // Add the pump energy to the total Evap Cooler energy consumption
thisEvapCond.EvapCoolerPower += PartLoadRatio * thisEvapCond.RecircPumpPower;
//******************
// WATER CONSUMPTION IN m3 OF WATER FOR DIRECT
@@ -1835,12 +1835,12 @@ void CalcDryIndirectEvapCooler(EnergyPlusData &state, int EvapCoolNum, Real64 co
CpAir = Psychrometrics::PsyCpAirFnW(thisEvapCond.InletHumRat);
RhoAir = Psychrometrics::PsyRhoAirFnPbTdbW(state, state.dataEnvrn->OutBaroPress, thisEvapCond.InletTemp, thisEvapCond.InletHumRat);
CFMAir = thisEvapCond.VolFlowRate; // Volume Flow Rate Primary Side
- CFMSec = thisEvapCond.IndirectVolFlowRate; // Volume Flolw Rate Secondary Side
+ CFMSec = thisEvapCond.IndirectVolFlowRate; // Volume Flow Rate Secondary Side
QHX = EffHX * min(CFMSec, CFMAir) * RhoAir * CpAir * (thisEvapCond.InletTemp - TDBSec);
thisEvapCond.OutletTemp = thisEvapCond.InletTemp - QHX / (RhoAir * CFMAir * CpAir);
// This is a rough approximation of the Total Indirect Stage Efficiency for the Dry stage which
- // is a 2 step process the first being teh pad efficiency and then the HX Effectiveness. I think that
+ // is a 2 step process the first being the pad efficiency and then the HX Effectiveness. I think that
// this would mainly be used for evap sizing purposes.
thisEvapCond.StageEff = SatEff * EffHX;
//***************************************************************************
@@ -1866,7 +1866,7 @@ void CalcDryIndirectEvapCooler(EnergyPlusData &state, int EvapCoolNum, Real64 co
// ENERGY CONSUMED BY THE RECIRCULATING PUMP
// ENERGY CONSUMED BY THE RECIRCULATING PUMP
- // Add the pump energy to the total Evap Cooler energy comsumption
+ // Add the pump energy to the total Evap Cooler energy consumption
thisEvapCond.EvapCoolerPower += PartLoadRatio * thisEvapCond.IndirectRecircPumpPower;
//******************
@@ -1937,7 +1937,7 @@ void CalcWetIndirectEvapCooler(EnergyPlusData &state, int EvapCoolNum, Real64 co
//******************************************************************************
// INDIRECT STAGE EFFICIENCY FOR WET COIL INDIRECT EVAP COOLERS
CFMAir = thisEvapCond.VolFlowRate; // Volume Flow Rate Primary Side
- CFMSec = thisEvapCond.IndirectVolFlowRate; // Volume Flolw Rate Secondary Side
+ CFMSec = thisEvapCond.IndirectVolFlowRate; // Volume Flow Rate Secondary Side
StageEff = thisEvapCond.WetCoilMaxEfficiency - min(thisEvapCond.WetCoilFlowRatio * CFMAir / CFMSec, thisEvapCond.WetCoilMaxEfficiency);
@@ -1995,7 +1995,7 @@ void CalcWetIndirectEvapCooler(EnergyPlusData &state, int EvapCoolNum, Real64 co
// ENERGY CONSUMED BY THE RECIRCULATING PUMP
// ENERGY CONSUMED BY THE RECIRCULATING PUMP
- // Add the pump energy to the total Evap Cooler energy comsumption
+ // Add the pump energy to the total Evap Cooler energy consumption
thisEvapCond.EvapCoolerPower += PartLoadRatio * thisEvapCond.IndirectRecircPumpPower;
//******************
@@ -2211,7 +2211,7 @@ void CalcIndirectResearchSpecialEvapCooler(EnergyPlusData &state, int const Evap
SecVdot = TotalVolFlow - TertVdot;
- if (SecVdot < 0.0) { // all tertiary/releif air e.g. econonizer wide open
+ if (SecVdot < 0.0) { // all tertiary/relief air e.g. economizer wide open
SecVdot = 0.0;
SecondaryInletDryBulbTemp = TertTemp;
SecondaryInletWetBulbTemp = Psychrometrics::PsyTwbFnTdbWPb(state, TertTemp, TertHumRate, state.dataEnvrn->OutBaroPress);
@@ -2246,7 +2246,7 @@ void CalcIndirectResearchSpecialEvapCooler(EnergyPlusData &state, int const Evap
}
}
if (thisEvapCond.EvapCoolerOperationControlFlag) {
- // addvanced mode: runs either in dry or wet depending on the entering conditions
+ // advanced mode: runs either in dry or wet depending on the entering conditions
CalcIndirectResearchSpecialEvapCoolerAdvanced(
state, EvapCoolNum, SecondaryInletDryBulbTemp, SecondaryInletWetBulbTemp, SecondaryInletDewPointTemp, SecondaryInletHumRatio);
@@ -2288,7 +2288,7 @@ void CalcIndirectResearchSpecialEvapCooler(EnergyPlusData &state, int const Evap
// ENERGY CONSUMED BY THE RECIRCULATING PUMP
// ENERGY CONSUMED BY THE RECIRCULATING PUMP
- // Add the pump energy to the total Evap Cooler energy comsumption
+ // Add the pump energy to the total Evap Cooler energy consumption
thisEvapCond.EvapCoolerPower += thisEvapCond.IndirectRecircPumpPower * PartLoad * FanPLR;
//***************************************************************************
@@ -2297,7 +2297,7 @@ void CalcIndirectResearchSpecialEvapCooler(EnergyPlusData &state, int const Evap
thisEvapCond.OuletWetBulbTemp =
Psychrometrics::PsyTwbFnTdbWPb(state, thisEvapCond.OutletTemp, thisEvapCond.InletHumRat, state.dataEnvrn->OutBaroPress);
//***************************************************************************
- // CALCULATE other outlet propertiesusing PSYCH ROUTINES
+ // CALCULATE other outlet properties using PSYCH ROUTINES
thisEvapCond.OutletHumRat = thisEvapCond.InletHumRat;
thisEvapCond.OutletEnthalpy = Psychrometrics::PsyHFnTdbW(thisEvapCond.OutletTemp, thisEvapCond.OutletHumRat);
@@ -2356,7 +2356,7 @@ void CalcIndirectResearchSpecialEvapCoolerAdvanced(EnergyPlusData &state,
{
// SUBROUTINE INFORMATION:
- // AUTHOR B. Bigusse
+ // AUTHOR B. Nigusse
// DATE WRITTEN October 2014
// PURPOSE OF THIS SUBROUTINE:
@@ -2365,7 +2365,7 @@ void CalcIndirectResearchSpecialEvapCoolerAdvanced(EnergyPlusData &state,
// SUBROUTINE PARAMETER DEFINITIONS:
int constexpr MaxIte(500); // Maximum number of iterations for solver
- Real64 constexpr TempTol(0.01); // convergence tollerance
+ Real64 constexpr TempTol(0.01); // convergence tolerance
// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Real64 BoundTemp; // temperature limit for outlet
@@ -2419,7 +2419,7 @@ void CalcIndirectResearchSpecialEvapCoolerAdvanced(EnergyPlusData &state,
EvapCond.SecInletMassFlowRate = AirMassFlowSec;
CalcIndirectRDDEvapCoolerOutletTemp(
state, EvapCoolNum, OperatingMode::DryModulated, AirMassFlowSec, InletDryBulbTempSec, InletWetBulbTempSec, InletHumRatioSec);
- Real64 const OutletAirTemp = EvapCond.OutletTemp; // evap Coler outlet air temperature
+ Real64 const OutletAirTemp = EvapCond.OutletTemp; // evap Cooler outlet air temperature
return SysTempSetPoint - OutletAirTemp;
};
int SolFla = 0; // Flag of solver
@@ -2485,7 +2485,7 @@ void CalcIndirectResearchSpecialEvapCoolerAdvanced(EnergyPlusData &state,
EvapCond.SecInletMassFlowRate = AirMassFlowSec;
CalcIndirectRDDEvapCoolerOutletTemp(
state, EvapCoolNum, OperatingMode::DryModulated, AirMassFlowSec, InletDryBulbTempSec, InletWetBulbTempSec, InletHumRatioSec);
- Real64 const OutletAirTemp = EvapCond.OutletTemp; // evap Coler outlet air temperature
+ Real64 const OutletAirTemp = EvapCond.OutletTemp; // evap Cooler outlet air temperature
return SysTempSetPoint - OutletAirTemp;
};
int SolFla = 0; // Flag of solver
@@ -2544,7 +2544,7 @@ void CalcIndirectResearchSpecialEvapCoolerAdvanced(EnergyPlusData &state,
EvapCond.SecInletMassFlowRate = AirMassFlowSec;
CalcIndirectRDDEvapCoolerOutletTemp(
state, EvapCoolNum, OperatingMode::WetModulated, AirMassFlowSec, InletDryBulbTempSec, InletWetBulbTempSec, InletHumRatioSec);
- Real64 const OutletAirTemp = EvapCond.OutletTemp; // evap Coler outlet air temperature
+ Real64 const OutletAirTemp = EvapCond.OutletTemp; // evap Cooler outlet air temperature
return SysTempSetPoint - OutletAirTemp;
};
General::SolveRoot(state, TempTol, MaxIte, SolFla, AirMassFlowSec, f2, MassFlowRateSecMin, MassFlowRateSecMax);
@@ -2620,7 +2620,7 @@ void CalcIndirectResearchSpecialEvapCoolerAdvanced(EnergyPlusData &state,
EvapCond.SecInletMassFlowRate = AirMassFlowSec;
CalcIndirectRDDEvapCoolerOutletTemp(
state, EvapCoolNum, OperatingMode::WetModulated, AirMassFlowSec, InletDryBulbTempSec, InletWetBulbTempSec, InletHumRatioSec);
- Real64 const OutletAirTemp = EvapCond.OutletTemp; // evap Coler outlet air temperature
+ Real64 const OutletAirTemp = EvapCond.OutletTemp; // evap Cooler outlet air temperature
return SysTempSetPoint - OutletAirTemp;
};
int SolFla = 0; // Flag of solver
@@ -2791,7 +2791,7 @@ OperatingMode IndirectResearchSpecialEvapCoolerOperatingMode(EnergyPlusData &sta
// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Real64 InletDryBulbTempPri; // entering air dry bulb temperature of primary air
Real64 SysTempSetPoint; // evaporative cooler outlet setpoint temperature, drybulb
- OperatingMode OperatingMode; // current operating mode of indrect evaporative cooler
+ OperatingMode OperatingMode; // current operating mode of indirect evaporative cooler
auto const &thisEvapCond = state.dataEvapCoolers->EvapCond(EvapCoolNum);
@@ -2835,7 +2835,7 @@ void CalcIndirectRDDEvapCoolerOutletTemp(EnergyPlusData &state,
// DATE WRITTEN Sep 2014
// PURPOSE OF THIS SUBROUTINE:
- // Indirect research special evaporative cooler perfomance:
+ // Indirect research special evaporative cooler performance:
// determines the IEC primary air outlet temperature
// METHODOLOGY EMPLOYED:
@@ -2950,7 +2950,7 @@ void CalcSecondaryAirOutletCondition(EnergyPlusData &state,
// METHODOLOGY EMPLOYED:
// applies energy balance equations to determine the secondary air outlet condition
// For wt operations assumes the secondary air leaves at at inlet temperature, i.e.,
- // latent heat transfer only. For dry operation the humdity ratio remains constant.
+ // latent heat transfer only. For dry operation the humidity ratio remains constant.
// REFERENCES:
// CalculateWaterUsage routine of cooling towers for wet operation mode
@@ -2959,7 +2959,7 @@ void CalcSecondaryAirOutletCondition(EnergyPlusData &state,
Real64 SecOutletAirHumRat; // secondary air humidity ratio at the outlet node
Real64 SecOutletEnthalpy; // secondary air outlet enthalpy
Real64 CpAirSec; // specific heat of secondary air at inlet condition
- Real64 hfg; // secondary air side enthaly of evaporation
+ Real64 hfg; // secondary air side enthalpy of evaporation
auto &thisEvapCond(state.dataEvapCoolers->EvapCond(EvapCoolNum));
diff --git a/src/EnergyPlus/EvaporativeFluidCoolers.cc b/src/EnergyPlus/EvaporativeFluidCoolers.cc
index 36ce9e1981a..6f4bcbf4a7d 100644
--- a/src/EnergyPlus/EvaporativeFluidCoolers.cc
+++ b/src/EnergyPlus/EvaporativeFluidCoolers.cc
@@ -912,7 +912,7 @@ namespace EvaporativeFluidCoolers {
ShowSevereError(
state,
format(
- "{} = \"{}\". Low-Speed User Specified Design Capacity must be less than the High-Speed User Specified Design Dapacity.",
+ "{} = \"{}\". Low-Speed User Specified Design Capacity must be less than the High-Speed User Specified Design Capacity.",
state.dataIPShortCut->cCurrentModuleObject,
thisEFC.Name));
ErrorsFound = true;
@@ -971,7 +971,7 @@ namespace EvaporativeFluidCoolers {
"\"UFactorTimesAreaAndDesignWaterFlowRate\" or \"StandardDesignCapacity\" or \"UserSpecifiedDesignCapacity\".",
state.dataIPShortCut->cCurrentModuleObject,
thisEFC.Name));
- ShowContinueError(state, format("Evaporative fluid cooler Performanace Input Method currently specified as: {}", AlphArray(4)));
+ ShowContinueError(state, format("Evaporative fluid cooler Performance Input Method currently specified as: {}", AlphArray(4)));
ErrorsFound = true;
}
@@ -2232,7 +2232,7 @@ namespace EvaporativeFluidCoolers {
}
// Calculate bypass fraction since OWTLowerLimit < OutletWaterTemp < TempSetPoint.
- // The iteration ends when the numer of iteration exceeds the limit or the difference
+ // The iteration ends when the number of iteration exceeds the limit or the difference
// between the new and old bypass fractions is less than the threshold.
if (BypassFlag == 1) {
Real64 bypassFraction = (TempSetPoint - this->OutletWaterTemp) / (inletWaterTemp - this->OutletWaterTemp);
@@ -2261,7 +2261,7 @@ namespace EvaporativeFluidCoolers {
this->SimSimpleEvapFluidCooler(
state, this->WaterMassFlowRate * (1.0 - BypassFraction2), AirFlowRate, UAdesign, this->OutletWaterTemp);
if (this->OutletWaterTemp < OWTLowerLimit) {
- // Use previous iteraction values
+ // Use previous iteration values
BypassFraction2 = BypassFractionPrev;
this->OutletWaterTemp = OutletWaterTempPrev;
}
@@ -2527,7 +2527,7 @@ namespace EvaporativeFluidCoolers {
// RE-ENGINEERED na
// PURPOSE OF THIS SUBROUTINE:
- // Collect evaporative fluid cooler water useage calculations for
+ // Collect evaporative fluid cooler water usage calculations for
// reuse by all the evaporative fluid cooler models.
// REFERENCES:
@@ -2660,7 +2660,7 @@ namespace EvaporativeFluidCoolers {
return;
// Check flow rate through evaporative fluid cooler and compare to design flow rate,
- // show warning if greater than Design * Mulitplier
+ // show warning if greater than Design * Multiplier
if (state.dataLoopNodes->Node(this->WaterOutletNode).MassFlowRate >
this->DesWaterMassFlowRate * this->EvapFluidCoolerMassFlowRateMultiplier) {
++this->HighMassFlowErrorCount;
diff --git a/src/EnergyPlus/FluidCoolers.cc b/src/EnergyPlus/FluidCoolers.cc
index 1f4601b9296..0d2e0fcf4f1 100644
--- a/src/EnergyPlus/FluidCoolers.cc
+++ b/src/EnergyPlus/FluidCoolers.cc
@@ -1639,7 +1639,7 @@ void FluidCoolerspecs::size(EnergyPlusData &state)
OutputReportPredefined::PreDefTableEntry(
state, state.dataOutRptPredefined->pdchCTFCApproach, this->Name, this->DesignLeavingWaterTemp - this->DesignEnteringAirWetBulbTemp);
OutputReportPredefined::PreDefTableEntry(
- state, state.dataOutRptPredefined->pdchCTFCDesFanPwr, this->Name, this->HighSpeedFanPower); // eqival to Design Fan Power?
+ state, state.dataOutRptPredefined->pdchCTFCDesFanPwr, this->Name, this->HighSpeedFanPower); // equivalent to Design Fan Power?
OutputReportPredefined::PreDefTableEntry(
state, state.dataOutRptPredefined->pdchCTFCDesInletAirWBT, this->Name, this->DesignEnteringAirWetBulbTemp);
OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchCTFCDesWaterFlowRate, this->Name, this->DesignWaterFlowRate);
@@ -1978,7 +1978,7 @@ void FluidCoolerspecs::update(EnergyPlusData &state)
state.dataGlobal->WarmupFlag)
return;
- // Check flow rate through fluid cooler and compare to design flow rate, show warning if greater than Design * Mulitplier
+ // Check flow rate through fluid cooler and compare to design flow rate, show warning if greater than Design * Multiplier
if (state.dataLoopNodes->Node(waterOutletNode).MassFlowRate > this->DesWaterMassFlowRate * this->FluidCoolerMassFlowRateMultiplier) {
++this->HighMassFlowErrorCount;
if (this->HighMassFlowErrorCount < 2) {
diff --git a/src/EnergyPlus/FuelCellElectricGenerator.cc b/src/EnergyPlus/FuelCellElectricGenerator.cc
index 6d040675b69..270b82bfa68 100644
--- a/src/EnergyPlus/FuelCellElectricGenerator.cc
+++ b/src/EnergyPlus/FuelCellElectricGenerator.cc
@@ -1223,7 +1223,7 @@ namespace FuelCellElectricGenerator {
SetupOutputVariable(state,
"Generator Power Module Entering Air Enthalpy",
Constant::Units::W,
- this->Report.TotAirInEnthalphy,
+ this->Report.TotAirInEnthalpy,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
this->Name);
@@ -1804,7 +1804,7 @@ namespace FuelCellElectricGenerator {
// units, NdotFuel in kmol/sec. Hmolfule in KJ/mol ,
// factor of 1000's to get to J/s or watts
- this->FCPM.TotFuelInEnthalphy = Hmolfuel * 1000.0 * this->FCPM.NdotFuel * 1000.0;
+ this->FCPM.TotFuelInEnthalpy = Hmolfuel * 1000.0 * this->FCPM.NdotFuel * 1000.0;
// Calculation Step 6, water compressor calculations
@@ -1921,7 +1921,7 @@ namespace FuelCellElectricGenerator {
// units, NdotAir in kmol/sec.; Hmolfuel in KJ/mol ,
// factor of 1000's to get to J/s or watts
- this->FCPM.TotAirInEnthalphy = Hmolair * 1000.0 * this->FCPM.NdotAir * 1000.0;
+ this->FCPM.TotAirInEnthalpy = Hmolair * 1000.0 * this->FCPM.NdotAir * 1000.0;
// calculation Step 8, Figure Product Gases
@@ -2001,7 +2001,7 @@ namespace FuelCellElectricGenerator {
// all the oxygen in the excess air stream
this->FCPM.ConstitMolalFract(3) = Ndot02 / this->FCPM.NdotProdGas;
- // all the H2O comming in plus the new H2O from reactions and the H2O from water used in reforming
+ // all the H2O coming in plus the new H2O from reactions and the H2O from water used in reforming
this->FCPM.ConstitMolalFract(4) = NdotH2O / this->FCPM.NdotProdGas;
// all the argon coming in.
@@ -2013,9 +2013,9 @@ namespace FuelCellElectricGenerator {
// units, NdotProdGas in kmol/sec.; HmolProdGases in KJ/mol ,
// factor of 1000's to get to J/s or watts
- this->FCPM.TotProdGasEnthalphy = HmolProdGases * 1000.0 * this->FCPM.NdotProdGas * 1000.0;
+ this->FCPM.TotProdGasEnthalpy = HmolProdGases * 1000.0 * this->FCPM.NdotProdGas * 1000.0;
- // calculation Step 9, Figure Skin lossess
+ // calculation Step 9, Figure Skin losses
if (this->FCPM.SkinLossMode == DataGenerators::SkinLoss::ConstantRate) {
// do nothing just use QdotSkin
@@ -2054,15 +2054,15 @@ namespace FuelCellElectricGenerator {
// calculation Step 13, Calculate Heat balance
// move all terms in Equation 7 to RHS and calculate imbalance
- Real64 MagofImbalance = -this->FCPM.TotFuelInEnthalphy - this->FCPM.TotAirInEnthalphy - this->FCPM.WaterInEnthalpy -
+ Real64 MagofImbalance = -this->FCPM.TotFuelInEnthalpy - this->FCPM.TotAirInEnthalpy - this->FCPM.WaterInEnthalpy -
this->FCPM.DilutionAirInEnthalpy -
this->FCPM.NdotFuel * state.dataGenerator->FuelSupply(this->FuelSupNum).LHV * 1000000.0 -
- this->FCPM.PelancillariesAC + this->FCPM.Pel + this->FCPM.TotProdGasEnthalphy + this->FCPM.WaterOutEnthalpy +
+ this->FCPM.PelancillariesAC + this->FCPM.Pel + this->FCPM.TotProdGasEnthalpy + this->FCPM.WaterOutEnthalpy +
this->FCPM.QdotStackCool + this->FCPM.QdotSkin + this->FCPM.DilutionAirOutEnthalpy;
- // Now find a new total prod Gas Enthalphy that would result in an energy balance
+ // Now find a new total prod Gas Enthalpy that would result in an energy balance
// TODO check signs...
- Real64 tmpTotProdGasEnthalpy = this->FCPM.TotProdGasEnthalphy - MagofImbalance;
+ Real64 tmpTotProdGasEnthalpy = this->FCPM.TotProdGasEnthalpy - MagofImbalance;
// solve for a new TprodGasLeavingFCPM using regula falsi method
@@ -2339,7 +2339,7 @@ namespace FuelCellElectricGenerator {
// loop through fuel constituents and sum up Cp
- // two different themodynamic curve fits might be used
+ // two different thermodynamic curve fits might be used
Real64 tempCp = 0.0;
@@ -2905,7 +2905,7 @@ namespace FuelCellElectricGenerator {
// AUTHOR Brent Griffith
// DATE WRITTEN Aug 2005
- Real64 PelInput = Pel; // hold initial value of inout var
+ Real64 PelInput = Pel; // hold initial value of input var
Real64 CurrentFractionalDay = double(state.dataGlobal->DayOfSim) +
(int(state.dataGlobal->CurrentTime) + (state.dataHVACGlobal->SysTimeElapsed +
@@ -3330,12 +3330,12 @@ namespace FuelCellElectricGenerator {
this->FCPM.Eel = 0.0;
this->FCPM.PelancillariesAC = 0.0;
this->FCPM.NdotFuel = 0.0;
- this->FCPM.TotFuelInEnthalphy = 0.0;
+ this->FCPM.TotFuelInEnthalpy = 0.0;
this->FCPM.NdotProdGas = 0.0;
this->FCPM.TprodGasLeavingFCPM = 0.0;
- this->FCPM.TotProdGasEnthalphy = 0.0;
+ this->FCPM.TotProdGasEnthalpy = 0.0;
this->FCPM.NdotAir = 0.0;
- this->FCPM.TotAirInEnthalphy = 0.0;
+ this->FCPM.TotAirInEnthalpy = 0.0;
this->FCPM.NdotLiqwater = 0.0;
this->FCPM.TwaterInlet = 0.0;
this->FCPM.WaterInEnthalpy = 0.0;
@@ -3405,7 +3405,7 @@ namespace FuelCellElectricGenerator {
this->ElecStorage.LastTimeStepStateOfCharge = this->ElecStorage.ThisTimeStepStateOfCharge;
this->FCPM.PelLastTimeStep = this->FCPM.Pel;
- // intialize flow rate in water loop, this is "requesting" flow
+ // initialize flow rate in water loop, this is "requesting" flow
Real64 mdot = this->ExhaustHX.WaterMassFlowRateDesign;
PlantUtilities::SetComponentFlowRate(state, mdot, this->ExhaustHX.WaterInNode, this->ExhaustHX.WaterOutNode, this->CWPlantLoc);
@@ -3548,7 +3548,7 @@ namespace FuelCellElectricGenerator {
this->Report.TairInlet = this->AirSup.TairIntoBlower; // State point 1
this->Report.TairIntoFCPM = this->AirSup.TairIntoFCPM; // State point 4
this->Report.NdotAir = this->FCPM.NdotAir; // air flow in kmol/sec
- this->Report.TotAirInEnthalphy = this->FCPM.TotAirInEnthalphy; // State point 4
+ this->Report.TotAirInEnthalpy = this->FCPM.TotAirInEnthalpy; // State point 4
this->Report.BlowerPower = this->AirSup.PairCompEl; // electrical power used by air supply blower
this->Report.BlowerEnergy = this->AirSup.PairCompEl * state.dataHVACGlobal->TimeStepSysSec; // electrical energy
this->Report.BlowerSkinLoss = this->AirSup.QskinLoss; // heat rate of losses by blower
@@ -3556,7 +3556,7 @@ namespace FuelCellElectricGenerator {
this->Report.TfuelInlet = state.dataGenerator->FuelSupply(this->FuelSupNum).TfuelIntoCompress; // State point 2
this->Report.TfuelIntoFCPM = state.dataGenerator->FuelSupply(this->FuelSupNum).TfuelIntoFCPM; // TEmperature state point 5 [C]
this->Report.NdotFuel = this->FCPM.NdotFuel; // fuel flow in kmol/sec
- this->Report.TotFuelInEnthalpy = this->FCPM.TotFuelInEnthalphy; // enthalpy at state point 5 [W]
+ this->Report.TotFuelInEnthalpy = this->FCPM.TotFuelInEnthalpy; // enthalpy at state point 5 [W]
this->Report.FuelCompressPower = state.dataGenerator->FuelSupply(this->FuelSupNum).PfuelCompEl;
// electrical power used by fuel supply compressor [W]
this->Report.FuelCompressEnergy =
@@ -3583,9 +3583,9 @@ namespace FuelCellElectricGenerator {
this->Report.WaterPumpEnergy = this->WaterSup.PwaterCompEl * state.dataHVACGlobal->TimeStepSysSec; // electrical energy
this->Report.WaterIntoFCPMEnthalpy = this->FCPM.WaterInEnthalpy;
- this->Report.TprodGas = this->FCPM.TprodGasLeavingFCPM; // temperature at State point 7
- this->Report.EnthalProdGas = this->FCPM.TotProdGasEnthalphy; // enthalpy at State point 7
- this->Report.NdotProdGas = this->FCPM.NdotProdGas; // flow rate at point 7 [kmol/sec]
+ this->Report.TprodGas = this->FCPM.TprodGasLeavingFCPM; // temperature at State point 7
+ this->Report.EnthalProdGas = this->FCPM.TotProdGasEnthalpy; // enthalpy at State point 7
+ this->Report.NdotProdGas = this->FCPM.NdotProdGas; // flow rate at point 7 [kmol/sec]
this->Report.NdotProdAr = this->FCPM.ConstitMolalFract(5) * this->FCPM.NdotProdGas;
this->Report.NdotProdCO2 = this->FCPM.ConstitMolalFract(1) * this->FCPM.NdotProdGas;
this->Report.NdotProdH2O = this->FCPM.ConstitMolalFract(4) * this->FCPM.NdotProdGas;
diff --git a/src/EnergyPlus/FuelCellElectricGenerator.hh b/src/EnergyPlus/FuelCellElectricGenerator.hh
index 623a1652741..7c0affbcedb 100644
--- a/src/EnergyPlus/FuelCellElectricGenerator.hh
+++ b/src/EnergyPlus/FuelCellElectricGenerator.hh
@@ -124,22 +124,22 @@ namespace FuelCellElectricGenerator {
bool HasBeenOn;
bool DuringShutDown;
bool DuringStartUp;
- Real64 NdotFuel; // molar fuel use rate. (kmol/sec)
- Real64 TotFuelInEnthalphy; // Enthalpy of fuel coming into FCPM (watts)
- Real64 NdotProdGas; // (kmol/sec)
+ Real64 NdotFuel; // molar fuel use rate. (kmol/sec)
+ Real64 TotFuelInEnthalpy; // Enthalpy of fuel coming into FCPM (watts)
+ Real64 NdotProdGas; // (kmol/sec)
Array1D ConstitMolalFract;
Array1D GasLibID; // lookup ID in Gas Phase ThermoChemistry Structure Array
Real64 TprodGasLeavingFCPM;
- Real64 NdotAir; // molar air use rate (kmol/sec)
- Real64 TotAirInEnthalphy; // Enthalpy of air coming nto FCPM energy balance (watts)
- Real64 NdotLiqwater; // molar water use rate (kmol/sec)
+ Real64 NdotAir; // molar air use rate (kmol/sec)
+ Real64 TotAirInEnthalpy; // Enthalpy of air coming nto FCPM energy balance (watts)
+ Real64 NdotLiqwater; // molar water use rate (kmol/sec)
Real64 TwaterInlet;
Real64 WaterInEnthalpy; // Enthalpy of liquid water used for reforming (watts)
Real64 DilutionAirInEnthalpy; // Enthalpy of Dilution air coming into FCPM (watts)
Real64 DilutionAirOutEnthalpy;
- Real64 PelancillariesAC; // ancillary power (watts)
- Real64 TotProdGasEnthalphy; // Enthalphy of product gases leaving FCPM (watts)
- Real64 WaterOutEnthalpy; // enthalpy of vapor from water used for reforming
+ Real64 PelancillariesAC; // ancillary power (watts)
+ Real64 TotProdGasEnthalpy; // Enthalpy of product gases leaving FCPM (watts)
+ Real64 WaterOutEnthalpy; // enthalpy of vapor from water used for reforming
int SeqSubstitIter;
int RegulaFalsiIter;
@@ -151,10 +151,10 @@ namespace FuelCellElectricGenerator {
SkinLossMode(DataGenerators::SkinLoss::Invalid), ZoneID(0), RadiativeFract(0.0), QdotSkin(0.0), UAskin(0.0), SkinLossCurveID(0),
WaterSupplyCurveID(0), NdotDilutionAir(0.0), StackHeatLossToDilution(0.0), DilutionInletNode(0), DilutionExhaustNode(0), PelMin(0.0),
PelMax(0.0), Pel(0.0), PelLastTimeStep(0.0), Eel(0.0), QdotStackCool(0.0), FractionalDayofLastStartUp(0.0),
- FractionalDayofLastShutDown(0.0), HasBeenOn(true), DuringShutDown(false), DuringStartUp(false), NdotFuel(0.0), TotFuelInEnthalphy(0.0),
+ FractionalDayofLastShutDown(0.0), HasBeenOn(true), DuringShutDown(false), DuringStartUp(false), NdotFuel(0.0), TotFuelInEnthalpy(0.0),
NdotProdGas(0.0), ConstitMolalFract(14, 0.0), GasLibID(14, GasID::Invalid), TprodGasLeavingFCPM(0.0), NdotAir(0.0),
- TotAirInEnthalphy(0.0), NdotLiqwater(0.0), TwaterInlet(0.0), WaterInEnthalpy(0.0), DilutionAirInEnthalpy(0.0),
- DilutionAirOutEnthalpy(0.0), PelancillariesAC(0.0), TotProdGasEnthalphy(0.0), WaterOutEnthalpy(0.0), SeqSubstitIter(0),
+ TotAirInEnthalpy(0.0), NdotLiqwater(0.0), TwaterInlet(0.0), WaterInEnthalpy(0.0), DilutionAirInEnthalpy(0.0),
+ DilutionAirOutEnthalpy(0.0), PelancillariesAC(0.0), TotProdGasEnthalpy(0.0), WaterOutEnthalpy(0.0), SeqSubstitIter(0),
RegulaFalsiIter(0)
{
}
@@ -398,13 +398,13 @@ namespace FuelCellElectricGenerator {
Real64 HeatRecOutletTemp; // reporting: Heat Recovery Loop Outlet Temperature (C)
Real64 HeatRecMdot; // reporting: Heat Recovery Loop Mass flow rate (kg/s)
// air supply and blower
- Real64 TairInlet; // State point 1
- Real64 TairIntoFCPM; // Temperature at State point 4
- Real64 NdotAir; // air flow in kmol/sec
- Real64 TotAirInEnthalphy; // Enthalpy at State point 4
- Real64 BlowerPower; // electrical power used by air supply blower
- Real64 BlowerEnergy; // electrical energy used by air supply blower
- Real64 BlowerSkinLoss; // heat rate of losses by blower
+ Real64 TairInlet; // State point 1
+ Real64 TairIntoFCPM; // Temperature at State point 4
+ Real64 NdotAir; // air flow in kmol/sec
+ Real64 TotAirInEnthalpy; // Enthalpy at State point 4
+ Real64 BlowerPower; // electrical power used by air supply blower
+ Real64 BlowerEnergy; // electrical energy used by air supply blower
+ Real64 BlowerSkinLoss; // heat rate of losses by blower
// fuel supply and compressor
Real64 TfuelInlet; // State point 2 [C]
Real64 TfuelIntoFCPM; // state point 5 [C]
@@ -463,7 +463,7 @@ namespace FuelCellElectricGenerator {
FCReportDataStruct()
: ACPowerGen(0.0), ACEnergyGen(0.0), QdotExhaust(0.0), TotalHeatEnergyRec(0.0), ExhaustEnergyRec(0.0), FuelEnergyLHV(0.0),
FuelEnergyUseRateLHV(0.0), FuelEnergyHHV(0.0), FuelEnergyUseRateHHV(0.0), FuelRateMdot(0.0), HeatRecInletTemp(0.0),
- HeatRecOutletTemp(0.0), HeatRecMdot(0.0), TairInlet(0.0), TairIntoFCPM(0.0), NdotAir(0.0), TotAirInEnthalphy(0.0), BlowerPower(0.0),
+ HeatRecOutletTemp(0.0), HeatRecMdot(0.0), TairInlet(0.0), TairIntoFCPM(0.0), NdotAir(0.0), TotAirInEnthalpy(0.0), BlowerPower(0.0),
BlowerEnergy(0.0), BlowerSkinLoss(0.0), TfuelInlet(0.0), TfuelIntoFCPM(0.0), NdotFuel(0.0), TotFuelInEnthalpy(0.0),
FuelCompressPower(0.0), FuelCompressEnergy(0.0), FuelCompressSkinLoss(0.0), TwaterInlet(0.0), TwaterIntoFCPM(0.0), NdotWater(0.0),
WaterPumpPower(0.0), WaterPumpEnergy(0.0), WaterIntoFCPMEnthalpy(0.0), TprodGas(0.0), EnthalProdGas(0.0), NdotProdGas(0.0),
diff --git a/src/EnergyPlus/Furnaces.cc b/src/EnergyPlus/Furnaces.cc
index 838216b36b4..29499a1d68a 100644
--- a/src/EnergyPlus/Furnaces.cc
+++ b/src/EnergyPlus/Furnaces.cc
@@ -118,7 +118,7 @@ namespace Furnaces {
// METHODOLOGY EMPLOYED:
// Calculates the part-load ratio of the HVAC system to meet the zone sensible load. For non-heat pump HVAC systems,
// if humidity control is specified and the latent capacity at the sensible PLR is insufficient to meet the latent load,
- // calculate a latent part-load ratio to meet the zone sensible load (MultiMode dehumidificaiton control) or the zone
+ // calculate a latent part-load ratio to meet the zone sensible load (MultiMode dehumidification control) or the zone
// latent load (CoolReheat dehumidification control). Use the greater of the sensible PLR and latent PLR to control
// the HVAC system.
// Subroutines:
@@ -134,10 +134,10 @@ namespace Furnaces {
// CalcNewZoneHeatCoolFlowRates - HeatCool furnace/unitarysystem and air-to-air HeatPump routine.
// Calculates a part-load ratio for the system (sensible and/or latent).
// For dehumidification control type COOLREHEAT, both a sensible and latent PLR
- // may exist for a single time step (heating and dehumidificaiton can occur). For all
+ // may exist for a single time step (heating and dehumidification can occur). For all
// other system types, only a single PLR is allowed for any given time step.
// Order of simulation depends on dehumidification control option as described below.
- // Dehumidificaiton control options (non-heat pump versions):
+ // Dehumidification control options (non-heat pump versions):
// Dehumidification Control NONE: Cooling performance is simulated first and then heating performance. If a HX
// assisted cooling coil is selected, the HX is always active (cooling).
// Dehumidification Control COOLREHEAT: For cooling operation, the sensible capacity is calculated to
@@ -309,7 +309,7 @@ namespace Furnaces {
state.dataFans->fans(thisFurnace.FanIndex)->simulate(state, FirstHVACIteration, state.dataFurnaces->FanSpeedRatio);
}
} break;
- // Simulate HeatCool sytems:
+ // Simulate HeatCool systems:
case HVAC::UnitarySysType::Furnace_HeatCool:
case HVAC::UnitarySysType::Unitary_HeatCool: {
if (thisFurnace.CoolingCoilType_Num == HVAC::Coil_CoolingAirToAirVariableSpeed) {
@@ -413,7 +413,7 @@ namespace Furnaces {
// Simulate furnace reheat coil if a humidistat is used or if the reheat coil is present
if (thisFurnace.DehumidControlType_Num == DehumidificationControlMode::CoolReheat || thisFurnace.SuppHeatCoilIndex > 0) {
- SuppHeatingCoilFlag = true; // if truee simulates supplemental heating coil
+ SuppHeatingCoilFlag = true; // if true simulates supplemental heating coil
CalcNonDXHeatingCoils(state, FurnaceNum, SuppHeatingCoilFlag, FirstHVACIteration, ReheatCoilLoad, fanOp, QActual);
}
}
@@ -518,7 +518,7 @@ namespace Furnaces {
// Simulate furnace reheat coil if a humidistat is present, the dehumidification type of coolreheat and
// reheat coil load exists
if (thisFurnace.DehumidControlType_Num == DehumidificationControlMode::CoolReheat && ReheatCoilLoad > 0.0) {
- SuppHeatingCoilFlag = true; // if truee simulates supplemental heating coil
+ SuppHeatingCoilFlag = true; // if true simulates supplemental heating coil
CalcNonDXHeatingCoils(state, FurnaceNum, SuppHeatingCoilFlag, FirstHVACIteration, ReheatCoilLoad, fanOp, QActual);
} else {
SuppHeatingCoilFlag = true; // if true simulates supplemental heating coil
@@ -2135,7 +2135,7 @@ namespace Furnaces {
}
}
- } else { // Illeagal heating coil
+ } else { // Illegal heating coil
ShowSevereError(state, format("{} = {}", CurrentModuleObject, Alphas(1)));
ShowContinueError(state, format("Illegal {} = {}", cAlphaFields(15), Alphas(15)));
ErrorsFound = true;
@@ -5782,7 +5782,7 @@ namespace Furnaces {
// Bo Shen, ORNL, July 2012 - added variable-speed air source heat pump cooling and heating coils, using curve-fits
// PURPOSE OF THIS SUBROUTINE:
- // This subroutine is for sizing Furnace Components for which nominal cpacities
+ // This subroutine is for sizing Furnace Components for which nominal capacities
// and flow rates have not been specified in the input
// METHODOLOGY EMPLOYED:
@@ -6410,10 +6410,10 @@ namespace Furnaces {
// the operating PLR (greater of the sensible and latent PLR) to meet the zone SENSIBLE load
// (Multimode dehumidification control) or zone LATENT load (CoolReheat dehumidification control).
// For dehumidification control type COOLREHEAT, both a sensible and latent PLR may exist for a
- // single time step (heating and dehumidificaiton can occur). For all other sytem types,
+ // single time step (heating and dehumidification can occur). For all other system types,
// only a single PLR is allowed for any given time step.
// Order of simulation depends on dehumidification control option as described below.
- // Dehumidificaiton control options:
+ // Dehumidification control options:
// Dehumidification Control NONE: Cooling performance is simulated first and then heating performance. If a HX
// assisted cooling coil is selected, the HX is always active.
// Dehumidification Control COOLREHEAT: Continuous Fan Operation:
@@ -6557,7 +6557,7 @@ namespace Furnaces {
}
SetAverageAirFlow(state, FurnaceNum, max(thisFurnace.HeatPartLoadRatio, thisFurnace.CoolPartLoadRatio), OnOffAirFlowRatio);
- // if dehumidification load exists (for heat pumps) turn on the supplmental heater
+ // if dehumidification load exists (for heat pumps) turn on the supplemental heater
if (state.dataFurnaces->HPDehumidificationLoadFlag) HumControl = true;
} else { // not FirstHVACIteration
// Init for heating
@@ -7283,7 +7283,7 @@ namespace Furnaces {
PartLoadRatio = 0.0;
} // EndIf for IF(CoolCoilLoad.NE.0.0)
- // Calculate the delivered capacity from the PLR caculated above
+ // Calculate the delivered capacity from the PLR calculated above
CalcFurnaceOutput(state,
FurnaceNum,
FirstHVACIteration,
@@ -7707,7 +7707,7 @@ namespace Furnaces {
}
// Calculate the reheat coil output
- if (HumControl) { // HumControl = .TRUE. if a Humidistat is installed and dehumdification control type is CoolReheat
+ if (HumControl) { // HumControl = .TRUE. if a Humidistat is installed and dehumidification control type is CoolReheat
if (thisFurnace.ZoneSequenceHeatingNum > 0) {
QToHeatSetPt = (state.dataZoneEnergyDemand->ZoneSysEnergyDemand(thisFurnace.ControlZoneNum)
.SequencedOutputRequiredToHeatingSP(thisFurnace.ZoneSequenceHeatingNum) /
@@ -7825,7 +7825,7 @@ namespace Furnaces {
Real64 ZoneSensLoadMet; // Actual zone sensible load met by heat pump (W)
Real64 ZoneLatLoadMet; // Actual zone latent load met by heat pump (W)
Real64 ZoneSensLoadMetFanONCompON; // Max Zone sensible load heat pump can meet (W)
- Real64 ZoneLatLoadMetFanONCompON; // Max Zone latentload heat pump can meet (W)
+ Real64 ZoneLatLoadMetFanONCompON; // Max Zone latent load heat pump can meet (W)
Real64 ZoneSensLoadMetFanONCompOFF; // control zone sensible load met using only outside air
// and fan heat (no coil output) (W)
Real64 ZoneLatLoadMetFanONCompOFF; // control zone Latent load met using only outside air
@@ -7848,7 +7848,7 @@ namespace Furnaces {
Real64 Dummy2 = 0.0; // used as dummy heat and reheat coil load
Real64 OnOffAirFlowRatio = 1.0; // Ratio of compressor ON air mass flow to AVERAGE air mass flow over time step
int FurnaceInletNode = thisFurnace.FurnaceInletNodeNum;
- HVAC::FanOp fanOp = thisFurnace.fanOp; // fan operting mode
+ HVAC::FanOp fanOp = thisFurnace.fanOp; // fan operating mode
thisFurnace.MdotFurnace = thisFurnace.DesignMassFlowRate;
//*********INITIAL CALCULATIONS****************
@@ -8411,7 +8411,7 @@ namespace Furnaces {
// Cooling to Heating PLR Ratio (CoolHeatPLRRat) is used to track the air mass flow rate of both the heating
// and cooling coils when RH control is used and the heating coil operates longer than the cooling coil.
- // When CoolPartLoadRatio/CoolHeatPLRRat is used, the PLR calculated is acutally the PLR for the heating
+ // When CoolPartLoadRatio/CoolHeatPLRRat is used, the PLR calculated is actually the PLR for the heating
// coil (heating PLR is greater than cooling PLR), it is this PLR that determines the air mass flow rate.
// When MAX(HeatPartLoadRatio,CoolPartLoadRatio) is used, only one of these values is non-zero.
if (fanOp == HVAC::FanOp::Cycling) {
@@ -8692,7 +8692,7 @@ namespace Furnaces {
state.dataFans->fans(thisFurnace.FanIndex)->simulate(state, FirstHVACIteration, state.dataFurnaces->FanSpeedRatio);
}
if (thisFurnace.DehumidControlType_Num == DehumidificationControlMode::CoolReheat || thisFurnace.SuppHeatCoilIndex > 0) {
- bool SuppHeatingCoilFlag = true; // if truee simulates supplemental heating coil
+ bool SuppHeatingCoilFlag = true; // if true simulates supplemental heating coil
CalcNonDXHeatingCoils(state, FurnaceNum, SuppHeatingCoilFlag, FirstHVACIteration, ReheatCoilLoad, fanOp, QActual);
}
} // IF(Furnace(FurnaceNum)%type == UnitarySys_HeatPump_AirToAir)THEN
@@ -9007,6 +9007,7 @@ namespace Furnaces {
} else {
state.dataFurnaces->FanSpeedRatio = state.dataFurnaces->CompOnFlowRatio;
}
+
// IF the furnace is scheduled on or nightime cycle overrides fan schedule. Uses same logic as fan.
if (state.dataFurnaces->Furnace(FurnaceNum).sched->getCurrentVal() > 0.0 &&
((state.dataFurnaces->Furnace(FurnaceNum).fanAvailSched->getCurrentVal() > 0.0 ||
@@ -9059,7 +9060,7 @@ namespace Furnaces {
}
}
- // Set mass flow rates during on and off cylce using an OnOff fan
+ // Set mass flow rates during on and off cycle using an OnOff fan
if (state.afn->distribution_simulated) {
state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopSystemOnMassFlowrate = state.dataFurnaces->CompOnMassFlow;
state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopSystemOffMassFlowrate = state.dataFurnaces->CompOffMassFlow;
@@ -9124,7 +9125,7 @@ namespace Furnaces {
int CoilTypeNum(0); // heating coil type number
int HeatingCoilIndex(0); // heating coil index
int CoilControlNode(0); // control node for hot water and steam heating coils
- int CoilOutletNode(0); // air outlet node of the heatiing coils
+ int CoilOutletNode(0); // air outlet node of the heating coils
PlantLocation plantLoc{}; // plant loop location
Real64 QActual = 0.0; // actual heating load
@@ -9430,7 +9431,7 @@ namespace Furnaces {
// Calculate the reheat coil output
if ((thisFurnace.sched->getCurrentVal() > 0.0) &&
(thisFurnace.Humidistat && thisFurnace.DehumidControlType_Num == DehumidificationControlMode::CoolReheat &&
- (QLatReq < 0.0))) { // if a Humidistat is installed and dehumdification control type is CoolReheat
+ (QLatReq < 0.0))) { // if a Humidistat is installed and dehumidification control type is CoolReheat
CalcVarSpeedHeatPump(state,
FurnaceNum,
FirstHVACIteration,
@@ -9538,9 +9539,9 @@ namespace Furnaces {
if (TotBranchNum == 1) {
int ZoneSideNodeNum = state.dataAirLoop->AirToZoneNodeInfo(AirLoopNum).ZoneEquipSupplyNodeNum(1);
// THE MASS FLOW PRECISION of the system solver is not enough for some small air flow rate iterations , BY DEBUGGING
- // it may cause mass flow rate occilations between airloop and zoneequip
+ // it may cause mass flow rate oscillations between airloop and zoneequip
// specify the air flow rate directly for one-to-one system, when the iteration deviation is closing the solver precision level
- // 0.02 is 2 * HVACFlowRateToler, in order to accomodate the system solver precision level
+ // 0.02 is 2 * HVACFlowRateToler, in order to accommodate the system solver precision level
if (std::abs(AirMassFlow - state.dataLoopNodes->Node(ZoneSideNodeNum).MassFlowRate) < 0.02)
state.dataLoopNodes->Node(ZoneSideNodeNum).MassFlowRateMaxAvail = AirMassFlow;
state.dataLoopNodes->Node(ZoneSideNodeNum).MassFlowRate = AirMassFlow;
@@ -10011,7 +10012,7 @@ namespace Furnaces {
// DATE WRITTEN: March 2012
// PURPOSE OF THIS SUBROUTINE:
- // This routine will calcultes MSHP performance based on given system load
+ // This routine will calculates MSHP performance based on given system load
Real64 SavePartloadRatio = 0.0; // part-load ratio
Real64 SaveSpeedRatio = 0.0; // speed ratio
diff --git a/src/EnergyPlus/General.cc b/src/EnergyPlus/General.cc
index 65a1dd95fed..9af92db3769 100644
--- a/src/EnergyPlus/General.cc
+++ b/src/EnergyPlus/General.cc
@@ -186,7 +186,7 @@ void SolveRoot(const EnergyPlusData &state,
Real64 X0 = X_0; // present 1st bound
Real64 X1 = X_1; // present 2nd bound
Real64 XTemp = X0; // new estimate
- int NIte = 0; // number of interations
+ int NIte = 0; // number of iterations
int AltIte = 0; // an accounter used for Alternation choice
Real64 Y0 = f(X0); // f at X0
@@ -396,7 +396,7 @@ void DetermineDateTokens(EnergyPlusData &state,
static constexpr std::array SingleChars{"/", ":", "-"};
static constexpr int NumDoubleChars(6);
static constexpr std::array DoubleChars{
- "ST ", "ND ", "RD ", "TH ", "OF ", "IN "}; // Need trailing spaces: Want thse only at end of words
+ "ST ", "ND ", "RD ", "TH ", "OF ", "IN "}; // Need trailing spaces: Want these only at end of words
static constexpr std::array Months{"JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"};
static constexpr std::array Weekdays{"SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"};
@@ -701,7 +701,7 @@ bool BetweenDates(int const TestDate, // Date to test
// METHODOLOGY EMPLOYED:
// The input dates are Julian Day format, year is irrelevant.
// Thus, if StartDate > EndDate (i.e. StartDate = 1Dec and EndDate = 31Jan),
- // this routine accomodates.
+ // this routine accommodates.
// REFERENCES:
// Adapted from BLAST BTWEEN function.
@@ -805,7 +805,7 @@ void Iterate(Real64 &ResultX, // ResultX is the final Iteration result passed b
// DATE WRITTEN March 2004
// PURPOSE OF THIS SUBROUTINE:
- // Iterately solves for the value of X which satisfies Y(X)=0.
+ // Iteratively solves for the value of X which satisfies Y(X)=0.
// The subroutine tests for convergence and provides a new guess for the value of the
// independent variable X.
@@ -1087,7 +1087,7 @@ void ScanForReports(EnergyPlusData &state,
state.dataGeneral->SurfDetWVert = true;
break;
case COSTINFO:
- // Custom case for reporting surface info for cost estimates (for first costs in opitimzing)
+ // Custom case for reporting surface info for cost estimates (for first costs in optimizing)
state.dataGeneral->CostInfo = true;
break;
case VIEWFACTORINFO: // actual reporting is in HeatBalanceIntRadExchange
diff --git a/src/EnergyPlus/GeneratorDynamicsManager.cc b/src/EnergyPlus/GeneratorDynamicsManager.cc
index a2e9e3952ab..5f408fc70b6 100644
--- a/src/EnergyPlus/GeneratorDynamicsManager.cc
+++ b/src/EnergyPlus/GeneratorDynamicsManager.cc
@@ -170,7 +170,7 @@ namespace GeneratorDynamicsManager {
// Control decision results include:
// -- electrical load allowed/resulting/provided
// -- new operating mode
- // -- part load this timestep for shift to normal mode occuring midway in timestep
+ // -- part load this timestep for shift to normal mode occurring midway in timestep
// -- part load this timestep for shift out of cool down mode
// Input data used to make control decisions include:
@@ -527,7 +527,7 @@ namespace GeneratorDynamicsManager {
newOpMode = DataGenerators::OperatingMode::Standby;
}
- } else { // not mandetory cool donw
+ } else { // not mandatory cool down
// likely to go into warm up but if no warm up then back to normal
if (thisGen.WarmUpByTimeDelay) {
if (thisGen.StartUpTimeDelay == 0.0) {
@@ -747,7 +747,7 @@ namespace GeneratorDynamicsManager {
// common place to figure flow rates with internal flow control
// METHODOLOGY EMPLOYED:
- // apply contraints imposed by plant according to flow lock, first HVAC iteration etc.
+ // apply constraints imposed by plant according to flow lock, first HVAC iteration etc.
// Return value
Real64 FuncDetermineCWMdotForInternalFlowControl;
diff --git a/src/EnergyPlus/GeneratorFuelSupply.cc b/src/EnergyPlus/GeneratorFuelSupply.cc
index dc65b8b4f42..388a2685d70 100644
--- a/src/EnergyPlus/GeneratorFuelSupply.cc
+++ b/src/EnergyPlus/GeneratorFuelSupply.cc
@@ -77,7 +77,7 @@ namespace GeneratorFuelSupply {
// reused among some generators to define gaseous fuel chemistry, optional compressor)
// Module containing the routines dealing with the fuel supply for some generators
- // different generator modules can reuse the same fuel supply code, hence a seperate module
+ // different generator modules can reuse the same fuel supply code, hence a separate module
// MODULE INFORMATION:
// AUTHOR B Griffith
diff --git a/src/EnergyPlus/GroundHeatExchangers.cc b/src/EnergyPlus/GroundHeatExchangers.cc
index 694d4c43ff5..ba58289f51b 100644
--- a/src/EnergyPlus/GroundHeatExchangers.cc
+++ b/src/EnergyPlus/GroundHeatExchangers.cc
@@ -47,6 +47,7 @@
// C++ Headers
#include
+#include
#include
// ObjexxFCL Headers
@@ -246,9 +247,12 @@ GLHESlinky::GLHESlinky(EnergyPlusData &state, std::string const &objName, nlohma
}
// Initialize ground temperature model and get pointer reference
- std::string const gtmType = Util::makeUPPER(j["undisturbed_ground_temperature_model_type"].get());
+ GroundTemp::ModelType gtmType = static_cast(
+ getEnumValue(GroundTemp::modelTypeNamesUC, Util::makeUPPER(j["undisturbed_ground_temperature_model_type"].get())));
+ assert(gtmType != GroundTemp::ModelType::Invalid);
+
std::string const gtmName = Util::makeUPPER(j["undisturbed_ground_temperature_model_name"].get());
- this->groundTempModel = GetGroundTempModelAndInit(state, gtmType, gtmName);
+ this->groundTempModel = GroundTemp::GetGroundTempModelAndInit(state, gtmType, gtmName);
// Check for Errors
if (errorsFound) {
@@ -411,10 +415,14 @@ GLHEVert::GLHEVert(EnergyPlusData &state, std::string const &objName, nlohmann::
state.dataGroundHeatExchanger->prevTimeSteps.allocate(static_cast((this->SubAGG + 1) * maxTSinHr + 1));
state.dataGroundHeatExchanger->prevTimeSteps = 0.0;
+ GroundTemp::ModelType modelType = static_cast(
+ getEnumValue(GroundTemp::modelTypeNamesUC, Util::makeUPPER(j["undisturbed_ground_temperature_model_type"].get())));
+ assert(modelType != GroundTemp::ModelType::Invalid);
+
// Initialize ground temperature model and get pointer reference
- this->groundTempModel = GetGroundTempModelAndInit(state,
- Util::makeUPPER(j["undisturbed_ground_temperature_model_type"].get()),
- Util::makeUPPER(j["undisturbed_ground_temperature_model_name"].get()));
+ this->groundTempModel = GroundTemp::GetGroundTempModelAndInit(state,
+ modelType,
+ Util::makeUPPER(j["undisturbed_ground_temperature_model_name"].get()));
// Check for Errors
if (errorsFound) {
@@ -487,12 +495,10 @@ GLHEResponseFactors::GLHEResponseFactors(EnergyPlusData &state, std::string cons
}
this->numGFuncPairs = static_cast(tmpLntts.size());
- this->LNTTS.dimension(this->numGFuncPairs, 0.0);
- this->GFNC.dimension(this->numGFuncPairs, 0.0);
for (int i = 1; i <= (int)tmpLntts.size(); ++i) {
- this->LNTTS(i) = tmpLntts[i - 1];
- this->GFNC(i) = tmpGvals[i - 1];
+ this->LNTTS.push_back(tmpLntts[i - 1]);
+ this->GFNC.push_back(tmpGvals[i - 1]);
}
}
@@ -649,7 +655,7 @@ BuildAndGetResponseFactorsObjectFromSingleBHs(EnergyPlusData &state, std::vector
// Make new props object which has the mean values of the other props objects referenced by the individual BH objects
std::shared_ptr thisProps(new GLHEVertProps);
thisProps->name = format("Response Factor Auto Generated Mean Props No: {}", state.dataGroundHeatExchanger->numAutoGeneratedResponseFactors + 1);
- for (auto &thisBH : state.dataGroundHeatExchanger->singleBoreholesVector) {
+ for (auto &thisBH : singleBHsForRFVect) {
thisProps->bhDiameter += thisBH->props->bhDiameter;
thisProps->bhLength += thisBH->props->bhLength;
thisProps->bhTopDepth += thisBH->props->bhTopDepth;
@@ -962,18 +968,12 @@ void GLHEVert::calcUniformBHWallTempGFunctions(EnergyPlusData &state)
boreholes.emplace_back(bh->props->bhLength, bh->props->bhTopDepth, bh->props->bhDiameter / 2.0, bh->xLoc, bh->yLoc);
}
- // convert time to a std::vector from an Array1D
- std::vector time;
- for (auto &v : this->myRespFactors->time) {
- time.push_back(v);
- }
-
// Obtain number of segments by adaptive discretization
gt::segments::adaptive adptDisc;
int nSegments = adptDisc.discretize(this->bhLength, this->totalTubeLength);
- this->myRespFactors->GFNC =
- gt::gfunction::uniform_borehole_wall_temperature(boreholes, time, this->soil.diffusivity, nSegments, true, state.dataGlobal->numThread);
+ this->myRespFactors->GFNC = gt::gfunction::uniform_borehole_wall_temperature(
+ boreholes, this->myRespFactors->time, this->soil.diffusivity, nSegments, true, state.dataGlobal->numThread);
}
//******************************************************************************
@@ -989,8 +989,8 @@ void GLHEVert::calcGFunctions(EnergyPlusData &state)
// save data for later
if (state.files.outputControl.glhe && !state.dataSysVars->DisableGLHECaching) {
- myCacheData["Response Factors"]["time"] = std::vector(this->myRespFactors->time.begin(), this->myRespFactors->time.end());
- myCacheData["Response Factors"]["LNTTS"] = std::vector(this->myRespFactors->LNTTS.begin(), this->myRespFactors->LNTTS.end());
+ myCacheData["Response Factors"]["time"] = std::vector(this->myRespFactors->time);
+ myCacheData["Response Factors"]["LNTTS"] = std::vector(this->myRespFactors->LNTTS);
myCacheData["Response Factors"]["GFNC"] = std::vector(this->myRespFactors->GFNC.begin(), this->myRespFactors->GFNC.end());
writeGLHECacheToFile(state);
}
@@ -1025,17 +1025,12 @@ void GLHEVert::setupTimeVectors()
}
}
- // Setup the arrays
- this->myRespFactors->time.dimension(tempLNTTS.size(), 0.0);
- this->myRespFactors->LNTTS.dimension(tempLNTTS.size(), 0.0);
- this->myRespFactors->GFNC.dimension(tempLNTTS.size(), 0.0);
-
- int index = 1;
- for (auto const &thisLNTTS : tempLNTTS) {
- this->myRespFactors->time(index) = exp(thisLNTTS) * t_s;
- this->myRespFactors->LNTTS(index) = thisLNTTS;
- ++index;
- }
+ this->myRespFactors->LNTTS = tempLNTTS;
+ this->myRespFactors->time = tempLNTTS;
+ std::transform(this->myRespFactors->time.begin(), this->myRespFactors->time.end(), this->myRespFactors->time.begin(), [&t_s](auto &c) {
+ return exp(c) * t_s;
+ });
+ this->myRespFactors->GFNC = std::vector(tempLNTTS.size(), 0.0);
}
//******************************************************************************
@@ -1045,15 +1040,15 @@ void GLHEVert::calcUniformHeatFluxGFunctions(EnergyPlusData &state)
DisplayString(state, "Initializing GroundHeatExchanger:System: " + this->name);
// Calculate the g-functions
- for (size_t lntts_index = 1; lntts_index <= this->myRespFactors->LNTTS.size(); ++lntts_index) {
+ for (size_t lntts_index = 0; lntts_index < this->myRespFactors->LNTTS.size(); ++lntts_index) {
for (auto const &bh_i : this->myRespFactors->myBorholes) {
Real64 sum_T_ji = 0;
for (auto const &bh_j : this->myRespFactors->myBorholes) {
- sum_T_ji += doubleIntegral(bh_i, bh_j, this->myRespFactors->time(lntts_index));
+ sum_T_ji += doubleIntegral(bh_i, bh_j, this->myRespFactors->time[lntts_index]);
}
- this->myRespFactors->GFNC(lntts_index) += sum_T_ji;
+ this->myRespFactors->GFNC[lntts_index] += sum_T_ji;
}
- this->myRespFactors->GFNC(lntts_index) /= (2 * this->totalTubeLength);
+ this->myRespFactors->GFNC[lntts_index] /= (2 * this->totalTubeLength);
std::stringstream ss;
ss << std::fixed << std::setprecision(1) << float(lntts_index) / this->myRespFactors->LNTTS.size() * 100;
@@ -1375,25 +1370,18 @@ void GLHEVert::combineShortAndLongTimestepGFunctions()
}
// Add the rest of the long time-step g-functions to the combined curve
- for (int index_longTS = this->myRespFactors->GFNC.l(); index_longTS <= this->myRespFactors->GFNC.u(); ++index_longTS) {
- GFNC_combined.push_back(this->myRespFactors->GFNC(index_longTS));
- LNTTS_combined.push_back(this->myRespFactors->LNTTS(index_longTS));
+ for (int index_longTS = 0; index_longTS < this->myRespFactors->GFNC.size(); ++index_longTS) {
+ GFNC_combined.push_back(this->myRespFactors->GFNC[index_longTS]);
+ LNTTS_combined.push_back(this->myRespFactors->LNTTS[index_longTS]);
}
- // Move combined values into right data struct
- this->myRespFactors->time.deallocate();
- this->myRespFactors->LNTTS.deallocate();
- this->myRespFactors->GFNC.deallocate();
+ this->myRespFactors->time = LNTTS_combined;
+ std::transform(this->myRespFactors->time.begin(), this->myRespFactors->time.end(), this->myRespFactors->time.begin(), [&t_s](auto &c) {
+ return exp(c) * t_s;
+ });
- this->myRespFactors->time.dimension(GFNC_combined.size(), 0.0);
- this->myRespFactors->LNTTS.dimension(GFNC_combined.size(), 0.0);
- this->myRespFactors->GFNC.dimension(GFNC_combined.size(), 0.0);
-
- for (unsigned int index = 0; index < GFNC_combined.size(); ++index) {
- this->myRespFactors->time[index] = exp(LNTTS_combined[index]) * t_s;
- this->myRespFactors->LNTTS[index] = LNTTS_combined[index];
- this->myRespFactors->GFNC[index] = GFNC_combined[index];
- }
+ this->myRespFactors->LNTTS = LNTTS_combined;
+ this->myRespFactors->GFNC = GFNC_combined;
}
void GLHEBase::makeThisGLHECacheAndCompareWithFileCache(EnergyPlusData &state)
@@ -1460,13 +1448,13 @@ void GLHEVert::readCacheFileAndCompareWithThisGLHECache(EnergyPlusData &state)
if (gFunctionsExist) {
// Populate the time array
- this->myRespFactors->time = Array1D(myCacheData["Response Factors"]["time"].get>());
+ this->myRespFactors->time = std::vector(myCacheData["Response Factors"]["time"].get>());
// Populate the lntts array
- this->myRespFactors->LNTTS = Array1D(myCacheData["Response Factors"]["LNTTS"].get>());
+ this->myRespFactors->LNTTS = std::vector(myCacheData["Response Factors"]["LNTTS"].get>());
// Populate the g-function array
- this->myRespFactors->GFNC = Array1D(myCacheData["Response Factors"]["GFNC"].get>());
+ this->myRespFactors->GFNC = std::vector(myCacheData["Response Factors"]["GFNC"].get>());
}
}
@@ -1522,18 +1510,13 @@ void GLHESlinky::calcGFunctions(EnergyPlusData &state)
int NPairs = static_cast((tLg_max - tLg_min) / (tLg_grid) + 1);
// Allocate and setup g-function arrays
- this->myRespFactors->GFNC.allocate(NPairs);
- this->myRespFactors->LNTTS.allocate(NPairs);
+ this->myRespFactors->GFNC = std::vector(NPairs, 0.0);
+ this->myRespFactors->LNTTS = std::vector(NPairs, 0.0);
this->QnMonthlyAgg.allocate(static_cast(this->maxSimYears * 12));
this->QnHr.allocate(730 + this->AGG + this->SubAGG);
this->QnSubHr.allocate(static_cast((this->SubAGG + 1) * maxTSinHr + 1));
this->LastHourN.allocate(this->SubAGG + 1);
- for (int i = 1; i <= NPairs; ++i) {
- this->myRespFactors->GFNC(i) = 0.0;
- this->myRespFactors->LNTTS(i) = 0.0;
- }
-
// Calculate the number of loops (per trench) and number of trenches to be involved
// Due to the symmetry of a slinky GHX field, we need only calculate about
// on quarter of the rings' tube wall temperature perturbation to get the
@@ -1652,8 +1635,8 @@ void GLHESlinky::calcGFunctions(EnergyPlusData &state)
} // n1
} // m1
- this->myRespFactors->GFNC(NT) = (gFunc * (this->coilDiameter / 2.0)) / (4 * Constant::Pi * fraction * this->numTrenches * this->numCoils);
- this->myRespFactors->LNTTS(NT) = tLg;
+ this->myRespFactors->GFNC[NT - 1] = (gFunc * (this->coilDiameter / 2.0)) / (4 * Constant::Pi * fraction * this->numTrenches * this->numCoils);
+ this->myRespFactors->LNTTS[NT - 1] = tLg;
} // NT time
}
@@ -1834,7 +1817,7 @@ inline bool GLHEBase::isEven(int const val)
//******************************************************************************
-Real64 GLHESlinky::integral(int const m, int const n, int const m1, int const n1, Real64 const t, Real64 const eta, Real64 const J0)
+Real64 GLHESlinky::integral(int const m, int const n, int const m1, int const n1, Real64 const t, Real64 const eta, int const J0)
{
// SUBROUTINE INFORMATION:
// AUTHOR: Matt Mitchell
@@ -1848,33 +1831,28 @@ Real64 GLHESlinky::integral(int const m, int const n, int const m1, int const n1
// Simpson's 1/3 rule of integration
// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
- Real64 sumIntF = 0.0;
Real64 theta = 0.0;
constexpr Real64 theta1 = 0.0;
constexpr Real64 theta2 = 2 * Constant::Pi;
- Array1D f(J0, 0.0);
+ std::vector f;
Real64 h = (theta2 - theta1) / (J0 - 1);
// Calculate the function at various equally spaced x values
- for (int j = 1; j <= J0; ++j) {
-
- theta = theta1 + (j - 1) * h;
-
- f(j) = nearFieldResponseFunction(m, n, m1, n1, eta, theta, t);
+ for (int j = 0; j < J0; ++j) {
+ theta = theta1 + j * h;
+ f.push_back(nearFieldResponseFunction(m, n, m1, n1, eta, theta, t));
+ }
- if (j == 1 || j == J0) {
- f(j) = f(j);
- } else if (isEven(j)) {
- f(j) = 4 * f(j);
+ for (int j = 1; j < J0 - 1; ++j) {
+ if (!isEven(j)) {
+ f[j] = 4 * f[j];
} else {
- f(j) = 2 * f(j);
+ f[j] = 2 * f[j];
}
-
- sumIntF += f(j);
}
- return (h / 3) * sumIntF;
+ return (h / 3) * std::reduce(f.begin(), f.end());
}
//******************************************************************************
@@ -1896,29 +1874,25 @@ Real64 GLHESlinky::doubleIntegral(int const m, int const n, int const m1, int co
constexpr Real64 eta1 = 0.0;
constexpr Real64 eta2 = 2 * Constant::Pi;
- Real64 sumIntF = 0.0;
- Array1D g(I0, 0.0);
+ std::vector g;
Real64 h = (eta2 - eta1) / (I0 - 1);
// Calculates the value of the function at various equally spaced values
- for (int i = 1; i <= I0; ++i) {
-
- Real64 eta = eta1 + (i - 1) * h;
- g(i) = integral(m, n, m1, n1, t, eta, J0);
+ for (int i = 0; i < I0; ++i) {
+ Real64 eta = eta1 + i * h;
+ g.push_back(integral(m, n, m1, n1, t, eta, J0));
+ }
- if (i == 1 || i == I0) {
- g(i) = g(i);
- } else if (isEven(i)) {
- g(i) = 4 * g(i);
+ for (int i = 1; i < g.size() - 1; ++i) {
+ if (!isEven(i)) {
+ g[i] = 4 * g[i];
} else {
- g(i) = 2 * g(i);
+ g[i] = 2 * g[i];
}
-
- sumIntF += g(i);
}
- return (h / 3) * sumIntF;
+ return (h / 3) * std::reduce(g.begin(), g.end());
}
//******************************************************************************
diff --git a/src/EnergyPlus/GroundHeatExchangers.hh b/src/EnergyPlus/GroundHeatExchangers.hh
index 50260f32822..4899c95a406 100644
--- a/src/EnergyPlus/GroundHeatExchangers.hh
+++ b/src/EnergyPlus/GroundHeatExchangers.hh
@@ -58,7 +58,7 @@
#include
#include
#include