Merge branch 'main' of https://github.com/GodotMisogi/AeroFuse.jl int…

…o develop

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.7' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
+          - '1.10' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
           - '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
           - 'nightly'
         os:

LICENSE

@@ -1,20 +1,7 @@
-Copyright (c) 2023 Arjit Seth
+Copyright 2023 Arjit Seth
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files, to use this software for public research, education or personal use, and to alter it and redistribute it freely, subject to the following restrictions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-1. In any scientific publications and/or documentation arising from use of this software or altered source versions, the article at the following DOI identifier 10.1109/TE.2023.3281825 must be cited.
-2. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. Commercial distribution is strictly not allowed. You may not sell this software, altered source versions, any part thereof or any of the rights granted to you under the license. You may not provide to third parties, for a fee or other consideration (including without limitation fees for hosting or consulting/support services related to the software), a product or service whose value derives from the functionality of this software, altered source versions or any part thereof, unless explicit permission is granted to you by the copyright owner.
-4. If binaries of altered source versions or data or results generated by altered source versions are published, the altered source code must be published as well.
-5. This license notice may not be removed or altered from the distribution of any source version, either original or altered.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Project.toml

@@ -1,7 +1,7 @@
 name = "AeroFuse"
 uuid = "477c59f4-51f5-487f-bf1e-8db39645b227"
 authors = ["GodotMisogi <[email protected]>"]
-version = "0.4.11"
+version = "0.4.12"
 
 [deps]
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"

src/Aerodynamics/parasitic_drag.jl

@@ -76,7 +76,7 @@ end
     xs = @. le[:,1] + wing.chords * xs_temp # Determine max. thickness x-coordinates in geometry frame
     ds = xs[2:end] - xs[1:end-1] # Compute differences between max. thickness x-coordinates between sections
     widths = @. wing.spans / cosd(wing.dihedrals) # Project planform span onto geometry based on dihedral angles
-    Λs = @. atan(ds, widths) # Now compute sweep angles at max. thickness locations
+    Λs = @. atand(ds, widths) # Now compute sweep angles at max. thickness locations
 
     # Average chord lengths for sections
     xs = (xs_temp[1:end-1] + xs_temp[2:end]) / 2

src/Geometry/AircraftGeometry/Wings/halfwing.jl

@@ -142,7 +142,7 @@ spans(wing :: Wing) = wing.spans
 dihedrals(wing :: Wing) = wing.dihedrals
 
 """
-    sweeps(wing :: AbstractWing, w = 0.)
+    sweeps(wing :: Wing, w = 0.)
 
 Obtain the sweep angles (in radians) at the corresponding normalized chord length ratio ``w ∈ [0,1]``.
 """

test/runtests.jl

@@ -225,8 +225,8 @@ end
         area = 10.,
         aspect = 6.,
         taper = 1.0,
-        sweep = 0.,
-        sweep_ratio = 0.25,
+        sweep = 10.,
+        w_sweep = 0.25,
     )
 
     # Get maximum (t/c) of root and tip
@@ -261,7 +261,7 @@ end
     )
 
     L_wing = avg_c # Length
-    Kf_wing = (1 + 0.6tbyc_r / xbyc_r + 100tbyc_r^4) * cos(Λ)^0.28 # Wing form factor
+    Kf_wing = (1 + 0.6tbyc_r / xbyc_r + 100tbyc_r^4) * cosd(Λ)^0.28 # Wing form factor
     fM_wing = 1.34M^0.18
 
     CD0_wing = parasitic_drag_coefficient(L_wing, x_tr, ρ, V, M, μ, S_ref, S_wet, Kf_wing, fM_wing)