Merge pull request #10 from NREL/develop

Major updates to post processing, Minor bug fixes
NREL · Apr 21, 2020 · a905ecc · a905ecc
2 parents a0bcf9f + a7b714a
commit a905ecc
Show file tree

Hide file tree

Showing 10 changed files with 438 additions and 134 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "ROSCO"]
 	path = ROSCO
 	url = https://github.com/NREL/ROSCO.git
+	branch = develop
diff --git a/README.md b/README.md
@@ -116,7 +116,7 @@ cited as:
 For LaTeX users:
 
 ```
-    @misc{ROSCO_toolbox_2019,
+@misc{ROSCO_toolbox_2019,
     author = {NREL},
     title = {{ROSCO Toolbox. Version 0.1.0}},
     year = {2019},

diff --git a/ROSCO b/ROSCO
diff --git a/ROSCO_toolbox/__init__.py b/ROSCO_toolbox/__init__.py
@@ -8,4 +8,4 @@
 
 __author__ = """Nikhar J. Abbas and Paul Fleming"""
 __email__ = 'nikhar.abbas@nrel.gov'
-__version__ = '0.1.0'
+__version__ = '2.0.1'
diff --git a/ROSCO_toolbox/control_interface.py b/ROSCO_toolbox/control_interface.py
@@ -67,9 +67,10 @@ def __init__(self, lib_name, param_filename='DISCON.IN'):
         self.avrSWAP[0] = 0
 
         # Put some values in
-        self.avrSWAP[48] = len(self.param_name)
-        self.avrSWAP[49] = self.char_buffer
+        self.avrSWAP[58] = self.char_buffer
+        self.avrSWAP[49] = len(self.param_name)
         self.avrSWAP[50] = self.char_buffer
+        self.avrSWAP[51] = self.char_buffer
 
         # Initialize DISCON and related
         self.aviFAIL = c_int32() # 1

diff --git a/ROSCO_toolbox/controller.py b/ROSCO_toolbox/controller.py
@@ -294,6 +294,9 @@ def tune_controller(self, turbine):
             except AttributeError:
                 print('ERROR: If Flp_Mode > 0, you need to have blade information loaded in the turbine object.')
                 raise
+            except UnboundLocalError:
+                print('ERROR: You are attempting to tune a flap controller for a blade without flaps!')
+                raise
         else:
             self.flp_angle = 0.0
             self.Ki_flap = np.array([0.0])

diff --git a/ROSCO_toolbox/turbine.py b/ROSCO_toolbox/turbine.py
@@ -394,7 +394,7 @@ def load_blade_info(self):
         self.span = r 
         self.chord = chord
         self.twist = theta
-        self.bld_flapwise_damp = self.fast.fst_vt['ElastoDynBlade']['BldFlDmp1']
+        self.bld_flapwise_damp = self.fast.fst_vt['ElastoDynBlade']['BldFlDmp1']/100 * 0.7
 
 class RotorPerformance():
     '''