Rename minimum speed for vs controller

johnjasa · Nov 20, 2019 · 569f955 · 569f955
1 parent 0d9f225
commit 569f955
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/ROSCO_toolbox/controller.py b/ROSCO_toolbox/controller.py
@@ -77,10 +77,10 @@ def __init__(self, controller_params):
         else:
             self.max_pitch = 90*deg2rad      # Default to 90 degrees max pitch
 
-        if controller_params['pc_minspd']:
-            self.pc_minspd = controller_params['pc_minspd']
+        if controller_params['vs_minspd']:
+            self.vs_minspd = controller_params['vs_minspd']
         else:
-            self.pc_minspd = None 
+            self.vs_minspd = None 
 
         if controller_params['ss_vsgain']:
             self.ss_vsgain = controller_params['ss_vsgain']
@@ -215,11 +215,11 @@ def tune_controller(self, turbine):
 
         # -- Define some setpoints --
         # minimum rotor speed saturation limits
-        self.vs_minspd = (turbine.Cp.TSR_opt * turbine.v_min / turbine.rotor_radius) * Ng
-        if self.pc_minspd:
-            self.pc_minspd = np.maximum(self.pc_minspd, (turbine.Cp.TSR_opt * turbine.v_min / turbine.rotor_radius) * Ng)
+        if self.vs_minspd:
+            self.vs_minspd = np.maximum(self.vs_minspd, (turbine.Cp.TSR_opt * turbine.v_min / turbine.rotor_radius) * Ng)
         else: 
-            self.pc_minspd = (turbine.Cp.TSR_opt * turbine.v_min / turbine.rotor_radius) * Ng
+            self.vs_minspd = (turbine.Cp.TSR_opt * turbine.v_min / turbine.rotor_radius) * Ng
+        self.pc_minspd = self.vs_minspd
 
         # max pitch angle for shutdown
         if self.sd_maxpit:

diff --git a/Tune_Cases/DTU10MW.yaml b/Tune_Cases/DTU10MW.yaml
@@ -42,7 +42,7 @@ controller_params:
   # Optional - these can be defined, but do not need to be
   max_pitch:          # None                  # Maximum pitch angle [rad], {default = 90 degrees}
   min_pitch:          # None                  # Minimum pitch angle [rad], {default = 0 degrees}
-  pc_minspd:          # None                  # Minimum rotor speed [rad/s], {default = 0 rad/s}
+  vs_minspd:          # None                  # Minimum rotor speed [rad/s], {default = 0 rad/s}
   ss_cornerfreq:      # None                  # First order low-pass filter cornering frequency for setpoint smoother [rad/s]
   ss_vsgain:          # None                  # Torque controller setpoint smoother gain bias percentage [%, <= 1 ], {default = 100%}
   ss_pcgain:          # None                  # Pitch controller setpoint smoother gain bias percentage  [%, <= 1 ], {default = 0.1%}

diff --git a/Tune_Cases/IEA15MW.yaml b/Tune_Cases/IEA15MW.yaml
@@ -42,7 +42,7 @@ controller_params:
   # Optional - these can be defined, but do not need to be
   max_pitch:          # None                # Maximum pitch angle [rad], {default = 90 degrees}
   min_pitch:          # None                # Minimum pitch angle [rad], {default = 0 degrees}
-  pc_minspd:          0.4817                # Minimum rotor speed [rad/s], {default = 0 rad/s}
+  vs_minspd:          0.5235                # Minimum rotor speed [rad/s], {default = 0 rad/s}
   ss_cornerfreq:      # None                # First order low-pass filter cornering frequency for setpoint smoother [rad/s]
   ss_vsgain:          # None                # Torque controller setpoint smoother gain bias percentage [%, <= 1 ], {default = 100%}
   ss_pcgain:          # None                # Pitch controller setpoint smoother gain bias percentage  [%, <= 1 ], {default = 0.1%}

diff --git a/Tune_Cases/NREL5MW.yaml b/Tune_Cases/NREL5MW.yaml
@@ -43,7 +43,7 @@ controller_params:
   # Optional - these can be defined, but do not need to be
   max_pitch:          # None                  # Maximum pitch angle [rad], {default = 90 degrees}
   min_pitch:          # None                  # Minimum pitch angle [rad], {default = 0 degrees}
-  pc_minspd:          # None                  # Minimum rotor speed [rad/s], {default = 0 rad/s}
+  vs_minspd:          # None                  # Minimum rotor speed [rad/s], {default = 0 rad/s}
   ss_cornerfreq:      # None                  # First order low-pass filter cornering frequency for setpoint smoother [rad/s]
   ss_vsgain:          # None                  # Torque controller setpoint smoother gain bias percentage [%, <= 1 ], {default = 100%}
   ss_pcgain:          # None                  # Pitch controller setpoint smoother gain bias percentage  [%, <= 1 ], {default = 0.1%}