Update paths with new Cp location

NREL · Jul 19, 2023 · 983f13d · 983f13d
1 parent 89ba586
commit 983f13d
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 20 deletions.
diff --git a/Examples/01_turbine_model.py b/Examples/01_turbine_model.py
@@ -34,7 +34,7 @@
 turbine.load_from_fast(
     path_params['FAST_InputFile'],
     os.path.join(tune_dir,path_params['FAST_directory']),
-    rot_source='txt',txt_filename=os.path.join(tune_dir,path_params['FAST_directory'],path_params['rotor_performance_filename'])
+    rot_source='txt',txt_filename=os.path.join(tune_dir,path_params['rotor_performance_filename'])
     )
 
 # Print some basic turbine info

diff --git a/Examples/03_tune_controller.py b/Examples/03_tune_controller.py
@@ -34,7 +34,7 @@
 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'])
+cp_filename = os.path.join(tune_dir,path_params['rotor_performance_filename'])
 turbine.load_from_fast(
     path_params['FAST_InputFile'],
     os.path.join(tune_dir,path_params['FAST_directory']),

diff --git a/Examples/04_simple_sim.py b/Examples/04_simple_sim.py
@@ -55,7 +55,7 @@
 # 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'])
+cp_filename = os.path.join(tune_dir,path_params['rotor_performance_filename'])
 turbine.load_from_fast(
     path_params['FAST_InputFile'],
     os.path.join(tune_dir,path_params['FAST_directory']),

diff --git a/Examples/05_openfast_sim.py b/Examples/05_openfast_sim.py
@@ -41,7 +41,7 @@
   path_params['FAST_InputFile'],
     os.path.join(this_dir,path_params['FAST_directory']),
     rot_source='txt',
-    txt_filename=os.path.join(this_dir,path_params['FAST_directory'],path_params['rotor_performance_filename'])
+    txt_filename=os.path.join(this_dir,path_params['rotor_performance_filename'])
     )
 
 # Tune controller 

diff --git a/Examples/06_peak_shaving.py b/Examples/06_peak_shaving.py
@@ -44,7 +44,7 @@
 turbine.load_from_fast(
     path_params['FAST_InputFile'],
     os.path.join(tune_dir,path_params['FAST_directory']),
-    rot_source='txt',txt_filename=os.path.join(tune_dir,path_params['FAST_directory'],path_params['rotor_performance_filename'])
+    rot_source='txt',txt_filename=os.path.join(tune_dir,path_params['rotor_performance_filename'])
     )
 # Tune controller 
 controller.tune_controller(turbine)

diff --git a/Examples/10_linear_params.py b/Examples/10_linear_params.py
@@ -45,7 +45,7 @@
   path_params['FAST_InputFile'],
   os.path.join(this_dir,path_params['FAST_directory']),
   rot_source='txt',
-  txt_filename=os.path.join(tune_dir,path_params['FAST_directory'],path_params['rotor_performance_filename'])
+  txt_filename=os.path.join(tune_dir,path_params['rotor_performance_filename'])
   )
 
 # Tune controller 

diff --git a/Examples/11_robust_tuning.py b/Examples/11_robust_tuning.py
@@ -53,12 +53,12 @@ def run_example():
     controller = ROSCO_controller.Controller(controller_params)
     turbine.load_from_fast(
         path_params['FAST_InputFile'],
-        os.path.join(this_dir, path_params['FAST_directory']),
-        rot_source='txt', txt_filename=os.path.join(this_dir,path_params['FAST_directory'],path_params['rotor_performance_filename'])
+        os.path.join(tune_dir, path_params['FAST_directory']),
+        rot_source='txt', txt_filename=os.path.join(tune_dir,path_params['rotor_performance_filename'])
         )
 
     # Fix path params for robust setup
-    path_params['FAST_directory'] = os.path.join(this_dir, path_params['FAST_directory'])
+    path_params['FAST_directory'] = os.path.join(tune_dir, path_params['FAST_directory'])
 
     controller.tune_controller(turbine)
     k_float = controller.Kp_float

diff --git a/Examples/14_open_loop_control.py b/Examples/14_open_loop_control.py
@@ -77,7 +77,7 @@
 turbine.load_from_fast(path_params['FAST_InputFile'], \
   os.path.join(this_dir,path_params['FAST_directory']), \
     rot_source='txt',\
-      txt_filename=os.path.join(this_dir,path_params['FAST_directory'],path_params['rotor_performance_filename']))
+      txt_filename=os.path.join(this_dir,path_params['rotor_performance_filename']))
 
 # Tune controller 
 controller.tune_controller(turbine)

diff --git a/Examples/ROSCO_walkthrough.ipynb b/Examples/ROSCO_walkthrough.ipynb
diff --git a/ROSCO_toolbox/tune.py b/ROSCO_toolbox/tune.py
@@ -36,7 +36,7 @@ def yaml_to_objs(tuning_yaml):
         path_params['FAST_InputFile'],
         os.path.join(yaml_dir,path_params['FAST_directory']),
         rot_source='txt',
-        txt_filename=os.path.join(yaml_dir,path_params['FAST_directory'],path_params['rotor_performance_filename'])
+        txt_filename=os.path.join(yaml_dir,path_params['rotor_performance_filename'])
         )
 
     # Tune controller 

diff --git a/Tune_Cases/IEA15MW_ExtInterface.yaml b/Tune_Cases/IEA15MW_ExtInterface.yaml
@@ -6,7 +6,7 @@ path_params:
   FAST_InputFile: 'IEA-15-240-RWT-UMaineSemi.fst'                                                                # Name of *.fst file
   FAST_directory: '../Test_Cases/IEA-15-240-RWT-UMaineSemi'                     # Main OpenFAST model directory, where the *.fst lives 
   # Optional (but suggested...)
-  rotor_performance_filename:  '../Test_Cases/IEA-15-240-RWT-UMaineSemi/Cp_Ct_Cq.IEA15MW.txtCp_Ct_Cq.IEA15MW.txt'                                # Filename for rotor performance text file (if it has been generated by ccblade already)
+  rotor_performance_filename:  '../Test_Cases/IEA-15-240-RWT-UMaineSemi/Cp_Ct_Cq.IEA15MW.txt'
 
 # -------------------------------- TURBINE PARAMETERS ----------------------------------- 
 turbine_params: