Pass through

.github/pull_request_template.md

@@ -13,6 +13,16 @@ _Select the appropriate type(s) that describe this PR_
 - [ ] Maintenance update
 - [ ] Other (please describe)
 
+TODO Items General:
+- [ ] Add example/test for new feature
+- [ ] Update registry
+- [ ] Run testing
+
+TODO Items API Change:
+- [ ] Update docs with API change
+- [ ] Run update_discons.py
+- [ ] Update DISCON schema
+
 ## Github issues addressed, if one exists
 
 ## Examples/Testing, if applicable

Examples/example_01.py

@@ -34,7 +34,7 @@
     path_params['FAST_InputFile'],
     os.path.join(tune_dir,path_params['FAST_directory']),
     dev_branch=True,
-    rot_source='txt',txt_filename=os.path.join(tune_dir,path_params['rotor_performance_filename'])
+    rot_source='txt',txt_filename=os.path.join(tune_dir,path_params['FAST_directory'],path_params['rotor_performance_filename'])
     )
 
 # Print some basic turbine info

Examples/example_04.py

@@ -34,19 +34,23 @@
 controller      = ROSCO_controller.Controller(controller_params)
 
 # Load turbine data from OpenFAST and rotor performance text file
+cp_filename = os.path.join(tune_dir,path_params['FAST_directory'],path_params['rotor_performance_filename'])
 turbine.load_from_fast(
     path_params['FAST_InputFile'],
     os.path.join(tune_dir,path_params['FAST_directory']),
     dev_branch=True,
-    rot_source='txt',txt_filename=os.path.join(tune_dir,path_params['rotor_performance_filename'])
+    rot_source='txt',txt_filename= cp_filename
     )
 
 # Tune controller 
 controller.tune_controller(turbine)
 
 # Write parameter input file
 param_file = os.path.join(this_dir,'DISCON.IN')
-write_DISCON(turbine,controller,param_file=param_file, txt_filename=os.path.join(tune_dir,path_params['rotor_performance_filename']))
+write_DISCON(turbine,controller,
+param_file=param_file, 
+txt_filename=cp_filename
+)
 
 # Plot gain schedule
 fig, ax = plt.subplots(2,2,constrained_layout=True,sharex=True)

Examples/example_05.py

@@ -55,11 +55,12 @@
 # controller      = ROSCO_controller.Controller(controller_params)
 
 # Load turbine data from OpenFAST and rotor performance text file
+cp_filename = os.path.join(tune_dir,path_params['FAST_directory'],path_params['rotor_performance_filename'])
 turbine.load_from_fast(
     path_params['FAST_InputFile'],
     os.path.join(tune_dir,path_params['FAST_directory']),
     dev_branch=True,
-    rot_source='txt',txt_filename=os.path.join(tune_dir,path_params['rotor_performance_filename'])
+    rot_source='txt',txt_filename=cp_filename
     )
 
 # Tune controller 
@@ -68,7 +69,11 @@
 
 # Write parameter input file
 param_filename = os.path.join(this_dir,'DISCON.IN')
-write_DISCON(turbine,controller,param_file=param_filename, txt_filename=os.path.join(tune_dir,path_params['rotor_performance_filename']))
+write_DISCON(
+  turbine,controller,
+  param_file=param_filename, 
+  txt_filename=cp_filename
+  )
 
 
 # Load controller library

Examples/example_07.py

@@ -45,7 +45,7 @@
     path_params['FAST_InputFile'],
     os.path.join(tune_dir,path_params['FAST_directory']),
     dev_branch=True,
-    rot_source='txt',txt_filename=os.path.join(tune_dir,path_params['rotor_performance_filename'])
+    rot_source='txt',txt_filename=os.path.join(tune_dir,path_params['FAST_directory'],path_params['rotor_performance_filename'])
     )
 # Tune controller 
 controller.tune_controller(turbine)

Examples/example_10.py

@@ -34,7 +34,6 @@
 
 # Load turbine data from openfast model
 turbine = ROSCO_turbine.Turbine(turbine_params)
-# turbine.load_from_fast(path_params['FAST_InputFile'],path_params['FAST_directory'],dev_branch=True,rot_source='txt',txt_filename=path_params['rotor_performance_filename'])
 turbine.load_from_fast(path_params['FAST_InputFile'], \
     os.path.join(this_dir,path_params['FAST_directory']),dev_branch=True)
 

Examples/example_11.py

@@ -46,7 +46,7 @@
   os.path.join(this_dir,path_params['FAST_directory']),
   dev_branch=True,
   rot_source='txt',
-  txt_filename=os.path.join(tune_dir,path_params['rotor_performance_filename'])
+  txt_filename=os.path.join(tune_dir,path_params['FAST_directory'],path_params['rotor_performance_filename'])
   )
 
 # Tune controller 

Examples/example_15.py

@@ -0,0 +1,47 @@
+'''
+----------- Example_15 --------------
+Use the runFAST scripts to set up an example, use pass through in yaml
+-------------------------------------
+
+In this example:
+    - use run_FAST_ROSCO class to set up a test case
+
+'''
+
+import os
+from ROSCO_toolbox.ofTools.case_gen.run_FAST import run_FAST_ROSCO
+from ROSCO_toolbox.ofTools.case_gen import CaseLibrary as cl
+
+
+#directories
+this_dir            = os.path.dirname(os.path.abspath(__file__))
+rosco_dir         = os.path.dirname(this_dir)
+example_out_dir     = os.path.join(this_dir,'examples_out')
+os.makedirs(example_out_dir,exist_ok=True)
+
+
+def main():
+     # Simulation config
+    sim_config = 7
+
+    r = run_FAST_ROSCO()
+
+    parameter_filename = os.path.join(rosco_dir,'Tune_Cases/NREL5MW_PassThrough.yaml')
+    run_dir = os.path.join(example_out_dir,'15_PassThrough')
+    os.makedirs(run_dir,exist_ok=True)
+
+    # RAAW FAD set up
+    r.tuning_yaml   = parameter_filename
+    r.wind_case_fcn = cl.simp_step
+    r.wind_case_opts    = {
+        'U_start': [10],
+        'U_end': [15],
+        'wind_dir': run_dir
+        }
+    r.save_dir      = run_dir
+
+    r.run_FAST()
+
+
+if __name__=="__main__":
+    main()

Examples/run_examples.py

@@ -18,7 +18,8 @@
     'example_11',
     'example_12',
     'example_13',
-    'example_14'
+    'example_14',
+    'example_15',
 ]
 
 def execute_script(fscript):