arma-thesis

git clone https://git.igankevich.com/arma-thesis.git
Log | Files | Refs | LICENSE

commit 872b6b1681890edcc9f526fbf788615f16ba0ea2
parent 982091eb609e6e136f93cf58dbb85f48bd7f9079
Author: Ivan Gankevich <igankevich@ya.ru>
Date:   Thu, 21 Jun 2018 19:48:43 +0300

Finish second part.

Diffstat:
arma-slides.org | 120++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
slides-preamble.tex | 22+++++++++++++++++++++-
2 files changed, 97 insertions(+), 45 deletions(-)

diff --git a/arma-slides.org b/arma-slides.org @@ -8,7 +8,7 @@ #+BEAMER_THEME: SaintPetersburg #+OPTIONS: todo:nil title:nil ':t toc:nil H:2 #+STARTUP: indent -#+PROPERTY: header-args:R :results graphics :exports results +#+PROPERTY: header-args:R :results graphics :exports results :eval no-export #+begin_export latex \setbeamertemplate{title page}{% @@ -501,61 +501,93 @@ arma.plot_nonlinear(file.path("build", "nit-standing"), args) * Поле давлений под дискретно заданной взволнованной поверхностью + ** Уравнения потенциального течения + +#+beamer: \footnotesize #+begin_export latex -\begin{align*} - & \nabla^2\phi = 0 & \text{\small уравнение неразрывности}\\ +\begin{beamercolorbox}[colsep*=.75ex,vmode]{block body}% +\vspace{-\baselineskip}% +\begin{align*}% + & \nabla^2\phi = 0 + & \text{уравнение неразрывности} + \\ & \phi_t+\frac{1}{2} |\vec{\upsilon}|^2 + g\zeta=-\frac{p}{\rho} - & \text{\small динамическое ГУ на }z=\zeta(x,y,t)\\ - & - \only<1>{D\zeta} - \only<2->{\circleemph{dzeta}{D\zeta}} - = - \only<1>{\nabla \phi \cdot \vec{n}} - \only<2->{\circleemph{dphi}{\nabla \phi \cdot \vec{n}}} - & \text{\small кинематическое ГУ на }z=\zeta(x,y,t) -\end{align*} -\only<2->{% -\begin{tikzpicture}[remember picture,overlay] - \node[fill=none,baseline,anchor=south west,xshift=1cm,yshift=0cm] - (dzetaLabel) at (current page.south west) {% - \small\hspace{-1cm}субстациональная производная $\zeta$% - }; - \node[fill=none,baseline,anchor=south east,yshift=0cm] - (dphiLabel) at (current page.south east) {% - \small производная по нормали к $\zeta$% - }; - \path[->,thick] (dzetaLabel.north west) edge [bend left](dzeta.west); - \path[->,thick] (dphiLabel.north) edge [bend left,out=0](dphi.south east); -\end{tikzpicture} -} -#+end_export - -** Трехмерный случай - -#+beamer: \small - -\begin{align*} + & \text{динамическое ГУ на }z=\zeta(x,y,t) + \\ + & D\zeta = \nabla \phi \cdot \vec{n} + & \text{кинематическое ГУ на }z=\zeta(x,y,t)\\ +\end{align*}% +\vspace{-2.5\baselineskip}% +\end{beamercolorbox}% +% +\spbuArrow{}% +\vspace{-0.2cm}% +% +\begin{beamercolorbox}[colsep*=.75ex,vmode]{block body}% +\vspace{-\baselineskip}% +\begin{align*}% & \phi_{xx} + \phi_{yy} + \phi_{zz} = 0\\ & \zeta_t = \underbrace{\fillrectemph{f1}{\left(\FracSqrtZetaY{\zeta_x} - \zeta_x\right)}}_{f_1} \phi_x + \underbrace{\fillrectemph{f2}{\left(\FracSqrtZetaY{\zeta_y} - \zeta_y\right)}}_{f_2} \phi_y - - \underbrace{\fillrectemph{f3}{\FracSqrtZetaY{1}}}_{f_3} \phi_z -\end{align*} + - \underbrace{\fillrectemph{f3}{\FracSqrtZetaY{1}}}_{f_3} \phi_z \\ +\end{align*}% +\vspace{-2.7\baselineskip}% +\end{beamercolorbox}% +#+end_export -Решение в рамках линейной теории: -\begin{equation*} - \phi(x,y,z,t) = \mathcal{W}(x,y,z) \mathrel{*} \left(-\zeta_t(x,y,t)\right) -\end{equation*} +*** Columns +:PROPERTIES: +:BEAMER_env: columns +:BEAMER_opt: T +:END: -Общее решение: -\begin{equation*} +**** Column 1 +:PROPERTIES: +:BEAMER_col: 0.47 +:END: +#+begin_export latex +\vspace{-\baselineskip}% +\spbuArrow{}% +\vspace{-1.3\baselineskip}% +\begingroup% +\setlength\abovedisplayskip{1mm}% +\begin{beamercolorbox}[colsep*=.75ex,vmode]{block body}% +Решение в рамках линейной теории:% +\begin{equation*}% +\phi(x,y,z,t) = \mathcal{W}_1(x,y,z) \mathrel{*} \left(-\zeta_t(x,y,t)\right) +\end{equation*}% +\vspace{-1.5\baselineskip}% +\end{beamercolorbox}% +\endgroup% +#+end_export + +**** Column 2 +:PROPERTIES: +:BEAMER_col: 0.47 +:END: +#+begin_export latex +\vspace{-\baselineskip}% +\spbuArrow{}% +\vspace{-1.3\baselineskip}% +\begingroup% +\setlength\abovedisplayskip{1mm}% +\begin{beamercolorbox}[colsep*=.75ex,vmode]{block body}% +Общее решение:\vspace{-0.5\baselineskip}% +\begin{equation*}% \phi(x,y,z,t) = - \mathcal{W}(x,y,z) + \mathcal{W}_2(x,y,z) \mathrel{*} - \frac{\zeta_t(x,y,t)}{i f_1(x,y,t) + i f_2(x,y,t) - f_3(x,y,t)} -\end{equation*} +% \frac{\zeta_t(x,y,t)}{i f_1(x,y,t) + i f_2(x,y,t) - f_3(x,y,t)} + \frac{\zeta_t(x,y,t)}{F\left(f_1, f_2, f_3\right)} +% & \mathcal{W}_1 \approx \mathcal{W}_2 +\end{equation*}% +\vspace{-1.35\baselineskip}% +\end{beamercolorbox}% +\endgroup% +#+end_export ** Верификация метода выч. давлений diff --git a/slides-preamble.tex b/slides-preamble.tex @@ -15,8 +15,11 @@ \usepackage{colortbl} \usepackage{tikz} -\usetikzlibrary{shapes} + +\usetikzlibrary{arrows} +\usetikzlibrary{decorations.markings} \usetikzlibrary{positioning} +\usetikzlibrary{shapes} \graphicspath{{build/}{graphics/slides/}} @@ -45,4 +48,21 @@ \end{tikzpicture} } +% down arrow +\newcommand*{\spbuArrow}{% +\begin{center}% +\begin{tikzpicture}[scale=1]% +\draw[ + -triangle 90, + very thick, + double, + double equal sign distance, + draw=spbuWhite2, + fill=spbuWhite2 +] + (0,0.1) -- (0,0); +\end{tikzpicture}% +\end{center}% +} + \AtBeginSection[]{\frame{\sectionpage}}