Skip to content

Commit

Permalink
Merge branch 'develop' into allow_wahp_afn and address conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lymereJ
lymereJ committed Jul 30, 2024
2 parents f57c2fb + 18f5c3f commit e583596
Show file tree
Hide file tree
Showing 107 changed files with 7,913 additions and 7,929 deletions.
2 changes: 1 addition & 1 deletion doc/input-output-reference/src/overview/group-airflow-network.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ \subsubsection{Inputs}\label{inputs-004}

\paragraph{Field: Allow Unsupported Zone Equipment}\label{allow-unsupported-zone-equipment}

This is an optional field. Input is Yes or No. The default is No. Set this input to Yes to have zone equipment that are currently unsupported in the AirflowNetwork model allowed in the simulation. Setting this field to Yes, allows the following equipment to be modeled along an AirflowNetwork model: ZoneHVAC:Dehumidifier, ZoneHVAC:EnergyRecoveryVentilator, WaterHeater:HeatPump:*. The AirflowNetwork model will exclude mass balance in these equipment objects and assume the mass flows are self-balanced in the equipment objects.
This is an optional field. Input is Yes or No. The default is No. Set this input to Yes to have zone equipment that are currently unsupported in the AirflowNetwork model allowed in the simulation. Setting this field to Yes, allows the following equipment to be modeled along an AirflowNetwork model: ZoneHVAC:Dehumidifier, ZoneHVAC:EnergyRecoveryVentilator, WaterHeater:HeatPump:*, and ZoneHVAC:WindowAirConditioner. The AirflowNetwork model will exclude mass balance in these equipment objects and assume the mass flows are self-balanced in the equipment objects.

\paragraph{Field: Do Distribution Duct Sizing Calculation}\label{do-distribution-duct-sizing-calculation}

Expand Down
62 changes: 0 additions & 62 deletions doc/output-details-and-examples/src/output-files/eplustbl-lt-ext-gt.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1018,8 +1018,6 @@ \subsection{Equipment Summary}\label{equipment-summary}
Plantloop Branch Name
\end{itemize}

An example of the report is shown here

\begin{figure}[h!]
\centering
\includegraphics{media/boiler-table-example.PNG}
Expand Down Expand Up @@ -1053,8 +1051,6 @@ \subsection{Equipment Summary}\label{equipment-summary}
Condenser Loop Branch Name
\end{itemize}

An example of the report is shown here

\begin{figure}[h!]
\centering
\includegraphics{media/cooling-tower-table-example.PNG}
Expand All @@ -1078,8 +1074,6 @@ \subsection{Equipment Summary}\label{equipment-summary}
Minimum Loop Flow Rate [m3/s]
\end{itemize}

An example of the report is shown here

\begin{figure}[h!]
\centering
\includegraphics{media/plantloop-table-example.PNG}
Expand Down Expand Up @@ -1127,8 +1121,6 @@ \subsection{Equipment Summary}\label{equipment-summary}
Minimum Outdoor Flow Schedule Name
\end{itemize}

An example of the report is shown here

\begin{figure}[h!]
\centering
\includegraphics{media/air-terminal-table-example.PNG}
Expand Down Expand Up @@ -1160,67 +1152,13 @@ \subsection{Equipment Summary}\label{equipment-summary}
Outdoor Airflow [kg/s]
\end{itemize}

An example of the report is shown here

\begin{figure}[h!]
\centering
\includegraphics{media/air-heat-recovery-table-example.PNG}
\caption{}
\end{figure}

{\scriptsize
\begin{longtable}[c]{>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}}
\toprule
~ & Type & Nominal Total Capacity (W) & Nominal Efficiency (W/W) \tabularnewline
~ & Type & Reference Capacity[W] & Type Reference Efficiency [W/W] & Rated Capacity [W] & Rated Efficiency [W/W] & IPLV in SI Units [W/W] & IPLV in IP Units [Btu/W-h] & Minimum Part Load Ratio & Fuel Type & Rated Entering Condenser Temperature [C] & Rated Leaving Evaporator Temperature [C] Reference Entering Condenser Temperature [C] Reference Leaving Evaporator Temperature [C] Design Size Reference Chilled Water Flow Rate [kg/s] Design Size Reference Condenser Fluid Flow Rate [kg/s] Plantloop Name Plantloop Branch Name Condenser Loop Name Condenser Loop Branch Name Heat Recovery Plantloop Name Heat Recovery Plantloop Branch Name Recovery Relative Capacity Fraction

