Skip to content

Commit

Permalink
Squashed 'RAFT/' changes from efddaa960..eb627eb25
Browse files Browse the repository at this point in the history
eb627eb25 Corrected rad-deg error in airfoil handling
56f7e15ad adding setControlGains call in Rotor init
1359dd218 Merge branch 'control' of https://github.com/dzalkind/RAFT into rotor
ade614f7f Added rotor plotting.
848bb303f Fix merge, add torque control inputs (derivatives off)
b7501958b Merge remote-tracking branch 'upstream/rotor' into control
a44b4377b Add torque control, Kp_fl from WEIS input
8cb722ead Adding load case support
70faacca0 Beginning conversion to friendlier rotor YAML for RAFT
fd0c82453 Added checks and handling for instability, fixed yawstiff:
40bbd5e4f Merge pull request #3 from dzalkind/control
315525a7a Merge branch 'rotor' into control
92ea0f113 Integrating control updates
a1688b152 Uncomment extra ccblade outputs
ffc388369 Add pitch control gains to omdao_raft
635f87952 Finish merge, raft_rotor working
b61426b49 Merge remote-tracking branch 'upstream/rotor' into control
8f5cc33c8 Add floating feedback control, wind speed dep., weis-like input
5142611cd Merge branch dev into rotor to integrate updates
cb9fec0cb Getting everything consistent with new calcAeroServoContributions:
ef2a6a049 Merge branch 'control' of https://github.com/dzalkind/RAFT into rotor
7ffffb1e8 Clarify rotor model input in comment
65a60599a First draft of splitting CCblade preprocessing:
bb0c040f1 Add control contributions, rotor (WISDEM) definitions
199dd41ce Finished initial hook-up of calcAeroContributions:
848f31095 Integrating Pietro's code for CCblade aerodynamics - in progress:
REVERT: efddaa960 Added checks and handling for instability, fixed yawstiff:

git-subtree-dir: RAFT
git-subtree-split: eb627eb25bd13fbaa9b7d891ef78b1aedf8221ab
  • Loading branch information
gbarter committed Jun 23, 2021
1 parent 9341ba2 commit 95bde32
Show file tree
Hide file tree
Showing 11 changed files with 4,120 additions and 220 deletions.
1,068 changes: 1,068 additions & 0 deletions designs/VolturnUS-S.yaml

Large diffs are not rendered by default.

757 changes: 757 additions & 0 deletions designs/rotors/IEA-10-198-RWT.yaml

Large diffs are not rendered by default.

924 changes: 924 additions & 0 deletions designs/rotors/IEA-15-240-RWT.yaml

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions designs/rotors/IEA-15MW_WEIS.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
pitch_control:
GS_Angles: [0.08951732571568687, 0.11113133201402342, 0.12982917355231283, 0.1466420801733839, 0.16211366466881905, 0.17655839335287876, 0.19019635501633186, 0.2031735797715147, 0.2155988980768675, 0.22755610891787487, 0.23910432007046029, 0.25029505429019794, 0.261175108296815, 0.2717701141434908, 0.2821130743895577, 0.2922299908966622, 0.30213155066939196, 0.3118425748263288, 0.32137789704483055, 0.3307503670667345, 0.3399699865577445, 0.3490461860239008, 0.3579880322509144, 0.3668047339186282, 0.37550289814624044, 0.3840890078940221, 0.3925675520014984, 0.4009446279452681]
GS_Kp: [-1.3577105502989462, -1.2022843685437077, -1.0708549194177244, -0.9582630743745694, -0.8607297095205451, -0.7754232092569442, -0.7001800303510133, -0.6333186502486411, -0.5735124113109392, -0.5197005998242658, -0.47102498684717165, -0.42678371240552293, -0.3863972240349146, -0.3493827470593987, -0.3153348933114633, -0.2839107527034031, -0.25481830344353146, -0.22780730986914496, -0.20266210648191768, -0.17919582739515136, -0.1572457543239439, -0.13666953808436225, -0.11734210805288207, -0.09915312775509398, -0.0820048872139108, -0.06581054702303714, -0.05049266752014871, -0.035981970477687836]
GS_Ki: [-0.17894491650627248, -0.16397538879097576, -0.1513170531162574, -0.14047301946725416, -0.13107930991420289, -0.12286320368570448, -0.11561632391744817, -0.10917671849690443, -0.1034166133382032, -0.09823384815435132, -0.09354576452975885, -0.08928476437884968, -0.08539502939237623, -0.08183006219898042, -0.07855081873709882, -0.07552427238274959, -0.07272229770523143, -0.07012079381210852, -0.06769898935959591, -0.06543888677457954, -0.06332481420661495, -0.06134306161000666, -0.05948158308525387, -0.057729751819724194, -0.05607815709384934, -0.054518435162958796, -0.0530431275978591, -0.05164556201983143]
Fl_Kp: -9.35
wt_ops:
v: [3.0, 3.266896551724138, 3.533793103448276, 3.800689655172414, 4.067586206896552, 4.334482758620689, 4.601379310344828, 4.868275862068966, 5.135172413793104, 5.402068965517241, 5.6689655172413795, 5.935862068965518, 6.2027586206896554, 6.469655172413793, 6.736551724137931, 7.00344827586207, 7.270344827586207, 7.537241379310345, 7.804137931034483, 8.071034482758622, 8.337931034482759, 8.604827586206897, 8.871724137931036, 9.138620689655173, 9.405517241379311, 9.672413793103448, 9.939310344827586, 10.206206896551725, 10.473103448275863, 10.74, 11.231724137931035, 11.723448275862069, 12.215172413793104, 12.706896551724139, 13.198620689655172, 13.690344827586207, 14.182068965517242, 14.673793103448276, 15.16551724137931, 15.657241379310346, 16.14896551724138, 16.640689655172416, 17.13241379310345, 17.624137931034483, 18.11586206896552, 18.607586206896553, 19.099310344827586, 19.591034482758623, 20.082758620689653, 20.57448275862069, 21.066206896551726, 21.557931034482756, 22.049655172413793, 22.54137931034483, 23.03310344827586, 23.524827586206897, 24.016551724137933, 24.508275862068963, 25.0]
pitch_op: [-0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, -0.004363323129985824, 0.062334863771766655, 0.08951732571568687, 0.11113133201402342, 0.12982917355231283, 0.1466420801733839, 0.16211366466881905, 0.17655839335287876, 0.19019635501633186, 0.2031735797715147, 0.2155988980768675, 0.22755610891787487, 0.23910432007046029, 0.25029505429019794, 0.261175108296815, 0.2717701141434908, 0.2821130743895577, 0.2922299908966622, 0.30213155066939196, 0.3118425748263288, 0.32137789704483055, 0.3307503670667345, 0.3399699865577445, 0.3490461860239008, 0.3579880322509144, 0.3668047339186282, 0.37550289814624044, 0.3840890078940221, 0.3925675520014984, 0.4009446279452681]
omega_op: [0.225, 0.24501724137931033, 0.2650344827586207, 0.28505172413793106, 0.3050689655172414, 0.3250862068965517, 0.34510344827586203, 0.36512068965517247, 0.38513793103448274, 0.4051551724137931, 0.4251724137931035, 0.4451896551724139, 0.46520689655172415, 0.48522413793103447, 0.5052413793103449, 0.5252586206896552, 0.5452758620689655, 0.5652931034482759, 0.5853103448275863, 0.6053275862068966, 0.625344827586207, 0.6453620689655172, 0.6653793103448277, 0.6853965517241379, 0.7054137931034483, 0.7254310344827586, 0.745448275862069, 0.7654655172413793, 0.7854827586206897, 0.7916813478, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999998, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999, 0.7916813477999999]
I_drivetrain: 318628138.0
gear_ratio: 1
torque_control:
VS_KP: -38609162.66552
VS_KI: -4588245.18720
Loading

0 comments on commit 95bde32

Please sign in to comment.