Merge 4b5c52d into 5b7d6ba

WISDEM · Jul 30, 2021 · a02112c · a02112c
2 parents 5b7d6ba + 4b5c52d
commit a02112c
Show file tree

Hide file tree

Showing 6 changed files with 338 additions and 65 deletions.
diff --git a/weis/aeroelasticse/openmdao_openfast.py b/weis/aeroelasticse/openmdao_openfast.py
@@ -1395,7 +1395,9 @@ def run_FAST(self, inputs, discrete_inputs, fst_vt):
         rotorD = float(inputs['Rtip'])*2.
         PLExp = float(inputs['shearExp'])
         fix_wind_seeds = modopt['DLC_driver']['fix_wind_seeds']
-        dlc_generator = DLCGenerator(cut_in, cut_out, rated, ws_class, wt_class, fix_wind_seeds)
+        fix_wave_seeds = modopt['DLC_driver']['fix_wave_seeds']
+        metocean = modopt['DLC_driver']['metocean_conditions']
+        dlc_generator = DLCGenerator(cut_in, cut_out, rated, ws_class, wt_class, fix_wind_seeds, fix_wave_seeds, metocean)
         # Generate cases from user inputs
         for i_DLC in range(len(DLCs)):
             DLCopt = DLCs[i_DLC]
@@ -1411,6 +1413,7 @@ def run_FAST(self, inputs, discrete_inputs, fst_vt):
         WaveTp = np.zeros(dlc_generator.n_cases)
         WaveHd = np.zeros(dlc_generator.n_cases)
         WaveGamma = np.zeros(dlc_generator.n_cases)
+        WaveSeed1 = np.zeros(dlc_generator.n_cases, dtype=int)
         TMax = np.zeros(dlc_generator.n_cases)
         TStart = np.zeros(dlc_generator.n_cases)
 
@@ -1479,6 +1482,7 @@ def run_FAST(self, inputs, discrete_inputs, fst_vt):
             WaveTp[i_case] = dlc_generator.cases[i_case].wave_period
             WaveHd[i_case] = dlc_generator.cases[i_case].wave_heading
             WaveGamma[i_case] = dlc_generator.cases[i_case].wave_gamma
+            WaveSeed1[i_case] = dlc_generator.cases[i_case].wave_seed1
             TMax[i_case] = dlc_generator.cases[i_case].analysis_time + dlc_generator.cases[i_case].transient_time
             TStart[i_case] = dlc_generator.cases[i_case].transient_time
 
@@ -1504,6 +1508,7 @@ def run_FAST(self, inputs, discrete_inputs, fst_vt):
         case_inputs[("HydroDyn","WaveTp")] = {'vals':WaveTp, 'group':1}
         case_inputs[("HydroDyn","WaveDir")] = {'vals':WaveHd, 'group':1}
         case_inputs[("HydroDyn","WavePkShp")] = {'vals':WaveGamma, 'group':1}
+        case_inputs[("HydroDyn","WaveSeed1")] = {'vals':WaveSeed1, 'group':1}
 
         # Append current DLC to full list of cases
         case_list, case_name = CaseGen_General(case_inputs, self.FAST_runDirectory, self.FAST_InputFile)