From 1240344ac59b9b330d1211d95704bee0107a6f65 Mon Sep 17 00:00:00 2001
From: misi9170 <39596329+misi9170@users.noreply.github.com>
Date: Thu, 10 Oct 2024 15:09:15 -0400
Subject: [PATCH] Ensure any wind_data and control setpoints on a passed
 FlorisModel are copied over. (#997)

---
 floris/par_floris_model.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/floris/par_floris_model.py b/floris/par_floris_model.py
index 9487c4e59..bfb60b300 100644
--- a/floris/par_floris_model.py
+++ b/floris/par_floris_model.py
@@ -47,8 +47,19 @@ def __init__(
         """
         # Instantiate the underlying FlorisModel
         if isinstance(configuration, FlorisModel):
-            configuration = configuration.core.as_dict()
-        super().__init__(configuration)
+            configuration_dict = configuration.core.as_dict()
+            super().__init__(configuration_dict)
+            # Copy over any control setpoints, wind data, if not already done.
+            self.set(
+                yaw_angles=configuration.core.farm.yaw_angles,
+                power_setpoints=configuration.core.farm.power_setpoints,
+                awc_modes=configuration.core.farm.awc_modes,
+                awc_amplitudes=configuration.core.farm.awc_amplitudes,
+                awc_frequencies=configuration.core.farm.awc_frequencies,
+                wind_data=configuration.wind_data,
+            )
+        else:
+            super().__init__(configuration)
 
         # Save parallelization parameters
         if interface == "multiprocessing":