Use generic full file paths

dzalkind · Feb 5, 2021 · f072f2e · f072f2e
1 parent 6ef5d52
commit f072f2e
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 20 deletions.
diff --git a/Examples/example_01.py b/Examples/example_01.py
@@ -18,7 +18,8 @@
 from ROSCO_toolbox import turbine as ROSCO_turbine
 
 # Load yaml file
-parameter_filename = os.path.join(os.path.dirname(__file__),'NREL5MW_example.yaml')
+this_dir = os.path.dirname(os.path.abspath(__file__))
+parameter_filename = os.path.join(this_dir,'NREL5MW_example.yaml')
 inps = yaml.safe_load(open(parameter_filename))
 path_params         = inps['path_params']
 turbine_params      = inps['turbine_params']
@@ -28,13 +29,13 @@
 
 turbine.load_from_fast(
     path_params['FAST_InputFile'],
-    os.path.join(os.path.dirname(__file__),path_params['FAST_directory']),
+    os.path.join(this_dir,path_params['FAST_directory']),
     dev_branch=True,
-    rot_source='txt',txt_filename=os.path.join(os.path.dirname(__file__),path_params['rotor_performance_filename'])
+    rot_source='txt',txt_filename=os.path.join(this_dir,path_params['rotor_performance_filename'])
     )
 
 # Print some basic turbine info
 print(turbine)
 
 # Save the turbine model
-turbine.save(os.path.join(os.path.dirname(__file__),'NREL5MW_saved.p'))
+turbine.save(os.path.join(this_dir,'NREL5MW_saved.p'))
diff --git a/Examples/example_02.py b/Examples/example_02.py
@@ -19,7 +19,8 @@
 turbine = ROSCO_turbine.Turbine
 
 # Load quick from python pickle
-turbine = turbine.load(os.path.join(os.path.dirname(__file__),'NREL5MW_saved.p'))
+this_dir = os.path.dirname(os.path.abspath(__file__))
+turbine = turbine.load(os.path.join(this_dir,'NREL5MW_saved.p'))
 
 # plot rotor performance 
 print('Plotting Cp data')

diff --git a/Examples/example_03.py b/Examples/example_03.py
@@ -19,7 +19,8 @@
 control_params = {}
 
 # Load yaml file
-parameter_filename = os.path.join(os.path.dirname(__file__),'NREL5MW_example.yaml')
+this_dir = os.path.dirname(os.path.abspath(__file__))
+parameter_filename = os.path.join(this_dir,'NREL5MW_example.yaml')
 inps = yaml.safe_load(open(parameter_filename))
 path_params         = inps['path_params']
 turbine_params      = inps['turbine_params']
@@ -29,11 +30,11 @@
 turbine = ROSCO_turbine.Turbine(turbine_params)
 turbine.load_from_fast(
     path_params['FAST_InputFile'],
-    os.path.join(os.path.dirname(__file__),path_params['FAST_directory']),
+    os.path.join(this_dir,path_params['FAST_directory']),
     dev_branch=True,
     rot_source='cc-blade',
     txt_filename=None)
 
 # Write rotor performance text file
-txt_filename = os.path.join(os.path.dirname(__file__),'Cp_Ct_Cq.Ex03.txt')
+txt_filename = os.path.join(this_dir,'Cp_Ct_Cq.Ex03.txt')
 write_rotor_performance(turbine,txt_filename=txt_filename)
diff --git a/Examples/example_04.py b/Examples/example_04.py
@@ -20,7 +20,8 @@
 from ROSCO_toolbox.utilities import write_DISCON
 
 # Load yaml file 
-parameter_filename = os.path.join(os.path.dirname(__file__),'NREL5MW_example.yaml')
+this_dir = os.path.dirname(os.path.abspath(__file__))
+parameter_filename = os.path.join(this_dir,'NREL5MW_example.yaml')
 inps = yaml.safe_load(open(parameter_filename))
 path_params         = inps['path_params']
 turbine_params      = inps['turbine_params']
