Merge branch 'tuning_dev'

DRC_Fortran/Parameter_files/NREL5MW/DISCON.IN

@@ -8,10 +8,19 @@
 1					! F_LPFType			- {1: first-order low-pass filter, 2: second-order low-pass filter}, [rad/s] (currently filters generator speed and pitch control signals)
 0					! F_NotchType		- Notch on the measured generator speed {0: disable, 1: enable} 
 0					! IPC_ControlMode	- Turn Individual Pitch Control (IPC) for fatigue load reductions (pitch contribution) {0: off, 1: 1P reductions, 2: 1P+2P reductions}
+<<<<<<< HEAD
 1					! VS_ControlMode	- Generator torque control mode in above rated conditions {0: constant torque, 1: constant power}
 1                   ! PC_ControlMode    - Blade pitch control mode {0: No pitch, fix to fine pitch, 1: active PI blade pitch control}
 0					! Y_ControlMode		- Yaw control mode {0: no yaw control, 1: yaw rate control, 2: yaw-by-IPC}
 1                   ! SS_Mode           - Setpoint Smoother mode {0: no setpoint smoothing, 1: introduce setpoint smoothing}
+=======
+0					! VS_ControlMode	- Generator torque control mode in above rated conditions {0: constant torque, 1: constant power, 2: TSR tracking PI control}
+1                   ! PC_ControlMode    - Blade pitch control mode {0: No pitch, fix to fine pitch, 1: active PI blade pitch control}
+0					! Y_ControlMode		- Yaw control mode {0: no yaw control, 1: yaw rate control, 2: yaw-by-IPC}
+1                   ! SS_Mode           - Setpoint Smoother mode {0: no setpoint smoothing, 1: introduce setpoint smoothing}
+0                   ! WE_Mode           - Wind speed estimator mode {0: One-second low pass filtered hub height wind speed, 1: Imersion and Invariance Estimator (Ortega et al.)}
+1                   ! PS_Mode           - Peak shaving mode {0: no peak shaving, 1: implement peak shaving}
+>>>>>>> tuning_dev
 
 !------- FILTERS ----------------------------------------------------------
 1.570796326			! F_LPFCornerFreq	- Corner frequency (-3dB point) in the low-pass filters, [Hz]
@@ -56,8 +65,13 @@
 43093.55			! VS_RtTq			- Rated torque, [Nm].
 120.113				! VS_RefSpd			- Rated generator speed [rad/s]
 1					! VS_n				- Number of generator PI torque controller gains
+<<<<<<< HEAD
 -4200				! VS_KP				- Proportional gain for generator PI torque controller, used in the transitional 2.5 region, [1/(rad/s) Nm]
 -2100	 			! VS_KI				- Integral gain for generator PI torque controller, used in the transitional 2.5 region, [1/rad Nm]
+=======
+-4200				! VS_KP				- Proportional gain for generator PI torque controller [1/(rad/s) Nm]. (Only used in the transitional 2.5 region if VS_ControlMode =/ 2)
+-2100	 			! VS_KI				- Integral gain for generator PI torque controller [1/rad Nm]. (Only used in the transitional 2.5 region if VS_ControlMode =/ 2)
+>>>>>>> tuning_dev
 
 !------- Setpoint Smoother ------------------------------------------------
 30                  ! SS_VSGainBias     - Variable speed torque controller gain bias, [(rad/s)/rad].
@@ -71,6 +85,14 @@
 97					! WE_GearboxRatio	- Gearbox ratio [>=1],  [-]
 4.0469564E+07		! WE_Jtot			- Total drivetrain inertia, including blades, hub and casted generator inertia to LSS, [kg m^2]
 1.225				! WE_RhoAir			- Air density, [kg m^-3]
+<<<<<<< HEAD
+=======
+"Cp_Ct_Cq.txt"      ! PerfFileName      - File containing rotor performance tables (Cp,Ct,Cq)
+320  40             ! PerfTableSize     - Size of rotor performance tables, first number refers to number of blade pitch angles, second number referse to number of tip-speed ratios
+23                  ! WE_FOPoles_N      - Number of first-order system poles used in EKF
+3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25   ! WE_FOPoles_v      - Wind speeds corresponding to first-order system poles [m/s]
+-0.0203 -0.0270 -0.0338 -0.0405 -0.0473 -0.0540 -0.0608 -0.0675 -0.0743 -0.0671 -0.0939 -0.1257 -0.1601 -0.1973 -0.2364 -0.2783 -0.3223 -0.3678 -0.4153 -0.4632 -0.5122 -0.5629 -0.6194   ! WE_FOPoles        - First order system poles
+>>>>>>> tuning_dev
 
 !------- YAW CONTROL ------------------------------------------------------
 1.745329252			! Y_ErrThresh		- Yaw error threshold. Turbine begins to yaw when it passes this, [rad^2 s]
@@ -89,3 +111,11 @@
 -1					! FA_KI				- Integral gain for the fore-aft tower damper controller, -1 = off / >0 = on [rad s/m] - !NJA - Make this a switch
 0.1                 ! FA_HPF_CornerFreq	- Corner frequency (-3dB point) in the high-pass filter on the fore-aft acceleration signal, [rad/s]                                                                                                              
 0.087266			! FA_IntSat			- Integrator saturation (maximum signal amplitude contribution to pitch from FA damper), [rad]
+<<<<<<< HEAD
+=======
+
+!------- PEAK SHAVING -------------------------------------------
+23                  ! PS_BldPitchMin_N  - Number of values in minimum blade pitch lookup table (should equal number of values in PS_WindSpeeds and PS_BldPitchMin)
+3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 ! PS_WindSpeeds       - Wind speeds corresponding to minimum blade pitch angles [m/s]
+ -0.0349 -0.0349 -0.0349 -0.0349 -0.0349 -0.0349 -0.0349 -0.0114 0.0356 0.0577 0.0825 0.1058 0.1282 0.1499 0.1708 0.1913 0.2114 0.2310 0.2502 0.2690 0.2874 0.3056 0.3239 ! PS_BldPitchMin          - Minimum blade pitch angles [rad]
+>>>>>>> tuning_dev

DRC_Fortran/Source/Constants.f90

@@ -1,6 +1,10 @@
 MODULE Constants
     REAL(4), PARAMETER          :: RPS2RPM = 9.5492966                  ! Factor to convert radians per second to revolutions per minute.
     REAL(4), PARAMETER          :: R2D = 57.295780                      ! Factor to convert radians to degrees.
+<<<<<<< HEAD
+=======
+    REAL(4), PARAMETER          :: D2R = 0.0175                         ! Factor to convert degrees to radians.
+>>>>>>> tuning_dev
     REAL(4), PARAMETER          :: PI = 3.14159265359                   ! Mathematical constant pi
     INTEGER(4), PARAMETER       :: NP_1 = 1                             ! First rotational harmonic
     INTEGER(4), PARAMETER       :: NP_2 = 2                             ! Second rotational harmonic