Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/develop' into VentMechCO…
Browse files Browse the repository at this point in the history 
…2Control9969
  • Loading branch information
@mjwitte
mjwitte committed Oct 10, 2023
2 parents 9d3b640 + 7636e6b commit 99733f8
Show file tree
Hide file tree
Showing 13 changed files with 192 additions and 120 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/documentation-windows.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
set -x
echo "Downloading MiKTeX CLI installer"
# We download from a specific miror already # TODO: Should store this setup package somewhere ourselves
curl -L -O https://ctan.math.illinois.edu/systems/win32/miktex/setup/windows-x64/miktexsetup-5.2.0%2Bb8f430f-x64.zip
unzip miktexsetup-5.2.0%2Bb8f430f-x64.zip
curl -L -O https://ctan.math.illinois.edu/systems/win32/miktex/setup/windows-x64/miktexsetup-5.5.0%2B1763023-x64.zip
unzip miktexsetup-5.5.0%2B1763023-x64.zip
echo "Setting up the local package directory via download"
./miktexsetup_standalone --verbose \
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/windows_release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ jobs:
# fail-fast: Default is true, switch to false to allow one platform to fail and still run others
fail-fast: false
matrix:
name: [x64, x86, x64_hardened]
name: [x64, x64_hardened] # removed x86 because it won't build packages now
include:
- name: x64
arch: x64
allow_failure: false
vs-generator: x64
package-arch: x86_64
enable_hardened_runtime: OFF
- name: x86
arch: x86
allow_failure: false
vs-generator: Win32
package-arch: i386
enable_hardened_runtime: OFF
# - name: x86
# arch: x86
# allow_failure: false
# vs-generator: Win32
# package-arch: i386
# enable_hardened_runtime: OFF
- name: x64_hardened
arch: x64
allow_failure: false
Expand Down Expand Up @@ -72,8 +72,8 @@ jobs:
set -x
echo "Downloading MiKTeX CLI installer"
# We download from a specific miror already # TODO: Should store this setup package somewhere ourselves
curl -L -O https://ctan.math.illinois.edu/systems/win32/miktex/setup/windows-x64/miktexsetup-5.2.0%2Bb8f430f-x64.zip
unzip miktexsetup-5.2.0%2Bb8f430f-x64.zip
curl -L -O https://ctan.math.illinois.edu/systems/win32/miktex/setup/windows-x64/miktexsetup-5.5.0%2B1763023-x64.zip
unzip miktexsetup-5.5.0%2B1763023-x64.zip
echo "Setting up the local package directory via download"
./miktexsetup_standalone --verbose \
Expand Down
24 changes: 20 additions & 4 deletions release/Deprecation.in.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,21 @@ <h3>Geometry Transformation</h3>

<h2>Level 2 Deprecation Status</h2>

<h3>Outdated Mac and Linux Builds</h3>
<h3>32-bit Windows Builds</h3>
<p>
Mac 10.15 and Ubuntu 18.04 builds will not be provided after the release of 23.1. These versions of each
operating system are outdated and have reached end of support, or will reach that before the next release of
EnergyPlus.
EnergyPlus has provided 32-bit Windows builds since the very early days of development, and 64-bit Windows
builds since version 6.0.0 (Fall 2010). Microsoft has begun the process of stopping 32-bit development and
invoked new requirements on system memory that effectively eliminate 32-bit systems except in the most niche
circumstances. As of 2020, Steam software reported that 32-bit Windows usage was down to 0.2% of users.
All of this would be sufficient for us to justify eliminating 32-bit builds, however some EnergyPlus interfaces
are still built as 32-bit binaries, and we try hard to provide interfaces with everything they need from
EnergyPlus. Our CI systems are no longer able to build 32-bit Windows packages, but we still have dev
machines that can do it, so for now we will provide 32-bit builds, but they won't be around much longer.
</p>

<h3>Outdated Mac Builds</h3>
<p>
Mac 10.15 builds will not be provided after the release of 23.2.
</p>

<h2>Level 3 Deprecation Status</h2>
Expand All @@ -155,6 +165,12 @@ <h3>Version Numbering Scheme</h3>
with a patch number such as 22.1.1.
</p>

<h3>Outdated Linux Builds</h3>
<p>
Ubuntu 18.04 builds are no longer provided. This version reached end of life in April, and we have instead
added 22.04.
</p>

<hr>

