Skip to content

Commit

Permalink
Merge branch 'develop' into 10508HybridModelThermalMassCalculationIssue
Browse files Browse the repository at this point in the history
  • Loading branch information
@RKStrand
RKStrand committed Jun 21, 2024
2 parents 1ca21b8 + 1d1665a commit 320219f
Show file tree
Hide file tree
Showing 33 changed files with 243 additions and 241 deletions.
48 changes: 25 additions & 23 deletions doc/input-output-reference/src/overview/group-thermal-zone-description-geometry.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2926,19 +2926,21 @@ \subsection{Window Output Variables}\label{window-output-variables}
Output variables applicable to exterior windows and glass doors:

\begin{lstlisting}
Zone,Average,Zone Windows Total Transmitted Solar Radiation Rate [W]
Zone,Average,Enclosure Windows Total Transmitted Solar Radiation Rate [W]
Zone,Sum,Enclosure Windows Total Transmitted Solar Radiation Energy [J]
Zone,Sum,Zone Transmitted Solar Energy [J]
Zone,Average,Zone Windows Total Heat Gain Rate [W]
Zone,Sum,Zone Windows Total Heat Gain Energy [J]
Zone,Average,Zone Windows Total Heat Loss Rate [W]
Zone,Sum,Zone Windows Total Heat Loss Energy [J]
Zone,Average,Zone Exterior Windows Total Transmitted Beam Solar Radiation Rate [W]
Zone,Sum,Zone Exterior Windows Total Transmitted Beam Solar Radiation Energy [J]
Zone,Average,Zone Interior Windows Total Transmitted Beam Solar Radiation Rate [W]
Zone,Sum,Zone Interior Windows Total Transmitted Beam Solar Radiation Energy [J]
Zone,Average,Zone Exterior Windows Total Transmitted Diffuse Solar Radiation Rate [W]
Zone,Sum,Zone Exterior Windows Total Transmitted Diffuse Solar Radiation Energy [J]
Zone,Average,Zone Interior Windows Total Transmitted Diffuse Solar Radiation Rate [W]
Zone,Average,Enclosure Exterior Windows Total Transmitted Beam Solar Radiation Rate [W]
Zone,Sum,Enclosure Exterior Windows Total Transmitted Beam Solar Radiation Energy [J]
Zone,Average,Enclosure Interior Windows Total Transmitted Beam Solar Radiation Rate [W]
Zone,Sum,Enclosure Interior Windows Total Transmitted Beam Solar Radiation Energy [J]
Zone,Average,Enclosure Exterior Windows Total Transmitted Diffuse Solar Radiation Rate [W]
Zone,Sum,Enclosure Exterior Windows Total Transmitted Diffuse Solar Radiation Energy [J]
Zone,Average,Enclosure Interior Windows Total Transmitted Diffuse Solar Radiation Rate [W]
Zone,Sum,Enclosure Interior Windows Total Transmitted Diffuse Solar Radiation Energy [J]
Zone,Average,Surface Window Total Glazing Layers Absorbed Solar Radiation Rate [W]
Zone,Average,Surface Window Total Glazing Layers Absorbed Shortwave Radiation Rate [W]
Zone,Sum,Surface Window Total Glazing Layers Absorbed Solar Radiation Energy [J]
Expand Down Expand Up @@ -3446,11 +3448,11 @@ \subsection{Window Output Variables}\label{window-output-variables-1}

The following output variables apply to subsurfaces that are windows or glass doors. These two subsurface types are called ``window'' here. ``Exterior window'' means that the base surface of the window is an exterior wall, floor, roof or ceiling (i.e., the base surface is a \hyperref[buildingsurfacedetailed]{BuildingSurface:Detailed} with OutsideFaceEnvironment = ExteriorEnvironment). ``Interior window'' means that the base surface of the window is an inter-zone wall, floor or ceiling. ``Glass'' means a transparent solid layer, usually glass, but possibly plastic or other transparent material. ``Shading device'' means an interior, exterior or between-glass shade or blind, or an exterior screen (only exterior windows can have a shading device).

