diff --git a/.SimulinkProject/slprj/_sfprj/EMLReport/sdotp2f9F9oaWPU38yWqof.mat b/.SimulinkProject/slprj/_sfprj/EMLReport/sdotp2f9F9oaWPU38yWqof.mat deleted file mode 100644 index 365f13553..000000000 Binary files a/.SimulinkProject/slprj/_sfprj/EMLReport/sdotp2f9F9oaWPU38yWqof.mat and /dev/null differ diff --git a/.SimulinkProject/slprj/_sfprj/precompile/7gJCvqJv3uUjWUBniT8OrF.mat b/.SimulinkProject/slprj/_sfprj/precompile/7gJCvqJv3uUjWUBniT8OrF.mat deleted file mode 100644 index 9c18a0b35..000000000 Binary files a/.SimulinkProject/slprj/_sfprj/precompile/7gJCvqJv3uUjWUBniT8OrF.mat and /dev/null differ diff --git a/.gitignore b/.gitignore index 6786ba8df..3b982cdb5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,7 @@ -output -*.asv -dump/ -# Windows default autosave extension +# MATLAB & Simulink backup *.asv +*.original +*.autosave # OSX / *nix default autosave extension *.m~ @@ -10,6 +9,22 @@ dump/ # 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 @@ -17,120 +32,38 @@ dump/ # 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 diff --git a/build_DOEOKP_mat.m b/build_DOEOKP_mat.m new file mode 100644 index 000000000..0f90a3976 --- /dev/null +++ b/build_DOEOKP_mat.m @@ -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 diff --git a/classes/+OCT/@turb/turb.m b/classes/+OCT/@turb/turb.m index 09969aa27..dab70da5d 100644 --- a/classes/+OCT/@turb/turb.m +++ b/classes/+OCT/@turb/turb.m @@ -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) diff --git a/classes/+OCT/@vehicle/vehicle.m b/classes/+OCT/@vehicle/vehicle.m index 9ac53a58b..e42799bb9 100644 --- a/classes/+OCT/@vehicle/vehicle.m +++ b/classes/+OCT/@vehicle/vehicle.m @@ -10,7 +10,7 @@ oldFluidMomentArms numTurbines - % turbDiam + turbDiam% note: was commented out, but required by fullScale1thrMod_bs, ayazThreeTetVhcl_bs volume inertia_CM @@ -94,7 +94,7 @@ %Turbines obj.numTurbines = SIM.parameter('Description','Number of turbines','NoScale',true); - % obj.turbDiam = SIM.parameter('Value',0,'Unit','m','Description','Turbine Diameter'); + obj.turbDiam = SIM.parameter('Value',0,'Unit','m','Description','Turbine Diameter');% note: was commented out, but required by fullScale1thrMod_bs, ayazThreeTetVhcl_bs % mass, volume and inertia obj.volume = SIM.parameter('Unit','m^3','Description','volume'); @@ -180,7 +180,7 @@ addParameter(p,'TurbClass','turb',@(x) any(strcmp(x,{'turb'}))) parse(p,varargin{:}) - % Create tturbines + % Create turbines for ii = 1:obj.numTurbines.Value obj.addprop(p.Results.TurbNames{ii}); obj.(p.Results.TurbNames{ii}) = eval(sprintf('OCT.%s',p.Results.TurbClass)); @@ -222,12 +222,12 @@ function setNumTurbines(obj,val,units) % end end - % function setTurbDiam(obj,val,units) - % obj.turbDiam.setValue(val,units); - % if obj.numTurbines.Value ~= 0 && obj.turbDiam.Value ~= 0 - % warning("The vehicle is being constructed with non-zero diameter turbines using hardcoded values in the OCT.Vehicle.get.turbines method") - % end - % end + function setTurbDiam(obj,val,units)% note: was commented out, but required by fullScale1thrMod_bs, ayazThreeTetVhcl_bs + obj.turbDiam.setValue(val,units); + if obj.numTurbines.Value ~= 0 && obj.turbDiam.Value ~= 0 + warning("The vehicle is being constructed with non-zero diameter turbines using hardcoded values in the OCT.Vehicle.get.turbines method") + end + end function setOldFluidMomentArms(obj,val,units) obj.oldFluidMomentArms.setValue(val,units); @@ -623,14 +623,19 @@ function updateWings(obj) % fluid dynamic coefficient data function calcFluidDynamicCoefffs(obj) fileLoc = which(obj.fluidCoeffsFileName.Value); + askfirst=0;% set t 0 to run unattended switch obj.hydroCharacterization.Value case 1 if ~isfile(fileLoc) - fprintf([' The file containing the fluid dynamic coefficient data file does not exist.\n',... - ' Would you like to run AVL and create data file ''%s'' ?\n'],obj.fluidCoeffsFileName.Value); - str = input('(Y/N): \n','s'); - if isempty(str) + if askfirst + fprintf([' The file containing the fluid dynamic coefficient data file does not exist.\n',... + ' Would you like to run AVL and create data file ''%s'' ?\n'],obj.fluidCoeffsFileName.Value); + str = input('(Y/N): \n','s'); + if isempty(str) + str = 'Y'; + end + else str = 'Y'; end if strcmpi(str,'Y') @@ -639,11 +644,15 @@ function calcFluidDynamicCoefffs(obj) warning('Simulation won''t run without valid aero coefficient values') end else - fprintf(['The file conaining the fluid dynamic coefficient data file already exists.\n',... - 'Would you like to create a new file?\n']); - str = input('(Y/N): \n','s'); - if isempty(str) - str = 'Y'; + if askfirst + fprintf(['The file conaining the fluid dynamic coefficient data file already exists.\n',... + 'Would you like to create a new file?\n']); + str = input('(Y/N): \n','s'); + if isempty(str) + str = 'Y'; + end + else + str = 'N'; end if strcmpi(str,'Y') newName = input('New filename (excluding ".mat"): \n','s'); @@ -658,10 +667,14 @@ function calcFluidDynamicCoefffs(obj) case 3 if ~isfile(fileLoc) - fprintf([' The file containing the fluid dynamic coefficient data file does not exist.\n',... - ' Would you like to run AVL and create data file ''%s'' ?\n'],obj.fluidCoeffsFileName.Value); - str = input('(Y/N): \n','s'); - if isempty(str) + if askfirst + fprintf([' The file containing the fluid dynamic coefficient data file does not exist.\n',... + ' Would you like to run AVL and create data file ''%s'' ?\n'],obj.fluidCoeffsFileName.Value); + str = input('(Y/N): \n','s'); + if isempty(str) + str = 'Y'; + end + else str = 'Y'; end if strcmpi(str,'Y') @@ -670,11 +683,15 @@ function calcFluidDynamicCoefffs(obj) warning('Simulation won''t run without valid aero coefficient values') end else - fprintf(['The file conaining the fluid dynamic coefficient data file already exists.\n',... - 'Would you like to create a new file?\n']); - str = input('(Y/N): \n','s'); - if isempty(str) - str = 'Y'; + if askfirst + fprintf(['The file conaining the fluid dynamic coefficient data file already exists.\n',... + 'Would you like to create a new file?\n']); + str = input('(Y/N): \n','s'); + if isempty(str) + str = 'Y'; + end + else + str = 'N'; end if strcmpi(str,'Y') newName = input('Enter new filename (excluding ".mat"): \n','s'); diff --git a/classes/+OCT/@vehicleM/animateSim.m b/classes/+OCT/@vehicleM/animateSim.m index b240136ab..fb2297274 100644 --- a/classes/+OCT/@vehicleM/animateSim.m +++ b/classes/+OCT/@vehicleM/animateSim.m @@ -266,12 +266,9 @@ function animateSim(obj,tsc,timeStep,varargin) % Plot the path if ~isempty(p.Results.PathFunc) -<<<<<<< HEAD - initBasisParams = tscTmp.basisParams.Data(1,:); -======= - initBasisParams = tscTmp.pathParams.Data(:,:,1); ->>>>>>> 235507af65cec79c01225d6f4f0f7a4771e8e48e - initBasisParams(5) = sqrt(sum((tscTmp.gndStnPositionVec.getsamples(1).Data(:) - tscTmp.positionVec.getsamples(1).Data(:)).^2)); + % initBasisParams = tscTmp.basisParams.Data(1,:); +% initBasisParams = tscTmp.pathParams.Data(:,:,1); + % initBasisParams(5) = sqrt(sum((tscTmp.gndStnPositionVec.getsamples(1).Data(:) - tscTmp.positionVec.getsamples(1).Data(:)).^2)); path = eval(sprintf('%s(linspace(0,1,1000),initBasisParams,tscTmp.gndStnPositionVec.Data(:,:,1))',... p.Results.PathFunc)); h.path = plot3(... diff --git a/classes/+OCT/@vehicleM/vehicleM.m b/classes/+OCT/@vehicleM/vehicleM.m index 651d2d093..f716eb46d 100644 --- a/classes/+OCT/@vehicleM/vehicleM.m +++ b/classes/+OCT/@vehicleM/vehicleM.m @@ -37,6 +37,9 @@ rCM_LE rBridle_LE rCentOfBuoy_LE + rUSBL2LE % Posisition vector of kite origin wrt USBL + rGnd2USBL % Position vector of master USBL wrt boat origin + rADV2LE % Position vector of kite origin wrt ADV sensor volume wingRootChord wingAR @@ -139,7 +142,11 @@ obj.rB_LE = SIM.parameter('Value',[0;0;0],'Unit','m','Description','Vector going from the Wing LE to the body frame'); obj.rCM_LE = SIM.parameter('Value',[0;0;0],'Unit','m','Description','Vector going from the Wing LE to the Center of Mass'); obj.rBridle_LE = SIM.parameter('Value',[0;0;0],'Unit','m','Description','Vector going from the Wing LE to bridle point'); - obj.rCentOfBuoy_LE = SIM.parameter('Unit','m','Description','Vector going from CM to center of buoyancy'); + obj.rCentOfBuoy_LE = SIM.parameter('Value',[0;0;0],'Unit','m','Description','Vector going from CM to center of buoyancy'); + obj.rUSBL2LE = SIM.parameter('Value',[0;0;0],'Unit','m','Description','Posisition vector of kite origin wrt USBL','NoScale',true); + obj.rGnd2USBL = SIM.parameter('Value',[0;0;0],'Unit','m','Description','Position vector of master USBL wrt boat origin','NoScale',true); + obj.rADV2LE = SIM.parameter('Value',[0;0;0],'Unit','m','Description','Position vector of kite origin wrt ADV sensor volume','NoScale',true); + % Overall Wing Properties (Used to create portWing and stbdWing obj.wingRootChord = SIM.parameter('Unit','m','Description','Wing root chord'); @@ -587,7 +594,13 @@ function setInitAngVelVec(obj,val,units) function obj = scale(obj,lengthScaleFactor,densityScaleFactor) props = findAttrValue(obj,'SetAccess','private'); for ii = 1:numel(props) - obj.(props{ii}).scale(lengthScaleFactor,densityScaleFactor); + try + + obj.(props{ii}).scale(lengthScaleFactor,densityScaleFactor); + + catch + bb=1; + end end end @@ -660,27 +673,40 @@ function updateWings(obj) % fluid dynamic coefficient data function calcFluidDynamicCoefffs(obj) fileLoc = which(obj.fluidCoeffsFileName.Value); + askfirst=0;% set t 0 to run unattended if ~isfile(fileLoc) - fprintf(['The file containing the fluid dynamic coefficient data file does not exist.\n',... - 'Would you like to run AVL and create data file ''%s'' ?\n'],obj.fluidCoeffsFileName.Value); - str = input('(Y/N): \n','s'); - if isempty(str); str = 'Y'; end + if askfirst + fprintf(['The file containing the fluid dynamic coefficient data file does not exist.\n',... + 'Would you like to run AVL and create data file ''%s'' ?\n'],obj.fluidCoeffsFileName.Value); + str = input('(Y/N): \n','s'); + if isempty(str); str = 'Y'; end + else + str = 'Y'; + end if strcmpi(str,'Y') aeroStruct = runAVL(obj); else warning('Simulation won''t run without valid aero coefficient values') end else - fprintf(['The file conaining the fluid dynamic coefficient data "%s" already exists.\n',... - 'Would you like to overwrite?\n'],obj.fluidCoeffsFileName.Value); - str = input('(Y/N): \n','s'); - if isempty(str); str = 'Y'; end + if askfirst + fprintf(['The file conaining the fluid dynamic coefficient data "%s" already exists.\n',... + 'Would you like to overwrite?\n'],obj.fluidCoeffsFileName.Value); + str = input('(Y/N): \n','s'); + if isempty(str); str = 'Y'; end + else + str = 'N'; + end if strcmpi(str,'Y') aeroStruct = runAVL(obj); else - fprintf('Would you like to create a new file?\n'); - str1 = input('(Y/N): \n','s'); - if isempty(str1); str1 = 'Y'; end + if askfirst + fprintf('Would you like to create a new file?\n'); + str1 = input('(Y/N): \n','s'); + if isempty(str1); str1 = 'Y'; end + else + str1 = 'N'; + end if strcmpi(str1,'Y') newName = input('New filename (excluding ".mat"): \n','s'); obj.setFluidCoeffsFileName(newName,''); diff --git a/clean_DOEOKP_mat.bat b/clean_DOEOKP_mat.bat new file mode 100644 index 000000000..031d1e566 --- /dev/null +++ b/clean_DOEOKP_mat.bat @@ -0,0 +1,214 @@ +del .\compositions\environment\flowCalculation\constT_XYZvarZ_Ramp\library\constT_XYZvarZ_Ramp.mat +del .\compositions\environment\flowCalculation\constXYZT\library\constXYZT.mat +del .\compositions\environment\flowCalculation\constXYZT\library\ayazAirborneFlow\ayazAirborneFlow.mat +del .\compositions\environment\flowCalculation\constXYZ_varT_SineWave\library\constXYZ_varT_SineWave.mat +del .\compositions\environment\flowCalculation\constYZTvarX\library\constYZTvarX.mat +del .\compositions\environment\flowCalculation\lowFreqWithFAUTurb\library\CNAPsNoTurbJosh\CNAPsNoTurbJosh.mat +del .\compositions\environment\flowCalculation\lowFreqWithFAUTurb\library\CNAPsTurbJames\CNAPsTurbJames.mat +del .\compositions\environment\flowCalculation\lowFreqWithFAUTurb\library\CNAPsTurbMitchell\CNAPsTurbMitchell.mat +del .\compositions\environment\flowCalculation\lowFreqWithFAUTurb\library\DARPATurbJames\DARPATurbJames.mat +del .\compositions\environment\flowCalculation\lowFreqWithFauTurbAndWaves\library\CNAPsTurbJames.mat +del .\compositions\environment\flowCalculation\planarWaveModel\library\hurricaneSandyWave.mat +del .\compositions\environment\flowCalculation\steppedLateralFlow\library\steppedLateralFlow.mat +del .\compositions\environment\flowCalculation\syntheticFlow\library\ayazAirborneSynFlow.mat +del .\compositions\environment\flowCalculation\syntheticFlow\library\ayazSynFlow.mat +del .\compositions\flightController\fullCycleController\library\fullCycleCtrl\fullCycleCtrl.mat +del .\compositions\flightController\guidanceLawPathFollowing\library\guidanceLawPathFollowingAir\guidanceLawPathFollowingAir.mat +del .\compositions\flightController\guidanceLawPathFollowing\library\guidanceLawPathFollowingWater\guidanceLawPathFollowingWater.mat +del .\compositions\flightController\pathFollowingController\library\pathFollowingCtrlAddedMass\pathFollowingCtrlAddedMass.mat +del .\compositions\flightController\pathFollowingController\library\pathFollowingCtrlForILC\pathFollowingCtrlForILC.mat +del .\compositions\flightController\pathFollowingController\library\pathFollowingCtrlForILC\library\ayazPathFollowingAirborne\ayazPathFollowingAirborne.mat +del .\compositions\flightController\pathFollowingCtrlAoATurb\library\pathFollowCtrlExp.mat +del .\compositions\flightController\pathFollowingCtrlAoATurb\library\pathFollowWithAoACtrlDOE.mat +del .\compositions\flightController\pathFollowingCtrlAoATurb\library\pathFollowingCtrlForManta\pathFollowingCtrlForILCAoA.mat +del .\compositions\flightController\poolTestControllers\library\newSpoolCtrlExp\newSpoolCtrlExp.mat +del .\compositions\flightController\poolTestControllers\library\periodicCtrlExp\periodicCtrlExp.mat +del .\compositions\flightController\shortLeashController\library\slCtrl\exp_slCtrl.mat +del .\compositions\flightController\shortLeashController\library\slCtrl\slCtrl.mat +del .\compositions\flightController\steadyLevelFlightController\library\baselineSteadyLevelFlight\baselineSteadyLevelFlight.mat +del .\compositions\flightController\takeoffToLanding\library\firstBuildTakeoff\firstBuildTakeoff1.mat +del .\compositions\flightController\takeoffToLanding\library\firstBuildTakeoff\firstBuildTakeoff.mat +del .\compositions\flightController\takeoffToLanding\library\jamesMultiCycleExp\jamesMultiCycleExp.mat +del .\compositions\flightController\takeoffToLanding\library\joshMultiCycleExp\joshMultiCycleExp.mat +del .\compositions\flightController\takeoffToLanding\library\newSpoolCtrl\newSpoolCtrl.mat +del .\compositions\flightController\threeTetherThreeSurfaceCtrl\library\ayazThreeTetCtrl\ayazThreeTetCtrl.mat +del .\compositions\gndStnController\anchorTetherCtrl\library\srgSwyHvCtrl\srgSwyHvCtrl.mat +del .\compositions\gndStnController\gliderCtrl\library\motionlessGliderCtrl\motionlessGliderCtrl.mat +del .\compositions\gndStnController\oneDoF\library\oneDoFGSCtrlBasic\oneDoFGSCtrlBasic.mat +del .\compositions\hiLvlController\constantBasisParameters\library\constBoothLem\constBoothLem.mat +del .\compositions\hiLvlController\constantBasisParameters\library\constEllipse\constEllipse.mat +del .\compositions\hiLvlController\gpkfPathOpt\library\gpkfAltitudeOptimization.mat +del .\compositions\hiLvlController\gpkfPathOpt\library\gpkfPathOptAirborne.mat +del .\compositions\hiLvlController\gpkfPathOpt\library\gpkfPathOptWithRGPAirborne.mat +del .\compositions\hiLvlController\gpkfPathOpt\library\gpkfPathOpt.mat +del .\compositions\hiLvlController\gpkfPathOpt\library\omniscientAltitudeOpt.mat +del .\compositions\hiLvlController\ilcPathOpt\library\basicILC\basicILCThrTen.mat +del .\compositions\hiLvlController\ilcPathOpt\library\basicILC\basicILC.mat +del .\compositions\hiLvlController\ilcPathOpt\library\fig8ILC15mPs\fig8ILC15mPs.mat +del .\compositions\hiLvlController\ilcPathOpt\library\fig8ILC1mPs\fig8ILC1mPs.mat +del .\compositions\hiLvlController\ilcPathOpt\library\fig8ILC2mPs\fig8ILC2mPs.mat +del .\compositions\hiLvlController\ilcPathOpt\library\seILC\seILC.mat +del .\compositions\hiLvlController\varGeom\varGeom.mat +del .\compositions\hiLvlController\variableAltitudeBasisParams\library\varAltitudeBooth\varAltitudeBooth.mat +del .\compositions\hiLvlController\variableRadiusBasisParams\library\varRadiusBooth\varRadiusBooth.mat +del .\compositions\plants\components\groundStations\groundStation000\ayazThreeTetGndStn\ayazThreeTetGndStn.mat +del .\compositions\plants\components\groundStations\groundStation000\oneThrGndStn000\oneThrGndStn000.mat +del .\compositions\plants\components\groundStations\groundStation000\pathFollowingGndStn\pathFollowingGndStn.mat +del .\compositions\plants\components\groundStations\groundStation000\threeThrGndStn000\threeThrGndStn000.mat +del .\compositions\plants\components\groundStations\groundStation001\library\library\oneThrThreeAnchGndStn001\oneThrThreeAnchGndStn001.mat +del .\compositions\plants\components\groundStations\groundStation001\library\oneThrThreeAnchGndStn001\oneThrThreeAnchGndStn001.mat +del .\compositions\plants\components\groundStations\groundStation002\library\resizedKiteGndStn\resizedKiteGndStn.mat +del .\compositions\plants\components\groundStations\groundStationPrescribed\library\prescribedGndStn\prescribedGndStn.mat +del .\compositions\plants\components\groundStations\groundStationPrescribed001\groundStationPrescribed001\library\prescribedGndStn001\prescribedGndStn001.mat +del .\compositions\plants\components\groundStations\groundStationPrescribed001\library\prescribedGndStn001\prescribedGndStn001.mat +del .\compositions\plants\components\groundStations\gsWave\library\gsWave.mat +del .\compositions\plants\components\groundStations\raftGroundStation\library\raftGroundStation\raftGroundStation.mat +del .\compositions\plants\components\tethers\tether000\library\ayazAirborneThr\ayazAirborneThr.mat +del .\compositions\plants\components\tethers\tether000\library\ayazFullScaleOneThrTether\ayazFullScaleOneThrTether.mat +del .\compositions\plants\components\tethers\tether000\library\ayazThreeTetTethers\ayazThreeTetTethers.mat +del .\compositions\plants\components\tethers\tether000\library\fiveNodeSingleTether\fiveNodeSingleTether.mat +del .\compositions\plants\components\tethers\tether000\library\ObsTether\ObsTether.mat +del .\compositions\plants\components\tethers\tether000\library\pathFollowingTether\pathFollowingTether.mat +del .\compositions\plants\components\tethers\tether001\library\shortTether\shortTether.mat +del .\compositions\plants\components\tethers\tether001\library\shortTetherCompare\shortTetherCompare.mat +del .\compositions\plants\components\tethers\tetherFaired\pathFollowingTetherFaired.mat +del .\compositions\plants\components\vehicle\vehicle000\library\ayazThreeTetVhcl\ayazThreeTetVhcl.mat +del .\compositions\plants\components\vehicle\vehicle000\library\pathFollowingVhcl\pathFollowingVhcl.mat +del .\compositions\plants\components\vehicle\vehicleLE\library\ayazAirborneVhcl\ayazAirborneVhcl.mat +del .\compositions\plants\components\vehicle\vehicleLE\library\ayazAirborneVhcl\realisticAirborneVhcl.mat +del .\compositions\plants\components\vehicle\vehicleLE\library\ayazFullScaleOneThrVhcl\ayazFullScaleOneThrVhcl.mat +del .\compositions\plants\components\vehicle\vehicleLE\library\ayazOptVhcl\ayazOptVhcl.mat +del .\compositions\plants\components\vehicle\vehicleLE\library\ayazThreeTetVhclForComp\ayazThreeTetVhclForComp.mat +del .\compositions\plants\components\vehicle\vehicleLE\library\fullScale1thr\fullScale1thr.mat +del .\compositions\plants\components\vehicle\vehicleLE\library\fullScale1thrMod\fullScale1thrMod.mat +del .\compositions\plants\components\vehicle\vehicleLE\library\KartikExperiment\sensitivityAnalysis.mat +del .\compositions\plants\components\vehicle\vehicleLE\library\pathFollowingVhclForComp\pathFollowingVhclForComp.mat +del .\compositions\plants\components\vehicle\vehicleTurbine\library\XFoil\poolScaleKiteAbneyDragScreens.mat +del .\compositions\plants\components\vehicle\vehicleTurbine\library\XFoil\poolScaleKiteAbneyRefined.mat +del .\compositions\plants\components\vehicle\vehicleTurbine\library\XFoil\poolScaleKiteAbney.mat +del .\compositions\plants\components\vehicle\vehicleTurbine\library\XFoil\poolScaleKite.mat +del .\compositions\plants\components\winches\winch000\library\anchWnch\anchWnch.mat +del .\compositions\plants\components\winches\winch000\library\ayazFullScaleOneThrWinch\ayazFullScaleOneThrWinch.mat +del .\compositions\plants\components\winches\winch000\library\ayazThreeTetWnch\ayazThreeTetWnch.mat +del .\compositions\plants\components\winches\winch000\library\oneDOFWnch\oneDOFWnch.mat +del .\compositions\plants\components\winches\winch000\library\oneWnch\oneWnch.mat +del .\compositions\plants\components\winches\winch000\library\threeWnch\threeWnch.mat +del .\compositions\plants\components\winches\winch001\library\oneDOFWnchPTO\oneDOFWnchPTO.mat +del .\compositions\sensorProcessing\idealSensorProcessing\library\idealSensorProcessing\idealSensorProcessing.mat +del .\compositions\sensorProcessing\realisticSensorProcessing\library\realisticSensorProcessing\realisticSensorProcessing.mat +del .\compositions\sensors\deadRecPos\deadRecPos.mat +del .\compositions\sensors\idealSensors\library\idealSensors\idealSensors.mat +del .\compositions\sensors\lasPosEst\library\lasPosEst\lasPosEst.mat +del .\compositions\sensors\lineAngleSensor\library\lineAngleSensorBoat.mat +del .\compositions\sensors\lineAngleSensor\library\lineAngleSensor.mat +del .\compositions\sensors\lineAngleSensorObserver\library\lineAngleSensorObserver.mat +del .\compositions\sensors\realisticSensors\library\realisticSensors\realisticSensors.mat +del .\units\applicationSpecific\lowFreqFlowData\library\CNAPsMitchell\CNAPsMitchell.mat + +del .\compositions\environment\flowCalculation\constT_XYZvarZ_Ramp\library\constT_XYZvarZ_Ramp.txt +del .\compositions\environment\flowCalculation\constXYZT\library\constXYZT.txt +del .\compositions\environment\flowCalculation\constXYZT\library\ayazAirborneFlow\ayazAirborneFlow.txt +del .\compositions\environment\flowCalculation\constXYZ_varT_SineWave\library\constXYZ_varT_SineWave.txt +del .\compositions\environment\flowCalculation\constYZTvarX\library\constYZTvarX.txt +del .\compositions\environment\flowCalculation\lowFreqWithFAUTurb\library\CNAPsNoTurbJosh\CNAPsNoTurbJosh.txt +del .\compositions\environment\flowCalculation\lowFreqWithFAUTurb\library\CNAPsTurbJames\CNAPsTurbJames.txt +del .\compositions\environment\flowCalculation\lowFreqWithFAUTurb\library\CNAPsTurbMitchell\CNAPsTurbMitchell.txt +del .\compositions\environment\flowCalculation\lowFreqWithFAUTurb\library\DARPATurbJames\DARPATurbJames.txt +del .\compositions\environment\flowCalculation\lowFreqWithFauTurbAndWaves\library\CNAPsTurbJames.txt +del .\compositions\environment\flowCalculation\planarWaveModel\library\hurricaneSandyWave.txt +del .\compositions\environment\flowCalculation\steppedLateralFlow\library\steppedLateralFlow.txt +del .\compositions\environment\flowCalculation\syntheticFlow\library\ayazAirborneSynFlow.txt +del .\compositions\environment\flowCalculation\syntheticFlow\library\ayazSynFlow.txt +del .\compositions\flightController\fullCycleController\library\fullCycleCtrl\fullCycleCtrl.txt +del .\compositions\flightController\guidanceLawPathFollowing\library\guidanceLawPathFollowingAir\guidanceLawPathFollowingAir.txt +del .\compositions\flightController\guidanceLawPathFollowing\library\guidanceLawPathFollowingWater\guidanceLawPathFollowingWater.txt +del .\compositions\flightController\pathFollowingController\library\pathFollowingCtrlAddedMass\pathFollowingCtrlAddedMass.txt +del .\compositions\flightController\pathFollowingController\library\pathFollowingCtrlForILC\pathFollowingCtrlForILC.txt +del .\compositions\flightController\pathFollowingController\library\pathFollowingCtrlForILC\library\ayazPathFollowingAirborne\ayazPathFollowingAirborne.txt +del .\compositions\flightController\pathFollowingCtrlAoATurb\library\pathFollowCtrlExp.txt +del .\compositions\flightController\pathFollowingCtrlAoATurb\library\pathFollowWithAoACtrlDOE.txt +del .\compositions\flightController\pathFollowingCtrlAoATurb\library\pathFollowingCtrlForManta\pathFollowingCtrlForILCAoA.txt +del .\compositions\flightController\poolTestControllers\library\newSpoolCtrlExp\newSpoolCtrlExp.txt +del .\compositions\flightController\poolTestControllers\library\periodicCtrlExp\periodicCtrlExp.txt +del .\compositions\flightController\shortLeashController\library\slCtrl\exp_slCtrl.txt +del .\compositions\flightController\shortLeashController\library\slCtrl\slCtrl.txt +del .\compositions\flightController\steadyLevelFlightController\library\baselineSteadyLevelFlight\baselineSteadyLevelFlight.txt +del .\compositions\flightController\takeoffToLanding\library\firstBuildTakeoff\firstBuildTakeoff1.txt +del .\compositions\flightController\takeoffToLanding\library\firstBuildTakeoff\firstBuildTakeoff.txt +del .\compositions\flightController\takeoffToLanding\library\jamesMultiCycleExp\jamesMultiCycleExp.txt +del .\compositions\flightController\takeoffToLanding\library\joshMultiCycleExp\joshMultiCycleExp.txt +del .\compositions\flightController\takeoffToLanding\library\newSpoolCtrl\newSpoolCtrl.txt +del .\compositions\flightController\threeTetherThreeSurfaceCtrl\library\ayazThreeTetCtrl\ayazThreeTetCtrl.txt +del .\compositions\gndStnController\anchorTetherCtrl\library\srgSwyHvCtrl\srgSwyHvCtrl.txt +del .\compositions\gndStnController\gliderCtrl\library\motionlessGliderCtrl\motionlessGliderCtrl.txt +del .\compositions\gndStnController\oneDoF\library\oneDoFGSCtrlBasic\oneDoFGSCtrlBasic.txt +del .\compositions\hiLvlController\constantBasisParameters\library\constBoothLem\constBoothLem.txt +del .\compositions\hiLvlController\constantBasisParameters\library\constEllipse\constEllipse.txt +del .\compositions\hiLvlController\gpkfPathOpt\library\gpkfAltitudeOptimization.txt +del .\compositions\hiLvlController\gpkfPathOpt\library\gpkfPathOptAirborne.txt +del .\compositions\hiLvlController\gpkfPathOpt\library\gpkfPathOptWithRGPAirborne.txt +del .\compositions\hiLvlController\gpkfPathOpt\library\gpkfPathOpt.txt +del .\compositions\hiLvlController\gpkfPathOpt\library\omniscientAltitudeOpt.txt +del .\compositions\hiLvlController\ilcPathOpt\library\basicILC\basicILCThrTen.txt +del .\compositions\hiLvlController\ilcPathOpt\library\basicILC\basicILC.txt +del .\compositions\hiLvlController\ilcPathOpt\library\fig8ILC15mPs\fig8ILC15mPs.txt +del .\compositions\hiLvlController\ilcPathOpt\library\fig8ILC1mPs\fig8ILC1mPs.txt +del .\compositions\hiLvlController\ilcPathOpt\library\fig8ILC2mPs\fig8ILC2mPs.txt +del .\compositions\hiLvlController\ilcPathOpt\library\seILC\seILC.txt +del .\compositions\hiLvlController\varGeom\varGeom.txt +del .\compositions\hiLvlController\variableAltitudeBasisParams\library\varAltitudeBooth\varAltitudeBooth.txt +del .\compositions\hiLvlController\variableRadiusBasisParams\library\varRadiusBooth\varRadiusBooth.txt +del .\compositions\plants\components\groundStations\groundStation000\ayazThreeTetGndStn\ayazThreeTetGndStn.txt +del .\compositions\plants\components\groundStations\groundStation000\oneThrGndStn000\oneThrGndStn000.txt +del .\compositions\plants\components\groundStations\groundStation000\pathFollowingGndStn\pathFollowingGndStn.txt +del .\compositions\plants\components\groundStations\groundStation000\threeThrGndStn000\threeThrGndStn000.txt +del .\compositions\plants\components\groundStations\groundStation001\library\library\oneThrThreeAnchGndStn001\oneThrThreeAnchGndStn001.txt +del .\compositions\plants\components\groundStations\groundStation001\library\oneThrThreeAnchGndStn001\oneThrThreeAnchGndStn001.txt +del .\compositions\plants\components\groundStations\groundStation002\library\resizedKiteGndStn\resizedKiteGndStn.txt +del .\compositions\plants\components\groundStations\groundStationPrescribed\library\prescribedGndStn\prescribedGndStn.txt +del .\compositions\plants\components\groundStations\groundStationPrescribed001\groundStationPrescribed001\library\prescribedGndStn001\prescribedGndStn001.txt +del .\compositions\plants\components\groundStations\groundStationPrescribed001\library\prescribedGndStn001\prescribedGndStn001.txt +del .\compositions\plants\components\groundStations\gsWave\library\gsWave.txt +del .\compositions\plants\components\groundStations\raftGroundStation\library\raftGroundStation\raftGroundStation.txt +del .\compositions\plants\components\tethers\tether000\library\ayazAirborneThr\ayazAirborneThr.txt +del .\compositions\plants\components\tethers\tether000\library\ayazFullScaleOneThrTether\ayazFullScaleOneThrTether.txt +del .\compositions\plants\components\tethers\tether000\library\ayazThreeTetTethers\ayazThreeTetTethers.txt +del .\compositions\plants\components\tethers\tether000\library\fiveNodeSingleTether\fiveNodeSingleTether.txt +del .\compositions\plants\components\tethers\tether000\library\ObsTether\ObsTether.txt +del .\compositions\plants\components\tethers\tether000\library\pathFollowingTether\pathFollowingTether.txt +del .\compositions\plants\components\tethers\tether001\library\shortTether\shortTether.txt +del .\compositions\plants\components\tethers\tether001\library\shortTetherCompare\shortTetherCompare.txt +del .\compositions\plants\components\tethers\tetherFaired\pathFollowingTetherFaired.txt +del .\compositions\plants\components\vehicle\vehicle000\library\ayazThreeTetVhcl\ayazThreeTetVhcl.txt +del .\compositions\plants\components\vehicle\vehicle000\library\pathFollowingVhcl\pathFollowingVhcl.txt +del .\compositions\plants\components\vehicle\vehicleLE\library\ayazAirborneVhcl\ayazAirborneVhcl.txt +del .\compositions\plants\components\vehicle\vehicleLE\library\ayazAirborneVhcl\realisticAirborneVhcl.txt +del .\compositions\plants\components\vehicle\vehicleLE\library\ayazFullScaleOneThrVhcl\ayazFullScaleOneThrVhcl.txt +del .\compositions\plants\components\vehicle\vehicleLE\library\ayazOptVhcl\ayazOptVhcl.txt +del .\compositions\plants\components\vehicle\vehicleLE\library\ayazThreeTetVhclForComp\ayazThreeTetVhclForComp.txt +del .\compositions\plants\components\vehicle\vehicleLE\library\fullScale1thr\fullScale1thr.txt +del .\compositions\plants\components\vehicle\vehicleLE\library\fullScale1thrMod\fullScale1thrMod.txt +del .\compositions\plants\components\vehicle\vehicleLE\library\KartikExperiment\sensitivityAnalysis.txt +del .\compositions\plants\components\vehicle\vehicleLE\library\pathFollowingVhclForComp\pathFollowingVhclForComp.txt +del .\compositions\plants\components\vehicle\vehicleTurbine\library\XFoil\poolScaleKiteAbneyDragScreens.txt +del .\compositions\plants\components\vehicle\vehicleTurbine\library\XFoil\poolScaleKiteAbneyRefined.txt +del .\compositions\plants\components\vehicle\vehicleTurbine\library\XFoil\poolScaleKiteAbney.txt +del .\compositions\plants\components\vehicle\vehicleTurbine\library\XFoil\poolScaleKite.txt +del .\compositions\plants\components\winches\winch000\library\anchWnch\anchWnch.txt +del .\compositions\plants\components\winches\winch000\library\ayazFullScaleOneThrWinch\ayazFullScaleOneThrWinch.txt +del .\compositions\plants\components\winches\winch000\library\ayazThreeTetWnch\ayazThreeTetWnch.txt +del .\compositions\plants\components\winches\winch000\library\oneDOFWnch\oneDOFWnch.txt +del .\compositions\plants\components\winches\winch000\library\oneWnch\oneWnch.txt +del .\compositions\plants\components\winches\winch000\library\threeWnch\threeWnch.txt +del .\compositions\plants\components\winches\winch001\library\oneDOFWnchPTO\oneDOFWnchPTO.txt +del .\compositions\sensorProcessing\idealSensorProcessing\library\idealSensorProcessing\idealSensorProcessing.txt +del .\compositions\sensorProcessing\realisticSensorProcessing\library\realisticSensorProcessing\realisticSensorProcessing.txt +del .\compositions\sensors\deadRecPos\deadRecPos.txt +del .\compositions\sensors\idealSensors\library\idealSensors\idealSensors.txt +del .\compositions\sensors\lasPosEst\library\lasPosEst\lasPosEst.txt +del .\compositions\sensors\lineAngleSensor\library\lineAngleSensorBoat.txt +del .\compositions\sensors\lineAngleSensor\library\lineAngleSensor.txt +del .\compositions\sensors\lineAngleSensorObserver\library\lineAngleSensorObserver.txt +del .\compositions\sensors\realisticSensors\library\realisticSensors\realisticSensors.txt +del .\units\applicationSpecific\lowFreqFlowData\library\CNAPsMitchell\CNAPsMitchell.txt +pause diff --git a/compositions/environment/env4turb_cl.slx b/compositions/environment/env4turb_cl.slx index f1ad0f87b..08bed16c8 100644 Binary files a/compositions/environment/env4turb_cl.slx and b/compositions/environment/env4turb_cl.slx differ diff --git a/compositions/environment/env4turb_cl.slx.r2020a b/compositions/environment/env4turb_cl.slx.r2020a new file mode 100644 index 000000000..f1ad0f87b Binary files /dev/null and b/compositions/environment/env4turb_cl.slx.r2020a differ diff --git a/compositions/environment/flowCalculation/constXYZT/constXYZT_cl.slx.r2020a b/compositions/environment/flowCalculation/constXYZT/constXYZT_cl.slx.r2020a new file mode 100644 index 000000000..6f9f01230 Binary files /dev/null and b/compositions/environment/flowCalculation/constXYZT/constXYZT_cl.slx.r2020a differ diff --git a/compositions/flightController/FSCtrl/FSCtrl_cl.slx.original b/compositions/flightController/FSCtrl/FSCtrl_cl.slx.original deleted file mode 100644 index fffdefa1a..000000000 Binary files a/compositions/flightController/FSCtrl/FSCtrl_cl.slx.original and /dev/null differ diff --git a/compositions/flightController/discreteCtrl/discreteWrapper.slx b/compositions/flightController/discreteCtrl/discreteWrapper.slx index 79f19abb1..fbb9dcc54 100644 Binary files a/compositions/flightController/discreteCtrl/discreteWrapper.slx and b/compositions/flightController/discreteCtrl/discreteWrapper.slx differ diff --git a/compositions/flightController/discreteCtrl/discreteWrapper.slx.original b/compositions/flightController/discreteCtrl/discreteWrapper.slx.original deleted file mode 100644 index e04cd090f..000000000 Binary files a/compositions/flightController/discreteCtrl/discreteWrapper.slx.original and /dev/null differ diff --git a/compositions/flightController/flightController_cl.slx b/compositions/flightController/flightController_cl.slx index c68150716..c64ee9e38 100644 Binary files a/compositions/flightController/flightController_cl.slx and b/compositions/flightController/flightController_cl.slx differ diff --git a/compositions/flightController/flightController_cl.slx.original b/compositions/flightController/flightController_cl.slx.original deleted file mode 100644 index 02492aa5a..000000000 Binary files a/compositions/flightController/flightController_cl.slx.original and /dev/null differ diff --git a/compositions/flightController/pathFollowingController/pathFollowingController_cl.slx.original b/compositions/flightController/pathFollowingController/pathFollowingController_cl.slx.original deleted file mode 100644 index d75d9d555..000000000 Binary files a/compositions/flightController/pathFollowingController/pathFollowingController_cl.slx.original and /dev/null differ diff --git a/compositions/flightController/pathFollowingCtrlAoATurb/pathFollowingControllerExp_cl.slx.original b/compositions/flightController/pathFollowingCtrlAoATurb/pathFollowingControllerExp_cl.slx.original deleted file mode 100644 index 2ede6e597..000000000 Binary files a/compositions/flightController/pathFollowingCtrlAoATurb/pathFollowingControllerExp_cl.slx.original and /dev/null differ diff --git a/compositions/flightController/pathFollowingCtrlAoATurb/pathFollowingCtrlAoATurbCoef_cl.slx b/compositions/flightController/pathFollowingCtrlAoATurb/pathFollowingCtrlAoATurbCoef_cl.slx index 868841d86..c4907660c 100644 Binary files a/compositions/flightController/pathFollowingCtrlAoATurb/pathFollowingCtrlAoATurbCoef_cl.slx and b/compositions/flightController/pathFollowingCtrlAoATurb/pathFollowingCtrlAoATurbCoef_cl.slx differ diff --git a/compositions/flightController/pathFollowingCtrlAoATurb/pathFollowingCtrlAoATurbOpt_cl.slx.original b/compositions/flightController/pathFollowingCtrlAoATurb/pathFollowingCtrlAoATurbOpt_cl.slx.original deleted file mode 100644 index 46b24566f..000000000 Binary files a/compositions/flightController/pathFollowingCtrlAoATurb/pathFollowingCtrlAoATurbOpt_cl.slx.original and /dev/null differ diff --git a/compositions/flightController/pathFollowingCtrlAoATurb/pathFollowingCtrlAoATurb_cl.slx.original b/compositions/flightController/pathFollowingCtrlAoATurb/pathFollowingCtrlAoATurb_cl.slx.original deleted file mode 100644 index 9b6566f18..000000000 Binary files a/compositions/flightController/pathFollowingCtrlAoATurb/pathFollowingCtrlAoATurb_cl.slx.original and /dev/null differ diff --git a/compositions/flightController/poolTestControllers/periodicCtrlExp.slx.original b/compositions/flightController/poolTestControllers/periodicCtrlExp.slx.original deleted file mode 100644 index 463afccf7..000000000 Binary files a/compositions/flightController/poolTestControllers/periodicCtrlExp.slx.original and /dev/null differ diff --git a/compositions/flightController/shortLeashController/library/slCtrl/slCtrl_bs.m b/compositions/flightController/shortLeashController/library/slCtrl/slCtrl_bs.m index 1443b3655..1a42efe3c 100644 --- a/compositions/flightController/shortLeashController/library/slCtrl/slCtrl_bs.m +++ b/compositions/flightController/shortLeashController/library/slCtrl/slCtrl_bs.m @@ -12,7 +12,7 @@ fltCtrl.tanRoll.ki.setValue(0,'(rad)/(rad*s)'); fltCtrl.tanRoll.kd.setValue(0,'(rad)/(rad/s)'); fltCtrl.tanRoll.tau.setValue(1e-3,'s'); -fltCtrl. + fltCtrl.rollMoment.kp.setValue((10e4)/(11*pi/180),'(N*m)/(rad)') fltCtrl.rollMoment.ki.setValue(0,'(N*m)/(rad*s)'); fltCtrl.rollMoment.kd.setValue((10e4)/(11*pi/180),'(N*m)/(rad/s)'); diff --git a/compositions/flightController/shortLeashController/slController_cl.slx.original b/compositions/flightController/shortLeashController/slController_cl.slx.original deleted file mode 100644 index 99fc24708..000000000 Binary files a/compositions/flightController/shortLeashController/slController_cl.slx.original and /dev/null differ diff --git a/compositions/hiLvlController/ilcPathOpt/ilcPathOptThrTen_cl.slx.original b/compositions/hiLvlController/ilcPathOpt/ilcPathOptThrTen_cl.slx.original deleted file mode 100644 index 0478e0981..000000000 Binary files a/compositions/hiLvlController/ilcPathOpt/ilcPathOptThrTen_cl.slx.original and /dev/null differ diff --git a/compositions/hiLvlController/ilcPathOpt/ilcPathOpt_cl.slx.original b/compositions/hiLvlController/ilcPathOpt/ilcPathOpt_cl.slx.original deleted file mode 100644 index 5a27efbcb..000000000 Binary files a/compositions/hiLvlController/ilcPathOpt/ilcPathOpt_cl.slx.original and /dev/null differ diff --git a/compositions/hiLvlController/ilcPathOpt/subcomponents/ilcPhaseSwitching_cl.slx.original b/compositions/hiLvlController/ilcPathOpt/subcomponents/ilcPhaseSwitching_cl.slx.original deleted file mode 100644 index 2a9187c16..000000000 Binary files a/compositions/hiLvlController/ilcPathOpt/subcomponents/ilcPhaseSwitching_cl.slx.original and /dev/null differ diff --git a/compositions/plants/components/vehicle/fluidDynamicSurface/Copy_of_fluidDynamicSurface_cl.slx b/compositions/plants/components/vehicle/fluidDynamicSurface/Copy_of_fluidDynamicSurface_cl.slx index 3cfe751f8..b7178b7fb 100644 Binary files a/compositions/plants/components/vehicle/fluidDynamicSurface/Copy_of_fluidDynamicSurface_cl.slx and b/compositions/plants/components/vehicle/fluidDynamicSurface/Copy_of_fluidDynamicSurface_cl.slx differ diff --git a/compositions/plants/components/vehicle/fluidDynamicSurface/calcFluidDynamicLoadsUnpartitioned.slx.original b/compositions/plants/components/vehicle/fluidDynamicSurface/calcFluidDynamicLoadsUnpartitioned.slx.original deleted file mode 100644 index 99399f190..000000000 Binary files a/compositions/plants/components/vehicle/fluidDynamicSurface/calcFluidDynamicLoadsUnpartitioned.slx.original and /dev/null differ diff --git a/compositions/plants/components/vehicle/fuselage/fuselage_cl.slx b/compositions/plants/components/vehicle/fuselage/fuselage_cl.slx index 834732e60..8f4b8d02f 100644 Binary files a/compositions/plants/components/vehicle/fuselage/fuselage_cl.slx and b/compositions/plants/components/vehicle/fuselage/fuselage_cl.slx differ diff --git a/compositions/plants/components/vehicle/vehicle000/library/ayazThreeTetVhcl/ayazThreeTetVhcl_bs.m b/compositions/plants/components/vehicle/vehicle000/library/ayazThreeTetVhcl/ayazThreeTetVhcl_bs.m index 8141a340e..524f795be 100644 --- a/compositions/plants/components/vehicle/vehicle000/library/ayazThreeTetVhcl/ayazThreeTetVhcl_bs.m +++ b/compositions/plants/components/vehicle/vehicle000/library/ayazThreeTetVhcl/ayazThreeTetVhcl_bs.m @@ -31,22 +31,27 @@ % % % volume and inertias vhcl.setVolume(10238.171*1e-9*(1/Lscale^3),'m^3'); MiCoeff = 1; -vhcl.setIxx(MiCoeff*8.308*1e-6*(1/Lscale^5),'kg*m^2'); -vhcl.setIyy(MiCoeff*9.474*1e-6*(1/Lscale^5),'kg*m^2'); -vhcl.setIzz(MiCoeff*18.738*1e-6*(1/Lscale^5),'kg*m^2'); -vhcl.setIxy(0,'kg*m^2'); -vhcl.setIxz(MiCoeff*0.402*1e-6*(1/Lscale^5),'kg*m^2'); -vhcl.setIyz(0,'kg*m^2'); -vhcl.setCentOfBuoy((rCB_LE-rCM_LE)*(1/Lscale),'m'); -vhcl.setRbridle_cm([0;0;0],'m'); +if 0 + vhcl.setIxx(MiCoeff*8.308*1e-6*(1/Lscale^5),'kg*m^2'); + vhcl.setIyy(MiCoeff*9.474*1e-6*(1/Lscale^5),'kg*m^2'); + vhcl.setIzz(MiCoeff*18.738*1e-6*(1/Lscale^5),'kg*m^2'); + vhcl.setIxy(0,'kg*m^2'); + vhcl.setIxz(MiCoeff*0.402*1e-6*(1/Lscale^5),'kg*m^2'); + vhcl.setIyz(0,'kg*m^2'); + vhcl.setCentOfBuoy((rCB_LE-rCM_LE)*(1/Lscale),'m'); + vhcl.setRbridle_cm([0;0;0],'m'); + vhcl.setRwingLE_cm(-rCM_LE*(1/Lscale),'m'); +else + vhcl.setInertia_CM(MiCoeff*[8.308,0,0.4022;0,9.474,0;0.402,0,18.738]*1e-6,'kg*m^2'); + vhcl.setRCentOfBuoy_LE((rCB_LE-rCM_LE)*(1/Lscale),'m'); + vhcl.setRBridle_LE([0;0;0],'m'); + vhcl.setRCM_LE(-rCM_LE*(1/Lscale),'m'); +end vhcl.setAddedMISwitch(true,''); % % % wing Clmax = 2; -% vhcl. - -vhcl.setRwingLE_cm(-rCM_LE*(1/Lscale),'m'); vhcl.setWingChord(15e-3*(1/Lscale),'m'); vhcl.setWingAR(10,''); vhcl.setWingTR(0.8,''); diff --git a/compositions/plants/components/vehicle/vehicle000/library/pathFollowingVhcl/pathFollowingVhcl_bs.m b/compositions/plants/components/vehicle/vehicle000/library/pathFollowingVhcl/pathFollowingVhcl_bs.m index 58fab531e..d887e5fd8 100644 --- a/compositions/plants/components/vehicle/vehicle000/library/pathFollowingVhcl/pathFollowingVhcl_bs.m +++ b/compositions/plants/components/vehicle/vehicle000/library/pathFollowingVhcl/pathFollowingVhcl_bs.m @@ -26,18 +26,25 @@ % % % volume and inertias % vhcl.setVolume(2.85698,'m^3') vhcl.setVolume(945352023.474*1e-9,'m^3'); -vhcl.setIxx(6.303080401918E+09*1e-6,'kg*m^2'); -vhcl.setIyy(2080666338.077*1e-6,'kg*m^2'); -vhcl.setIzz(8.320369733598E+09*1e-6,'kg*m^2'); -vhcl.setIxy(0,'kg*m^2'); -vhcl.setIxz(81875397.942*1e-6,'kg*m^2'); -vhcl.setIyz(0,'kg*m^2'); -vhcl.setCentOfBuoy([0;0;0],'m'); -vhcl.setRbridle_cm([0;0;0],'m'); +if 0 + vhcl.setIxx(6.303080401918E+09*1e-6,'kg*m^2'); + vhcl.setIyy(2080666338.077*1e-6,'kg*m^2'); + vhcl.setIzz(8.320369733598E+09*1e-6,'kg*m^2'); + vhcl.setIxy(0,'kg*m^2'); + vhcl.setIxz(81875397.942*1e-6,'kg*m^2'); + vhcl.setIyz(0,'kg*m^2'); + vhcl.setCentOfBuoy([0;0;0],'m'); + vhcl.setRbridle_cm([0;0;0],'m'); + vhcl.setRwingLE_cm([0;0;0],'m'); +else + vhcl.setInertia_CM([6.303080401918E+09,0,81875397.942;0,2080666338.07,0;81875397.942,0,8.320369733598E+09]*1e-6,'kg*m^2'); + vhcl.setRCentOfBuoy_LE([0;0;0],'m'); + vhcl.setRBridle_LE([0;0;0],'m'); + vhcl.setRCM_LE([0;0;0],'m'); +end % % % wing % vhcl.setRwingLE_cm([-.47064 0 0],'m'); -vhcl.setRwingLE_cm([0;0;0],'m'); vhcl.setWingChord(1,'m'); vhcl.setWingAR(10,''); vhcl.setWingTR(0.8,''); diff --git a/compositions/plants/components/vehicle/vehicleLE/vehicleLE_cl.slx.original b/compositions/plants/components/vehicle/vehicleLE/vehicleLE_cl.slx.original deleted file mode 100644 index 2e5b0c6df..000000000 Binary files a/compositions/plants/components/vehicle/vehicleLE/vehicleLE_cl.slx.original and /dev/null differ diff --git a/compositions/plants/components/vehicle/vehicleTurbine/vhcl4turb_cl.slx.original b/compositions/plants/components/vehicle/vehicleTurbine/vhcl4turb_cl.slx.original deleted file mode 100644 index 52bf7b518..000000000 Binary files a/compositions/plants/components/vehicle/vehicleTurbine/vhcl4turb_cl.slx.original and /dev/null differ diff --git a/compositions/plants/components/vehicle/vehicleTurbine/vhclTurbAMTowed_cl.slx b/compositions/plants/components/vehicle/vehicleTurbine/vhclTurbAMTowed_cl.slx index 12e5437c8..e338389dd 100644 Binary files a/compositions/plants/components/vehicle/vehicleTurbine/vhclTurbAMTowed_cl.slx and b/compositions/plants/components/vehicle/vehicleTurbine/vhclTurbAMTowed_cl.slx differ diff --git a/compositions/sensorProcessing/externalInputSensor/externalInputSensorProcessing.slx b/compositions/sensorProcessing/externalInputSensor/externalInputSensorProcessing.slx index 8f13c2320..e070459c8 100644 Binary files a/compositions/sensorProcessing/externalInputSensor/externalInputSensorProcessing.slx and b/compositions/sensorProcessing/externalInputSensor/externalInputSensorProcessing.slx differ diff --git a/compositions/sensorProcessing/externalInputSensor/externalInputSensorProcessing.slx.original b/compositions/sensorProcessing/externalInputSensor/externalInputSensorProcessing.slx.original deleted file mode 100644 index 9e3931f4a..000000000 Binary files a/compositions/sensorProcessing/externalInputSensor/externalInputSensorProcessing.slx.original and /dev/null differ diff --git a/compositions/sensorProcessing/externalInputSensor/externalInputSensorProcessing_bc.m b/compositions/sensorProcessing/externalInputSensor/externalInputSensorProcessing_bc.m index 23aa61dc6..37dff5637 100644 --- a/compositions/sensorProcessing/externalInputSensor/externalInputSensorProcessing_bc.m +++ b/compositions/sensorProcessing/externalInputSensor/externalInputSensorProcessing_bc.m @@ -1,4 +1,4 @@ -function idealSensorProcessing_bc() +function externalInputSensorProcessing_bc() sz = getBusDims; elems(1) = Simulink.BusElement; @@ -163,6 +163,15 @@ function idealSensorProcessing_bc() elems(18).Complexity = 'real'; elems(18).Unit = 'rad/s'; +elems(19) = Simulink.BusElement; +elems(19).Name = 'ctrlOverride'; +elems(19).Dimensions = [1 1]; +elems(19).DimensionsMode = 'Fixed'; +elems(19).DataType = 'uint8'; +elems(19).SampleTime = -1; +elems(19).Complexity = 'real'; +elems(19).Unit = ''; + BUS = Simulink.Bus; BUS.Elements = elems; BUS.Description = 'Bus containing signals from the sensor processing'; diff --git a/compositions/sensorProcessing/idealSensorProcessing/tiSensorProcessing_bc.m b/compositions/sensorProcessing/idealSensorProcessing/tiSensorProcessing_bc.m new file mode 100644 index 000000000..177cc6181 --- /dev/null +++ b/compositions/sensorProcessing/idealSensorProcessing/tiSensorProcessing_bc.m @@ -0,0 +1,146 @@ +function idealSensorProcessing_bc() +sz = getBusDims; + +elems(1) = Simulink.BusElement; +elems(1).Name = 'positionVec'; +elems(1).Dimensions = [3 1]; +elems(1).DimensionsMode = 'Fixed'; +elems(1).DataType = 'double'; +elems(1).SampleTime = -1; +elems(1).Complexity = 'real'; +elems(1).Unit = 'm'; + +elems(2) = Simulink.BusElement; +elems(2).Name = 'velocityVec'; +elems(2).Dimensions = [3 1]; +elems(2).DimensionsMode = 'Fixed'; +elems(2).DataType = 'double'; +elems(2).SampleTime = -1; +elems(2).Complexity = 'real'; +elems(2).Unit = 'm/s'; + +elems(3) = Simulink.BusElement; +elems(3).Name = 'eulerAngles'; +elems(3).Dimensions = [3 1]; +elems(3).DimensionsMode = 'Fixed'; +elems(3).DataType = 'double'; +elems(3).SampleTime = -1; +elems(3).Complexity = 'real'; +elems(3).Unit = 'rad'; + +elems(4) = Simulink.BusElement; +elems(4).Name = 'angularVel'; +elems(4).Dimensions = [3 1]; +elems(4).DimensionsMode = 'Fixed'; +elems(4).DataType = 'double'; +elems(4).SampleTime = -1; +elems(4).Complexity = 'real'; +elems(4).Unit = 'rad/s'; + +elems(5) = Simulink.BusElement; +elems(5).Name = 'winchPower'; +elems(5).Dimensions = 1; +elems(5).DimensionsMode = 'Fixed'; +elems(5).DataType = 'double'; +elems(5).SampleTime = -1; +elems(5).Complexity = 'real'; +elems(5).Unit = 'W'; + +elems(6) = Simulink.BusElement; +elems(6).Name = 'gndStnPositionVec'; +elems(6).Dimensions = [3 1]; +elems(6).DimensionsMode = 'Fixed'; +elems(6).DataType = 'double'; +elems(6).SampleTime = -1; +elems(6).Complexity = 'real'; +elems(6).Unit = 'm'; + +elems(7) = Simulink.BusElement; +elems(7).Name = 'gndStnVelocityVec'; +elems(7).Dimensions = [3 1]; +elems(7).DimensionsMode = 'Fixed'; +elems(7).DataType = 'double'; +elems(7).SampleTime = -1; +elems(7).Complexity = 'real'; +elems(7).Unit = 'm/s'; + +elems(8) = Simulink.BusElement; +elems(8).Name = 'gndStnEulerAngles'; +elems(8).Dimensions = [3 1]; +elems(8).DimensionsMode = 'Fixed'; +elems(8).DataType = 'double'; +elems(8).SampleTime = -1; +elems(8).Complexity = 'real'; +elems(8).Unit = 'rad'; + +elems(9) = Simulink.BusElement; +elems(9).Name = 'gndStnAngularVel'; +elems(9).Dimensions = [3 1]; +elems(9).DimensionsMode = 'Fixed'; +elems(9).DataType = 'double'; +elems(9).SampleTime = -1; +elems(9).Complexity = 'real'; +elems(9).Unit = 'rad/s'; + +elems(10) = Simulink.BusElement; +elems(10).Name = 'avgTetherLength'; +elems(10).Dimensions = 1; +elems(10).DimensionsMode = 'Fixed'; +elems(10).DataType = 'double'; +elems(10).SampleTime = -1; +elems(10).Complexity = 'real'; +elems(10).Unit = 'm'; + +elems(11) = Simulink.BusElement; +elems(11).Name = 'tetherReleaseSpeeds'; +elems(11).DimensionsMode = 'Fixed'; +elems(11).Dimensions = [sz.numTethers 1]; +elems(11).DataType = 'double'; +elems(11).SampleTime = -1; +elems(11).Complexity = 'real'; +elems(11).Unit = 'm/s'; + +elems(12) = Simulink.BusElement; +elems(12).Name = 'gndTenVecs'; +elems(12).Dimensions = sz.nodeTenVecSize; +elems(12).DimensionsMode = 'Fixed'; +elems(12).DataType = 'double'; +elems(12).SampleTime = -1; +elems(12).Complexity = 'real'; +elems(12).Unit = 'N'; + +elems(13) = Simulink.BusElement; +elems(13).Name = 'airTenVecs'; +elems(13).Dimensions = sz.nodeTenVecSize; +elems(13).DimensionsMode = 'Fixed'; +elems(13).DataType = 'double'; +elems(13).SampleTime = -1; +elems(13).Complexity = 'real'; +elems(13).Unit = 'N'; + +n = evalin('base','vhcl.numTurbines.Value'); +elems(14) = Simulink.BusElement; +elems(14).Name = 'rotorSpeed'; +elems(14).Dimensions = [n 1]; +elems(14).DimensionsMode = 'Fixed'; +elems(14).DataType = 'double'; +elems(14).SampleTime = -1; +elems(14).Complexity = 'real'; +elems(14).Unit = 'rad/s'; + +elems(15) = Simulink.BusElement; +elems(15).Name = 'flowVelocityVec'; +elems(15).Dimensions = [3 1]; +elems(15).DimensionsMode = 'Fixed'; +elems(15).DataType = 'double'; +elems(15).SampleTime = -1; +elems(15).Complexity = 'real'; +elems(15).Unit = 'm/s'; + +BUS = Simulink.Bus; +BUS.Elements = elems; +BUS.Description = 'Bus containing signals from the sensor processing'; + +assignin('base','sensorsProcessingBus',BUS) + +end \ No newline at end of file diff --git a/compositions/sensorProcessing/sensorProcessing_cl.slx.original b/compositions/sensorProcessing/sensorProcessing_cl.slx.original deleted file mode 100644 index 5b0f1675d..000000000 Binary files a/compositions/sensorProcessing/sensorProcessing_cl.slx.original and /dev/null differ diff --git a/compositions/sensors/lineAngleSensor/lineAngleSensor.slx.original b/compositions/sensors/lineAngleSensor/lineAngleSensor.slx.original deleted file mode 100644 index d71acd020..000000000 Binary files a/compositions/sensors/lineAngleSensor/lineAngleSensor.slx.original and /dev/null differ diff --git a/compositions/sensors/lineAngleSensorObserver/lineAngleSensorObserver.slx.original b/compositions/sensors/lineAngleSensorObserver/lineAngleSensorObserver.slx.original deleted file mode 100644 index d71acd020..000000000 Binary files a/compositions/sensors/lineAngleSensorObserver/lineAngleSensorObserver.slx.original and /dev/null differ diff --git a/compositions/sensors/sensors_cl.slx.original b/compositions/sensors/sensors_cl.slx.original deleted file mode 100644 index 7f8afd15c..000000000 Binary files a/compositions/sensors/sensors_cl.slx.original and /dev/null differ diff --git a/development/slmLin/OCTModel_for_lin.slx.original b/development/slmLin/OCTModel_for_lin.slx.original deleted file mode 100644 index 4b61b5b83..000000000 Binary files a/development/slmLin/OCTModel_for_lin.slx.original and /dev/null differ diff --git a/spoolingControllerVDL.slx b/spoolingControllerVDL.slx new file mode 100644 index 000000000..27b8a6fa9 Binary files /dev/null and b/spoolingControllerVDL.slx differ diff --git a/units/applicationSpecific/dragTurbineMantaNew/dragTurbine.slx b/units/applicationSpecific/dragTurbine/dragTurbine.slx similarity index 100% rename from units/applicationSpecific/dragTurbineMantaNew/dragTurbine.slx rename to units/applicationSpecific/dragTurbine/dragTurbine.slx diff --git a/units/applicationSpecific/dragTurbineMantaNew/dragTurbine.slx.r2020a b/units/applicationSpecific/dragTurbine/dragTurbine.slx.r2020a similarity index 100% rename from units/applicationSpecific/dragTurbineMantaNew/dragTurbine.slx.r2020a rename to units/applicationSpecific/dragTurbine/dragTurbine.slx.r2020a diff --git a/units/applicationSpecific/dragTurbineMantaNew/dragTurbine.slx.original b/units/applicationSpecific/dragTurbineMantaNew/dragTurbine.slx.original deleted file mode 100644 index 4238734d4..000000000 Binary files a/units/applicationSpecific/dragTurbineMantaNew/dragTurbine.slx.original and /dev/null differ diff --git a/units/applicationSpecific/pathGeometry/pathGeometry_ul.slx.original b/units/applicationSpecific/pathGeometry/pathGeometry_ul.slx.original deleted file mode 100644 index b67c8e672..000000000 Binary files a/units/applicationSpecific/pathGeometry/pathGeometry_ul.slx.original and /dev/null differ diff --git a/units/applicationSpecific/rotorTorqueCtrl/rotorTorqueCtrl.slx.original b/units/applicationSpecific/rotorTorqueCtrl/rotorTorqueCtrl.slx.original deleted file mode 100644 index f046271c1..000000000 Binary files a/units/applicationSpecific/rotorTorqueCtrl/rotorTorqueCtrl.slx.original and /dev/null differ diff --git a/units/generics/discreteFilter/discreteFilter_ul.slx b/units/generics/discreteFilter/discreteFilter_ul.slx index d1503962b..1901570e7 100644 Binary files a/units/generics/discreteFilter/discreteFilter_ul.slx and b/units/generics/discreteFilter/discreteFilter_ul.slx differ diff --git a/units/generics/discretePID/discreteClampingPID.slx b/units/generics/discretePID/discreteClampingPID.slx index 22ac2673b..d99680aef 100644 Binary files a/units/generics/discretePID/discreteClampingPID.slx and b/units/generics/discretePID/discreteClampingPID.slx differ diff --git a/units/generics/discretePID/discreteGainScheduledFilteredPID.slx b/units/generics/discretePID/discreteGainScheduledFilteredPID.slx index 0a99a3cb9..378bd6999 100644 Binary files a/units/generics/discretePID/discreteGainScheduledFilteredPID.slx and b/units/generics/discretePID/discreteGainScheduledFilteredPID.slx differ diff --git a/units/generics/discretePID/discretePID.slx b/units/generics/discretePID/discretePID.slx index b19383182..124984375 100644 Binary files a/units/generics/discretePID/discretePID.slx and b/units/generics/discretePID/discretePID.slx differ diff --git a/units/generics/discretePID/discreteSecondOrderPD_cl.slx b/units/generics/discretePID/discreteSecondOrderPD_cl.slx index e7e19d6f0..30db493a0 100644 Binary files a/units/generics/discretePID/discreteSecondOrderPD_cl.slx and b/units/generics/discretePID/discreteSecondOrderPD_cl.slx differ