\midrule
\endfirsthead

\toprule
~ & Type & Nominal Total Capacity (W) & Nominal Efficiency (W/W) \tabularnewline
\midrule
\endhead

Type Reference Capacity[W] TypeReference Efficiency [W/W] Rated Capacity [W] Rated Efficiency [W/W] IPLV in SI Units [W/W] IPLV in IP Units [Btu/W-h] Minimum Part Load Ratio Fuel Type Rated Entering Condenser Temperature [C] Rated Leaving Evaporator Temperature [C] Reference Entering Condenser Temperature [C] Reference Leaving Evaporator Temperature [C] Design Size Reference Chilled Water Flow Rate [kg/s] Design Size Reference Condenser Fluid Flow Rate [kg/s] Plantloop Name Plantloop Branch Name Condenser Loop Name Condenser Loop Branch Name Heat Recovery Plantloop Name Heat Recovery Plantloop Branch Name Recovery Relative Capacity Fraction
90.1-2004 WATERCOOLED CENTRIFUGAL CHILLER 0 416TONS 0.6KW/TON Chiller:Electric:EIR 1932343.27 6.10 1932343.27 6.10 6.88 6.92 0.00 Electricity 35.00 6.67 35.00 6.67 82.04 96.29 CHILLED WATER LOOP CHILLED WATER LOOP SUPPLY BRANCH 1 CONDENSER WATER LOOP CONDENSER WATER LOOP DEMAND BRANCH 2 N/A N/A 0.00
90.1-2004 WATERCOOLED CENTRIFUGAL CHILLER 1 416TONS 0.6KW/TON Chiller:Electric:EIR 1932343.27 6.10 1932343.27 6.10 6.88 6.92 0.00 Electricity 35.00 6.67 35.00 6.67 82.04 96.29 CHILLED WATER LOOP CHILLED WATER LOOP SUPPLY BRANCH 2 CONDENSER WATER LOOP CONDENSER WATER LOOP DEMAND BRANCH 3 N/A N/A 0.00






SPACE1-1 ZONE COIL & Coil:Heating:Fuel & 17614.83 & 0.80 \tabularnewline
SPACE2-1 ZONE COIL & Coil:Heating:Fuel & 14619.82 & 0.80 \tabularnewline
SPACE3-1 ZONE COIL & Coil:Heating:Fuel & 16093.74 & 0.80 \tabularnewline
SPACE4-1 ZONE COIL & Coil:Heating:Fuel & 18942.35 & 0.80 \tabularnewline
SPACE5-1 ZONE COIL & Coil:Heating:Fuel & 19146.73 & 0.80 \tabularnewline
MAIN HEATING COIL 1 & Coil:Heating:Fuel & 19754.61 & 0.80 \tabularnewline
\bottomrule
\end{longtable}}

{\scriptsize
\begin{longtable}[c]{>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}>{\raggedright}p{1.5in}}
\toprule
~ & Type & Nominal Total Capacity (W) & Nominal Efficiency (W/W) \tabularnewline
\midrule
\endfirsthead

\toprule
~ & Type & Nominal Total Capacity (W) & Nominal Efficiency (W/W) \tabularnewline
\midrule
\endhead

SPACE1-1 ZONE COIL & Coil:Heating:Fuel & 17614.83 & 0.80 \tabularnewline
SPACE2-1 ZONE COIL & Coil:Heating:Fuel & 14619.82 & 0.80 \tabularnewline
SPACE3-1 ZONE COIL & Coil:Heating:Fuel & 16093.74 & 0.80 \tabularnewline
SPACE4-1 ZONE COIL & Coil:Heating:Fuel & 18942.35 & 0.80 \tabularnewline
SPACE5-1 ZONE COIL & Coil:Heating:Fuel & 19146.73 & 0.80 \tabularnewline
MAIN HEATING COIL 1 & Coil:Heating:Fuel & 19754.61 & 0.80 \tabularnewline
\bottomrule
\end{longtable}}


\subsection{Envelope Summary}\label{envelope-summary}

