diff --git a/contents/tech-solvers.tex b/contents/tech-solvers.tex index 86dfa149fce20977ded40b86ce242dbd7077e34a..5f64f12eebd779764a0cbae51b596aa916e377d5 100644 --- a/contents/tech-solvers.tex +++ b/contents/tech-solvers.tex @@ -213,14 +213,14 @@ then given by: \end{equation} Furthermore, it can be showed that axial induced velocity at the disk is equal -to half the slipstream velocity in the far wake: $\viAx = \frac{\vSlip}{2}$. +to half the slipstream velocity in the far wake: $\viAx = \frac{\vSlipAx}{2}$. The thrust can then be expressed using the momentum balance in the axial direction as: \begin{equation} \label{eq:tech:solvers:mom:thrust} \begin{split} d\thrust & = \mFlow (\vAx[d] - \vAx[u]) \\ - & = \mFlow \vSlip \\ + & = \mFlow \vSlipAx \\ & = \mFlow (2\viAx) \\ & = 4\pi \dens (\vAx + \viAx) \viAx \radA \dy \end{split} diff --git a/contents/user-input.tex b/contents/user-input.tex index a52c6c809e7dc54b4dd782d7ee1bc6ecad9abfa1..8d1de4a5f806cdd0d0e4547ce636acc2982d86af 100644 --- a/contents/user-input.tex +++ b/contents/user-input.tex @@ -181,9 +181,12 @@ The structure \lstmat{Mod} contains the parameters for the solvers and the extension and corrections to apply. It also specifies the numerical limits (number of iterations, precision, etc.). -\describeOption{Mod.solver}{}{\lst{'leishman', 'prop', 'turbine', 'stahlhut'}}{ +\describeOption{Mod.solvers}{}{\lst{'leishman', 'prop', 'turbine', 'stahlhut', +'all'}}{ Type of solver to use. The solvers are described in length in Chapter~\ref{chap:tech:solvers}. + \textit{It is possible to provide a cell array with multiple solvers. Rotare + will then loop for all solvers.} } diff --git a/rotare-bib.bib b/rotare-bib.bib index e72ca7e53eb08202e7d8f76e7e54a0f4fe8d882b..6bc53d704c58a0f4e62d8a8133f9ae3ca815e883 100644 --- a/rotare-bib.bib +++ b/rotare-bib.bib @@ -23,4 +23,3 @@ location = {{Fort Worth, Texas, USA}}, keywords = {\#nosource,helicopters,IMPORTANT,methods/BEMT,rotors} } - diff --git a/style/symbols.sty b/style/symbols.sty index 0a2cdfb2c01bb8ae3c3719ddad178444e3c74847..88c4ff629107f7d88afb8f29b658f50b9d8701ab 100644 --- a/style/symbols.sty +++ b/style/symbols.sty @@ -46,11 +46,13 @@ % Induced velocities \newcommand{\viAx}{\ensuremath{v_{i}}} \newcommand{\viTg}{\ensuremath{u_{i}}} -\newcommand{\vSlip}{\ensuremath{w}} +\newcommand{\vSlipAx}{\ensuremath{v_w}} +\newcommand{\vSlipTg}{\ensuremath{u_w}} \nomenclature[A]{\viAx}{Induced axial velocity\nomunit{\m\per\s}} \nomenclature[A]{\viTg}{Induced tangential velocity\nomunit{\m\per\s}} -\nomenclature[A]{\vSlip}{Slipsteam velocity in the far wake\nomunit{\m\per\s}} +\nomenclature[A]{\vSlipAx}{Axial velocity in the far wake\nomunit{\m\per\s}} +\nomenclature[A]{\vSlipTg}{Tangential velocity in the far wake\nomunit{\m\per\s}} % Induction factors \newcommand{\axFact}{\ensuremath{a}}