Skip to content

Seattle test #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maull-ncsu wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Seattle test #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dbd45c9
remove .original from repo and update gitignore
markaull May 5, 2023
8dca3c7
uncompress selected simulink files
markaull May 8, 2023
5d4060b
changes as of 2023-04 testing
markaull May 8, 2023
6360a52
fix Simulink error
markaull May 12, 2023
9346982
fix Simulink error
markaull May 15, 2023
4d83e99
fix bugs in build scripts
markaull May 18, 2023
c5d03f6
update files that don't affect TI controller to Jacob's versions
markaull May 22, 2023
a3d96b8
D:/Users/maull/Documents/sim_files/Copy_of_fluidDynamicSurface_cl.slx…
markaull May 22, 2023
05c39d1
controller builds with Jacob's pathFollowingCtrlAoATurb
markaull May 22, 2023
bc2901e
mod discrete PID & filter to handle params as constant or inport signal
markaull May 25, 2023
1b389c1
add saturations on tau (secondOrder)
markaull May 30, 2023
751644d
fix compatibility with input port or mask variable
markaull May 31, 2023
e8b0de2
modify snsProcBus to match lakeController
markaull Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .SimulinkProject/slprj/_sfprj/EMLReport/sdotp2f9F9oaWPU38yWqof.mat
View file
Open in desktop
Binary file not shown.
Binary file removed .SimulinkProject/slprj/_sfprj/precompile/7gJCvqJv3uUjWUBniT8OrF.mat
View file
Open in desktop
Binary file not shown.
157 changes: 45 additions & 112 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,136 +1,69 @@
output
*.asv
dump/
# Windows default autosave extension
# MATLAB & Simulink backup
*.asv
*.original
*.autosave

# OSX / *nix default autosave extension
*.m~

# Compiled MEX binaries (all platforms)
*.mex*

# Simulink cache/compiled
*.slxc

# Simulink Embedded Coder outputs
*.dwo
*.out
*.hex

# Simulink Embedded Coder intermediate
*.d
*.obj
*.dmr
slprj/
sccprj/
*_rtw/

# Packaged app and toolbox files
*.mlappinstall
*.mltbx

# Generated helpsearch folders
helpsearch*/

# Simulink code generation folders
slprj/
sccprj/

# Matlab code generation folders
codegen/

# Simulink autosave extension
*.autosave

# Octave session info
octave-workspace

# Video files
*.avi
*.gif
output
dump/

# compiled simulink models
*.slxc
# Simulink session settings
*.mldatx

# Linux/ROS temp file
*.swp
*.swo
*.log

# temp file
~$*.docx
~$*.xlsx
~$*.sldprt

