Merge branch 'IEAontology4all' into bos

WISDEM · Aug 11, 2020 · 835ba32 · 835ba32
2 parents 4f767bc + 959e22d
commit 835ba32
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/wisdem/aeroelasticse/CaseGen_General.py b/wisdem/aeroelasticse/CaseGen_General.py
@@ -155,7 +155,10 @@ def CaseGen_General(case_inputs, dir_matrix='', namebase='', save_matrix=True):
             for g in matrix_group_idx[j]:
                 row_out[g] = change_vals[g][val]
         matrix_out.append(row_out)
-    matrix_out = np.asarray(matrix_out, dtype=str)
+    try:
+        matrix_out = np.asarray(matrix_out, dtype=str)
+    except:
+        matrix_out = np.asarray(matrix_out)
     n_cases = np.shape(matrix_out)[0]
 
     # case naming

diff --git a/wisdem/aeroelasticse/openmdao_openfast.py b/wisdem/aeroelasticse/openmdao_openfast.py
@@ -850,6 +850,7 @@ def DLC_creation_powercurve(self, inputs, discrete_inputs, fst_vt):
                 for var in list(self.options['modeling_options']['openfast']['fst_settings'].keys()):
                     case_inputs[var] = {'vals':[self.options['modeling_options']['openfast']['fst_settings'][var]], 'group':0}
                 # wind speeds
+                case_inputs[("InflowWind","WindType")]   = {'vals':[1], 'group':0}
                 case_inputs[("InflowWind","HWindSpeed")] = {'vals':U, 'group':1}
                 case_inputs[("ElastoDyn","RotSpeed")]    = {'vals':omega, 'group':1}
                 case_inputs[("ElastoDyn","BlPitch1")]    = {'vals':pitch, 'group':1}

diff --git a/wisdem/ccblade/ccblade_component.py b/wisdem/ccblade/ccblade_component.py
@@ -180,7 +180,7 @@ def setup(self):
 
         # inputs
         self.add_input('V_load',        val=20.0, units='m/s')
-        self.add_input('Omega_load',    val=9.0, units='rpm')
+        self.add_input('Omega_load',    val=0.0, units='rpm')
         self.add_input('pitch_load',    val=0.0, units='deg')
         self.add_input('azimuth_load',  val=0.0, units='deg')
 

diff --git a/wisdem/servose/servose.py b/wisdem/servose/servose.py
@@ -324,6 +324,7 @@ def compute(self,inputs,outputs, discrete_inputs, discrete_outputs):
 
         # DISCON Parameters
         #   - controller
+
         if 'DISCON_in' not in self.modeling_options['openfast']['fst_vt'].keys():
             self.modeling_options['openfast']['fst_vt']['DISCON_in']  = {}
         self.modeling_options['openfast']['fst_vt']['DISCON_in']['LoggingLevel'] = controller.LoggingLevel
@@ -365,6 +366,7 @@ def compute(self,inputs,outputs, discrete_inputs, discrete_outputs):
         self.modeling_options['openfast']['fst_vt']['DISCON_in']['Flp_Ki'] = controller.Ki_flap
         self.modeling_options['openfast']['fst_vt']['DISCON_in']['Flp_MaxPit'] = controller.flp_maxpit
         self.modeling_options['openfast']['fst_vt']['DISCON_in']['Flp_Angle'] = 0.
+
         # - turbine
         self.modeling_options['openfast']['fst_vt']['DISCON_in']['WE_BladeRadius'] = WISDEM_turbine.rotor_radius
         self.modeling_options['openfast']['fst_vt']['DISCON_in']['v_rated'] = inputs['v_rated'][0]