Better Open Loop Control Error Catching

Examples/11_robust_tuning.py

@@ -45,6 +45,7 @@ def run_example():
 
     # Path options
     example_out_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'examples_out')
+    os.makedirs(example_out_dir,exist_ok=True)
     output_name = '11_robust_scheduling'
     path_options = {'output_dir': example_out_dir,
                     'output_name': output_name

Examples/test_examples.py

@@ -54,7 +54,7 @@ def execute_script(fscript):
     # Use runpy to execute examples
     s = time()
     runpy.run_path(os.path.realpath(fullpath), run_name='__main__')
-    print(time() - s, "seconds to run")
+    print(f"{fscript} took {time() - s} seconds to run")
 
 class TestExamples(unittest.TestCase):
 

ROSCO/src/Controllers.f90

@@ -408,7 +408,7 @@ SUBROUTINE YawRateControl(avrSWAP, CntrPar, LocalVar, objInst, zmqVar, DebugVar,
 
             ! If using open loop yaw rate control, overwrite controlled output
             ! Open loop yaw rate control - control input in rad/s
-            IF ((CntrPar%OL_Mode == 1) .AND. (CntrPar%Ind_YawRate > 0)) THEN
+            IF ((CntrPar%OL_Mode > 0) .AND. (CntrPar%Ind_YawRate > 0)) THEN
                 IF (LocalVar%Time >= CntrPar%OL_Breakpoints(1)) THEN
                     avrSWAP(48) = interp1d(CntrPar%OL_Breakpoints,CntrPar%OL_YawRate,LocalVar%Time, ErrVar)
                 ENDIF

ROSCO/src/ReadSetParameters.f90

@@ -657,6 +657,9 @@ SUBROUTINE ReadControlParameterFileSub(CntrPar, LocalVar, zmqVar, accINFILE, acc
 
             CALL GetNewUnit(UnOpenLoop, ErrVar)
             CALL Read_OL_Input(CntrPar%OL_Filename,UnOpenLoop,OL_Count,CntrPar%OL_Channels, ErrVar)
+            IF (ErrVar%aviFAIL < 0) THEN
+                RETURN
+            ENDIF
 
             CntrPar%OL_Breakpoints = CntrPar%OL_Channels(:,CntrPar%Ind_Breakpoint)
 
@@ -1392,7 +1395,12 @@ SUBROUTINE CheckInputs(LocalVar, CntrPar, avrSWAP, ErrVar, size_avcMSG)
             ErrVar%ErrMsg  = 'Pitch angle actuator not requested.'
         ENDIF
 
-        IF (NINT(avrSWAP(28)) == 0 .AND. ((CntrPar%IPC_ControlMode > 0) .OR. (CntrPar%Y_ControlMode > 1))) THEN
+        IF ((NINT(avrSWAP(28)) == 0) .AND. &
+            ((CntrPar%IPC_ControlMode > 0) .OR. &
+             (CntrPar%Y_ControlMode > 1) .OR. & 
+             (CntrPar%Ind_BldPitch(2) > 0) .OR. &
+             (CntrPar%Ind_BldPitch(3) > 0) &
+             )) THEN
             ErrVar%aviFAIL = -1
             ErrVar%ErrMsg  = 'IPC enabled, but Ptch_Cntrl in ServoDyn has a value of 0. Set it to 1 for individual pitch control.'
         ENDIF

ROSCO_toolbox/ofTools/case_gen/CaseLibrary.py

@@ -333,21 +333,26 @@ def user_hh(**wind_case_opts):
     '''
      Uniform, hub-height wind file
      Expected inputs:
-        TMax            TODO: someday make all TMaxs TMax
-        wind_inputs (list of string wind inputs filenames)
+        TMax            (float or array) of simulation TMax
+        wind_filenames (list of string wind inputs filenames)
     '''
 
-    if 'TMax' in wind_case_opts:
-        TMax = wind_case_opts['TMax']
-    else:
-        TMax = 720
+    # Default is 720 for all cases
+    TMax = wind_case_opts.get('TMax', 720)
 
     if 'wind_filenames' not in wind_case_opts:
-        raise Exception('Define wind_filenames when using turb_bts case generator')
+        raise Exception('Define wind_filenames when using user_hh case generator')
+
+    # Make into array
+    if not hasattr(TMax,'__len__'):
+        TMax = len(wind_case_opts['wind_filenames']) * [TMax]
+
+
+
 
     # wind inflow
     case_inputs = base_op_case()
-    case_inputs[("Fst","TMax")] = {'vals':[TMax], 'group':0}
+    case_inputs[("Fst","TMax")] = {'vals':TMax, 'group':1}
     case_inputs[("InflowWind","WindType")] = {'vals':[2], 'group':0}
     case_inputs[("InflowWind","Filename_Uni")] = {'vals':wind_case_opts['wind_filenames'], 'group':1}