Optimization under wind direction uncertainty in FLORIS version 2 ignores wind direction heterogeneity

[pjireland]

I've been using FLORIS version 2 due to the inability to specify heterogeneous wind directions in later versions. Looking at the code, it seems that when optimizing under wind direction uncertainty, the baseline wind direction is taken as the first wind direction (self.floris.farm.wind_map.input_direction[0]), ignoring any specified wind direction heterogeneity.

In floris.tools.floris_interface.py::get_turbine_power, I see the following:

            wd_orig = self.floris.farm.wind_map.input_direction[0]

            yaw_angles = self.get_yaw_angles()

            for i_wd, delta_wd in enumerate(unc_pmfs["wd_unc"]):
                self.reinitialize_flow_field(wind_direction=wd_orig + delta_wd)

                for i_yaw, delta_yaw in enumerate(unc_pmfs["yaw_unc"]):
                    self.calculate_wake(
                        yaw_angles=list(np.array(yaw_angles) - delta_wd + delta_yaw),
                        no_wake=no_wake,
                    )
                    mean_farm_power = mean_farm_power + unc_pmfs["wd_unc_pmf"][
                        i_wd
                    ] * unc_pmfs["yaw_unc_pmf"][i_yaw] * np.array(
                        [turbine.power for turbine in self.floris.farm.turbines]
                    )

            # reinitialize with original values
            self.reinitialize_flow_field(wind_direction=wd_orig)

A possible solution is this following:

            wd_orig = self.floris.farm.wind_map.input_direction

            yaw_angles = self.get_yaw_angles()

            for i_wd, delta_wd in enumerate(unc_pmfs["wd_unc"]):
                self.reinitialize_flow_field(wind_direction=[wd + delta_wd for wd in wd_orig])

                for i_yaw, delta_yaw in enumerate(unc_pmfs["yaw_unc"]):
                    self.calculate_wake(
                        yaw_angles=list(np.array(yaw_angles) - delta_wd + delta_yaw),
                        no_wake=no_wake,
                    )
                    mean_farm_power = mean_farm_power + unc_pmfs["wd_unc_pmf"][
                        i_wd
                    ] * unc_pmfs["yaw_unc_pmf"][i_yaw] * np.array(
                        [turbine.power for turbine in self.floris.farm.turbines]
                    )

            # reinitialize with original values
            self.reinitialize_flow_field(wind_direction=wd_orig)

Is this something the team is aware of? Would there be a benefit to submitting a PR to resolve the issue, or are changes no longer being made to version 2?