Skip to content

Commit

Permalink
Merge master into vsp
Browse files Browse the repository at this point in the history
  • Loading branch information
EdoAlvarezR committed Nov 15, 2023
2 parents d2f833e + 0122c62 commit b45b33d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 4 additions & 2 deletions docs/src/installation/general.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,11 @@ in the official Julia registry:
import Pkg

url = "https://github.com/byuflowlab/"
packages = ("AirfoilPrep.jl", "FLOWVLM", "BPM.jl", "FLOWNoise", "VSPGeom.jl")

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"), ("VSPGeom.jl", ""))

Pkg.add([ Pkg.PackageSpec(; url=url*name, rev=v) for (name, v) in packages ])
```

!!! info "Troubleshooting"
Expand Down
2 changes: 1 addition & 1 deletion examples/blownwing/blownwing.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
23 changes: 7 additions & 16 deletions src/FLOWUnsteady_monitors.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/FLOWUnsteady_utils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b45b33d

Please sign in to comment.