Update examples

NREL · Oct 26, 2023 · b627b48 · b627b48
1 parent f48067d
commit b627b48
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 19 deletions.
diff --git a/examples_smarteole/06_wake_steering_energy_ratio_analysis.ipynb b/examples_smarteole/06_wake_steering_energy_ratio_analysis.ipynb
diff --git a/examples_smarteole/07_emgauss_scada_tuning_optimization_method.ipynb b/examples_smarteole/07_emgauss_scada_tuning_optimization_method.ipynb
diff --git a/flasc/model_tuning/floris_tuning.py b/flasc/model_tuning/floris_tuning.py
@@ -84,6 +84,10 @@ def sweep_velocity_model_parameter_for_overall_wake_losses(
     # Assign the ref and test cols
     df_scada = pl.from_pandas(df_scada_in)
 
+    df_scada = df_scada.with_columns(
+        pl.Series(name='simple_index', values=np.arange(0,df_scada.shape[0]))
+    )
+
     # Trim to ws/wd
     df_scada = df_scada.filter(
         (pl.col('ws') >= ws_min) &  # Filter the mean wind speed
@@ -92,6 +96,11 @@ def sweep_velocity_model_parameter_for_overall_wake_losses(
         (pl.col('wd') < wd_max) 
     )
 
+    # Trim the yaw angle matrices
+    if yaw_angles is not None:
+        simple_index = df_scada['simple_index'].to_numpy()
+        yaw_angles = yaw_angles[simple_index,:,:]
+
     ref_cols = [f'pow_{i:03d}' for i in ref_turbines]
     test_cols = [f'pow_{i:03d}' for i in test_turbines]
     df_scada = add_power_ref(df_scada, ref_cols)