crp/MSRE
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/openmsr/msre

Browse source
This commit is contained in:
aslakstubsgaard 2018-12-14 12:07:11 +01:00
commit 7c44c3c83f
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
report/msrecore.pdf (Stored with Git LFS)
View file

Binary file not shown.

12
report/msrecore.tex
View file

@ -220,7 +220,11 @@ figure \ref{3229-fig9} shows a schematized cross section view of the reactor and
\centering
\centering
\fbox{\includegraphics[page=122,width=0.8\textwidth,trim={4cm 4.5cm 4cm 3cm},clip]{./references/ORNL-TM-3039.pdf}}
<<<<<<< HEAD
\caption{reactor access nozzle showing 10- and 2-1/2 in. annuli \parencite[figure 5.10]{ornl-tm-3229}.}
=======
\caption{reactor access nozzle showing 10- and 2-1/2 in. annuli \parencite[figure 5.10]{ornl-tm-3039}.}
>>>>>>> 01f03e808467f25abf47a4f7f547ed45bcd324be
\label{3039-fig5-10}
\end{figure}
@ -231,7 +235,11 @@ figure \ref{3229-fig9} shows a schematized cross section view of the reactor and
\centering
\centering
\fbox{\includegraphics[page=123,width=0.8\textwidth,trim={4cm 8cm 2.5cm 3.5cm},clip]{./references/ORNL-TM-3039.pdf}}
<<<<<<< HEAD
\caption{reactor fuel outlet strainer \parencite[figure 5.11]{ornl-tm-3229}.}
=======
\caption{reactor fuel outlet strainer \parencite[figure 5.11]{ornl-tm-3039}.}
>>>>>>> 01f03e808467f25abf47a4f7f547ed45bcd324be
\label{3039-fig5-11}
\end{figure}
@ -431,7 +439,11 @@ the control stringer and sample assembly is further detailed in figure \ref{6124
\centering
\centering
\fbox{\includegraphics[page=130,width=0.8\textwidth,trim={3.8cm 3.7cm 3.5cm 2.5cm},clip,angle=0.25]{./references/ORNL-TM-3039.pdf}}
<<<<<<< HEAD
\caption{msre surveillance facility inside reactor vessel \parencite[figure 5.14]{ornl-tm-3229}.}
=======
\caption{msre surveillance facility inside reactor vessel \parencite[figure 5.14]{ornl-tm-3039}.}
>>>>>>> 01f03e808467f25abf47a4f7f547ed45bcd324be
\label{3039-fig5-11}
\end{figure}