Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Space Followup Release #9142

Merged
merged 10 commits into from
Oct 18, 2021
Merged

Conversation

Myoldmopar
Copy link
Member

Pull request from the space branch into the v9.6.0 space baseline branch. This PR is purely for creating a bug fix release package.

See #9132 for the changes included here, though it may differ slightly. That particular PR will bring the changes into develop, which is different from this PR.

@Myoldmopar Myoldmopar added the Defect Includes code to repair a defect in EnergyPlus label Oct 18, 2021
Copy link
Member Author

@Myoldmopar Myoldmopar left a comment

Choose a reason for hiding this comment

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

OK, this all seems fine. I have one question about the incrementing of int mass surfaces but everything else looks good.

@@ -3,7 +3,7 @@ results_path : _posts
results_base_url : https://nrel.github.io/EnergyPlusBuildResults
regression_repository : NREL/EnergyPlusRegressionTool
regression_branch : master # this is the branch of NREL/EnergyPlusRegressionTool to use
regression_baseline_default : develop # this is the branch to use as the baseline for regressions
regression_baseline_default : SpaceReleaseBranchBaseline # this is the branch to use as the baseline for regressions
Copy link
Member Author

Choose a reason for hiding this comment

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

This change just ensures that regressions will be compared the baseline branch instead of develop, which has moved since release. This is an irrelevant change.

\item
There is no full heat balance at the Enclosure level. Each Enclosure only balances the radiant/solar flux on each Surface. These fluxes then become part of the Surface inside heat balance.
\end{itemize}
\end{description}
Copy link
Member Author

Choose a reason for hiding this comment

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

This is nice additional detail.

@@ -243,7 +243,7 @@ \subsubsection{Inputs}\label{inputs-025}
\begin{figure}[hbtp] % fig 48
\centering
\includegraphics[width=0.9\textwidth, height=0.9\textheight, keepaspectratio=true]{media/image083.png}
\caption{Graphical representation fo the dynamic predictive clothing insulation model \protect \label{fig:graphical-representation-fo-the-dynamic}}
\caption{Graphical representation of the dynamic predictive clothing insulation model \protect \label{fig:graphical-representation-of-the-dynamic}}
Copy link
Member Author

Choose a reason for hiding this comment

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

OK 😄


The name of the SpaceList object. Must be unique across SpaceLists and Spaces.
The name of the SpaceList object. This name must be unique across Zone, Space, ZoneList, and SpaceList names.
Copy link
Member Author

Choose a reason for hiding this comment

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

Additional detail is helpful.

@@ -9261,10 +9261,13 @@ Space,
\min-fields 3
\extensible:1
A1, \field Name
\note Name of the Space.
\note This name must be unique across Zone, Space, ZoneList, and SpaceList names.
Copy link
Member Author

Choose a reason for hiding this comment

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

OK, additional notes don't affect anything.

cCurrentModuleObject + "=\"" + state.dataIPShortCut->cAlphaArgs(1) + "\", invalid " +
state.dataIPShortCut->cAlphaFieldNames(2) + "=\"" + state.dataIPShortCut->cAlphaArgs(2) + "\".");
ErrorsFound = true;
int spaceNum = UtilityRoutines::FindItemInList(state.dataIPShortCut->cAlphaArgs(2), state.dataHeatBal->space);
Copy link
Member Author

Choose a reason for hiding this comment

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

OK, so conditionally set the zone num and/or emit a severe error.

Array1D_bool const &lAlphaBlanks,
Array1D_string const &cAlphaFields,
[[maybe_unused]] Array1D_string const &cNumericFields, // Unused
bool &ErrorsFound // If errors found in input
bool &ErrorsFound // If errors found in input
Copy link
Member Author

Choose a reason for hiding this comment

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

I'll take less arguments!

@@ -7039,7 +7039,9 @@ namespace SurfaceGeometry {
if (Item1 == 0 && state.dataHeatBal->NumOfZoneLists > 0)
ZLItem = UtilityRoutines::FindItemInList(state.dataIPShortCut->cAlphaArgs(3), state.dataHeatBal->ZoneList);
if (Item1 > 0) {
++NumIntMassSurfaces;
if (state.dataIPShortCut->lAlphaFieldBlanks(4)) {
Copy link
Member Author

Choose a reason for hiding this comment

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

Only increment the number of surfaces if the field is blank. I'm not sure I get why, I'll ask separately.

@@ -1322,6 +1322,37 @@ void SetUpZoneSizingArrays(EnergyPlusData &state)
state.dataSize->CalcFinalZoneSizing(CtrlZoneNum).MinOA);
}
}

// Populate DesignSpecification:OutdoorAir:SpaceList spaces
Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, makes sense.

@@ -52,7 +52,14 @@

// EnergyPlus Headers
#include <EnergyPlus/Data/EnergyPlusData.hh>
#include <EnergyPlus/DataHeatBalance.hh>
Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not going to be reviewing any unit test code here for today.

@Myoldmopar
Copy link
Member Author

Mac is happy here. For expedience I'm going to go ahead and merge this and kick off an RC.

@Myoldmopar Myoldmopar merged commit 4b123cf into SpaceReleaseBranchBaseline Oct 18, 2021
@Myoldmopar Myoldmopar deleted the SpaceReleaseBranch branch April 21, 2022 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Defect Includes code to repair a defect in EnergyPlus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants