Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into nrel_bar
Browse files Browse the repository at this point in the history
  • Loading branch information
dingraha committed Aug 9, 2024
2 parents 01b31d0 + 67eafa1 commit 7b8ffde
Show file tree
Hide file tree
Showing 786 changed files with 24,321 additions and 726 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,19 @@ jobs:
matrix:
version:
- '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
#- 'nightly'
os:
- ubuntu-latest
- macOS-latest
- windows-latest
arch:
- x64
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@latest
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- name: Add General
shell: julia --color=yes {0}
run: |
using Pkg
Pkg.Registry.add(RegistrySpec(url="https://github.com/JuliaRegistries/General"))
env:
JULIA_PKG_USE_CLI_GIT: 'true'
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-runtest@latest
env:
JULIA_PKG_USE_CLI_GIT: 'true'
16 changes: 9 additions & 7 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
name = "AcousticAnalogies"
uuid = "e71b3392-1e0c-4536-b366-2bd1fce6fba0"
authors = ["Ingraham, Daniel James (GRC-LTV0) <[email protected]>"]
version = "0.7.2"
authors = ["Ingraham, Daniel James (GRC-LTV0) <[email protected]> and contributors"]
version = "0.8.0"

[deps]
AcousticMetrics = "046f749b-9c1e-43ca-86bc-6902340f753e"
CCBlade = "e1828068-15df-11e9-03e4-ef195ea46fa4"
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
FLOWMath = "6cb5d3fb-0fe8-4cc2-bd89-9fe0b19a99d3"
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
FlexiMaps = "6394faf6-06db-4fa8-b750-35ccc60383f7"
Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0"
Format = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
JuliennedArrays = "5cadff95-7770-533d-a838-a1bf817ee6e0"
KinematicCoordinateTransformations = "730d3219-0a85-48f9-b699-9f31f8913d09"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Meshes = "eacbb407-ea5a-433e-ab97-5258b1ca43fa"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192"

[compat]
AcousticMetrics = "0.6.0"
AcousticMetrics = "0.7.0"
CCBlade = "0.2.4"
ConcreteStructs = "0.2.3"
FLOWMath = "0.3.3"
FillArrays = "1.11.0"
FlexiMaps = "0.1.18"
Formatting = "0.4.2"
Format = "1.3.7"
JuliennedArrays = "0.4.0"
KinematicCoordinateTransformations = "0.4.1"
Meshes = "0.46.0"
StaticArrays = "1.5.19"
WriteVTK = "1.17.1"
julia = "1.9.1"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
or
[http://dx.doi.org/10.2514/1.C034048](http://dx.doi.org/10.2514/1.C034048)
for details).
* Implementation of Brooks & Burley's rotor broadband noise prediction method [http://dx.doi.org/10.2514/6.2001-2210](http://dx.doi.org/10.2514/6.2001-2210).
* Support for stationary or constant-velocity moving observers, with an
explict calculation for the latter from D. Casalino
[http://dx.doi.org/10.1016/S0022-460X(02)00986-0](http://dx.doi.org/10.1016/S0022-460X(02)00986-0).
Expand All @@ -50,7 +51,6 @@

**Installation**
```julia-repl
] registry add [email protected]:dingraha/DanielIngrahamRegistry.git # Optional, but needed to resolve dependencies in the next step
] add AcousticAnalogies
```

Expand Down
3 changes: 3 additions & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@ AcousticAnalogies = "e71b3392-1e0c-4536-b366-2bd1fce6fba0"
AcousticMetrics = "046f749b-9c1e-43ca-86bc-6902340f753e"
CCBlade = "e1828068-15df-11e9-03e4-ef195ea46fa4"
ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
FLOWMath = "6cb5d3fb-0fe8-4cc2-bd89-9fe0b19a99d3"
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
KinematicCoordinateTransformations = "730d3219-0a85-48f9-b699-9f31f8913d09"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56"
Expand Down
8 changes: 7 additions & 1 deletion docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ function doit()
"WriteVTK.jl Support"=>"writevtk_support.md",
"OpenFAST Example"=>"openfast_example.md",
"API Reference"=>"api.md",
"Software Quality Assurance"=>"sqa.md"])
"Software Quality Assurance"=>"sqa.md",
"BPM Airfoil Self-Noise Tests"=>"bpm_tests1.md",
"BPM Airfoil Self-Noise Tests, Cont."=>"bpm_tests2.md",
"BPM Airfoil Self-Noise Tests, Cont."=>"bpm_tests3.md",
"Ideally Twisted Rotor Tests"=>"itr_tests1.md",
"Ideally Twisted Rotor Tests, Cont."=>"itr_tests2.md",
])

if IN_CI
deploydocs(repo="github.com/OpenMDAO/AcousticAnalogies.jl.git", devbranch="main")
Expand Down
Loading

0 comments on commit 7b8ffde

Please sign in to comment.