Merge pull request #11470 from NatLabRockies/misc-issues

Fix a few miscellaneous issues

Author: mitchute

doc/engineering-reference/src/alternative-modeling-processes/hybrid-model.tex

@@ -8,7 +8,7 @@ \subsection{Overview}
 
 The new hybrid modeling approach uses the inverse modeling method to improve the accuracy of the building energy simulation for existing buildings, which adds measured data to solve uncertain model parameters. The hybrid modeling approach builds upon the virtue of the physics-based model taking advantage of measured data. The approach uses measured zone air temperature, humidity ratio, or CO$_2$ concentration to solve highly uncertain parameters such as internal thermal mass, infiltration airflow rate, and people count with the reformulated zone heat, moisture, or CO$_2$ balance equations. Figure~\ref{fig:hybrid-model-solution-diagram} shows the relationship among the measurements and unknown parameters.
 
-\begin{figure}[h]
+\begin{figure}[htbp]
 \begin{center}
 \includegraphics[width=295pt]{media/img_HybridModel-0.png}
 \caption{Relationship among measurements and unknown parameters}\protect \label{fig:hybrid-model-solution-diagram}
@@ -18,7 +18,7 @@ \subsection{Overview}
 
 Figure~\ref{fig:hybrid-model-conceptual-diagram} illustrates a conceptual diagram that easily express the concept of the hybrid modeling approach with measured air temperature.
 
-\begin{figure}[h]
+\begin{figure}[htbp]
 \begin{center}
 \includegraphics[width=295pt]{media/img_HybridModel-1.png}
 \caption{Hybrid model conceptual diagram}\protect \label{fig:hybrid-model-conceptual-diagram}
@@ -138,7 +138,7 @@ \subsubsection{Zone air CO$_2$ balance algorithm}\label{Zone-air-CO$_2$-balance-
 \subsection{Internal thermal mass hybrid modeling method}\label{internal-thermal-mass-hybrid-modeling method}
 There are two approaches to model internal thermal mass in EnergyPlus. One approach is to use the internal mass objects to define construction specifications of internal furnishing materials, and the other is to use the temperature capacitance multipliers. The multiplier increases zone air capacity as it represents the effective storage capacity of the zone interior thermal mass. Figure~\ref {fig:two-approaches-of-representing-interior-thermal-mass-in-EnergyPlus} illustrates two approaches of representing interior thermal mass in EnergyPlus.
 
-\begin{figure}[h]
+\begin{figure}[htbp]
 \begin{center}
 \includegraphics[width=428pt]{media/img_HybridModel-2.png}
 \caption{Two approaches of representing interior thermal mass in EnergyPlus}\protect \label{fig:two-approaches-of-representing-interior-thermal-mass-in-EnergyPlus}

doc/output-details-and-examples/src/output-files/eplustbl-lt-ext-gt.tex

@@ -1018,7 +1018,7 @@ \subsection{Equipment Summary}\label{equipment-summary}
 	Plantloop Branch Name
 \end{itemize}
 
-\begin{figure}[h!]
+\begin{figure}[htbp]
 \centering
 \includegraphics{media/boiler-table-example.PNG}
 \caption{}
@@ -1051,7 +1051,7 @@ \subsection{Equipment Summary}\label{equipment-summary}
 	Condenser Loop Branch Name
 \end{itemize}
 
-\begin{figure}[h!]
+\begin{figure}[htbp]
 \centering
 \includegraphics{media/cooling-tower-table-example.PNG}
 \caption{}
@@ -1074,7 +1074,7 @@ \subsection{Equipment Summary}\label{equipment-summary}
 	Minimum Loop Flow Rate [m3/s]
 \end{itemize}
 
-\begin{figure}[h!]
+\begin{figure}[htbp]
 \centering
 \includegraphics{media/plantloop-table-example.PNG}
 \caption{}
@@ -1121,7 +1121,7 @@ \subsection{Equipment Summary}\label{equipment-summary}
 	Minimum Outdoor Flow Schedule Name
 \end{itemize}
 
-\begin{figure}[h!]
+\begin{figure}[htbp]
 \centering
 \includegraphics{media/air-terminal-table-example.PNG}
 \caption{}
@@ -1153,7 +1153,7 @@ \subsection{Equipment Summary}\label{equipment-summary}
 \end{itemize}
 
 
-\begin{figure}[h!]
+\begin{figure}[htbp]
 \centering
 \includegraphics{media/air-heat-recovery-table-example.PNG}
 \caption{}
@@ -1300,7 +1300,7 @@ \subsection{Envelope Summary}\label{envelope-summary}
 
 The columns for this report are shown as the ten possible layers of the construction, in order. An example of the report is shown.
 
-\begin{figure}[h!]
+\begin{figure}[htbp]
 \centering
 \includegraphics{media/layers-table-example.PNG}
 \caption{}
@@ -1885,7 +1885,7 @@ \subsection{System Summary}\label{system-summary}
 
 An example of the report is shown here
 
-\begin{figure}[h!]
+\begin{figure}[htbp]
 \centering
 \includegraphics{media/thermostat-schedule-table-example.PNG}
 \caption{}
@@ -1926,7 +1926,7 @@ \subsection{HVAC Topology}\label{hvac-topology}
 
 An example of the report is shown here
 
-\begin{figure}[h!]
+\begin{figure}[htbp]
 \centering
 \includegraphics{media/air-supply-side-table-example.PNG}
 \caption{}
@@ -1962,7 +1962,7 @@ \subsection{HVAC Topology}\label{hvac-topology}
 
 An example of the report is shown here
 
-\begin{figure}[h!]
+\begin{figure}[htbp]
 \centering
 \includegraphics{media/air-demand-side-table-example.PNG}
 \caption{}
@@ -1992,7 +1992,7 @@ \subsection{HVAC Topology}\label{hvac-topology}
 
 An example of the report is shown here
 
-\begin{figure}[h!]
+\begin{figure}[htbp]
 \centering
 \includegraphics{media/zone-equipment-table-example.png}
 \caption{}
@@ -2022,7 +2022,7 @@ \subsection{HVAC Topology}\label{hvac-topology}
 
 An example of the report is shown here
 
-\begin{figure}[h!]
+\begin{figure}[htbp]
 \centering
 \includegraphics{media/plant-loop-table-example.png}
 \caption{}

tst/EnergyPlus/unit/FileSystem.unit.cc

@@ -244,7 +244,7 @@ TEST(FileSystem, make_and_remove_Directory)
     EXPECT_TRUE(EnergyPlus::FileSystem::fileExists(filePath));
     EXPECT_FALSE(EnergyPlus::FileSystem::directoryExists((filePath)));
 
-    fs::remove_all("sandbox");
+    fs::remove_all("sandboxA");
 }
 
 TEST(FileSystem, Elaborate)