# images and videos
.gif
.GIF
.png
.PNG
.jpeg
.JPEG
.fig
.FIG
280 snaps.png
03262021/data_26_Mar_2021_13_03_44.mat
03262021/data_26_Mar_2021_12_57_12.mat
03262021/data_26_Mar_2021_12_32_53.mat
03262021/data_26_Mar_2021_12_28_52.mat
03262021/data_26_Mar_2021_12_25_43.mat
03262021/data_26_Mar_2021_12_19_25.mat
03262021/data_26_Mar_2021_12_16_13.mat
03262021/data_26_Mar_2021_12_12_14.mat
03262021/data_26_Mar_2021_12_07_41.mat
03262021/data_26_Mar_2021_12_04_40.mat
03262021/data_26_Mar_2021_12_01_55.mat
03262021/data_26_Mar_2021_11_46_14.mat
03262021/data_26_Mar_2021_11_42_49.mat
03262021/data_26_Mar_2021_11_39_53.mat
03262021/data_26_Mar_2021_11_36_42.mat
03262021/data_26_Mar_2021_11_33_41.mat
03262021/data_26_Mar_2021_11_30_08.mat
03262021/data_26_Mar_2021_11_27_19.mat
03262021/data_26_Mar_2021_11_24_02.mat
03262021/data_26_Mar_2021_11_21_02.mat
03262021/data_26_Mar_2021_11_05_42.mat
03262021/data_26_Mar_2021_11_02_49.mat
03262021/data_26_Mar_2021_11_00_13.mat
03262021/data_26_Mar_2021_10_57_16.mat
03262021/data_26_Mar_2021_10_54_17.mat
03262021/data_26_Mar_2021_10_51_06.mat
03262021/data_26_Mar_2021_10_45_50.mat
03262021/data_26_Mar_2021_10_40_37.mat
03262021/data_26_Mar_2021_10_37_44.mat
03262021/data_26_Mar_2021_10_34_51.mat
03262021/data_26_Mar_2021_10_26_46.mat
03262021/data_26_Mar_2021_10_21_56.mat
03192021/data_19_Mar_2021_13_30_55.mat
03192021/data_19_Mar_2021_13_28_06.mat
03192021/data_19_Mar_2021_13_25_37.mat
03192021/data_19_Mar_2021_13_21_41.mat
03192021/data_19_Mar_2021_13_19_24.mat
03192021/data_19_Mar_2021_13_16_23.mat
03192021/data_19_Mar_2021_13_13_39.mat
03192021/data_19_Mar_2021_13_10_28.mat
03192021/data_19_Mar_2021_13_07_41.mat
03192021/data_19_Mar_2021_12_58_27.mat
03192021/data_19_Mar_2021_12_54_00.mat
03192021/data_19_Mar_2021_12_50_35.mat
03192021/data_19_Mar_2021_12_48_06.mat
03192021/data_19_Mar_2021_12_44_35.mat
03192021/data_19_Mar_2021_12_41_04.mat
03192021/data_19_Mar_2021_12_38_22.mat
03192021/data_19_Mar_2021_12_35_33.mat
03192021/data_19_Mar_2021_12_32_30.mat
03192021/data_19_Mar_2021_12_23_59.mat
03192021/data_19_Mar_2021_12_20_27.mat
03192021/data_19_Mar_2021_12_16_55.mat
03192021/data_19_Mar_2021_12_13_55.mat
03192021/data_19_Mar_2021_12_11_04.mat
03192021/data_19_Mar_2021_12_06_17.mat
03192021/data_19_Mar_2021_12_03_25.mat
03192021/data_19_Mar_2021_11_54_14.mat
03192021/data_19_Mar_2021_11_46_33.mat
03192021/data_19_Mar_2021_11_42_09.mat
03192021/data_19_Mar_2021_11_38_55.mat
03192021/data_19_Mar_2021_11_31_21.mat
03192021/data_19_Mar_2021_11_24_36.mat
03192021/data_19_Mar_2021_11_21_23.mat
03192021/data_19_Mar_2021_11_11_51.mat
03192021/data_19_Mar_2021_10_58_55.mat
03192021/data_19_Mar_2021_10_34_42.mat
03192021/data_19_Mar_2021_10_26_04.mat
03192021/data_19_Mar_2021_10_16_28.mat
03192021/data_19_Mar_2021_10_08_09.mat
03122021/data_12_Mar_2021_13_16_07.mat
03122021/data_12_Mar_2021_13_10_42.mat
03122021/data_12_Mar_2021_12_51_02.mat
03122021/data_12_Mar_2021_12_44_03.mat
03122021/data_12_Mar_2021_12_31_53.mat
03122021/data_12_Mar_2021_12_28_46.mat
03122021/data_12_Mar_2021_12_19_34.mat
03122021/data_12_Mar_2021_12_13_30.mat
03122021/data_12_Mar_2021_12_08_56.mat
03122021/data_12_Mar_2021_12_03_15.mat
03122021/data_12_Mar_2021_11_58_17.mat
03122021/data_12_Mar_2021_11_54_36.mat
03122021/data_12_Mar_2021_11_51_02.mat
03122021/data_12_Mar_2021_11_13_17.mat
03122021/data_12_Mar_2021_11_06_47.mat
03122021/data_12_Mar_2021_10_55_23.mat
03122021/data_12_Mar_2021_10_41_33.mat
*.avi
*.gif
*.GIF
*.png
*.PNG
*.jpeg
*.JPEG
*.fig
*.FIG

data*.mat
*.mat
119 changes: 119 additions & 0 deletions build_DOEOKP_mat.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
% build_DOEOKP_mat: needs to run once to write .mat files that are used by various scripts; reduces download size vs. including at files directly
path_DOEOKP=genpath('.');
addpath(path_DOEOKP);

