Squashed 'ROSCO/' changes from 7fa1ae25e..6c2807a9e

6c2807a9e Merge remote-tracking branch 'upstream/develop' into v2.9.0_prep 4cdef25d4 Merge pull request #300 from NREL/smart_lib_path b1c943ea0 fixes for windows 8c39105a3 hopefully caught everything 2d0525830 switch to cmake-build-extension and logic for finding rosco library path git-subtree-dir: ROSCO git-subtree-split: 6c2807a9ece26b4b94bc0a78bc4ca8388fba60b0
WISDEM · Jan 12, 2024 · 5912bf5 · 5912bf5
1 parent 8fab9a3
commit 5912bf5
Show file tree

Hide file tree

Showing 31 changed files with 187 additions and 321 deletions.
diff --git a/Examples/04_simple_sim.py b/Examples/04_simple_sim.py
@@ -17,8 +17,9 @@
 # Python modules
 import matplotlib.pyplot as plt 
 import numpy as np
-import os, platform
+import os
 # ROSCO toolbox modules 
+from rosco import discon_lib_path as lib_name
 from rosco.toolbox import controller as ROSCO_controller
 from rosco.toolbox import turbine as ROSCO_turbine
 from rosco.toolbox import sim as ROSCO_sim
@@ -43,14 +44,6 @@
 example_out_dir     = os.path.join(this_dir,'examples_out')
 os.makedirs(example_out_dir,exist_ok=True)
 
-if platform.system() == 'Windows':
-    sfx = 'dll'
-elif platform.system() == 'Darwin':
-    sfx = 'dylib'
-else:
-    sfx = 'so'
-lib_name = os.path.join(rosco_dir, 'lib', 'libdiscon.'+sfx)
-
 # # Load turbine model from saved pickle
 turbine         = ROSCO_turbine.Turbine
 turbine         = turbine.load(os.path.join(example_out_dir,'01_NREL5MW_saved.p'))

diff --git a/Examples/05_openfast_sim.py b/Examples/05_openfast_sim.py
@@ -11,10 +11,10 @@
 Note - you will need to have a compiled controller in ROSCO/build/ 
 '''
 # Python Modules
-import yaml
+#import yaml
 import os
-import numpy as np
-import matplotlib.pyplot as plt
+#import numpy as np
+#import matplotlib.pyplot as plt
 # ROSCO toolbox modules 
 from rosco.toolbox import controller as ROSCO_controller
 from rosco.toolbox import turbine as ROSCO_turbine

diff --git a/Examples/07_openfast_outputs.py b/Examples/07_openfast_outputs.py
@@ -12,7 +12,7 @@
 '''
 
 # Python Modules
-import numpy as np
+#import numpy as np
 import matplotlib.pyplot as plt 
 # ROSCO toolbox modules 
 from rosco.toolbox.ofTools.fast_io import output_processing

diff --git a/Examples/12_tune_ipc.py b/Examples/12_tune_ipc.py
@@ -10,7 +10,7 @@
 
 '''
 # Python Modules
-import os, platform
+import os
 import matplotlib.pyplot as plt
 
 # ROSCO toolbox modules 

diff --git a/Examples/14_open_loop_control.py b/Examples/14_open_loop_control.py
@@ -11,11 +11,12 @@
 
 '''
 # Python Modules
-import yaml, os, platform
+import os
 import numpy as np
 import matplotlib.pyplot as plt
 
 # ROSCO toolbox modules 
+from rosco import discon_lib_path
 from rosco.toolbox import controller as ROSCO_controller
 from rosco.toolbox import turbine as ROSCO_turbine
 from rosco.toolbox import utilities as ROSCO_utilities
@@ -89,17 +90,8 @@
 ROSCO_utilities.write_DISCON(turbine,controller,param_file=param_file, txt_filename=path_params['rotor_performance_filename'])
 
 ### Run OpenFAST using aeroelasticse tools
-
-if platform.system() == 'Windows':
-    sfx = 'dll'
-elif platform.system() == 'Darwin':
-    sfx = 'dylib'
-else:
-    sfx = 'so'
-rosco_dll = os.path.join(rosco_dir, 'lib', 'libdiscon.'+sfx)
-
 case_inputs = {}
