From b2c735dcc1e1959841b834000002881c3670f6ed Mon Sep 17 00:00:00 2001 From: kevmoor Date: Fri, 30 Aug 2024 09:24:29 -0600 Subject: [PATCH] Update items caught by CICD --- docs/src/literate/C_customizablePreprocessing.jl | 2 +- src/Unsteady.jl | 4 ++-- src/utilities.jl | 2 +- test/34mROMtest.jl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/src/literate/C_customizablePreprocessing.jl b/docs/src/literate/C_customizablePreprocessing.jl index 05aa24fa..acfee8aa 100644 --- a/docs/src/literate/C_customizablePreprocessing.jl +++ b/docs/src/literate/C_customizablePreprocessing.jl @@ -22,7 +22,7 @@ import PyPlot import OWENSOpenFASTWrappers -path = runpath = "/home/runner/work/OWENS.jl/OWENS.jl/docs/src/literate" #bld_height_numadsplitdir(@__FILE__)[1] +path = runpath = "/home/runner/work/OWENS.jl/OWENS.jl/docs/src/literate" #splitdir(@__FILE__)[1] Inp = OWENS.MasterInput("$runpath/sampleOWENS.yml") diff --git a/src/Unsteady.jl b/src/Unsteady.jl index 7093cbce..8d6b9ace 100644 --- a/src/Unsteady.jl +++ b/src/Unsteady.jl @@ -384,7 +384,7 @@ function Unsteady(inputs;topModel=nothing,topMesh=nothing,topEl=nothing, if inputs.AD15On aeroVals,aeroDOFs = run_aero_with_deformAD15(aero,deformAero,topMesh,topEl,u_j,udot_j,uddot_j,inputs,t[i],azi_j,Omega_j,OmegaDot_j) else - aeroVals,aeroDOFs = run_aero_with_deform(aero,deformAero,topMesh,topEl,u_j,uddot_j,inputs,numIterations,t[i],azi_j,Omega_j,top_grav_setting) + aeroVals,aeroDOFs = run_aero_with_deform(aero,deformAero,topMesh,topEl,u_j,uddot_j,inputs,numIterations,t[i],azi_j,Omega_j,topModel.gravityOn) end end end @@ -577,7 +577,7 @@ function Unsteady(inputs;topModel=nothing,topMesh=nothing,topEl=nothing, if inputs.AD15On aeroVals,aeroDOFs = run_aero_with_deformAD15(aero,deformAero,topMesh,topEl,u_j,udot_j,uddot_j,inputs,t[i],azi_j,Omega_j,OmegaDot_j) else - aeroVals,aeroDOFs = run_aero_with_deform(aero,deformAero,topMesh,topEl,u_j,uddot_j,inputs,numIterations,t[i],azi_j,Omega_j,top_grav_setting) + aeroVals,aeroDOFs = run_aero_with_deform(aero,deformAero,topMesh,topEl,u_j,uddot_j,inputs,numIterations,t[i],azi_j,Omega_j,topModel.gravityOn) end end end diff --git a/src/utilities.jl b/src/utilities.jl index b514b05d..8402bf26 100644 --- a/src/utilities.jl +++ b/src/utilities.jl @@ -330,7 +330,7 @@ function owens(owensfile,analysisType; aeroForces(t,azi) = externalForcing(t+delta_t,aerotimeArray,aeroForceValHist,aeroForceDof) - deformAero(azi;newOmega=-1,newVinf=-1,bld_x=-1,bld_z=-1,bld_twist=-1) = 0.0 #placeholder function + deformAero(azi;newOmega=-1,newVinf=-1,bld_x=-1,bld_z=-1,bld_twist=-1,accel_flap_in=-1,accel_edge_in=-1,gravity=-1) = 0.0 #placeholder function Unsteady(model;topModel=feamodel,topMesh=mesh,topEl=el,bin,aero=aeroForces,deformAero) return model diff --git a/test/34mROMtest.jl b/test/34mROMtest.jl index 0240af6c..570b0eae 100644 --- a/test/34mROMtest.jl +++ b/test/34mROMtest.jl @@ -33,7 +33,7 @@ for i=1:length(myel2["props"]) end myel = OWENSFEA.El(sectionPropsArray,myel2["elLen"],myel2["psi"],myel2["theta"],myel2["roll"],myel2["rotationalEffects"]) -deformTurb2(a;newOmega=-1,newVinf=-1, bld_x=-1, bld_z=-1, bld_twist=-1) = 0 +deformTurb2(a;newOmega=-1,newVinf=-1, bld_x=-1, bld_z=-1, bld_twist=-1,accel_flap_in=-1,accel_edge_in=-1,gravity=-1) = 0 delta_t = 0.1 function aeroForcesDMS(t,azi)