Expand Down
6 changes: 4 additions & 2 deletions idd/Energy+.idd.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21309,7 +21309,8 @@ RoomAir:Node:AirflowNetwork:HVACEquipment,
\key ZoneHVAC:IdealLoadsAirSystem
\key ZoneHVAC:RefrigerationChillerSet
\key Fan:ZoneExhaust
\key WaterHeater:HeatPump
\key WaterHeater:HeatPump:PumpedCondenser
\key WaterHeater:HeatPump:WrappedCondenser
\key AirTerminal:DualDuct:ConstantVolume
\key AirTerminal:DualDuct:VAV
\key AirTerminal:SingleDuct:ConstantVolume:Reheat
Expand Down Expand Up @@ -21359,7 +21360,8 @@ RoomAir:Node:AirflowNetwork:HVACEquipment,
\key ZoneHVAC:IdealLoadsAirSystem
\key ZoneHVAC:RefrigerationChillerSet
\key Fan:ZoneExhaust
\key WaterHeater:HeatPump
\key WaterHeater:HeatPump:PumpedCondenser
\key WaterHeater:HeatPump:WrappedCondenser
\key AirTerminal:DualDuct:ConstantVolume
\key AirTerminal:DualDuct:VAV
\key AirTerminal:SingleDuct:ConstantVolume:Reheat
Expand Down
14 changes: 14 additions & 0 deletions src/EnergyPlus/AirflowNetwork/src/Solver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
#include <EnergyPlus/UnitarySystem.hh>
#include <EnergyPlus/UtilityRoutines.hh>
#include <EnergyPlus/WaterThermalTanks.hh>
#include <EnergyPlus/WindowAC.hh>
#include <EnergyPlus/ZoneDehumidifier.hh>
#include <EnergyPlus/ZoneTempPredictorCorrector.hh>