<footer>
Expand Down
131 changes: 66 additions & 65 deletions release/readme.in.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,40 @@ <h5 class="card-title">Some objects require transition</h5>
on exact object changes that you can do by hand. The updater program is described more fully in the
Auxiliary Programs document.
<ul class="list-group">
<li class="list-group-item transition-object-name">Coil:Cooling:DX:CurveFit:Speed</li>
<li class="list-group-item transition-object-name">Branch</li>
<li class="list-group-item transition-object-name">Coil:Cooling:DX:TwoSpeed</li>
<li class="list-group-item transition-object-name">Coil:Cooling:DX:CurveFit:Performance</li>
<li class="list-group-item transition-object-name">Coil:Cooling:DX:SingleSpeed</li>
<li class="list-group-item transition-object-name">Coil:Cooling:DX:MultiSpeed</li>
<li class="list-group-item transition-object-name">Coil:Cooling:DX:VariableSpeed</li>
<li class="list-group-item transition-object-name">Coil:Cooling:DX:TwoStageWithHumidityControlMode</li>
<li class="list-group-item transition-object-name">Coil:Heating:DX:SingleSpeed</li>
<li class="list-group-item transition-object-name">Coil:Heating:DX:MultiSpeed</li>
<li class="list-group-item transition-object-name">FuelFactors</li>
<li class="list-group-item transition-object-name">Space</li>
<li class="list-group-item transition-object-name">Coil:Heating:DX:VariableSpeed</li>
<li class="list-group-item transition-object-name">Coil:WaterHeating:AirToWaterHeatPump:Pumped</li>
<li class="list-group-item transition-object-name">Coil:WaterHeating:AirToWaterHeatPump:Wrapped</li>
<li class="list-group-item transition-object-name">Coil:WaterHeating:AirToWaterHeatPump:VariableSpeed</li>
<li class="list-group-item transition-object-name">DistrictHeating</li>
<li class="list-group-item transition-object-name">EnergyManagementSystem:MeteredOutputVariable</li>
<li class="list-group-item transition-object-name">Exterior:FuelEquipment</li>
<li class="list-group-item transition-object-name">HVACTemplate:Zone:WaterToAirHeatPump</li>
<li class="list-group-item transition-object-name">AirLoopHVAC:UnitarySystem</li>
<li class="list-group-item transition-object-name">AirLoopHVAC:UnitarySystem:WaterToAir</li>
<li class="list-group-item transition-object-name">ZoneHVAC:WaterToAirHeatPump</li>
<li class="list-group-item transition-object-name">Coil:Cooling:WaterToAirHeatPump:ParameterEstimation</li>
<li class="list-group-item transition-object-name">Coil:Heating:WaterToAirHeatPump:ParameterEstimation</li>
<li class="list-group-item transition-object-name">Coil:Cooling:WaterToAirHeatPump:EquationFit</li>
<li class="list-group-item transition-object-name">Coil:Heating:WaterToAirHeatPump:EquationFit</li>
<li class="list-group-item transition-object-name">Coil:Cooling:WaterToAirHeatPump:VariableSpeedEquationFit</li>
<li class="list-group-item transition-object-name">LifeCycleCost:UsePriceEscalation</li>
<li class="list-group-item transition-object-name">LifeCycleCost:UseAdjustment</li>
<li class="list-group-item transition-object-name">OtherEquipment</li>
<li class="list-group-item transition-object-name">PythonPlugin:OutputVariable</li>
<li class="list-group-item transition-object-name">PlantEquipmentList</li>
<li class="list-group-item transition-object-name">PlantEquipmentOperation:ComponentSetpoint</li>
<li class="list-group-item transition-object-name">WaterHeat:Mixed</li>
<li class="list-group-item transition-object-name">WaterHeater:Stratified</li>
<li class="list-group-item transition-object-name">ZoneHVAC:HybridUnitaryHVAC</li>
</ul>
</div>
</div>
Expand Down Expand Up @@ -249,24 +274,40 @@ <h3><a id="Highlights_of_this_release"></a>New Features</h3>
<th>Description</th>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9394">9394</a></td>
<td>Subdivide Heat Balance by Space</td>
<td><a href="https://github.com/NREL/EnergyPlus/pull/10138">10138</a></td>
<td>Add Vertical (1-D) Solution to Earth Tube Object</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9405">9405</a></td>
<td>Gas-Fired Absorption Heat Pump (GAHP) model</td>
<td><a href="https://github.com/NREL/EnergyPlus/pull/10143">10143</a></td>
<td>Ruleset Model Description Phase 2</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9594">9594</a></td>
<td>NewFeature: Implement Model for Building-Integrated Photovoltaic Thermal (BIPVT)</td>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9746">9746</a></td>
<td>Improved Support for Multi-speed Fans</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9755">9755</a></td>
<td>Modeling Dynamic Coating for Opaque Surfaces</td>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9756">9756</a></td>
<td>90.1 metrics - EER/IEER</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9848">9848</a></td>
<td>Add ISO 8601 format support to native CSV and JSON output</td>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9949">9949</a></td>
<td>Enhancement to crankcase heater</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9950">9950</a></td>
<td>Evaporative cooler RH control</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9979">9979</a></td>
<td>New plant heat pump features and supervisory controller</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9982">9982</a></td>
<td>Extend Spaces to Sizing and HVAC</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9987">9987</a></td>
<td>Multistage economizer control</td>
</tr>
</table>
<h3><a id="PerformanceFeatures"></a>Runtime Performance Enhancing Developments</h3>
Expand All @@ -291,68 +332,28 @@ <h3><a id="RefactoringEfforts"></a>Targeted Refactoring Efforts</h3>
<th>Description</th>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9670">9670</a></td>
<td>Quick SolveRoot cleanup</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9693">9693</a></td>
<td>Clean up Par arrays in SolveRoot calls</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9765">9765</a></td>
<td>Refactor int to enum as a follow up to previous code changes</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9766">9766</a></td>
<td>Solve root cleanups continued</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9770">9770</a></td>
<td>Quick curve manager cleanup</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9779">9779</a></td>
<td>Curve Manager Round 2</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9782">9782</a></td>
<td>Refactor loops for zone sizing array initialization</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9812">9812</a></td>
<td>MaterialProperties Refactoring step 2</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9823">9823</a></td>
<td>Quick cleaning in General.cc</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9854">9854</a></td>
<td>Refactor in RefrigeratedCase and new unit test process_idf for string_view</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9868">9868</a></td>
<td>Remove Scalar Auto Refs -- Pass1</td>
<td><a href="https://github.com/NREL/EnergyPlus/pull/10015">10015</a></td>
<td>Refactor logic in VRF control function to simplify code readability</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9872">9872</a></td>
<td>Remove Scalar Auto Refs -- pass 2</td>
<td><a href="https://github.com/NREL/EnergyPlus/pull/10050">10050</a></td>
<td>ConvectionCoefficients Enumeration-based Cleanup</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9886">9886</a></td>
<td>Fix Bad Auto: Part 3</td>
<td><a href="https://github.com/NREL/EnergyPlus/pull/10202">10202</a></td>
<td>Update penumbra</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9892">9892</a></td>
<td>Fix Bad Auto 4 (with a bonus)</td>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9902">9902</a></td>
<td>End Use Cleanup</td>
</tr>
<tr>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9896">9896</a></td>
<td>Fix Bad Auto: Part 2 (Take 2)</td>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9924">9924</a></td>
<td>Remove Optional Arguments, Part 1</td>
</tr>
<tr>
<td>(many!)</td>
<td>Cleaning up CppCheck-identified issues in many files!</td>
<td><a href="https://github.com/NREL/EnergyPlus/pull/9981">9981</a></td>
<td>Improved ReadTheDocs Documentation</td>
</tr>
</table>

