Skip to content

Commit be2dee8

Browse files
authored
clean-up and correct lab docs (#580)
* added new he plume; with write_up. * added new break sim; with write_up. * added Rec IC for VOF. * updated all pdfs for write ups. * updated xml and inpout file for examples. * modify break write up
1 parent 58a10b8 commit be2dee8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1229
-17
lines changed

examples/hula/milestone.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
<Parameter name="aggregation: type" type="string" value="uncoupled"/>
1616
<Parameter name="aggregation: drop tol" type="double" value="0.02"/>
17-
<Parameter name="aggregation: phase2a include root" type="bool" value="false"/>
1817
<Parameter name="repartition: enable" type="bool" value="true"/>
1918
<Parameter name="repartition: min rows per proc" type="int" value="1000"/>
2019
<Parameter name="repartition: start level" type="int" value="2"/>

examples/shapes/dgSquare_R0.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ linear_solvers:
2525
realms:
2626

2727
- name: realm_1
28-
mesh: mesh/square_R0.g
28+
mesh: square_R0.g
2929
use_edges: no
3030
automatic_decomposition_type: rcb
3131

examples/shapes/milestone.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
<Parameter name="aggregation: type" type="string" value="uncoupled"/>
1616
<Parameter name="aggregation: drop tol" type="double" value="0.02"/>
17-
<Parameter name="aggregation: phase2a include root" type="bool" value="false"/>
1817
<Parameter name="repartition: enable" type="bool" value="true"/>
1918
<Parameter name="repartition: min rows per proc" type="int" value="1000"/>
2019
<Parameter name="repartition: start level" type="int" value="2"/>

examples/street/milestone_aspect_ratio_smooth.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<Parameter name="aggregation: type" type="string" value="uncoupled"/>
1616
<Parameter name="aggregation: drop tol" type="double" value="0.01"/>
1717
<Parameter name="aggregation: drop scheme" type="string" value="distance laplacian"/>
18-
<Parameter name="aggregation: phase2a include root" type="bool" value="false"/>
1918

2019
<Parameter name="repartition: enable" type="bool" value="true"/>
2120
<Parameter name="repartition: min rows per proc" type="int" value="1000"/>
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*------------------------------------------------------------------------*/
2+
/* Copyright 2014 Sandia Corporation. */
3+
/* This software is released under the license detailed */
4+
/* in the file, LICENSE, which is located in the top-level Nalu */
5+
/* directory structure */
6+
/*------------------------------------------------------------------------*/
7+
8+
#ifndef RecMixFracAuxFunction_h
9+
#define RecMixFracAuxFunction_h
10+
11+
#include <AuxFunction.h>
12+
13+
#include <vector>
14+
15+
namespace sierra{
16+
namespace nalu{
17+
18+
class RecMixFracAuxFunction : public AuxFunction
19+
{
20+
public:
21+
22+
RecMixFracAuxFunction();
23+
24+
virtual ~RecMixFracAuxFunction() {}
25+
26+
virtual void do_evaluate(
27+
const double * coords,
28+
const double time,
29+
const unsigned spatialDimension,
30+
const unsigned numPoints,
31+
double * fieldPtr,
32+
const unsigned fieldSize,
33+
const unsigned beginPos,
34+
const unsigned endPos) const;
35+
};
36+
37+
} // namespace nalu
38+
} // namespace Sierra
39+
40+
#endif

reg_tests/CTestList.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,6 @@ if(ENABLE_LABORATORY_TESTS)
182182
add_test_l(2d_quad9_couette 4)
183183
add_test_l(3d_hex8_open_jet 8)
184184
add_test_l(3d_tet4_pipe 8)
185+
add_test_l(3d_hex8_dam_break 8)
186+
add_test_l(2d_quad9_helium 8)
185187
endif(ENABLE_LABORATORY_TESTS)
Binary file not shown.

reg_tests/test_files/laboratory/2d_quad4_channel/write_up/2d_quad4_channel_laboratory.tex

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ \section{Introduction}
1717
This case provides a description for two-dimensional channel flow
1818
with constant properties, and a constant pressure gradient.
1919

20-
\section{Theory}
20+
\section{Domain}
2121
The two-dimensional geometry for this tutorial is captured in
2222
Figure~\ref{fig:geom} where the rectangular domain is defined by the
2323
height, $H$, and length, $L$. The streamwise and vertical velocity are
@@ -39,6 +39,7 @@ \section{Theory}
3939
\label{fig:geom}
4040
\end{figure}
4141

42+
\section{Theory}
4243
The variable-density low-Mach equation set is defined by the continuity and momentum equation,
4344

4445
\begin{align}
@@ -154,7 +155,7 @@ \section{Discussion Points}
154155
\item Ensure that derivation of Equation~\ref{eq:uMax} is clear.
155156
\item Ensure that derivation of Equation~\ref{eq:balance} and the expression
156157
$\frac{dP}{dx} = 2\tau_w$ is clear.
157-
\item Explore the mesh and input file associated with this case.
158+
\item Explore the mesh and input file specifications associated with this case.
158159
\item In Figure~\ref{fig:results}, it is noted that the difference between
159160
the analytical and simulation result is zero. When you run the two mesh resolutions provided,
160161
does this finding hold? Why is this?
Binary file not shown.

reg_tests/test_files/laboratory/2d_quad9_couette/write_up/2d_quad9_couette_laboratory.tex

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ \section{Introduction}
1717
This case provides a description for two-dimensional Couette flow
1818
with constant properties, and a zero pressure gradient.
1919

20-
\section{Theory}
20+
\section{Domain}
2121
The two-dimensional geometry for this tutorial is captured in
2222
Figure~\ref{fig:geom} where the rectangular domain is defined by the
2323
height, $H$, and length, $L$. The streamwise and vertical velocity are
@@ -39,6 +39,7 @@ \section{Theory}
3939
\label{fig:geom}
4040
\end{figure}
4141

42+
\section{Theory}
4243
The variable-density low-Mach equation set is defined by the continuity and momentum equation,
4344

4445
\begin{align}
@@ -113,13 +114,13 @@ \subsection{Simulation Specification and Results}
113114
provided above.
114115

115116
\begin{figure}[!htbp]
116-
\subfloat[]
117117
\centering
118+
\subfloat[]
118119
{
119120
\includegraphics[height=1.2in]{images/2d_quad9_couette_results_early.png}
120121
}
121-
\subfloat[]
122122
\centering
123+
\subfloat[]
123124
{
124125
\includegraphics[height=1.2in]{images/2d_quad9_couette_results_late.png}
125126
}
@@ -134,7 +135,7 @@ \section{Discussion Points}
134135

135136
\begin{itemize}
136137
\item Ensure that derivation of Equation~\ref{eq:simpleEqWithoutK} is clear.
137-
\item Explore the mesh and input file associated with this case.
138+
\item Explore the mesh and input file specifications associated with this case.
138139
\item In Figure~\ref{fig:results}, the flow results demonstrate a linear profile, as
139140
expected. Based on past experience with a linear basis, comment on the usage of a quadratic
140141
basis.

0 commit comments

Comments
 (0)