Expanded level 2 linearization capabilities

.gitignore

@@ -108,7 +108,15 @@ Thumbs.db
 *.sum
 *.ech
 *.dbg
+*/CMakeCache.txt
+*.check_cache
 
 # Temp
 *Temp*
 *temp*
+
+outputs/
+results/
+
+# Turbsim
+wind/

OpenFAST/docs/source/user/api_change.rst

@@ -47,6 +47,22 @@ InflowWind     7    VFlowAng                0   VFlowAng  - Upflow angle (degree
 ============== ==== ================== =============================================================================================================================================================================
 
 
+OpenFAST v2.3.0 to OpenFAST v2.4.0
+----------------------------------
+
+============== ==== ================== =============================================================================================================================================================================
+Added in OpenFAST v2.4.0
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Module        Line  Flag Name          Example Value
+============== ==== ================== =============================================================================================================================================================================
+IfW driver     6    [separator line]   ===================== File Conversion Options =================================
+IfW driver     7    WrHAWC             false    WrHAWC    - Convert all data to HAWC2 format? (flag)
+IfW driver     8    WrBladed           false    WrBladed  - Convert all data to Bladed format? (flag)
+IfW driver     9    WrVTK              false    WrVTK     - Convert all data to VTK format? (flag)
+InflowWind     7    VFlowAng                0   VFlowAng  - Upflow angle (degrees) (not used for native Bladed format WindType=7)
+============== ==== ================== =============================================================================================================================================================================
+
+
 OpenFAST v2.3.0 to OpenFAST v2.4.0
 ----------------------------------
 

OpenFAST/glue-codes/simulink/src/FAST_SFunc.c

@@ -450,6 +450,7 @@ static void mdlTerminate(SimStruct *S)
       FAST_End(&iTurb, &tr);
       n_t_global = -2;
    }  