Expand Down
12 changes: 11 additions & 1 deletion src/EnergyPlus/ChillerElectricEIR.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1585,7 +1585,17 @@ void ElectricEIRChillerSpecs::size(EnergyPlusData &state)

// now do heat recovery flow rate sizing if active
if (this->HeatRecActive) {
Real64 tempHeatRecVolFlowRate = tmpCondVolFlowRate * this->HeatRecCapacityFraction;
Real64 tempHeatRecVolFlowRate;
if (this->CondenserType == DataPlant::CondenserType::WaterCooled) {
tempHeatRecVolFlowRate = tmpCondVolFlowRate * this->HeatRecCapacityFraction;
} else {
if (this->EvapVolFlowRateWasAutoSized) {
tempHeatRecVolFlowRate = tmpEvapVolFlowRate;
} else {
tempHeatRecVolFlowRate = this->EvapVolFlowRate;
}
tempHeatRecVolFlowRate *= (1.0 + (1.0 / this->RefCOP)) * this->CompPowerToCondenserFrac * this->HeatRecCapacityFraction;
}
if (this->DesignHeatRecVolFlowRateWasAutoSized) {

if (state.dataPlnt->PlantFirstSizesOkayToFinalize) {
Expand Down
14 changes: 12 additions & 2 deletions src/EnergyPlus/ChillerReformulatedEIR.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1350,7 +1350,7 @@ void ReformulatedEIRChillerSpecs::size(EnergyPlusData &state)
this->CondVolFlowRate = tmpCondVolFlowRate;
BaseSizer::reportSizerOutput(
state, "Chiller:Electric:ReformulatedEIR", this->Name, "Design Size Reference Condenser Air Flow Rate [m3/s]", this->CondVolFlowRate);
} else if (!this->CondVolFlowRateWasAutoSized && state.dataPlnt->PlantFinalSizesOkayToReport && (tmpCondVolFlowRate > 0.0) &&
} else if (!this->CondVolFlowRateWasAutoSized && state.dataPlnt->PlantFinalSizesOkayToReport && (this->CondVolFlowRate > 0.0) &&
this->CondenserType == DataPlant::CondenserType::WaterCooled) {
BaseSizer::reportSizerOutput(state,
"Chiller:Electric:ReformulatedEIR",
Expand All @@ -1366,7 +1366,17 @@ void ReformulatedEIRChillerSpecs::size(EnergyPlusData &state)
}

if (this->HeatRecActive) {
Real64 tmpHeatRecVolFlowRate = tmpCondVolFlowRate * this->HeatRecCapacityFraction;
Real64 tmpHeatRecVolFlowRate;
if (this->CondenserType == DataPlant::CondenserType::WaterCooled) {
tmpHeatRecVolFlowRate = tmpCondVolFlowRate * this->HeatRecCapacityFraction;
} else {
if (this->EvapVolFlowRateWasAutoSized) {
tmpHeatRecVolFlowRate = tmpEvapVolFlowRate;
} else {
tmpHeatRecVolFlowRate = this->EvapVolFlowRate;
}
tmpHeatRecVolFlowRate *= (1.0 + (1.0 / this->RefCOP)) * this->CompPowerToCondenserFrac * this->HeatRecCapacityFraction;
}
if (!this->DesignHeatRecVolFlowRateWasAutoSized) tmpHeatRecVolFlowRate = this->DesignHeatRecVolFlowRate;
if (state.dataPlnt->PlantFirstSizesOkayToFinalize) {
if (this->DesignHeatRecVolFlowRateWasAutoSized) {
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/HVACFan.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ namespace HVACFan {
bool AirPathFlag; // Yes, this fan is a part of airpath
int m_numSpeeds; // input for how many speed levels for discrete fan
std::vector<Real64> m_massFlowAtSpeed;
std::vector<Real64> m_flowFractionAtSpeed; // array of flow fractions for speed levels

// Mass Flow Rate Control Variables
bool fanIsSecondaryDriver; // true if this fan is used to augment flow and may pass air when off.
Expand Down Expand Up @@ -207,7 +208,6 @@ namespace HVACFan {
Real64 m_qdotConvZone; // fan power lost to surrounding zone by convection to air (W)
Real64 m_qdotRadZone; // fan power lost to surrounding zone by radiation to zone surfaces(W)
std::string m_endUseSubcategoryName;
std::vector<Real64> m_flowFractionAtSpeed; // array of flow fractions for speed levels
std::vector<Real64> m_powerFractionAtSpeed; // array of power fractions for speed levels
std::vector<bool> m_powerFractionInputAtSpeed;
// calculation variables
Expand Down
Loading

5 comments on commit 99733f8

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VentMechCO2Control9969 (mjwitte) - Win64-Windows-10-VisualStudio-16: Build Failed

Failures:\n

API Test Summary

  • Failed: 10
  • notrun: 5

ConvertInputFormat Test Summary

  • Failed: 4
  • notrun: 1

integration Test Summary

  • Passed: 2
  • Failed: 786

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VentMechCO2Control9969 (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3576 of 3576 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VentMechCO2Control9969 (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (1963 of 1963 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VentMechCO2Control9969 (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (789 of 789 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VentMechCO2Control9969 (mjwitte) - x86_64-MacOS-10.17-clang-14.0.0: OK (3535 of 3535 tests passed, 1 test warnings)

Messages:\n

  • 1 test had: ERR diffs.

Build Badge Test Badge

Please sign in to comment.