if 1
pathFollowingTether_bs
constT_XYZvarZ_Ramp_bs
constXYZT_bs
ayazAirborneFlow_bs
constYZTvarX_bs
hurricaneSandyWave_bs
steppedLateralFlow_bs
ayazSynFlow_bs
gpkfPathOpt_bs% depends on ayazSynFlow_bs
fullCycleCtrl_bs
guidanceLawPathFollowingAir_bs
guidanceLawPathFollowingWater_bs
pathFollowingCtrlAddedMass_bs
pathFollowingCtrlForILC_bs
ayazPathFollowingAirborne_bs
pathFollowCtrlExp_bs
pathFollowWithAoACtrlDOE_bs
pathFollowingCtrlForILCAoA_bs
newSpoolCtrlExp_bs
periodicCtrlExp_bs
exp_slCtrl_bs
baselineSteadyLevelFlight_bs
firstBuildTakeoff1_bs
firstBuildTakeoff_bs
jamesMultiCycleExp_bs
joshMultiCycleExp_bs
newSpoolCtrl_bs
srgSwyHvCtrl_bs
motionlessGliderCtrl_bs
oneDoFGSCtrlBasic_bs
constBoothLem_bs
constEllipse_bs
basicILCThrTen_bs
basicILC_bs
fig8ILC15mPs_bs
fig8ILC1mPs_bs
fig8ILC2mPs_bs
seILC_bs
varGeom_bs
varAltitudeBooth_bs
varRadiusBooth_bs
ayazThreeTetGndStn_bs
oneThrGndStn000_bs
pathFollowingGndStn_bs
threeThrGndStn000_bs
oneThrThreeAnchGndStn001_bs
oneThrThreeAnchGndStn001_bs
gsWave_bs
raftGroundStation_bs
ayazAirborneThr_bs
ayazFullScaleOneThrTether_bs
ayazThreeTetTethers_bs
fiveNodeSingleTether_bs
ObsTether_bs
shortTether_bs
shortTetherCompare_bs
pathFollowingTetherFaired_bs
fullScale1thr_bs
anchWnch_bs
oneDOFWnch_bs
oneWnch_bs
threeWnch_bs
oneDOFWnchPTO_bs
idealSensorProcessing_bs
realisticSensorProcessing_bs
deadRecPos_bs
idealSensors_bs
lasPosEst_bs
realisticSensors_bs
slCtrl_bs
resizedKiteGndStn_bs% dep on fullScale1thr_bs
poolScaleKite_bs% dependent on dsgnMassFile.mass
ayazFullScaleOneThrWinch_bs
ayazThreeTetWnch_bs
ayazThreeTetCtrl_bs% depends on ayazThreeTetWnch_bs
realisticAirborneVhcl_bs% Unrecognized method, property, or field 'setMass' for class 'OCT.turb'
poolScaleKiteAbney_bs% dependent on 'SG6040_AR7dot4_EXPT.mat'
end

if 0
CNAPsMitchell_bs% depends on pathFollowingTether_bs; error line 8
CNAPsTurbJames_bs% depends on pathFollowingTether_bs; error line 9
DARPATurbJames_bs% depends on pathFollowingTether_bs; error line 10
CNAPsNoTurbJosh_bs% depends on pathFollowingTether_bs; error line 10
CNAPsTurbMitchell_bs% depends on pathFollowingTether_bs; error line 10
end
% poolScaleKiteAbneyDragScreens_bs% dependent on 'SG6040_AR7dot4_EXPT.mat' and poolKiteWingsDragScreen.mat'.
% poolScaleKiteAbneyRefined_bs% dependent on 'SG6040_AR7dot4_EXPT.mat' and poolKiteWings.mat
% prescribedGndStn_bs% Dot indexing is not supported for variables of this type
% prescribedGndStn001_bs
% pathFollowingVhcl_bs% Unrecognized method, property, or field 'setIxx' setRwingLE_cm for class 'OCT.vehicle'

% fullScale1thrMod_bs% Unrecognized method, property, or field 'setTurbDiam' setWingNACA for class 'OCT.vehicle'.
% ayazAirborneSynFlow_bs% SquaredExponentialKernel
% ayazThreeTetVhcl_bs% Unrecognized method, property, or field 'setTurbDiam' setIxx for class 'OCT.vehicle'
% ayazAirborneVhcl_bs% Error using rmdir
% ayazFullScaleOneThrVhcl_bs% calcFluidDynamicCoefffs obj.hydroCharacterization.Value
% ayazOptVhcl_bs% vhcl.calcFluidDynamicCoefffs
% ayazThreeTetVhclForComp_bs% calcFluidDynamicCoefffs obj.hydroCharacterization.Value

if 0
gpkfAltitudeOptimization_bs% dep on ayazAirborneSynFlow_bs
gpkfPathOptAirborne_bs% dep on ayazAirborneSynFlow_bs
gpkfPathOptWithRGPAirborne_bs% dep on ayazAirborneSynFlow_bs
omniscientAltitudeOpt_bs% dep on ayazAirborneSynFlow_bs

lineAngleSensor_bs% dependent on thrAngLAS.mat
lineAngleSensorObserver_bs% dependent on thrAngLAS.mat
lineAngleSensorBoat_bs% dependent on thrAngLAS.mat
end

% sensitivityAnalysis_bs% calcFluidDynamicCoefffs obj.hydroCharacterization.Value
% pathFollowingVhclForComp_bs% calcFluidDynamicCoefffs obj.hydroCharacterization.Value
% constXYZ_varT_SineWave_bs% getBusDims
6 changes: 6 additions & 0 deletions classes/+OCT/@turb/turb.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ function setHubMass(obj,val,units)
function setBladeMass(obj,val,units)
obj.bladeMass.setValue(val,units)
end

function obj = setMass(obj,val,units)
% obj.hubMass.setValue(0.25*val,units)
% obj.bladeMass.setValue(0.75*val/obj.numBlades.Value,units)
obj.turbMassStated.setValue(val,units);
end

function setDiameter(obj,val,units)
obj.diameter.setValue(val,units)
Expand Down
Loading