Merge remote-tracking branch 'upstream/develop' into raaw

NREL · May 10, 2022 · fc44a4a · fc44a4a
2 parents 155c132 + 5cdb0b5
commit fc44a4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ROSCO_toolbox/ofTools/case_gen/CaseLibrary.py b/ROSCO_toolbox/ofTools/case_gen/CaseLibrary.py
@@ -123,7 +123,7 @@ def power_curve(**wind_case_opts):
     # Constant wind speed, multiple wind speeds, define below
 
     # Runtime
-    T_max   = 200.
+    T_max   = 400.
 
     if 'U' in wind_case_opts:
         U = wind_case_opts['U']
@@ -356,6 +356,7 @@ def user_hh(**wind_case_opts):
     case_inputs[("InflowWind","Filename_Uni")] = {'vals':wind_case_opts['wind_filenames'], 'group':1}
 
     return case_inputs
+
 ##############################################################################################
 #
 #   Control sweep cases
@@ -557,7 +558,6 @@ def sweep_ps_percent(start_group, **control_sweep_opts):
 
 
 
-
     # elif tune == 'max_tq':
     #     case_inputs[('DISCON_in','VS_MaxTq')] = {'vals': [19624046.66639, 1.5*19624046.66639], 'group': 3}
 

diff --git a/ROSCO_toolbox/ofTools/case_gen/run_FAST.py b/ROSCO_toolbox/ofTools/case_gen/run_FAST.py
@@ -202,7 +202,7 @@ def run_FAST(self):
             }
         r.sweep_mode    = None
         r.save_dir      = '/Users/dzalkind/Tools/ROSCO/outputs'
-        r.control_sweep_fcn = cl.simp_step
+        r.control_sweep_fcn = cl.sweep_pitch_act
         r.control_sweep_opts = {
             'act_bw': np.array([0.25,0.5,1,10]) * np.pi * 2
         }