+   FAST_DeallocateTurbines(&ErrStat, ErrMsg);
 
    FAST_DeallocateTurbines(&ErrStat2, ErrMsg2);
    if (ErrStat2 != ErrID_None){

ROSCO/.github/pull_request_template.md

@@ -17,4 +17,3 @@ _Select the appropriate type(s) that describe this PR_
 
 ## Examples/Testing, if applicable
 
-

ROSCO_toolbox/.github/workflows/CI_rosco-toolbox.yml → ROSCO/.github/workflows/CI_rosco-toolbox.yml

@@ -86,6 +86,11 @@ jobs:
         run: |
           conda install -y compilers
           conda install -y wisdem
+      - name: Add dependencies windows specific
+        if: true == contains( matrix.os, 'windows')
+        run: |
+          conda install -y m2w64-toolchain libpython 
+          conda install -y wisdem
 
 
       # Install ROSCO toolbox

ROSCO/.github/workflows/CI_rosco.yml

@@ -1,4 +1,4 @@
-name: CI_rosco-toolbox
+name: CI_rosco
 
 # We run CI on push commits on all branches
 on: [push, pull_request]
@@ -45,6 +45,7 @@ jobs:
         if: false == contains( matrix.os, 'windows')
         shell: pwsh
         run: |
+          cd ROSCO
           mkdir build
           cd build
           cmake ..
@@ -55,6 +56,7 @@ jobs:
         if: true == contains( matrix.os, 'windows')
         shell: pwsh
         run: |
+          cd ROSCO
           mkdir build
           cd build
           cmake .. -G "MinGW Makefiles" 

ROSCO/.gitignore

@@ -1,27 +1,84 @@
-# Gitignore
-~$README.docx
-ControllerSchematic.pptx
-
-# Compiled code, unnecessary for git
-Source/Obj_win32
-Source/Obj_lin64
-*.mod
-Source/x64/
-Source/Release/
-*build*
-Makefile
-*install*
-
-# Archive
-Scripts/CompileDISCONHereCopyRun\.cmd
-\.vs/
-
-# Temp Files
-*~
-.DS_Store
-*.u2d
-*.i90
-*.swp
-
-# vs code
-.vscode
+# Gitignore
+~$README.docx
+ControllerSchematic.pptx
+
+# Compiled code, unnecessary for git
+Source/Obj_win32
+Source/Obj_lin64
+*.mod
+Source/x64/
+Source/Release/
+*build*
+Makefile
+*install*
+
+# Archive
+Scripts/CompileDISCONHereCopyRun\.cmd
+\.vs/
+
+# Temp Files
+*~
+.DS_Store
+*.u2d
+*.i90
+*.swp
+
+
+# python compiled files
+__pycache__/
+.cache
+*.pyc
+*.egg-info
+dist
+build
+_build
+*.ipynb_checkpoints*
+*.html
+
+# macOS files
+.DS_Store
+
+# MATLAB files
+*.m~
+*slprj*
+
+# ide settings and files
+.idea
+.vscode
+
+# OpenFAST generated files
+*.sum
+*.ech
+*.dbg
+*.out
+*.outb
+*.dbg
+*.vtp
+
+# ROSCO files
+*.85
+*.i90
+*local*
+
+# Binaries
+*.dylib
+*.so
+*.dll
+*.bts
+
+# Other
+.pytest_cache
+examples/cp_ct_cq_lut.p
+
+# Files Generated in Examples
+Examples/DISCON.IN
+Examples/*.p
+
+# Exclude testing results
+ROSCO_testing/results/
+
+# Simulink/Matlab temp files
+*.slxc
+*.autosave
+*.mat
+

ROSCO_toolbox/Examples/example_01.py → ROSCO/Examples/example_01.py

@@ -16,11 +16,14 @@
 import yaml, os
 # ROSCO Modules
 from ROSCO_toolbox import turbine as ROSCO_turbine
+from ROSCO_toolbox.inputs.validation import load_rosco_yaml
+
 
 # Load yaml file
 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))
+tune_dir =  os.path.join(this_dir,'../Tune_Cases')
+parameter_filename = os.path.join(tune_dir,'NREL5MW.yaml')
+inps = load_rosco_yaml(parameter_filename)
 path_params         = inps['path_params']
 turbine_params      = inps['turbine_params']
 
@@ -29,9 +32,9 @@
 
 turbine.load_from_fast(
     path_params['FAST_InputFile'],
-    os.path.join(this_dir,path_params['FAST_directory']),
+    os.path.join(tune_dir,path_params['FAST_directory']),
     dev_branch=True,
-    rot_source='txt',txt_filename=os.path.join(this_dir,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

ROSCO_toolbox/Examples/example_03.py → ROSCO/Examples/example_03.py

@@ -14,6 +14,7 @@
 # ROSCO toolbox modules 
 from ROSCO_toolbox import turbine as ROSCO_turbine
 from ROSCO_toolbox.utilities import write_rotor_performance
+from ROSCO_toolbox.inputs.validation import load_rosco_yaml
 # Initialize parameter dictionaries
 turbine_params = {}
 control_params = {}
@@ -24,8 +25,10 @@
   os.makedirs(example_out_dir)
 
 # Load yaml file
-parameter_filename = os.path.join(this_dir,'NREL5MW_example.yaml')
-inps = yaml.safe_load(open(parameter_filename))
+this_dir = os.path.dirname(os.path.abspath(__file__))
+tune_dir =  os.path.join(this_dir,'../Tune_Cases')
+parameter_filename = os.path.join(tune_dir,'NREL5MW.yaml')
+inps = load_rosco_yaml(parameter_filename)
 path_params         = inps['path_params']
 turbine_params      = inps['turbine_params']
 controller_params   = inps['controller_params']

ROSCO_toolbox/Examples/example_04.py → ROSCO/Examples/example_04.py

@@ -18,11 +18,14 @@
 from ROSCO_toolbox import turbine as ROSCO_turbine
 from ROSCO_toolbox import sim as ROSCO_sim
 from ROSCO_toolbox.utilities import write_DISCON
+from ROSCO_toolbox.inputs.validation import load_rosco_yaml
+
 
 # Load yaml file 
 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))
+tune_dir =  os.path.join(this_dir,'../Tune_Cases')
+parameter_filename = os.path.join(tune_dir,'NREL5MW.yaml')
+inps = load_rosco_yaml(parameter_filename)
 path_params         = inps['path_params']
 turbine_params      = inps['turbine_params']
 controller_params   = inps['controller_params']
@@ -34,17 +37,17 @@
 # Load turbine data from OpenFAST and rotor performance text file
 turbine.load_from_fast(
     path_params['FAST_InputFile'],
-    os.path.join(this_dir,path_params['FAST_directory']),
+    os.path.join(tune_dir,path_params['FAST_directory']),
     dev_branch=True,
-    rot_source='txt',txt_filename=os.path.join(this_dir,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)
 
 # Write parameter input file
-param_file = 'DISCON.IN'   
-write_DISCON(turbine,controller,param_file=param_file, txt_filename=path_params['rotor_performance_filename'])
+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']))
 
 # Plot gain schedule
 fig, ax = plt.subplots(1,2,constrained_layout=True)

ROSCO_toolbox/Examples/example_05.py → ROSCO/Examples/example_05.py

@@ -11,7 +11,8 @@
 Notes - You will need to have a compiled controller in ROSCO, and 
         properly point to it in the `lib_name` variable.
       - Using wind speed estimators in this simple simulation is 
-        known to cause problems. We suggesting using WE_Mode = 0 in DISCON.IN.
+        known to cause problems. We suggesting using WE_Mode = 0 in DISCON.IN 
+        or increasing sampling rate of simulation
 '''
 # Python modules
 import matplotlib.pyplot as plt 
@@ -22,6 +23,18 @@
 from ROSCO_toolbox import turbine as ROSCO_turbine
 from ROSCO_toolbox import sim as ROSCO_sim
 from ROSCO_toolbox import control_interface as ROSCO_ci
+from ROSCO_toolbox.utilities import write_DISCON
+from ROSCO_toolbox.inputs.validation import load_rosco_yaml
+
+
+# Load yaml file 
+this_dir = os.path.dirname(os.path.abspath(__file__))
+tune_dir =  os.path.join(this_dir,'../Tune_Cases')
+parameter_filename = os.path.join(tune_dir,'NREL5MW.yaml')
+inps = load_rosco_yaml(parameter_filename)
+path_params         = inps['path_params']
+turbine_params      = inps['turbine_params']
+controller_params   = inps['controller_params']
 
 # Specify controller dynamic library path and name
 this_dir = os.path.dirname(os.path.abspath(__file__))
@@ -36,20 +49,36 @@
 else:
     lib_name = os.path.join(this_dir, '../ROSCO/build/libdiscon.so')
 
+# # Load turbine model from saved pickle
+turbine         = ROSCO_turbine.Turbine
+turbine         = turbine.load(os.path.join(example_out_dir,'01_NREL5MW_saved.p'))
+# controller      = ROSCO_controller.Controller(controller_params)
+
+# Load turbine data from OpenFAST and rotor performance text file
+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'])
+    )
+
+# Tune controller 
+controller      = ROSCO_controller.Controller(controller_params)
+controller.tune_controller(turbine)
+
+# 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']))
 
-# Load turbine model from saved pickle
-turbine = ROSCO_turbine.Turbine
-turbine = turbine.load(os.path.join(example_out_dir,'01_NREL5MW_saved.p'))
 
 # Load controller library
-controller_int = ROSCO_ci.ControllerInterface(lib_name,param_filename=param_filename)
+controller_int = ROSCO_ci.ControllerInterface(lib_name,param_filename=param_filename,sim_name='sim1')
 
 # Load the simulator
-sim = ROSCO_sim.Sim(turbine,controller_int)
+sim_1 = ROSCO_sim.Sim(turbine,controller_int)
 
 # Define a wind speed history
-dt = 0.1
+dt = 0.025
 tlen = 1000      # length of time to simulate (s)
 ws0 = 7         # initial wind speed (m/s)
 t= np.arange(0,tlen,dt) 
@@ -59,7 +88,17 @@
     ws[i] = ws[i] + t[i]//100
 
 # Run simulator and plot results
-sim.sim_ws_series(t,ws,rotor_rpm_init=4)
+sim_1.sim_ws_series(t,ws,rotor_rpm_init=4)
+
+# Load controller library again to see if we deallocated properly
+controller_int = ROSCO_ci.ControllerInterface(lib_name,param_filename=param_filename,sim_name='sim_2')
+
+# Run simulator again and plot results
+sim_2 = ROSCO_sim.Sim(turbine,controller_int)
+sim_2.sim_ws_series(t,ws,rotor_rpm_init=4)
+
+# Check if simulations are equal
+np.testing.assert_almost_equal(sim_1.gen_speed,sim_2.gen_speed)
 
 if False:
   plt.show()