diff --git a/Libraries/Blades/Blades_Lib.slx b/Libraries/Blades/Blades_Lib.slx index ada5d7c..3eae599 100644 Binary files a/Libraries/Blades/Blades_Lib.slx and b/Libraries/Blades/Blades_Lib.slx differ diff --git a/Libraries/Blades/Blades_Testrig.slx b/Libraries/Blades/Blades_Testrig.slx index 3c7c226..13dc609 100644 Binary files a/Libraries/Blades/Blades_Testrig.slx and b/Libraries/Blades/Blades_Testrig.slx differ diff --git a/Libraries/Blades/Flex_Blades/Libraries/Flex_Cantilever_Element_Lib.slx b/Libraries/Blades/Flex_Blades/Libraries/Flex_Cantilever_Element_Lib.slx deleted file mode 100644 index fe999ad..0000000 Binary files a/Libraries/Blades/Flex_Blades/Libraries/Flex_Cantilever_Element_Lib.slx and /dev/null differ diff --git a/Libraries/Blades/Flex_Blades/Libraries/Flex_Cantilever_Lib.slx b/Libraries/Blades/Flex_Blades/Libraries/Flex_Cantilever_Lib.slx deleted file mode 100644 index f808d11..0000000 Binary files a/Libraries/Blades/Flex_Blades/Libraries/Flex_Cantilever_Lib.slx and /dev/null differ diff --git a/Libraries/Blades/Flex_Blades/Scripts/Change_Flex_Body_To_FEA_Approach.m b/Libraries/Blades/Flex_Blades/Scripts/Change_Flex_Body_To_FEA_Approach.m index 4a2ebe2..fd3aa23 100644 --- a/Libraries/Blades/Flex_Blades/Scripts/Change_Flex_Body_To_FEA_Approach.m +++ b/Libraries/Blades/Flex_Blades/Scripts/Change_Flex_Body_To_FEA_Approach.m @@ -6,4 +6,4 @@ set_param([test_model '/Flexible Cantilever2'],'BlockChoice','FEA Modes'); set_param([test_model '/Flexible Cantilever3'],'BlockChoice','FEA Modes'); -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. diff --git a/Libraries/Blades/Flex_Blades/Scripts/Change_Flex_Body_To_Lumped_Parameter.m b/Libraries/Blades/Flex_Blades/Scripts/Change_Flex_Body_To_Lumped_Parameter.m index b4255f4..8a5cd81 100644 --- a/Libraries/Blades/Flex_Blades/Scripts/Change_Flex_Body_To_Lumped_Parameter.m +++ b/Libraries/Blades/Flex_Blades/Scripts/Change_Flex_Body_To_Lumped_Parameter.m @@ -6,4 +6,4 @@ set_param([test_model '/Flexible Cantilever2'],'BlockChoice','Lumped Parameter'); set_param([test_model '/Flexible Cantilever3'],'BlockChoice','Lumped Parameter'); -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. diff --git a/Libraries/Blades/Flex_Blades/Scripts/Flex_Blades_Params.m b/Libraries/Blades/Flex_Blades/Scripts/Flex_Blades_Params.m index 9c653f7..6395195 100644 --- a/Libraries/Blades/Flex_Blades/Scripts/Flex_Blades_Params.m +++ b/Libraries/Blades/Flex_Blades/Scripts/Flex_Blades_Params.m @@ -2,4 +2,4 @@ Flex_Blade.Ki = 0.5; Flex_Blade.Damping = 1; -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. diff --git a/Libraries/Blades/Flex_Blades/Scripts/Flexible_Blades_Slide_Prep.m b/Libraries/Blades/Flex_Blades/Scripts/Flexible_Blades_Slide_Prep.m index 8c8ff85..d494aa7 100644 --- a/Libraries/Blades/Flex_Blades/Scripts/Flexible_Blades_Slide_Prep.m +++ b/Libraries/Blades/Flex_Blades/Scripts/Flexible_Blades_Slide_Prep.m @@ -62,4 +62,4 @@ colordef white; -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. diff --git a/Libraries/Blades/Flex_Blades/Scripts/Flexible_Cantilever_Lumped_Parameters.m b/Libraries/Blades/Flex_Blades/Scripts/Flexible_Cantilever_Lumped_Parameters.m index 8fd20e1..b0d531c 100644 --- a/Libraries/Blades/Flex_Blades/Scripts/Flexible_Cantilever_Lumped_Parameters.m +++ b/Libraries/Blades/Flex_Blades/Scripts/Flexible_Cantilever_Lumped_Parameters.m @@ -1,5 +1,5 @@ % FLEXIBLE BODY LUMPED PARAMETER DEFINITION -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. %----------------------------------------- % Defined in the block mask diff --git a/Libraries/Blades/Flex_Blades/Scripts/Flexible_Cantilever_Properties_Aluminum1060.m b/Libraries/Blades/Flex_Blades/Scripts/Flexible_Cantilever_Properties_Aluminum1060.m index 009b14c..83073e5 100644 --- a/Libraries/Blades/Flex_Blades/Scripts/Flexible_Cantilever_Properties_Aluminum1060.m +++ b/Libraries/Blades/Flex_Blades/Scripts/Flexible_Cantilever_Properties_Aluminum1060.m @@ -3,4 +3,4 @@ materialdata.youngsModulus = 6.9e10 ; % N/m^2 materialdata.density = 2700 ; % kg/m^3 -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. diff --git a/Libraries/Blades/Flex_Blades/Scripts/cantilever_aluminum.m b/Libraries/Blades/Flex_Blades/Scripts/cantilever_aluminum.m index eab31d0..5c012cd 100644 --- a/Libraries/Blades/Flex_Blades/Scripts/cantilever_aluminum.m +++ b/Libraries/Blades/Flex_Blades/Scripts/cantilever_aluminum.m @@ -4,4 +4,4 @@ cantileverdata.width = 0.05 ; % m cantileverdata.material = Flexible_Cantilever_Properties_Aluminum1060; -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. diff --git a/Libraries/Blades/Flex_Blades/Scripts/derive_cantilever_properties.m b/Libraries/Blades/Flex_Blades/Scripts/derive_cantilever_properties.m index 2277494..fbb8254 100644 --- a/Libraries/Blades/Flex_Blades/Scripts/derive_cantilever_properties.m +++ b/Libraries/Blades/Flex_Blades/Scripts/derive_cantilever_properties.m @@ -1,5 +1,5 @@ function derivedData = cantilever_init( cantileverData ) -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. L = cantileverData.length; a = cantileverData.height / 2; b = cantileverData.width / 2; diff --git a/Libraries/Blades/Flex_Blades/Wind_Turbine_Flexible_Blades.slx b/Libraries/Blades/Flex_Blades/Wind_Turbine_Flexible_Blades.slx index c23d4df..0bd24d5 100644 Binary files a/Libraries/Blades/Flex_Blades/Wind_Turbine_Flexible_Blades.slx and b/Libraries/Blades/Flex_Blades/Wind_Turbine_Flexible_Blades.slx differ diff --git a/Libraries/Blades/Flex_Blades/startup_Flexible_Blades.m b/Libraries/Blades/Flex_Blades/startup_Flexible_Blades.m index 1c13f32..e1c1a57 100644 --- a/Libraries/Blades/Flex_Blades/startup_Flexible_Blades.m +++ b/Libraries/Blades/Flex_Blades/startup_Flexible_Blades.m @@ -1,13 +1,7 @@ -%STARTUP FLEXIBLE BLADES -addpath(pwd); -addpath([pwd '\Scripts']); -addpath([pwd '\Images']); -addpath([pwd '\Libraries']); - load ss_cantilever_pva Flexible_Cantilever_Lumped_Parameters Flex_Blades_Params Wind_Turbine_Flexible_Blades -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. diff --git a/Libraries/Brakes/Brakes_Lib.slx b/Libraries/Brakes/Brakes_Lib.slx index 458f31d..7322aa2 100644 Binary files a/Libraries/Brakes/Brakes_Lib.slx and b/Libraries/Brakes/Brakes_Lib.slx differ diff --git a/Libraries/Environment/+AerodynamicLoads/BendingSpinningMoments.ssc b/Libraries/Environment/+AerodynamicLoads/BendingSpinningMoments.ssc index 6f2f51b..1defdee 100644 --- a/Libraries/Environment/+AerodynamicLoads/BendingSpinningMoments.ssc +++ b/Libraries/Environment/+AerodynamicLoads/BendingSpinningMoments.ssc @@ -6,7 +6,7 @@ component BendingSpinningMoments % lift and drag coefficients. It outputs the angle of attack, as well % as the bending and spinning moments. - % Copyright 2011-2019 The MathWorks, Inc. + % Copyright 2011-2020 The MathWorks, Inc. inputs v_wind = { 0 , 'm/s' }; % V_wind:left diff --git a/Libraries/Environment/Inputs_Set_Busses_Testrig.slx b/Libraries/Environment/Inputs_Set_Busses_Testrig.slx index 8a94285..0a58d35 100644 Binary files a/Libraries/Environment/Inputs_Set_Busses_Testrig.slx and b/Libraries/Environment/Inputs_Set_Busses_Testrig.slx differ diff --git a/Libraries/Environment/Turbine_Input_Lib.slx b/Libraries/Environment/Turbine_Input_Lib.slx index a593855..c68ab5a 100644 Binary files a/Libraries/Environment/Turbine_Input_Lib.slx and b/Libraries/Environment/Turbine_Input_Lib.slx differ diff --git a/Libraries/Environment/Wind_Lib.slx b/Libraries/Environment/Wind_Lib.slx index 0cc71ec..ecc5cf1 100644 Binary files a/Libraries/Environment/Wind_Lib.slx and b/Libraries/Environment/Wind_Lib.slx differ diff --git a/Libraries/Environment/Wind_Testrig.slx b/Libraries/Environment/Wind_Testrig.slx index 82d1fda..c59ab3a 100644 Binary files a/Libraries/Environment/Wind_Testrig.slx and b/Libraries/Environment/Wind_Testrig.slx differ diff --git a/Libraries/Geartrain/Geartrain_Lib.slx b/Libraries/Geartrain/Geartrain_Lib.slx index 21d4084..3fbd19d 100644 Binary files a/Libraries/Geartrain/Geartrain_Lib.slx and b/Libraries/Geartrain/Geartrain_Lib.slx differ diff --git a/Libraries/Geartrain/Geartrain_Testrig.slx b/Libraries/Geartrain/Geartrain_Testrig.slx index 7c02a02..fb5e2d3 100644 Binary files a/Libraries/Geartrain/Geartrain_Testrig.slx and b/Libraries/Geartrain/Geartrain_Testrig.slx differ diff --git a/Libraries/Generator/Check_Generator_Power.m b/Libraries/Generator/Check_Generator_Power.m index 7ed540f..1286f69 100644 --- a/Libraries/Generator/Check_Generator_Power.m +++ b/Libraries/Generator/Check_Generator_Power.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. load Generator_Speed_Tests colordef black; diff --git a/Libraries/Generator/Generator_Lib.slx b/Libraries/Generator/Generator_Lib.slx index 753a490..cbed28f 100644 Binary files a/Libraries/Generator/Generator_Lib.slx and b/Libraries/Generator/Generator_Lib.slx differ diff --git a/Libraries/Generator/Generator_Testrig.slx b/Libraries/Generator/Generator_Testrig.slx index eb84ad7..a198484 100644 Binary files a/Libraries/Generator/Generator_Testrig.slx and b/Libraries/Generator/Generator_Testrig.slx differ diff --git a/Libraries/Main_Controller/Main_Controller_Lib.slx b/Libraries/Main_Controller/Main_Controller_Lib.slx index 7e87a77..feb09a8 100644 Binary files a/Libraries/Main_Controller/Main_Controller_Lib.slx and b/Libraries/Main_Controller/Main_Controller_Lib.slx differ diff --git a/Libraries/Main_Controller/SLDV/ControlLogic.slx b/Libraries/Main_Controller/SLDV/ControlLogic.slx index a728d9e..d67fdaf 100644 Binary files a/Libraries/Main_Controller/SLDV/ControlLogic.slx and b/Libraries/Main_Controller/SLDV/ControlLogic.slx differ diff --git a/Libraries/Main_Controller/SLDV/ControlLogic_Ports.slx b/Libraries/Main_Controller/SLDV/ControlLogic_Ports.slx index db90ab9..57a8a40 100644 Binary files a/Libraries/Main_Controller/SLDV/ControlLogic_Ports.slx and b/Libraries/Main_Controller/SLDV/ControlLogic_Ports.slx differ diff --git a/Libraries/Main_Controller/SLDV/ControlLogic_Testrig.slx b/Libraries/Main_Controller/SLDV/ControlLogic_Testrig.slx index 2f1fe6a..ffafb31 100644 Binary files a/Libraries/Main_Controller/SLDV/ControlLogic_Testrig.slx and b/Libraries/Main_Controller/SLDV/ControlLogic_Testrig.slx differ diff --git a/Libraries/Main_Controller/Turbine_State_Machine_Lib.slx b/Libraries/Main_Controller/Turbine_State_Machine_Lib.slx index b6fe581..f46f682 100644 Binary files a/Libraries/Main_Controller/Turbine_State_Machine_Lib.slx and b/Libraries/Main_Controller/Turbine_State_Machine_Lib.slx differ diff --git a/Libraries/Main_Controller/Turbine_State_Machine_Testrig.slx b/Libraries/Main_Controller/Turbine_State_Machine_Testrig.slx index 4148317..01ea7a6 100644 Binary files a/Libraries/Main_Controller/Turbine_State_Machine_Testrig.slx and b/Libraries/Main_Controller/Turbine_State_Machine_Testrig.slx differ diff --git a/Libraries/Nacelle/Hub_Axis_Lib.slx b/Libraries/Nacelle/Hub_Axis_Lib.slx index 3f66b05..eefd266 100644 Binary files a/Libraries/Nacelle/Hub_Axis_Lib.slx and b/Libraries/Nacelle/Hub_Axis_Lib.slx differ diff --git a/Libraries/Pitch_Actuation/Hydraulic_Actuator_Lib.slx b/Libraries/Pitch_Actuation/Hydraulic_Actuator_Lib.slx index 6a5ddee..f631c10 100644 Binary files a/Libraries/Pitch_Actuation/Hydraulic_Actuator_Lib.slx and b/Libraries/Pitch_Actuation/Hydraulic_Actuator_Lib.slx differ diff --git a/Libraries/Pitch_Actuation/Pitch_Actuation_Hydraulic_Testrig.slx b/Libraries/Pitch_Actuation/Pitch_Actuation_Hydraulic_Testrig.slx index 1b0fe5d..4233316 100644 Binary files a/Libraries/Pitch_Actuation/Pitch_Actuation_Hydraulic_Testrig.slx and b/Libraries/Pitch_Actuation/Pitch_Actuation_Hydraulic_Testrig.slx differ diff --git a/Libraries/Pitch_Actuation/Pitch_Actuation_Hydraulic_Testrig_setsolver.m b/Libraries/Pitch_Actuation/Pitch_Actuation_Hydraulic_Testrig_setsolver.m index 8c89a0b..27a50cd 100644 --- a/Libraries/Pitch_Actuation/Pitch_Actuation_Hydraulic_Testrig_setsolver.m +++ b/Libraries/Pitch_Actuation/Pitch_Actuation_Hydraulic_Testrig_setsolver.m @@ -1,5 +1,5 @@ function Pitch_Actuation_Hydraulic_Testrig_setsolver(mdl,deskreal) -% Copyright 2011-2019 The MathWorks, Inc. +% Copyright 2011-2020 The MathWorks, Inc. desktop_solver = 'ode15s'; diff --git a/Libraries/Pitch_Actuation/Pitch_Actuation_Lib.slx b/Libraries/Pitch_Actuation/Pitch_Actuation_Lib.slx index 51df40c..30cf7ac 100644 Binary files a/Libraries/Pitch_Actuation/Pitch_Actuation_Lib.slx and b/Libraries/Pitch_Actuation/Pitch_Actuation_Lib.slx differ diff --git a/Libraries/Pitch_Actuation/Pitch_Actuation_Linkage.slx b/Libraries/Pitch_Actuation/Pitch_Actuation_Linkage.slx index a5fd2d5..3668035 100644 Binary files a/Libraries/Pitch_Actuation/Pitch_Actuation_Linkage.slx and b/Libraries/Pitch_Actuation/Pitch_Actuation_Linkage.slx differ diff --git a/Libraries/Pitch_Actuation/Pitch_Actuation_Linkage_Lib.slx b/Libraries/Pitch_Actuation/Pitch_Actuation_Linkage_Lib.slx index 85fef39..3416d1e 100644 Binary files a/Libraries/Pitch_Actuation/Pitch_Actuation_Linkage_Lib.slx and b/Libraries/Pitch_Actuation/Pitch_Actuation_Linkage_Lib.slx differ diff --git a/Libraries/Pitch_Actuation/Pitch_System_Lib.slx b/Libraries/Pitch_Actuation/Pitch_System_Lib.slx index 458524a..3fe980f 100644 Binary files a/Libraries/Pitch_Actuation/Pitch_System_Lib.slx and b/Libraries/Pitch_Actuation/Pitch_System_Lib.slx differ diff --git a/Libraries/Pitch_Controller/Pitch_Control_Hydraulic_Testrig.slx b/Libraries/Pitch_Controller/Pitch_Control_Hydraulic_Testrig.slx index 30654d4..f3692f9 100644 Binary files a/Libraries/Pitch_Controller/Pitch_Control_Hydraulic_Testrig.slx and b/Libraries/Pitch_Controller/Pitch_Control_Hydraulic_Testrig.slx differ diff --git a/Libraries/Pitch_Controller/Pitch_Control_Hydraulic_Testrig_setparam.m b/Libraries/Pitch_Controller/Pitch_Control_Hydraulic_Testrig_setparam.m index 83e2dd5..130182a 100644 --- a/Libraries/Pitch_Controller/Pitch_Control_Hydraulic_Testrig_setparam.m +++ b/Libraries/Pitch_Controller/Pitch_Control_Hydraulic_Testrig_setparam.m @@ -1,5 +1,5 @@ function Pitch_Control_Hydraulic_Testrig_setparam(initialtuned) -% Copyright 2017-2019 The MathWorks, Inc. +% Copyright 2017-2020 The MathWorks, Inc. if strcmp(initialtuned,'Initial') evalin('base','Pitch_Kp = 7000;'); diff --git a/Libraries/Pitch_Controller/Pitch_Control_Ideal_Testrig.slx b/Libraries/Pitch_Controller/Pitch_Control_Ideal_Testrig.slx index 1460056..349c2c5 100644 Binary files a/Libraries/Pitch_Controller/Pitch_Control_Ideal_Testrig.slx and b/Libraries/Pitch_Controller/Pitch_Control_Ideal_Testrig.slx differ diff --git a/Libraries/Pitch_Controller/Pitch_Controller_Generated_SFunc.slx b/Libraries/Pitch_Controller/Pitch_Controller_Generated_SFunc.slx index f7325d0..5d18b18 100644 Binary files a/Libraries/Pitch_Controller/Pitch_Controller_Generated_SFunc.slx and b/Libraries/Pitch_Controller/Pitch_Controller_Generated_SFunc.slx differ diff --git a/Libraries/Pitch_Controller/Pitch_Controller_Lib.slx b/Libraries/Pitch_Controller/Pitch_Controller_Lib.slx index fd8b2ac..f54406d 100644 Binary files a/Libraries/Pitch_Controller/Pitch_Controller_Lib.slx and b/Libraries/Pitch_Controller/Pitch_Controller_Lib.slx differ diff --git a/Libraries/Pitch_Controller/UpdateControlSystemDesigner_Session.m b/Libraries/Pitch_Controller/UpdateControlSystemDesigner_Session.m index 6b1b038..e2d64ad 100644 --- a/Libraries/Pitch_Controller/UpdateControlSystemDesigner_Session.m +++ b/Libraries/Pitch_Controller/UpdateControlSystemDesigner_Session.m @@ -1,4 +1,4 @@ -% Copyright 2016-2019 The MathWorks, Inc. +% Copyright 2016-2020 The MathWorks, Inc. % MAT file containing session load('ControlSystemDesignerSession_start.mat'); diff --git a/Libraries/Tower/Tower.slx b/Libraries/Tower/Tower.slx index 1b04fec..13a173b 100644 Binary files a/Libraries/Tower/Tower.slx and b/Libraries/Tower/Tower.slx differ diff --git a/Libraries/Yaw_Actuation/Yaw_Actuation_Lib.slx b/Libraries/Yaw_Actuation/Yaw_Actuation_Lib.slx index 01b3a4b..9702f85 100644 Binary files a/Libraries/Yaw_Actuation/Yaw_Actuation_Lib.slx and b/Libraries/Yaw_Actuation/Yaw_Actuation_Lib.slx differ diff --git a/Libraries/Yaw_Actuation/Yaw_Actuation_Testrig.slx b/Libraries/Yaw_Actuation/Yaw_Actuation_Testrig.slx index 63683b8..0546f23 100644 Binary files a/Libraries/Yaw_Actuation/Yaw_Actuation_Testrig.slx and b/Libraries/Yaw_Actuation/Yaw_Actuation_Testrig.slx differ diff --git a/Libraries/Yaw_Actuation/Yaw_Gearbox_Lib.slx b/Libraries/Yaw_Actuation/Yaw_Gearbox_Lib.slx index e1c18b6..7b4afe0 100644 Binary files a/Libraries/Yaw_Actuation/Yaw_Gearbox_Lib.slx and b/Libraries/Yaw_Actuation/Yaw_Gearbox_Lib.slx differ diff --git a/Libraries/Yaw_Actuation/Yaw_Gearbox_Testrig.slx b/Libraries/Yaw_Actuation/Yaw_Gearbox_Testrig.slx index 6089b34..2b32e19 100644 Binary files a/Libraries/Yaw_Actuation/Yaw_Gearbox_Testrig.slx and b/Libraries/Yaw_Actuation/Yaw_Gearbox_Testrig.slx differ diff --git a/Libraries/Yaw_Actuation/Yaw_Ideal_Actuator_Lib.slx b/Libraries/Yaw_Actuation/Yaw_Ideal_Actuator_Lib.slx index 6761de7..659add2 100644 Binary files a/Libraries/Yaw_Actuation/Yaw_Ideal_Actuator_Lib.slx and b/Libraries/Yaw_Actuation/Yaw_Ideal_Actuator_Lib.slx differ diff --git a/Libraries/Yaw_Actuation/Yaw_Ideal_Motor_Lib.slx b/Libraries/Yaw_Actuation/Yaw_Ideal_Motor_Lib.slx index 14a95e2..55e5b81 100644 Binary files a/Libraries/Yaw_Actuation/Yaw_Ideal_Motor_Lib.slx and b/Libraries/Yaw_Actuation/Yaw_Ideal_Motor_Lib.slx differ diff --git a/Libraries/Yaw_Actuation/Yaw_Motor_Lib.slx b/Libraries/Yaw_Actuation/Yaw_Motor_Lib.slx index 1c577bd..e469315 100644 Binary files a/Libraries/Yaw_Actuation/Yaw_Motor_Lib.slx and b/Libraries/Yaw_Actuation/Yaw_Motor_Lib.slx differ diff --git a/Libraries/Yaw_Actuation/Yaw_System_Lib.slx b/Libraries/Yaw_Actuation/Yaw_System_Lib.slx index 7760beb..6b910b5 100644 Binary files a/Libraries/Yaw_Actuation/Yaw_System_Lib.slx and b/Libraries/Yaw_Actuation/Yaw_System_Lib.slx differ diff --git a/Libraries/Yaw_Controller/Yaw_Controller_Lib.slx b/Libraries/Yaw_Controller/Yaw_Controller_Lib.slx index e478ec8..d53f5c4 100644 Binary files a/Libraries/Yaw_Controller/Yaw_Controller_Lib.slx and b/Libraries/Yaw_Controller/Yaw_Controller_Lib.slx differ diff --git a/README.txt b/README.txt index 9c80ddc..f456d20 100644 --- a/README.txt +++ b/README.txt @@ -18,4 +18,4 @@ Here are some key points about this demonstration model. 5. The model Wind_Turbine_Flexible_Blades.slx is not built to be attached to Wind_Turbine.slx. It is proof of concept only. -Copyright 2009-2019 The MathWorks, Inc. +Copyright 2009-2020 The MathWorks, Inc. diff --git a/Scripts_Data/Break_All_Links.m b/Scripts_Data/Break_All_Links.m index d9ba195..0186101 100644 --- a/Scripts_Data/Break_All_Links.m +++ b/Scripts_Data/Break_All_Links.m @@ -1,5 +1,5 @@ % FIND ALL BLOCKS THAT ARE CONFIGURABLE SUBSYSTEMS -% Copyright 2011-2019 The MathWorks, Inc. +% Copyright 2011-2020 The MathWorks, Inc. ConfigSubsysBlks_path=find_system(bdroot,'FollowLinks','on','RegExp','on','MemberBlocks','.+'); diff --git a/Scripts_Data/Compare_Pitch_Actuators.m b/Scripts_Data/Compare_Pitch_Actuators.m index 4a8bdc8..ae62b98 100644 --- a/Scripts_Data/Compare_Pitch_Actuators.m +++ b/Scripts_Data/Compare_Pitch_Actuators.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. open_system([bdroot '/Nacelle']); open_system([bdroot '/Scopes/Pitch Scopes/Pitch Command and Angle (deg)']); diff --git a/Scripts_Data/Compare_Yaw_Actuators.m b/Scripts_Data/Compare_Yaw_Actuators.m index 092089b..e990372 100644 --- a/Scripts_Data/Compare_Yaw_Actuators.m +++ b/Scripts_Data/Compare_Yaw_Actuators.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. Select_Turbine_Systems('IM_Yaw Test', WT_Configs); open_system('Wind_Turbine/Nacelle'); diff --git a/Scripts_Data/Cylinder_Inertia.m b/Scripts_Data/Cylinder_Inertia.m index 4295983..824f174 100644 --- a/Scripts_Data/Cylinder_Inertia.m +++ b/Scripts_Data/Cylinder_Inertia.m @@ -1,6 +1,6 @@ function [Inertia] = Cylinder_Inertia(length, radius,density,sym_axis) % Example function for calculating cylinder inertia -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. mass = density*pi*radius^2*length; inertia_about_sym_axis = mass*(radius^2)/2; diff --git a/Scripts_Data/Cylinder_Mass.m b/Scripts_Data/Cylinder_Mass.m index 088549f..d3e4fd4 100644 --- a/Scripts_Data/Cylinder_Mass.m +++ b/Scripts_Data/Cylinder_Mass.m @@ -1,5 +1,5 @@ % Example function for calculating cylinder mass -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. function [mass] = Cylinder_Mass(length, radius,density) mass = density*pi*radius^2*length; diff --git a/Scripts_Data/Extr_Data_BoxFillet.m b/Scripts_Data/Extr_Data_BoxFillet.m index fdc0543..0057e8a 100644 --- a/Scripts_Data/Extr_Data_BoxFillet.m +++ b/Scripts_Data/Extr_Data_BoxFillet.m @@ -18,7 +18,7 @@ % add 'plot' as the final argument % >> Extr_Data_BoxFillet(6,4,1,2,4,0,5,'plot') -% Copyright 2012-2019 The MathWorks, Inc. +% Copyright 2012-2020 The MathWorks, Inc. % Default data to show diagram if (nargin == 0) diff --git a/Scripts_Data/Extr_Data_Ellipse.m b/Scripts_Data/Extr_Data_Ellipse.m index aa0c78d..77c5064 100644 --- a/Scripts_Data/Extr_Data_Ellipse.m +++ b/Scripts_Data/Extr_Data_Ellipse.m @@ -17,7 +17,7 @@ % add 'plot' as the final argument % >> Extr_Data_Ellipse(5,2,60,315,1,'plot') -% Copyright 2012-2019 The MathWorks, Inc. +% Copyright 2012-2020 The MathWorks, Inc. % Default data to show diagram if (nargin == 0) diff --git a/Scripts_Data/Extr_Data_Ring.m b/Scripts_Data/Extr_Data_Ring.m index cc008cb..74d7ab2 100644 --- a/Scripts_Data/Extr_Data_Ring.m +++ b/Scripts_Data/Extr_Data_Ring.m @@ -16,7 +16,7 @@ % add 'plot' as the final argument % >> Extr_Data_Ring(10,5,45,315,'plot') -% Copyright 2012-2019 The MathWorks, Inc. +% Copyright 2012-2020 The MathWorks, Inc. % Default data to show diagram if (nargin == 0) diff --git a/Scripts_Data/Generator_Speed_vs_Power_Tests.m b/Scripts_Data/Generator_Speed_vs_Power_Tests.m index 481e07c..1a35258 100644 --- a/Scripts_Data/Generator_Speed_vs_Power_Tests.m +++ b/Scripts_Data/Generator_Speed_vs_Power_Tests.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. k=0, for i = 10:0.1:18 diff --git a/Scripts_Data/Hydraulic_Actuator_Test.m b/Scripts_Data/Hydraulic_Actuator_Test.m index 9d3c877..ca7aa2d 100644 --- a/Scripts_Data/Hydraulic_Actuator_Test.m +++ b/Scripts_Data/Hydraulic_Actuator_Test.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. Select_Turbine_Systems('I_Pitch Test', WT_Configs); sim('Wind_Turbine'); diff --git a/Scripts_Data/Nacelle_Mask_Image.m b/Scripts_Data/Nacelle_Mask_Image.m index 896cf73..dd756e8 100644 --- a/Scripts_Data/Nacelle_Mask_Image.m +++ b/Scripts_Data/Nacelle_Mask_Image.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks, Inc. +% Copyright 2009-2020 The MathWorks, Inc. PiA_Char = get_param([bdroot '/Nacelle/Pitch System'],'ActiveVariant'); YaA_Char = get_param([bdroot '/Nacelle/Yaw System'],'ActiveVariant'); diff --git a/Scripts_Data/Rectangular_Block_Inertia.m b/Scripts_Data/Rectangular_Block_Inertia.m index 0eb48b2..59cc6c2 100644 --- a/Scripts_Data/Rectangular_Block_Inertia.m +++ b/Scripts_Data/Rectangular_Block_Inertia.m @@ -1,5 +1,5 @@ % Example function for calculating cylinder inertia -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. function [Inertia] = Rectangular_Block_Inertia(x, y, z, density) diff --git a/Scripts_Data/Remove_Images.m b/Scripts_Data/Remove_Images.m index 4db6f3a..9a5e19b 100644 --- a/Scripts_Data/Remove_Images.m +++ b/Scripts_Data/Remove_Images.m @@ -1,5 +1,5 @@ % REMOVE MASK LINES -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. ImagedBlocks =find_system(gcs,'FollowLinks','on','RegExp','on','MaskDisplay','i*IMAGE.jpg*'); for i=1:size(ImagedBlocks,1) diff --git a/Scripts_Data/Remove_Mask_Image_Dependency.m b/Scripts_Data/Remove_Mask_Image_Dependency.m index 8fb5e07..b1902b5 100644 --- a/Scripts_Data/Remove_Mask_Image_Dependency.m +++ b/Scripts_Data/Remove_Mask_Image_Dependency.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks, Inc. +% Copyright 2009-2020 The MathWorks, Inc. masked_blk_list = find_system(bdroot,'Mask','on'); for i = 1:length(masked_blk_list) diff --git a/Scripts_Data/Run_Configurations.m b/Scripts_Data/Run_Configurations.m index 2e6868c..8181a46 100644 --- a/Scripts_Data/Run_Configurations.m +++ b/Scripts_Data/Run_Configurations.m @@ -1,5 +1,5 @@ %WT_Tests = {'Ideal Pitch Test Only','Ideal Pitch Ideal Yaw Test Only','I_Pitch I_Yaw Simple Lift'}; -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. WT_Tests = {WT_Configs.Type}; diff --git a/Scripts_Data/Run_Demo_Configurations.m b/Scripts_Data/Run_Demo_Configurations.m index 85a81f1..a5e1deb 100644 --- a/Scripts_Data/Run_Demo_Configurations.m +++ b/Scripts_Data/Run_Demo_Configurations.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. WT_Tests = {'I_Pitch Test','H_Pitch Test','IA_Yaw Test','IM_Yaw Test','S_Yaw Test','I_Pitch L_Yaw Ge Gn Lift_Drag','I_Pitch IA_Yaw Ge Lift_Drag'}; diff --git a/Scripts_Data/Run_FixedStep_tests.m b/Scripts_Data/Run_FixedStep_tests.m index 0e7b9a9..98cf5ea 100644 --- a/Scripts_Data/Run_FixedStep_tests.m +++ b/Scripts_Data/Run_FixedStep_tests.m @@ -2,7 +2,7 @@ %WT_Tests = [WT_Configs.Type]; %Select_Turbine_Systems(WT_Tests(i),WT_Configs) -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. FixedStepSolvers = {'ode1';'ode2';'ode3';'ode4'}; diff --git a/Scripts_Data/Run_Hydraulic_tests.m b/Scripts_Data/Run_Hydraulic_tests.m index 8a2a53a..d9d4db4 100644 --- a/Scripts_Data/Run_Hydraulic_tests.m +++ b/Scripts_Data/Run_Hydraulic_tests.m @@ -2,7 +2,7 @@ %WT_Tests = [WT_Configs.Type]; %Select_Turbine_Systems(WT_Tests(i),WT_Configs) -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. leakage_area_set = [1e-9 1e-10 1e-11 1e-12]; init_opening_set = [0 -1e-5 -3e-5 -5e-5]; diff --git a/Scripts_Data/SRev_Data_Ellipse.m b/Scripts_Data/SRev_Data_Ellipse.m index f922008..0b15047 100644 --- a/Scripts_Data/SRev_Data_Ellipse.m +++ b/Scripts_Data/SRev_Data_Ellipse.m @@ -16,7 +16,7 @@ % add 'plot' as the final argument % >> Extr_Data_Ring(10,5,45,315,'plot') -% Copyright 2012-2019 The MathWorks, Inc. +% Copyright 2012-2020 The MathWorks, Inc. % DEFAULT DATA TO SHOW DIAGRAM if (nargin == 0) diff --git a/Scripts_Data/Select_Turbine_Systems.m b/Scripts_Data/Select_Turbine_Systems.m index 5a4e4ce..46d52a0 100644 --- a/Scripts_Data/Select_Turbine_Systems.m +++ b/Scripts_Data/Select_Turbine_Systems.m @@ -1,5 +1,5 @@ function Select_Turbine_Systems(WT_Config_Name,WT_Configs) -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. %Wind_Turbine %CurrentPath = gcs; diff --git a/Scripts_Data/Set_Body_Color_White.m b/Scripts_Data/Set_Body_Color_White.m index 1c32706..994e981 100644 --- a/Scripts_Data/Set_Body_Color_White.m +++ b/Scripts_Data/Set_Body_Color_White.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. BodyList = find_system(gcs,'LookUnderMasks','on','ClassName','Body'); BCKColor = [1 1 1]; diff --git a/Scripts_Data/Setup_Pitch_Control_Design.m b/Scripts_Data/Setup_Pitch_Control_Design.m index 11356c0..27a5e5a 100644 --- a/Scripts_Data/Setup_Pitch_Control_Design.m +++ b/Scripts_Data/Setup_Pitch_Control_Design.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. BlocksToSwitch = 'Pitch Controller'; diff --git a/Scripts_Data/Setup_WT_Configurations.m b/Scripts_Data/Setup_WT_Configurations.m index f30a808..8a31e08 100644 --- a/Scripts_Data/Setup_WT_Configurations.m +++ b/Scripts_Data/Setup_WT_Configurations.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. hub_axis_path = char(find_system(gcs,'FollowLinks','on','Name','Hub Axis')); blade_load_path = char(find_system(gcs,'FollowLinks','on','Name','Blade Load')); diff --git a/Scripts_Data/Slide_Prep/Pitch_Control_Optimized_Slide_Prep.m b/Scripts_Data/Slide_Prep/Pitch_Control_Optimized_Slide_Prep.m index cff78e8..8d5e7cf 100644 --- a/Scripts_Data/Slide_Prep/Pitch_Control_Optimized_Slide_Prep.m +++ b/Scripts_Data/Slide_Prep/Pitch_Control_Optimized_Slide_Prep.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. colordef black; diff --git a/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Geartrain_Torque.m b/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Geartrain_Torque.m index 042c535..ef57f3f 100644 --- a/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Geartrain_Torque.m +++ b/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Geartrain_Torque.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. colordef black; diff --git a/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Generator.m b/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Generator.m index bd12ab1..5b94592 100644 --- a/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Generator.m +++ b/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Generator.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. colordef black; diff --git a/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Pitch_Act.m b/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Pitch_Act.m index 705e478..0b954ac 100644 --- a/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Pitch_Act.m +++ b/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Pitch_Act.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. colordef black; diff --git a/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Pitch_Control.m b/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Pitch_Control.m index 3094739..51a4f76 100644 --- a/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Pitch_Control.m +++ b/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Pitch_Control.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. colordef black; diff --git a/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Yaw_Act.m b/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Yaw_Act.m index 3ec5275..6c2ee88 100644 --- a/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Yaw_Act.m +++ b/Scripts_Data/Slide_Prep/Wind_Turbine_Slide_Prep_Yaw_Act.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. colordef black; diff --git a/Scripts_Data/Solver_Settings_Tests.m b/Scripts_Data/Solver_Settings_Tests.m index af35dcf..cad106e 100644 --- a/Scripts_Data/Solver_Settings_Tests.m +++ b/Scripts_Data/Solver_Settings_Tests.m @@ -1,4 +1,4 @@ -% Copyright 2009-2019 The MathWorks(TM), Inc. +% Copyright 2009-2020 The MathWorks(TM), Inc. Solver_Set = {'ode23t' 'ode15s'}; Max_Step_Size_Set = {0.01 'auto'}; diff --git a/Scripts_Data/Wind_Turbine_Config_Script.html b/Scripts_Data/Wind_Turbine_Config_Script.html index 5cd2536..3749f50 100644 --- a/Scripts_Data/Wind_Turbine_Config_Script.html +++ b/Scripts_Data/Wind_Turbine_Config_Script.html @@ -105,7 +105,7 @@
-

Copyright 2009-2019 The MathWorks™, Inc.


Published with MATLAB® R2017a

Wind Turbine Demo Script -

Copyright 2009-2019 The MathWorks™, Inc.


Published with MATLAB® R2019b