Commit e3c77b38 authored by Salko Jr, Robert's avatar Salko Jr, Robert
Browse files

Add more equations for other friction models

Description:

CASL Ticket # - N/A
parent 24ea04f2
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -271,12 +271,14 @@ models{
      }
      zigrang{
         Description="Selects the Zigrang-Sylvester friction factor model."
         ### Appearance=":math:`{$\lambda = \left(- 2.0 \log_{10}\right(\dfrac{\epsilon}{3.7D}+\dfrac{2.51}{Re}\left[1.14-2\log_{10}\left(\dfrac{\epsilon}{D}+\dfrac{21.25}{{Re}^{0.9}}\right)\right]\left)\right)^{-2}$`"
         MinOccurs=0
         MaxOccurs=1
         InputTmpl="flag"
      }
      churchill{
         Description="Selects the Churchill friction factor model."
         ### Appearance=":math:`$f_{f} = 2\left[\left(\dfrac{8}{Re}\right)^{12}+\dfrac{1}{(a+b)^{3/2}}\right]^{1/12};a = \left(2.475\ln\left[\dfrac{1}{\left(\dfrac{7}{Re}\right)^{0.9}+0.27\left(\dfrac{\epsilon}{D}\right)}\right]\right)^{16};b = \left(\dfrac{3.753x10^{4}}{Re}\right)^{16}$`"
         MinOccurs=0
         MaxOccurs=1
         InputTmpl="flag"
+2 −0
Original line number Diff line number Diff line
@@ -351,12 +351,14 @@ zigrang
:Description: Selects the Zigrang-Sylvester friction factor model.
:Min Occurance: 0
:Max Occurance: 1
:Note: :math:`{$\lambda = \left(- 2.0 \log_{10}\right(\dfrac{\epsilon}{3.7D}+\dfrac{2.51}{Re}\left[1.14-2\log_{10}\left(\dfrac{\epsilon}{D}+\dfrac{21.25}{{Re}^{0.9}}\right)\right]\left)\right)^{-2}$`

churchill
^^^^^^^^^
:Description: Selects the Churchill friction factor model.
:Min Occurance: 0
:Max Occurance: 1
:Note: :math:`$f_{f} = 2\left[\left(\dfrac{8}{Re}\right)^{12}+\dfrac{1}{(a+b)^{3/2}}\right]^{1/12};a = \left(2.475\ln\left[\dfrac{1}{\left(\dfrac{7}{Re}\right)^{0.9}+0.27\left(\dfrac{\epsilon}{D}\right)}\right]\right)^{16};b = \left(\dfrac{3.753x10^{4}}{Re}\right)^{16}$`

custom
^^^^^^