\subsubsection{Zone Windows Total Transmitted Solar Radiation Rate {[}W{]}}\label{zone-windows-total-transmitted-solar-radiation-rate-w}
\subsubsection{Enclosure Windows Total Transmitted Solar Radiation Rate {[}W{]}}\label{zone-windows-total-transmitted-solar-radiation-rate-w}

\subsubsection{Zone Windows Total Transmitted Solar Radiation Energy {[}J{]}}\label{zone-windows-total-transmitted-solar-radiation-energy-j}
\subsubsection{Enclosure Windows Total Transmitted Solar Radiation Energy {[}J{]}}\label{zone-windows-total-transmitted-solar-radiation-energy-j}

The total Surface Window Transmitted Solar Radiation Rate of all the exterior windows in a zone.
The total Surface Window Transmitted Solar Radiation Rate of all the exterior windows in an enclosure. If the user wishes to report these variables only for a specific enclosure and is uncertain as to what the name of the enclosure is, the enclosure name can be obtained from the the "Input Verification and Results Summary" output report in the "Space Summary" subtable.

\subsubsection{Zone Windows Total Heat Gain Rate {[}W{]}}\label{zone-windows-total-heat-gain-rate-w}

Expand Down Expand Up @@ -3508,35 +3510,35 @@ \subsubsection{Surface Window Transmitted Beam To Diffuse Solar Radiation Energy

For a window with a blind, this transmitted radiation consists of diffuse radiation reflected from beam by the slats. For a window with a screen, this value consists of diffuse radiation reflected by the screen material.

\subsubsection{Zone Exterior Windows Total Transmitted Beam Solar Radiation Rate {[}W{]}}\label{zone-exterior-windows-total-transmitted-beam-solar-radiation-rate-w}
\subsubsection{Enclosure Exterior Windows Total Transmitted Beam Solar Radiation Rate {[}W{]}}\label{zone-exterior-windows-total-transmitted-beam-solar-radiation-rate-w}

\subsubsection{Zone Exterior Windows Total Transmitted Beam Solar Radiation Energy {[}J{]}}\label{zone-exterior-windows-total-transmitted-beam-solar-radiation-energy-j}
\subsubsection{Enclosure Exterior Windows Total Transmitted Beam Solar Radiation Energy {[}J{]}}\label{zone-exterior-windows-total-transmitted-beam-solar-radiation-energy-j}

The sum of the Surface Window Transmitted Beam Solar Radiation Rate (see definition above) from all exterior windows in a zone.
The sum of the Surface Window Transmitted Beam Solar Radiation Rate (see definition above) from all exterior windows in an enclosure. If the user wishes to report these variables only for a specific enclosure and is uncertain as to what the name of the enclosure is, the enclosure name can be obtained from the the "Input Verification and Results Summary" output report in the "Space Summary" subtable.

\subsubsection{Zone Interior Windows Total Transmitted Beam Solar Radiation Rate {[}W{]}}\label{zone-interior-windows-total-transmitted-beam-solar-radiation-rate-w}
\subsubsection{Enclosure Interior Windows Total Transmitted Beam Solar Radiation Rate {[}W{]}}\label{zone-interior-windows-total-transmitted-beam-solar-radiation-rate-w}

\subsubsection{Zone Interior Windows Total Transmitted Beam Solar Radiation Energy {[}J{]}}\label{zone-interior-windows-total-transmitted-beam-solar-radiation-energy-j}
\subsubsection{Enclosure Interior Windows Total Transmitted Beam Solar Radiation Energy {[}J{]}}\label{zone-interior-windows-total-transmitted-beam-solar-radiation-energy-j}

The sum of the Surface Window Transmitted Beam Solar Radiation Rate (see definition above) from all interior windows in a zone.
The sum of the Surface Window Transmitted Beam Solar Radiation Rate (see definition above) from all interior windows in an enclosure. If the user wishes to report these variables only for a specific enclosure and is uncertain as to what the name of the enclosure is, the enclosure name can be obtained from the the "Input Verification and Results Summary" output report in the "Space Summary" subtable.

\subsubsection{Surface Window Transmitted Diffuse Solar Radiation Rate {[}W{]}}\label{surface-window-transmitted-diffuse-solar-radiation-rate-w}

\subsubsection{Surface Window Transmitted Diffuse Solar Radiation Energy {[}J{]}}\label{surface-window-transmitted-diffuse-solar-radiation-energy-j}

The solar radiation transmitted by an exterior window whose source is diffuse solar incident on the outside of the window. For a bare window, this transmitted radiation consists of diffuse radiation passing through the glass. For a window with a shade, this transmitted radiation is totally diffuse (shades are assumed to be perfect diffusers). For a window with a blind, this transmitted radiation consists of diffuse radiation that passes between the slats and diffuse radiation from diffuse-to-diffuse reflection from the slats. For a window with a screen, this value consists of diffuse radiation transmitted through the screen (gaps between the screen material) and diffuse radiation from diffuse-to-diffuse reflection from the screen material.

\subsubsection{Zone Exterior Windows Total Transmitted Diffuse Solar Radiation Rate {[}W{]}}\label{zone-exterior-windows-total-transmitted-diffuse-solar-radiation-rate-w}
\subsubsection{Enclosure Exterior Windows Total Transmitted Diffuse Solar Radiation Rate {[}W{]}}\label{zone-exterior-windows-total-transmitted-diffuse-solar-radiation-rate-w}

\subsubsection{Zone Exterior Windows Total Transmitted Diffuse Solar Radiation Energy {[}J{]}}\label{zone-exterior-windows-total-transmitted-diffuse-solar-radiation-energy-j}
\subsubsection{Enclosure Exterior Windows Total Transmitted Diffuse Solar Radiation Energy {[}J{]}}\label{zone-exterior-windows-total-transmitted-diffuse-solar-radiation-energy-j}

The combined beam and diffuse solar that first entered adjacent zones through exterior windows in the adjacent zones, was subsequently reflected from interior surfaces in those zones (becoming diffuse through that reflection), and was then transmitted through interior windows into the current zone.
The combined beam and diffuse solar that first entered adjacent zones through exterior windows in the adjacent zones, was subsequently reflected from interior surfaces in those zones (becoming diffuse through that reflection), and was then transmitted through interior windows into the current enclosure. If the user wishes to report these variables only for a specific enclosure and is uncertain as to what the name of the enclosure is, the enclosure name can be obtained from the the "Input Verification and Results Summary" output report in the "Space Summary" subtable.

\subsubsection{Zone Interior Windows Total Transmitted Diffuse Solar Radiation Rate {[}W{]}}\label{zone-interior-windows-total-transmitted-diffuse-solar-radiation-rate-w}
\subsubsection{Enclosure Interior Windows Total Transmitted Diffuse Solar Radiation Rate {[}W{]}}\label{zone-interior-windows-total-transmitted-diffuse-solar-radiation-rate-w}

\subsubsection{Zone Interior Windows Total Transmitted Diffuse Solar Radiation Energy {[}J{]}}\label{zone-interior-windows-total-transmitted-diffuse-solar-radiation-energy-j}
\subsubsection{Enclosure Interior Windows Total Transmitted Diffuse Solar Radiation Energy {[}J{]}}\label{zone-interior-windows-total-transmitted-diffuse-solar-radiation-energy-j}

The sum of the Surface Window Transmitted Diffuse Solar Radiation Rate (see definition above) from all interior windows in a zone.
The sum of the Surface Window Transmitted Diffuse Solar Radiation Rate (see definition above) from all interior windows in an enclosure. If the user wishes to report these variables only for a specific enclosure and is uncertain as to what the name of the enclosure is, the enclosure name can be obtained from the the "Input Verification and Results Summary" output report in the "Space Summary" subtable.

\subsubsection{Surface Window System Solar Transmittance {[]}}\label{surface-window-system-solar-transmittance}

Expand Down
20 changes: 10 additions & 10 deletions doc/input-output-reference/src/standard-output-reports/output-table-summaryreports.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1237,15 +1237,15 @@ \subsubsection{Predefined Monthly Summary Reports}\label{predefined-monthly-summ
\item
Zone Windows Total Heat Loss Rate (SumOrAverage)
\item
Zone Windows Total Transmitted Solar Radiation Rate (SumOrAverage)
Enclosure Windows Total Transmitted Solar Radiation Rate (SumOrAverage)
\item
Zone Exterior Windows Total Transmitted Beam Solar Radiation Rate (SumOrAverage)
Enclosure Exterior Windows Total Transmitted Beam Solar Radiation Rate (SumOrAverage)
\item
Zone Exterior Windows Total Transmitted Diffuse Solar Radiation Rate (SumOrAverage)
Enclosure Exterior Windows Total Transmitted Diffuse Solar Radiation Rate (SumOrAverage)
\item
Zone Interior Windows Total Transmitted Diffuse Solar Radiation Rate (SumOrAverage)
Enclosure Interior Windows Total Transmitted Diffuse Solar Radiation Rate (SumOrAverage)
\item
Zone Interior Windows Total Transmitted Beam Solar Radiation Rate (SumOrAverage)
Enclosure Interior Windows Total Transmitted Beam Solar Radiation Rate (SumOrAverage)
\end{itemize}
\paragraph{WindowEnergyZoneSummaryMonthly}\label{windowenergyzonesummarymonthly}
Expand All @@ -1256,15 +1256,15 @@ \subsubsection{Predefined Monthly Summary Reports}\label{predefined-monthly-summ
\item
Zone Windows Total Heat Loss Energy (SumOrAverage)
\item
Zone Windows Total Transmitted Solar Radiation Energy (SumOrAverage)
Enclosure Windows Total Transmitted Solar Radiation Energy (SumOrAverage)
\item
Zone Exterior Windows Total Transmitted Beam Solar Radiation Energy (SumOrAverage)
Enclosure Exterior Windows Total Transmitted Beam Solar Radiation Energy (SumOrAverage)
\item
Zone Exterior Windows Total Transmitted Diffuse Solar Radiation Energy (SumOrAverage)
Enclosure Exterior Windows Total Transmitted Diffuse Solar Radiation Energy (SumOrAverage)
\item
Zone Interior Windows Total Transmitted Diffuse Solar Radiation Energy (SumOrAverage)
Enclosure Interior Windows Total Transmitted Diffuse Solar Radiation Energy (SumOrAverage)
\item
Zone Interior Windows Total Transmitted Beam Solar Radiation Energy (SumOrAverage)
Enclosure Interior Windows Total Transmitted Beam Solar Radiation Energy (SumOrAverage)
\end{itemize}
\paragraph{AverageOutdoorConditionsMonthly}\label{averageoutdoorconditionsmonthly}
Expand Down
20 changes: 10 additions & 10 deletions src/EnergyPlus/InputProcessing/InputProcessor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2129,20 +2129,20 @@ void InputProcessor::addVariablesForMonthlyReport(EnergyPlusData &state, std::st
} else if (reportName == "WINDOWZONESUMMARYMONTHLY") {
addRecordToOutputVariableStructure(state, "*", "ZONE WINDOWS TOTAL HEAT GAIN RATE");
addRecordToOutputVariableStructure(state, "*", "ZONE WINDOWS TOTAL HEAT LOSS RATE");
addRecordToOutputVariableStructure(state, "*", "ZONE WINDOWS TOTAL TRANSMITTED SOLAR RADIATION RATE");
addRecordToOutputVariableStructure(state, "*", "ZONE EXTERIOR WINDOWS TOTAL TRANSMITTED BEAM SOLAR RADIATION RATE");
addRecordToOutputVariableStructure(state, "*", "ZONE EXTERIOR WINDOWS TOTAL TRANSMITTED DIFFUSE SOLAR RADIATION RATE");
addRecordToOutputVariableStructure(state, "*", "ZONE INTERIOR WINDOWS TOTAL TRANSMITTED DIFFUSE SOLAR RADIATION RATE");
addRecordToOutputVariableStructure(state, "*", "ZONE INTERIOR WINDOWS TOTAL TRANSMITTED BEAM SOLAR RADIATION RATE");
addRecordToOutputVariableStructure(state, "*", "ENCLOSURE WINDOWS TOTAL TRANSMITTED SOLAR RADIATION RATE");
addRecordToOutputVariableStructure(state, "*", "ENCLOSURE EXTERIOR WINDOWS TOTAL TRANSMITTED BEAM SOLAR RADIATION RATE");
addRecordToOutputVariableStructure(state, "*", "ENCLOSURE EXTERIOR WINDOWS TOTAL TRANSMITTED DIFFUSE SOLAR RADIATION RATE");
addRecordToOutputVariableStructure(state, "*", "ENCLOSURE INTERIOR WINDOWS TOTAL TRANSMITTED DIFFUSE SOLAR RADIATION RATE");
addRecordToOutputVariableStructure(state, "*", "ENCLOSURE INTERIOR WINDOWS TOTAL TRANSMITTED BEAM SOLAR RADIATION RATE");

} else if (reportName == "WINDOWENERGYZONESUMMARYMONTHLY") {
addRecordToOutputVariableStructure(state, "*", "ZONE WINDOWS TOTAL HEAT GAIN ENERGY");
addRecordToOutputVariableStructure(state, "*", "ZONE WINDOWS TOTAL HEAT LOSS ENERGY");
addRecordToOutputVariableStructure(state, "*", "ZONE WINDOWS TOTAL TRANSMITTED SOLAR RADIATION ENERGY");
addRecordToOutputVariableStructure(state, "*", "ZONE EXTERIOR WINDOWS TOTAL TRANSMITTED BEAM SOLAR RADIATION ENERGY");
addRecordToOutputVariableStructure(state, "*", "ZONE EXTERIOR WINDOWS TOTAL TRANSMITTED DIFFUSE SOLAR RADIATION ENERGY");
addRecordToOutputVariableStructure(state, "*", "ZONE INTERIOR WINDOWS TOTAL TRANSMITTED DIFFUSE SOLAR RADIATION ENERGY");
addRecordToOutputVariableStructure(state, "*", "ZONE INTERIOR WINDOWS TOTAL TRANSMITTED BEAM SOLAR RADIATION ENERGY");
addRecordToOutputVariableStructure(state, "*", "ENCLOSURE WINDOWS TOTAL TRANSMITTED SOLAR RADIATION ENERGY");
addRecordToOutputVariableStructure(state, "*", "ENCLOSURE EXTERIOR WINDOWS TOTAL TRANSMITTED BEAM SOLAR RADIATION ENERGY");
addRecordToOutputVariableStructure(state, "*", "ENCLOSURE EXTERIOR WINDOWS TOTAL TRANSMITTED DIFFUSE SOLAR RADIATION ENERGY");
addRecordToOutputVariableStructure(state, "*", "ENCLOSURE INTERIOR WINDOWS TOTAL TRANSMITTED DIFFUSE SOLAR RADIATION ENERGY");
addRecordToOutputVariableStructure(state, "*", "ENCLOSURE INTERIOR WINDOWS TOTAL TRANSMITTED BEAM SOLAR RADIATION ENERGY");

} else if (reportName == "AVERAGEOUTDOORCONDITIONSMONTHLY") {
addRecordToOutputVariableStructure(state, "*", "SITE OUTDOOR AIR DRYBULB TEMPERATURE");
Expand Down
Loading

5 comments on commit 320219f

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

10508HybridModelThermalMassCalculationIssue (RKStrand) - Win64-Windows-10-VisualStudio-16: OK (2809 of 2809 tests passed, 0 test warnings)

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.

10508HybridModelThermalMassCalculationIssue (RKStrand) - x86_64-MacOS-10.18-clang-15.0.0: OK (3598 of 3598 tests passed, 1 test warnings)

Messages:\n

  • 1 test had: AUD diffs.
  • 1 test had: RDD diffs.

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.

10508HybridModelThermalMassCalculationIssue (RKStrand) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3639 of 3639 tests passed, 1 test warnings)

Messages:\n

  • 1 test had: AUD diffs.
  • 1 test had: RDD diffs.

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.

10508HybridModelThermalMassCalculationIssue (RKStrand) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (2020 of 2020 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.

10508HybridModelThermalMassCalculationIssue (RKStrand) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (792 of 792 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.