small fixes

NREL · Aug 21, 2023 · 36f30ea · 36f30ea
1 parent 2dba783
commit 36f30ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/flasc/energy_ratio/energy_ratio.py b/flasc/energy_ratio/energy_ratio.py
@@ -272,7 +272,7 @@ def compute_energy_ratio(er_in: EnergyRatioInput,
                          bin_cols_in = ['wd_bin','ws_bin'],
                          wd_bin_overlap_radius = 0.,
                          N = 1,
-                                                  parallell_interface="serial",  # Options are  'serial 'multiprocessing', 'mpi4py'
+                         parallell_interface="serial",  # Options are  'serial 'multiprocessing', 'mpi4py'
                          max_workers=None,
                          )-> EnergyRatioOutput:
 
@@ -299,6 +299,8 @@ def compute_energy_ratio(er_in: EnergyRatioInput,
         wd_bin_overlap_radius (float): The distance in degrees one wd bin overlaps into the next, must be 
             less or equal to half the value of wd_step
         N (int): The number of bootstrap samples to use.
+        parallell_interface (str): The interface to use for parallelization. Options are 'serial', 'multiprocessing', 'mpi4py'
+        max_workers (int): The maximum number of workers to use for parallelization. If None, use all available workers.
 
     Returns:
         EnergyRatioOutput: An EnergyRatioOutput object containing the energy ratio between the two sets of turbines.
@@ -412,7 +414,9 @@ def compute_energy_ratio(er_in: EnergyRatioInput,
                             ws_max,
                             bin_cols_in,
                             wd_bin_overlap_radius,
-                            N)
+                            N,
+                            parallell_interface,
+                            max_workers)
 
     # Return the results as an EnergyRatioOutput object
     return EnergyRatioOutput(df_res, 

diff --git a/flasc/timing_tests/energy_ratio_timing.py b/flasc/timing_tests/energy_ratio_timing.py
@@ -97,6 +97,7 @@ def time_energy_ratio_with_bootstrapping():
             wd_min=wd_min,
             wd_step=wd_step,
             N=N,
+            parallell_interface='multiprocessing',
             )
 
         end_time = time.time()