@@ -33,9 +34,9 @@
 # Load turbine data from OpenFAST and rotor performance text file
 turbine.load_from_fast(
     path_params['FAST_InputFile'],
-    os.path.join(os.path.dirname(__file__),path_params['FAST_directory']),
+    os.path.join(this_dir,path_params['FAST_directory']),
     dev_branch=True,
-    rot_source='txt',txt_filename=os.path.join(os.path.dirname(__file__),path_params['rotor_performance_filename'])
+    rot_source='txt',txt_filename=os.path.join(this_dir,path_params['rotor_performance_filename'])
     )
 
 # Tune controller 

diff --git a/Examples/example_05.py b/Examples/example_05.py
@@ -25,7 +25,7 @@
 from ROSCO_toolbox import control_interface as ROSCO_ci
 
 # Specify controller dynamic library path and name
-this_dir = os.path.dirname(__file__)
+this_dir = os.path.dirname(os.path.abspath(__file__))
 lib_name = os.path.join(this_dir,'../ROSCO/build/libdiscon.dylib')
 param_filename = os.path.join(this_dir,'DISCON.IN')
 

diff --git a/Examples/example_06.py b/Examples/example_06.py
@@ -19,10 +19,10 @@
 from ROSCO_toolbox.utilities import write_DISCON, run_openfast
 from ROSCO_toolbox import sim as ROSCO_sim
 
-this_dir = os.path.dirname(__file__)
+this_dir = os.path.dirname(os.path.abspath(__file__))
 
 # Load yaml file 
-parameter_filename = '/Users/dzalkind/Tools/ROSCO_toolbox/Tune_Cases/BAR.yaml' #os.path.join(this_dir,'NREL5MW_example.yaml') #
+parameter_filename = os.path.join(os.path.dirname(this_dir), 'Tune_Cases', 'IEA15MW.yaml') 
 inps = yaml.safe_load(open(parameter_filename))
 path_params         = inps['path_params']
 turbine_params      = inps['turbine_params']
@@ -47,7 +47,8 @@
 
 # Run OpenFAST
 # --- May need to change fastcall if you use a non-standard command to call openfast
-run_openfast(path_params['FAST_directory'], fastcall='openfast', fastfile=path_params['FAST_InputFile'], chdir=True)
+fastcall = 'openfast'
+run_openfast(path_params['FAST_directory'], fastcall=fastcall, fastfile=path_params['FAST_InputFile'], chdir=True)
 
 
 

diff --git a/Examples/example_08.py b/Examples/example_08.py
@@ -19,7 +19,7 @@
 from ROSCO_toolbox.ofTools.fast_io import output_processing
 import os
 
-this_dir = os.path.dirname(__file__)
+this_dir = os.path.dirname(os.path.abspath(__file__))
 
 # Define openfast output filenames
 filenames = ["../Test_Cases/NREL-5MW/NREL-5MW.outb"]

diff --git a/Examples/example_09.py b/Examples/example_09.py
@@ -14,7 +14,7 @@
 from ROSCO_toolbox.utilities import run_openfast
 import os
 
-this_dir = os.path.dirname(__file__)
+this_dir = os.path.dirname(os.path.abspath(__file__))
 
 # Define openfast output filenames
 wind_directory = os.path.join(this_dir,'../Test_Cases/Wind/')

diff --git a/Examples/example_10.py b/Examples/example_10.py
@@ -21,10 +21,10 @@
 from ROSCO_toolbox import turbine as ROSCO_turbine
 from ROSCO_toolbox import controller as ROSCO_controller
 
-rt_dir = os.path.dirname(os.path.dirname(__file__))
+this_dir =  os.path.dirname(os.path.abspath(__file__))
 
 # Load yaml file
-parameter_filename = os.path.join(rt_dir,'Tune_Cases/BAR.yaml')
+parameter_filename = os.path.join(os.path.dirname(this_dir),'Tune_Cases/BAR.yaml')
 inps = yaml.safe_load(open(parameter_filename))
 path_params         = inps['path_params']
 turbine_params      = inps['turbine_params']
@@ -34,7 +34,7 @@
 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(rt_dir,path_params['FAST_directory']),dev_branch=True)
+    os.path.join(this_dir,path_params['FAST_directory']),dev_branch=True)
 
 # Tune controller
 controller = ROSCO_controller.Controller(controller_params)