Skip to content

Commit

Permalink
Merge branch 'master' into compathelper/new_version/2024-04-04-00-15-…
Browse files Browse the repository at this point in the history
…45-083-02832508202
  • Loading branch information
kevmoor authored Jun 14, 2024
2 parents dd38991 + d453e15 commit 9784292
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,7 @@ jobs:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: julia-actions/cache@v1
- name: Install OpenFASTWrappers
run: julia --project=./ -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/sandialabs/OWENSOpenFASTWrappers.jl.git"))'
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
2 changes: 1 addition & 1 deletion .github/workflows/Documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Install dependencies
env:
PYTHON: ""
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
run: julia --project=docs/ -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/sandialabs/OWENSOpenFASTWrappers.jl.git")); Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
- name: Build and deploy
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # If authenticating with GitHub Actions token
Expand Down
9 changes: 9 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

[compat]
Statistics = "1"
QuadGK = "2"
NLsolve = "4"
FiniteDiff = "2"
Dierckx = "0.5"
FLOWMath = "0.3"
LsqFit = "0.15"
ForwardDiff = "0.10"
DelimitedFiles = "1"
HDF5 = "0.17"
julia = "1"

[extras]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OWENSAero.jl

[![](https://img.shields.io/badge/docs-stable-blue.svg)](github.com/sandialabs/OWENSAero.jl.git)
[![](https://img.shields.io/badge/docs-stable-blue.svg)](https://sandialabs.github.io/OWENSAero.jl)
![](https://github.com/sandialabs/OWENSAero.jl/workflows/CI/badge.svg)

This repository contains a set of aerodynamic tools for VAWTs both steady and unsteady operation, 2D and
Expand Down
9 changes: 9 additions & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[deps]
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"

[extras]
CPUSummary = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9"
2 changes: 1 addition & 1 deletion src/advanceTurbine.jl
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function setupTurb(bld_x,bld_z,B,chord,TSR,Vinf;
windangle_D = 0.0,
afname = "$(path)/airfoils/NACA_0015_RE3E5.dat", #TODO: analytical airfoil as default
turbsim_filename = "$path/data/ifw/turb_DLC1p3_13mps_330m_seed1.bts",
ifw_libfile = joinpath(dirname(@__FILE__), "../bin/libifw_c_binding"))
ifw_libfile = nothing)

global dt = 0.0 #might not be used
global last_step1 = 0
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ println("Start Tests")

include("simple_example.jl")

include("dyn_stall_tests.jl")
# include("dyn_stall_tests.jl")

@testset "full turbine" begin
include("full_turb.jl")
Expand Down

0 comments on commit 9784292

Please sign in to comment.