Expand Down Expand Up @@ -10145,6 +10146,7 @@ namespace AirflowNetwork {
using SplitterComponent::GetSplitterNodeNumbers;
using SplitterComponent::GetSplitterOutletNumber;
using WaterThermalTanks::GetHeatPumpWaterHeaterNodeNumber;
using WindowAC::GetWindowACNodeNumber;
using ZoneDehumidifier::GetZoneDehumidifierNodeNumber;

// SUBROUTINE PARAMETER DEFINITIONS:
Expand All @@ -10166,6 +10168,7 @@ namespace AirflowNetwork {
bool packagedUnitaryFound(false); // Flag for packaged unitary systems (ZoneHVAC:PackagedTerminalAirConditioner,
// ZoneHVAC:PackagedTerminalHeatPump, ZoneHVAC:WaterToAirHeatPump) identification
bool vrfTUFound(false);
bool WindowACFound(false); // Flag for Window AC (ZoneHVAC:WindowAirConditioner) identification

// Validate supply and return connections
NodeFound.dimension(m_state.dataLoopNodes->NumOfNodes, false);
Expand Down Expand Up @@ -10290,6 +10293,12 @@ namespace AirflowNetwork {
NodeFound(i) = true;
vrfTUFound = true;
}

// Skip Window AC with no OA
if (GetWindowACNodeNumber(m_state, i)) {
NodeFound(i) = true;
WindowACFound = true;
}
}

for (int zoneNum = 1; zoneNum <= m_state.dataGlobal->NumOfZones; ++zoneNum) {
Expand Down Expand Up @@ -10442,6 +10451,11 @@ namespace AirflowNetwork {
"A ZoneHVAC:TerminalUnit:VariableRefrigerantFlow is simulated along with an AirflowNetwork but is not "
"included in the AirflowNetwork.");
}
if (WindowACFound) {
ShowWarningError(m_state,
format(RoutineName) + "A ZoneHVAC:WindowAirConditioner is simulated along with an AirflowNetwork but is not "
"included in the AirflowNetwork.");
}
NodeFound.deallocate();

// Assign AirLoop Number to every node and linkage
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/BoilerSteam.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ namespace BoilerSteam {
"Hot Steam Nodes");

if (SteamFluidIndex == 0 && BoilerNum == 1) {
SteamFluidIndex = FluidProperties::FindRefrigerant(state, fluidNameSteam);
SteamFluidIndex = FluidProperties::GetRefrigNum(state, fluidNameSteam); // Steam is a refrigerant?
if (SteamFluidIndex == 0) {
ShowSevereError(
state, format("{}{}=\"{}\",", RoutineName, state.dataIPShortCut->cCurrentModuleObject, state.dataIPShortCut->cAlphaArgs(1)));
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/ChillerAbsorption.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ void GetBLASTAbsorberInput(EnergyPlusData &state)
state.dataIPShortCut->cAlphaArgs(7),
"Hot Water Nodes");
} else {
thisChiller.SteamFluidIndex = FluidProperties::FindRefrigerant(state, fluidNameSteam);
thisChiller.SteamFluidIndex = FluidProperties::GetRefrigNum(state, fluidNameSteam);
thisChiller.GeneratorInletNodeNum = NodeInputManager::GetOnlySingleNode(state,
state.dataIPShortCut->cAlphaArgs(6),
ErrorsFound,
Expand Down
5 changes: 3 additions & 2 deletions src/EnergyPlus/ChillerElectricASHRAE205.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
#include <EnergyPlus/EMSManager.hh>
#include <EnergyPlus/EnergyPlusLogger.hh>
#include <EnergyPlus/FaultsManager.hh>
#include <EnergyPlus/FileSystem.hh>
#include <EnergyPlus/FluidProperties.hh>
#include <EnergyPlus/General.hh>
#include <EnergyPlus/GeneralRoutines.hh>
Expand Down Expand Up @@ -146,9 +147,9 @@ void getChillerASHRAE205Input(EnergyPlusData &state)
// Since logger context must persist across all calls to libtk205/btwxt, it must be a member
thisChiller.LoggerContext = {&state, format("{} \"{}\"", state.dataIPShortCut->cCurrentModuleObject, thisObjectName)};
thisChiller.Representation = std::dynamic_pointer_cast<tk205::rs0001_ns::RS0001>(
RSInstanceFactory::create("RS0001", rep_file_path.string().c_str(), std::make_shared<EnergyPlusLogger>()));
RSInstanceFactory::create("RS0001", FileSystem::toString(rep_file_path).c_str(), std::make_shared<EnergyPlusLogger>()));
if (nullptr == thisChiller.Representation) {
ShowSevereError(state, format("{} is not an instance of an ASHRAE205 Chiller.", rep_file_path.string()));
ShowSevereError(state, format("{} is not an instance of an ASHRAE205 Chiller.", rep_file_path));
ErrorsFound = true;
}
thisChiller.Representation->performance.performance_map_cooling.get_logger()->set_message_context(&thisChiller.LoggerContext);
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/ChillerIndirectAbsorption.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ void GetIndirectAbsorberInput(EnergyPlusData &state)
state.dataIPShortCut->cAlphaArgs(10),
"Hot Water Nodes");
} else {
thisChiller.SteamFluidIndex = FluidProperties::FindRefrigerant(state, fluidNameSteam);
thisChiller.SteamFluidIndex = FluidProperties::GetRefrigNum(state, fluidNameSteam);
thisChiller.GeneratorInletNodeNum = NodeInputManager::GetOnlySingleNode(state,
state.dataIPShortCut->cAlphaArgs(9),
ErrorsFound,
Expand Down
Loading

5 comments on commit e583596

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

allow_wahp_afn (lymereJ) - Win64-Windows-10-VisualStudio-16: OK (2858 of 2863 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1571
  • Failed: 5

Build Badge Test 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.

allow_wahp_afn (lymereJ) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3686 of 3696 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1572
  • Failed: 1
  • SEGFAULT: 5

integration Test Summary

  • Passed: 795
  • Failed: 2

regression Test Summary

  • Passed: 809
  • Failed: 2

Build Badge Test 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.

allow_wahp_afn (lymereJ) - x86_64-MacOS-10.18-clang-15.0.0: OK (3654 of 3655 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1577
  • Failed: 1

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.

allow_wahp_afn (lymereJ) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (795 of 795 tests passed, 0 test warnings)

Build Badge Test Badge Coverage 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.

allow_wahp_afn (lymereJ) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (2070 of 2071 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1577
  • Failed: 1

Build Badge Test Badge Coverage Badge

Please sign in to comment.