fix merge conflict

NREL · May 7, 2024 · d634ba0 · d634ba0
2 parents a9f8fe5 + d04e384
commit d634ba0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## Unreleased
+
+- A bug was fixed where the array system installation costs were nearly doubled when compared
+  to a direct ORBIT run. This was the result of a duplicated design result when calling both
+  `Project.connect_orbit_cable_lengths()` and `Project.orbit.run()`.
+
 ## 0.5.2 (9 April 2024)
 
 - Pins FLORIS to v3.6 to avoid workarounds for previous versions, and to avoid issues with

diff --git a/waves/project.py b/waves/project.py
@@ -607,6 +607,9 @@ def connect_orbit_cable_lengths(self, save_results: bool = True) -> None:
                 index=False,
             )
 
+        # Unset the ORBIT settings to ensure the design result isn't double counted
+        self.setup_orbit()
+
     def generate_floris_positions_from_layout(
         self,
         x_col: str = "easting",