Remove and revert extra commits

Author: dzalkind

Examples/07_openfast_outputs.py

@@ -36,8 +36,8 @@ def main():
     #  --- Comment,uncomment, create, and change these as desired...
     cases = {}
     cases['Baseline'] = ['Wind1VelX', 'BldPitch1', 'GenTq', 'RotSpeed']
-    #cases['Rotor'] = ['BldPitch1', 'GenTq', 'GenPwr']
-    #cases['Platform Motion'] = ['PtfmSurge', 'PtfmSway', 'PtfmHeave', 'PtfmPitch','PtfmRoll','PtfmYaw']
+    # cases['Rotor'] = ['BldPitch1', 'GenTq', 'GenPwr']
+    # cases['Platform Motion'] = ['PtfmSurge', 'PtfmSway', 'PtfmHeave', 'PtfmPitch','PtfmRoll','PtfmYaw']
 
 
     # Instantiate fast_IO

Examples/28_tower_resonance.py

@@ -45,7 +45,6 @@ def main():
 
     # Set DISCON input dynamically through yaml/dict
     controller_params = {}
-    controller_params['ASO_Mode'] = 0  
     controller_params['TRA_Mode'] = 2    
     controller_params['vs_minspd'] = 0.    # Reduce minimum rotor speed so that saturation does not interfere with exclusion
     controller_params['VS_ControlMode'] = 3.   
@@ -64,20 +63,20 @@ def main():
     # A few different cases highlight TRA
 
     # Ramp: good demo of functionality, short for CI
-    #r.wind_case_fcn = cl.ramp  
-    #r.wind_case_opts    = {
-    #    'U_start': 0,  # from 10 to 15 m/s
-    #    'U_end': 10,
-    #    't_start': 100,
-    #    't_end': 300,
-    #    }
+    r.wind_case_fcn = cl.ramp  
+    r.wind_case_opts    = {
+        'U_start': 0,  # from 10 to 15 m/s
+        'U_end': 10,
+        't_start': 100,
+        't_end': 300
+        }
 
     # # steady
-    r.wind_case_fcn = cl.power_curve  
-    r.wind_case_opts    = {
-         'U': 6.5,  # from 10 to 15 m/s
-         'TMax': 400,
-         }
+    # r.wind_case_fcn = cl.power_curve  
+    # r.wind_case_opts    = {
+    #     'U': 6.5,  # from 10 to 15 m/s
+    #     'TMax': 400,
+    #     }
 
     # # turbulence
     # r.wind_case_fcn = cl.turb_bts  
@@ -90,16 +89,14 @@ def main():
     r.control_sweep_fcn = cl.sweep_yaml_input
     r.control_sweep_opts = {
             'control_param': 'TRA_Mode',
-            #'param_values': [0]
             'param_values': [0,1]
         }
 
     r.controller_params = controller_params
     r.save_dir      = run_dir
     r.rosco_dir     = rosco_dir
     r.case_inputs = {}
-    r.rosco_dll = "C:/Users/musah/ROSCO/rosco/controller/build/libdiscon.dll"
-    r.n_cores = 1
+    r.n_cores = 2
     r.run_FAST()
 
 

Examples/Test_Cases/IEA-15-240-RWT/IEA-15-240-RWT-UMaineSemi/ReadFASTbinary.m

@@ -69,7 +69,32 @@ else (NWTC_SYS_FILE)
   message(FATAL_ERROR "Cannot determine system file used with NWTC_Library")
 endif (NWTC_SYS_FILE)
 
+# ZMQ Library
+find_package(PkgConfig)
+pkg_check_modules(PC_ZeroMQ libzmq)
+if(PC_ZeroMQ_FOUND)
+	# Find ZeroMQ installation
+	find_path(ZeroMQ_INCLUDE_DIR
+			NAMES zmq.h
+			PATHS ${PC_ZeroMQ_INCLUDE_DIRS}
+			)
+	find_library(ZeroMQ_LIBRARY
+			NAMES zmq
+			PATHS ${PC_ZeroMQ_LIBRARY_DIRS}
+			)
+	include_directories(${ZeroMQ_INCLUDE_DIR})
+
+	set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -L${PC_ZeroMQ_LIBRARY_DIRS} -lzmq")
 
+	# Compile C-based ZeroMQ client as object library
+	add_compile_options(-I${ZeroMQ_INCLUDE_DIR} -l${ZeroMQ_LIBRARY} -fPIC)
+	add_library(zmq_client OBJECT src/zmq_client.c)
+
+	# Add definition
+	add_definitions(-DZMQ_CLIENT="TRUE")
+    	set(SOURCES ${SOURCES}
+	$<TARGET_OBJECTS:zmq_client>)
+endif()
 
 add_library(discon SHARED ${SOURCES})