Merge pull request #58 from byuflowlab/dev

Dev
byuflowlab · Apr 20, 2023 · a829829 · a829829
2 parents a14efd3 + 8291d41
commit a829829
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 24 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "FLOWUnsteady"
 uuid = "b491798d-ac6e-455f-a27c-49c10bb0a666"
 authors = ["Eduardo J. Alvarez <[email protected]> and contributors"]
-version = "3.2.0"
+version = "3.2.1"
 
 [deps]
 PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"

diff --git a/docs/src/examples/blownwing-aero.md b/docs/src/examples/blownwing-aero.md
@@ -204,7 +204,7 @@ for ri in 1:nrotors
 
     # Translate rotor to its position along wing
     O = [x, y, z]                                       # New position
-    Oaxis = uns.gt.rotation_matrix2(0, 0, 0)            # New orientation
+    Oaxis = uns.gt.rotation_matrix2(0, 0, 180)          # New orientation
     vlm.setcoordsystem(rotor, O, Oaxis)
 
     push!(rotors, rotor)

diff --git a/docs/src/installation/general.md b/docs/src/installation/general.md
@@ -203,9 +203,11 @@ in the official Julia registry:
 import Pkg
 
 url = "https://github.com/byuflowlab/"
-packages = ("AirfoilPrep.jl", "FLOWVLM", "BPM.jl", "FLOWNoise")
 
-Pkg.add([ Pkg.PackageSpec(; url=url*name) for name in packages ])
+packages = (("AirfoilPrep.jl", "v2.1.2"), ("FLOWVLM", "v2.1.2"),
+            ("BPM.jl", "v2.0.1"), ("FLOWNoise", "v2.3.1"))
+
+Pkg.add([ Pkg.PackageSpec(; url=url*name, rev=v) for (name, v) in packages ])
 ```
 
 !!! info "Troubleshooting"

diff --git a/examples/blownwing/blownwing.jl b/examples/blownwing/blownwing.jl
@@ -211,7 +211,7 @@ for ri in 1:nrotors
 
     # Translate rotor to its position along wing
     O = [x, y, z]                                       # New position
-    Oaxis = uns.gt.rotation_matrix2(0, 0, 0)            # New orientation
+    Oaxis = uns.gt.rotation_matrix2(0, 0, 180)          # New orientation
     vlm.setcoordsystem(rotor, O, Oaxis)
 
     push!(rotors, rotor)

diff --git a/src/FLOWUnsteady_maneuver.jl b/src/FLOWUnsteady_maneuver.jl
@@ -227,7 +227,7 @@ function calc_dV(self::DynamicManeuver, vehicle::AbstractVehicle, t::Real,
 end
 
 
-function calc_dw(self::KinematicManeuver, vehicle::AbstractVehicle, t::Real,
+function calc_dw(self::DynamicManeuver, vehicle::AbstractVehicle, t::Real,
                                                          dt::Real, ttot::Real)
      # Here calculate change in angular velocity of the vehicle based on current
      # aerodynamics forces

diff --git a/src/FLOWUnsteady_monitors.jl b/src/FLOWUnsteady_monitors.jl
@@ -24,15 +24,10 @@ The aerodynamic performance consists of thrust coefficient
 \$C_Q = \\frac{Q}{\\rho n^2 d^5}\$, and propulsive efficiency
 \$\\eta = \\frac{T u_\\infty}{2\\pi n Q}\$.
 
-* `J_ref` and `rho_ref` are the reference advance ratio and air density used \
-for calculating propulsive efficiency and coefficients. The advance ratio used \
-here is defined as \$J=\\frac{u_\\infty}{n d}\$ with \
-\$n = \\frac{\\mathrm{RPM}}{60}\$.
+* `J_ref` and `rho_ref` are the reference advance ratio and air density used for calculating propulsive efficiency and coefficients. The advance ratio used here is defined as \$J=\\frac{u_\\infty}{n d}\$ with \$n = \\frac{\\mathrm{RPM}}{60}\$.
 * `RPM_ref` is the reference RPM used to estimate the age of the wake.
-* `nsteps_sim` is the number of time steps by the end of the simulation (used \
-for generating the color gradient).
-* Use `save_path` to indicate a directory where to save the plots. If so, it \
-will also generate a CSV file with \$C_T\$, \$C_Q\$, and \$\\eta\$.
+* `nsteps_sim` is the number of time steps by the end of the simulation (used for generating the color gradient).
+* Use `save_path` to indicate a directory where to save the plots. If so, it will also generate a CSV file with \$C_T\$, \$C_Q\$, and \$\\eta\$.
 
 
 ![image](http://edoalvar2.groups.et.byu.net/public/FLOWUnsteady/rotorhover-example-high02-singlerotor_convergence.png)
@@ -253,15 +248,11 @@ Kutta-Joukowski force, parasitic drag (calculated from a NACA 0012 airfoil
 polar), and unsteady-circulation force.
 
 * `b_ref`       : Reference span length.
-* `ar_ref`      : Reference aspect ratio, used to calculate the equivalent \
-                    chord \$c = \\frac{b}{\\mathrm{ar}}\$.
+* `ar_ref`      : Reference aspect ratio, used to calculate the equivalent chord \$c = \\frac{b}{\\mathrm{ar}}\$.
 * `rho_ref`     : Reference density.
-* `qinf_ref`    : Reference dynamic pressure \
-                    \$q_\\infty = \\frac{1}{2}\\rho u_\\infty^2\$.
-* `nsteps_sim`  : the number of time steps by the end of the simulation (used \
-                    for generating the color gradient).
-* Use `save_path` to indicate a directory where to save the plots. If so, it \
-will also generate a CSV file with \$C_L\$ and \$C_D\$.
+* `qinf_ref`    : Reference dynamic pressure \$q_\\infty = \\frac{1}{2}\\rho u_\\infty^2\$.
+* `nsteps_sim`  : the number of time steps by the end of the simulation (used for generating the color gradient).
+* Use `save_path` to indicate a directory where to save the plots. If so, it will also generate a CSV file with \$C_L\$ and \$C_D\$.
 
 Here is an example of this monitor:
 ![image](http://edoalvar2.groups.et.byu.net/public/FLOWUnsteady/wing-example_convergence.png)

diff --git a/src/FLOWUnsteady_utils.jl b/src/FLOWUnsteady_utils.jl
@@ -26,8 +26,8 @@ const clrs = [
 
 function formatpyplot()
     # Fonts
-    # plt.rc("font", family="Times New Roman")            # Text font
-    plt.rc("mathtext", fontset="stix")                  # Math font
+    plt.rc("font", family="STIXGeneral")            # Text font
+    plt.rc("mathtext", fontset="stix")              # Math font
     plt.rc("font", size=12)          # controls default text sizes
     plt.rc("axes", titlesize=12)     # fontsize of the axes title
     plt.rc("axes", labelsize=14)     # fontsize of the x and y labels