-case_inputs[('ServoDyn','DLL_FileName')] = {'vals': [rosco_dll], 'group': 0}
+case_inputs[('ServoDyn','DLL_FileName')] = {'vals': [discon_lib_path], 'group': 0}
 
 # Apply all discon variables as case inputs
 discon_vt = ROSCO_utilities.DISCON_dict(

diff --git a/Examples/16_external_dll.py b/Examples/16_external_dll.py
@@ -8,6 +8,7 @@
 '''
 
 import os, platform
+from rosco import discon_lib_path as lib_name
 from rosco.toolbox.ofTools.case_gen.run_FAST import run_FAST_ROSCO
 from rosco.toolbox.ofTools.case_gen import CaseLibrary as cl
 import shutil
@@ -19,14 +20,6 @@
 example_out_dir     = os.path.join(this_dir,'examples_out')
 os.makedirs(example_out_dir,exist_ok=True)
 
-if platform.system() == 'Windows':
-    sfx = 'dll'
-elif platform.system() == 'Darwin':
-    sfx = 'dylib'
-else:
-    sfx = 'so'
-lib_name = os.path.join(rosco_dir, 'lib', 'libdiscon.'+sfx)
-
 
 def main():
 

diff --git a/Examples/17a_zeromq_simple.py b/Examples/17a_zeromq_simple.py
@@ -8,9 +8,9 @@
 '''
 
 
-import platform
 import os
 import matplotlib.pyplot as plt
+from rosco import discon_lib_path
 from rosco.toolbox.inputs.validation import load_rosco_yaml
 from rosco.toolbox.utilities import write_DISCON
 from rosco.toolbox import control_interface as ROSCO_ci
@@ -32,14 +32,6 @@
 example_out_dir     = os.path.join(this_dir,'examples_out')
 os.makedirs(example_out_dir,exist_ok=True)
 
-if platform.system() == 'Windows':
-    sfx = 'dll'
-elif platform.system() == 'Darwin':
-    sfx = 'dylib'
-else:
-    sfx = 'so'
-lib_name = os.path.join(rosco_dir, 'lib', 'libdiscon.'+sfx)
-
 def run_zmq(logfile=None):
     # Start the server at the following address
     network_address = "tcp://*:5555"
@@ -118,7 +110,7 @@ def sim_rosco():
 
     # Load controller library
     controller_int = ROSCO_ci.ControllerInterface(
-        lib_name, 
+        discon_lib_path, 
         param_filename=param_filename, 
         sim_name=os.path.join(sim_dir,'sim-zmq')
         )

diff --git a/Examples/18_pitch_offsets.py b/Examples/18_pitch_offsets.py
@@ -7,7 +7,7 @@
 
 '''
 
-import os, platform
+import os
 from rosco.toolbox.ofTools.case_gen.run_FAST import run_FAST_ROSCO
 from rosco.toolbox.ofTools.case_gen import CaseLibrary as cl
 from rosco.toolbox.ofTools.fast_io import output_processing
@@ -20,14 +20,6 @@
 example_out_dir     = os.path.join(this_dir,'examples_out')
 os.makedirs(example_out_dir,exist_ok=True)
 
-if platform.system() == 'Windows':
-    sfx = 'dll'
-elif platform.system() == 'Darwin':
-    sfx = 'dylib'
-else:
-    sfx = 'so'
-lib_name = os.path.join(rosco_dir, 'lib', 'libdiscon.'+sfx)
-
 
 def main():
 

diff --git a/Examples/20_active_wake_control.py b/Examples/20_active_wake_control.py
@@ -153,12 +153,12 @@
 [2] - Frederik, Joeri A., et al. "The helix approach: Using dynamic individual pitch control to enhance wake mixing in wind farms." Wind Energy 23.8 (2020): 1739-1751.
 '''
 
-import os, platform
+import os
 from rosco.toolbox.ofTools.case_gen.run_FAST import run_FAST_ROSCO
 from rosco.toolbox.ofTools.case_gen import CaseLibrary as cl
-from rosco.toolbox.ofTools.fast_io import output_processing
-from rosco.toolbox.utilities import read_DISCON, DISCON_dict
-import numpy as np
+#from rosco.toolbox.ofTools.fast_io import output_processing
+from rosco.toolbox.utilities import read_DISCON #, DISCON_dict
+#import numpy as np
 
 # Choose your implementation method
 AWC_Mode 			= 1 		# 1 for SNL implementation, 2 for Coleman Transformation implementation
@@ -170,14 +170,6 @@
 example_out_dir     = os.path.join(this_dir,'examples_out')
 os.makedirs(example_out_dir,exist_ok=True)
 
-if platform.system() == 'Windows':
-    sfx = 'dll'
-elif platform.system() == 'Darwin':
-    sfx = 'dylib'
-else:
-    sfx = 'so'
-lib_name = os.path.join(rosco_dir, 'lib', 'libdiscon.'+sfx)
-
 
 
 def main():

diff --git a/Examples/21_optional_inputs.py b/Examples/21_optional_inputs.py
@@ -4,12 +4,12 @@
 to the current version
 '''
 
-import os, platform
+import os
+from rosco import discon_lib_path
 from rosco.toolbox import control_interface as ROSCO_ci
-from rosco.toolbox import sim as ROSCO_sim
+#from rosco.toolbox import sim as ROSCO_sim
 from rosco.toolbox import turbine as ROSCO_turbine
-import numpy as np
-
+#import numpy as np
 
 #directories
 this_dir            = os.path.dirname(os.path.abspath(__file__))
@@ -18,15 +18,6 @@
 example_in_dir      = os.path.join(this_dir,'example_inputs')
 os.makedirs(example_out_dir,exist_ok=True)
 
-if platform.system() == 'Windows':
-    sfx = 'dll'
-elif platform.system() == 'Darwin':
-    sfx = 'dylib'
-else:
-    sfx = 'so'
-rosco_dll = os.path.join(rosco_dir, 'lib', 'libdiscon.'+sfx)
-
-
 
 def main():
 
@@ -42,7 +33,9 @@ def main():
 
     avi_fail = []
     for param_filename in param_filenames:
-        controller_int = ROSCO_ci.ControllerInterface(rosco_dll,param_filename=param_filename,sim_name='sim1')
+        controller_int = ROSCO_ci.ControllerInterface(discon_lib_path,
+                                                      param_filename=param_filename,
+                                                      sim_name='sim1')
         controller_int.kill_discon()
         avi_fail.append(controller_int.aviFAIL.value)
 

diff --git a/Examples/22_cable_control.py b/Examples/22_cable_control.py
@@ -7,7 +7,7 @@
 
 '''
 
-import os, platform
+import os
 from rosco.toolbox.ofTools.case_gen.run_FAST import run_FAST_ROSCO
 from rosco.toolbox.ofTools.case_gen import CaseLibrary as cl
 from rosco.toolbox.ofTools.fast_io import output_processing
@@ -149,4 +149,4 @@ def main():
 
 
 if __name__=="__main__":
-    main()
+    main()
diff --git a/Examples/23_structural_control.py b/Examples/23_structural_control.py
@@ -7,10 +7,10 @@
 
 '''
 
-import os, platform
+import os
 from rosco.toolbox.ofTools.case_gen.run_FAST import run_FAST_ROSCO
 from rosco.toolbox.ofTools.case_gen import CaseLibrary as cl
-import numpy as np
+#import numpy as np
 from rosco.toolbox.ofTools.fast_io.FAST_reader import InputReader_OpenFAST
 from rosco.toolbox.inputs.validation import load_rosco_yaml
 from rosco.toolbox.controller import OpenLoopControl
@@ -35,15 +35,6 @@
 example_out_dir     = os.path.join(this_dir,'examples_out')
 os.makedirs(example_out_dir,exist_ok=True)
 
-if platform.system() == 'Windows':
-    sfx = 'dll'
-elif platform.system() == 'Darwin':
-    sfx = 'dylib'
-else:
-    sfx = 'so'
-lib_name = os.path.join(rosco_dir, 'lib', 'libdiscon.'+sfx)
-
-
 
 def main():
 

diff --git a/Examples/24_floating_feedback.py b/Examples/24_floating_feedback.py
@@ -12,13 +12,13 @@
 
 '''
 
-import os, platform
+import os
 from rosco.toolbox.ofTools.case_gen.run_FAST import run_FAST_ROSCO
 from rosco.toolbox.ofTools.case_gen import CaseLibrary as cl
 import numpy as np
-from rosco.toolbox.ofTools.fast_io.FAST_reader import InputReader_OpenFAST
-from rosco.toolbox.inputs.validation import load_rosco_yaml
-from rosco.toolbox.controller import OpenLoopControl
+#from rosco.toolbox.ofTools.fast_io.FAST_reader import InputReader_OpenFAST
+#from rosco.toolbox.inputs.validation import load_rosco_yaml
+#from rosco.toolbox.controller import OpenLoopControl
 from rosco.toolbox.tune import yaml_to_objs
 from rosco.toolbox.utilities import write_DISCON, read_DISCON
 from rosco.toolbox import controller as ROSCO_controller
@@ -33,15 +33,6 @@
 example_out_dir     = os.path.join(this_dir,'examples_out')
 os.makedirs(example_out_dir,exist_ok=True)
 
-if platform.system() == 'Windows':
-    sfx = 'dll'
-elif platform.system() == 'Darwin':
-    sfx = 'dylib'
-else:
-    sfx = 'so'
-lib_name = os.path.join(rosco_dir, 'lib', 'libdiscon.'+sfx)
-
-
 def main():
 
     # Input yaml and output directory

diff --git a/Examples/25_rotor_position_control.py b/Examples/25_rotor_position_control.py
@@ -7,13 +7,13 @@
 
 '''
 
-import os, platform
+import os
 from rosco.toolbox.ofTools.case_gen.run_FAST import run_FAST_ROSCO
 from rosco.toolbox.ofTools.case_gen import CaseLibrary as cl
 from rosco.toolbox.ofTools.fast_io import output_processing
 from rosco.toolbox.controller import OpenLoopControl
 import numpy as np
-import pandas as pd
+#import pandas as pd
 import matplotlib.pyplot as plt
 
 
@@ -23,14 +23,6 @@
 example_out_dir     = os.path.join(this_dir,'examples_out')
 os.makedirs(example_out_dir,exist_ok=True)
 
-if platform.system() == 'Windows':
-    sfx = 'dll'
-elif platform.system() == 'Darwin':
-    sfx = 'dylib'
-else:
-    sfx = 'so'
-lib_name = os.path.join(rosco_dir, 'lib', 'libdiscon.'+sfx)
-
 
 def main():
 

diff --git a/Examples/26_marine_hydro.py b/Examples/26_marine_hydro.py
@@ -6,15 +6,14 @@
 
 '''
 
-import os, platform
+import os
 from rosco.toolbox.ofTools.case_gen.run_FAST import run_FAST_ROSCO
 from rosco.toolbox.ofTools.case_gen import CaseLibrary as cl
-from rosco.toolbox.ofTools.fast_io import output_processing
-import numpy as np
-from rosco.toolbox.ofTools.fast_io.FAST_reader import InputReader_OpenFAST
-from rosco.toolbox.inputs.validation import load_rosco_yaml
-import matplotlib.pyplot as plt
-from rosco.toolbox.controller import OpenLoopControl
+#from rosco.toolbox.ofTools.fast_io import output_processing
+#from rosco.toolbox.ofTools.fast_io.FAST_reader import InputReader_OpenFAST
+#from rosco.toolbox.inputs.validation import load_rosco_yaml
+#import matplotlib.pyplot as plt
+#from rosco.toolbox.controller import OpenLoopControl
 
 '''
 Run MHK turbine in OpenFAST with ROSCO torque controller
@@ -83,4 +82,4 @@ def main():
 
 
 if __name__=="__main__":
-    main()
+    main()