-
Notifications
You must be signed in to change notification settings - Fork 425
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Fix latex issues via value added scripts #8027
Changes from all commits
302b20e
cac5222
2fcdaa3
c2f77d9
78e1ebd
cfbd400
278224e
23b6f0c
7411d92
acc2a3c
b536523
e5d3608
f855703
03b0807
78c940c
bf724d0
f0ed856
249ee6b
ccfdcfc
cacdb9d
91a0949
97c55af
7e43ca9
22080aa
e743528
ec74c96
97b8b77
99c0811
0ad04a8
a2e8ad4
b4f290c
3bbe35c
b4db3c0
6ca31e0
9b736eb
48ebc50
9f79612
f582916
17f2edd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,13 @@ cmake_minimum_required(VERSION 3.5.1) | |
|
||
set_property(GLOBAL PROPERTY USE_FOLDERS ON) | ||
|
||
if(NOT EXISTS ${PYTHON_EXECUTABLE}) | ||
# we are making *a Python 3.6 Interpreter* a required dependency, so find it here | ||
find_package(PythonInterp 3.6 REQUIRED) | ||
endif() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It would be cool to just reuse the previously found Python, but I know that may be an annoying thing to manage, so it's OK. |
||
|
||
option( DOCS_TESTING "Test the docs for issues" OFF ) | ||
|
||
# this _should_ find the xelatex compiler, but for some reason it isn't populating for me | ||
find_package(LATEX) | ||
# so we'll create a cache variable which will be available to the add_subdirectory call below | ||
|
@@ -14,7 +21,7 @@ string(REPLACE pdflatex xelatex XELATEX ${PDFLATEX_COMPILER}) | |
set(TEX_INTERACTION "batchmode" CACHE STRING "Choose the interaction mode for TeX.") | ||
set_property(CACHE TEX_INTERACTION PROPERTY STRINGS "nonstopmode" "batchmode") | ||
if( EXISTS ${XELATEX} ) | ||
# and if it does, just add the doc/CMakeLists commands | ||
# and if it does, just add the doc/CMakeLists commands | ||
# let's create a folder to drop ONLY PDFs in once they are built, this will allow easy upload to s3 | ||
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/pdf) | ||
file(COPY ${PROJECT_SOURCE_DIR}/index.html DESTINATION ${PROJECT_BINARY_DIR}/pdf) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -128,7 +128,7 @@ \subsection{MODELISAR Notice}\label{modelisar-notice} | |
|
||
This file is licensed by the copyright holders under the BSD License\footnote{\url{http://www.opensource.org/licenses/bsd-license.html\textgreater}}: | ||
|
||
\begin{center}\rule{0.5\linewidth}{\linethickness}\end{center} | ||
\begin{center}\rule{0.5\linewidth}{0.4pt}\end{center} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What's the purpose of this change? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a fix for a warning generated by LaTeX. |
||
|
||
Redistribution and use in source and binary forms, with or withoutmodification, are permitted provided that the following conditions are met: | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,5 +11,13 @@ macro( CREATE_DOC_TARGET SOURCE_FILENAME OUTPUT_FILENAME ) | |
) | ||
|
||
add_dependencies(docs zPDF_${OUTPUT_FILENAME}) | ||
|
||
set_target_properties(zPDF_${OUTPUT_FILENAME} PROPERTIES FOLDER Documentation) | ||
|
||
if (DOCS_TESTING) | ||
add_custom_command(TARGET zPDF_${OUTPUT_FILENAME} | ||
POST_BUILD | ||
COMMAND ${PYTHON_EXECUTABLE} "${PROJECT_SOURCE_DIR}/tools/parse_latex_log.py" "${PROJECT_SOURCE_DIR}/${SOURCE_FILENAME}/${SOURCE_FILENAME}.log" "${PROJECT_SOURCE_DIR}/${SOURCE_FILENAME}" "${PROJECT_BINARY_DIR}/${OUTPUT_FILENAME}_errors.json" | ||
) | ||
endif() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. OK, so if this is just a POST_BUILD on the PDF building portion, then the file should be available once "make" is complete. In this case, I think I actually could have CI find the error files early enough to catch these as build errors, not test failures. Let me know if I am correct in the build step and I can make an alteration to CI. |
||
endmacro() |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -76,7 +76,7 @@ \subsection{Sky Radiation Modeling}\label{sky-radiation-modeling} | |
\begin{table}[hbtp] | ||
\centering | ||
\begin{tabular}{cl} | ||
\textbf{Author} & \epsilon_{sky, clear} \\ \\ | ||
\textbf{Author} & $\epsilon_{sky, clear}$ \\ \\ | ||
Clark \& Allen & $= 0.787 + 0.764 \ln\left(T_{dp}/273\right)$ \\ \\ | ||
Martin \& Berdahl & $= 0.758 + 0.521 \left(T_{dp}/100\right) + 0.625 \left(T_{dp} / 100\right)^2$ \\ \\ | ||
Brunt & $= 0.618 + 0.056 \left(P_{wv}\right)^{0.5}$ \\ \\ | ||
|
@@ -111,10 +111,10 @@ \subsection{Sky Radiation Modeling}\label{sky-radiation-modeling} | |
\noindent Example: | ||
\newline | ||
|
||
Clear sky ($N=0$), $T_{db} = 20 + 273.15 = \SI{293.15}{\kelivin}$, $T_{dp} = 10 + 273.15 = \SI{283.15}{\kelvin}$ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah |
||
Clear sky ($N=0$), $T_{db} = 20 + 273.15 = \SI{293.15}{\kelvin}$, $T_{dp} = 10 + 273.15 = \SI{283.15}{\kelvin}$ | ||
\newline | ||
|
||
$\epsilon_{sky} = \left(0.787 + 0.764 \ln\left(283.15/273\right)\right) \left(1 + 0.0224 N - 0.0035 N^2 + 0.00028 N^3) = 0.815$ | ||
$\epsilon_{sky} = \left(0.787 + 0.764 \ln\left(283.15/273\right)\right) \left(1 + 0.0224 N - 0.0035 N^2 + 0.00028 N^3 \right) = 0.815$ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice to see these balanced parentheses being found. |
||
\newline | ||
|
||
$IR_H = 0.815 5.6697E-8 293.15^4 = \SI{341.2}{\watt\per\meter\squared}$ | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -196,23 +196,23 @@ \subsection{Interior Illuminance}\label{interior-illuminance} | |
The total illuminance at a reference point from all of the exterior windows in a zone is | ||
|
||
\begin{equation} | ||
{I_{tot}}({i_L}) = \sum\limits_{\scriptstyle{\rm{windows}}\atop\scriptstyle{\rm{in~zone}}} {{I_{win}}({i_s},{i_L})} | ||
{I_{tot}}({i_L}) = \sum\limits_{\genfrac{}{}{0pt}{2}{\rm{windows}}{\rm{in~zone}}} {{I_{win}}({i_s},{i_L})} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Much better. |
||
\end{equation} | ||
|
||
where i\(_{S}\) = 1 if the window is unshaded and \emph{i\(_{S}\)} = 2 if the window is shaded that time step. (Before the illuminance calculation is done the window shading control will have been simulated to determine whether or not the window is shaded.) | ||
|
||
Similarly, the total background luminance is calculated: | ||
|
||
\begin{equation} | ||
{B_{tot}}({i_L}) = \sum\limits_{\scriptstyle{\rm{windows}}\atop\scriptstyle{\rm{in~zone}}} {{B_{win}}({i_s},{i_L})} | ||
{B_{tot}}({i_L}) = \sum\limits_{\genfrac{}{}{0pt}{2}{\rm{windows}}{\rm{in~zone}}} {{B_{win}}({i_s},{i_L})} | ||
\end{equation} | ||
|
||
\subsection{Glare Index}\label{glare-index-000} | ||
|
||
The net glare index at each reference point is calculated as: | ||
|
||
\begin{equation} | ||
{G_I}({i_L}) = 10{\log_{10}}\sum\limits_{\scriptstyle{\rm{windows}}\atop\scriptstyle{\rm{in zone}}} {\frac{{{S_{win}}{{({i_L},{i_S})}^{1.6}}\Omega {{({i_L})}^{0.8}}}}{{B({i_L}) + 0.07\omega {{({i_L})}^{0.5}}{S_{win}}({i_L},{i_S})}}} | ||
{G_I}({i_L}) = 10{\log_{10}}\sum\limits_{\genfrac{}{}{0pt}{2}{\rm{windows}}{\rm{in~zone}}} {\frac{{{S_{win}}{{({i_L},{i_S})}^{1.6}}\Omega {{({i_L})}^{0.8}}}}{{B({i_L}) + 0.07\omega {{({i_L})}^{0.5}}{S_{win}}({i_L},{i_S})}}} | ||
\end{equation} | ||
|
||
where | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1611,38 +1611,38 @@ \subsubsection{Special Calculations for Coil:Cooling:DX:TwoStageWithHumidityCont | |
|
||
1. No latent control | ||
|
||
Perform normal operation with SHR_{Normal} | ||
Perform normal operation with SHR\(_{Normal}\) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The output of these changes look identical on my machine. What's the purpose? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Another warning and, again, the LaTeX compiler is able to guess in this instance and muddle through. What's wrong is the |
||
|
||
2. Latent control | ||
|
||
a. If CoilSHR >= SHR_{Normal} | ||
a. If CoilSHR >= SHR\(_{Normal}\) | ||
|
||
Perform normal operation to meet sensible load, adjusted by PLR for a single capacity equipmentl | ||
|
||
SenLoad = SenOut * PLR | ||
|
||
b. Else if (SHR_{Normal} > CoilSHR And CoilSHR >= SHR_{Sub}) | ||
b. Else if SHR\(_{Normal}\) > CoilSHR And CoilSHR >= SHR\(_{Sub}\) | ||
|
||
Perform combination between normal and subcooling operation | ||
|
||
CoilSHR = SHR_{Sub} * r_{Sub} + SHR_{Normal} * (1 - r_{Sub}) | ||
CoilSHR = SHR\(_{Sub}\) * r\(_{Sub}\) + SHR\(_{Normal}\) * (1 - r\(_{Sub})\) | ||
|
||
SenLoad = [SenOut_{Sub} * r_{Sub} + SenOut_{Normal} * (1 - r_{Sub})] * PLR | ||
SenLoad = [SenOut\(_{Sub}\) * r\(_{Sub}\) + SenOut\(_{Normal}\) * (1 - r\(_{Sub}\))] * PLR | ||
|
||
c. Else if (SHR_{Sub} > CoilSHR And CoilSHR >= SHR_{Reheat}) | ||
c. Else if SHR\(_{Sub}\) > CoilSHR And CoilSHR >= SHR\(_{Reheat}\) | ||
|
||
Perform combination between normal and reheat operation | ||
|
||
CoilSHR = SHR_{Reheat} * r_{Reheat} + SHR_{Normal} * (1 - r_{Sub}) | ||
CoilSHR = SHR\(_{Reheat}\) * r\(_{Reheat}\) + SHR\(_{Normal}\) * (1 - r\(_{Sub}\)) | ||
|
||
SenLoad = [SenOut_{Sub} * r_{Sub} + SenOut_{Normal} * (1 - r_{Sub})] * PLR | ||
SenLoad = [SenOut\(_{Sub}\) * r\(_{Sub}\) + SenOut\(_{Normal}\) * (1 - r\(_{Sub}\))] * PLR | ||
|
||
|
||
Else | ||
|
||
Performreheatg operation | ||
|
||
SenLoad = SenOut_{Reheat} * PLR | ||
SenLoad = SenOut\(_{Reheat}\) * PLR | ||
|
||
End If | ||
|
||
|
@@ -5190,7 +5190,7 @@ \subsubsection{Model Description}\label{model-description-7} | |
The temperature of the water leaving the desuperheater is then calculated as | ||
|
||
\begin{equation} | ||
{T_{water,outlet}} = {T_{water,inlet}} + \frac{{{Q_{coil}}}}{{{{\dot m}_{water}}\cdot {C_{p,water}}}} ~for~ {\dot m_{water}} \textgreater{} 0 | ||
{T_{water,outlet}} = {T_{water,inlet}} + \frac{{{Q_{coil}}}}{{{{\dot m}_{water}}\cdot {C_{p,water}}}} ~for~ {\dot m_{water}} > 0 | ||
\end{equation} | ||
|
||
\begin{equation} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sometime in the future we need to move away from this PythonInterp as it was deprecated in 2018 in favor of
find_package(Python3)
, but first we need to move our minimum cmake up.