Reconcile cory's and main offshore-dev

.coveragerc

@@ -1,5 +1,6 @@
 [run]
 omit = 
     ard/glue/prototype.py
-    ard/test_utils.py
+    ard/utils/test_utils.py
+    ard/farm_aero/placeholder.py
 

.github/workflows/python-tests-system.yml

@@ -12,7 +12,7 @@ jobs:
   test:
     strategy:
       matrix:
-        python-version: [3.13, 3.12] # ["3.10", "3.11", "3.12", "3.13"]
+        python-version: [3.12] # ["3.10", "3.11", "3.12", "3.13"]
         os: [macos-latest, ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
 
@@ -28,7 +28,6 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install .[dev]
 
     - name: Install Ard
       run: |

.github/workflows/python-tests-unit.yml

@@ -12,7 +12,7 @@ jobs:
   test:
     strategy:
       matrix:
-        python-version: [3.13, 3.12] # ["3.10", "3.11", "3.12", "3.13"]
+        python-version: [3.12] # ["3.10", "3.11", "3.12", "3.13"]
         os: [macos-latest, ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -27,7 +27,6 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install .[dev]
 
     - name: Install Ard
       run: |

README.md

@@ -58,7 +58,7 @@ There can be some hardware-software mis-specification issues with WISDEM install
 In the event of issues, WISDEM can be installed manually or using `conda` without issues, then `pip` installation can proceed.
 
 ```shell
-mamba install wisdem=3.18.1 -y
+mamba install wisdem -y
 pip install -e .[dev,docs]
 ```
 

ard/cost/approximate_turbine_spacing.py

@@ -1,58 +1,4 @@
 import openmdao.api as om
-from ard.cost.wisdem_wrap import LandBOSSE
-
-
-class LandBOSSEWithSpacingApproximations(om.Group):
-    """
-    OpenMDAO group that connects the SpacingApproximations component to the LandBOSSE component.
-
-    This group calculates the turbine spacing using the SpacingApproximations and passes it
-    to the LandBOSSE component for further cost estimation.
-    """
-
-    def initialize(self):
-        """Initialize the group and declare options."""
-        self.options.declare(
-            "modeling_options", types=dict, desc="Ard modeling options"
-        )
-
-    def setup(self):
-        """Set up the group by adding and connecting components."""
-        # Add the PrimarySpacingApproximations component
-        self.add_subsystem(
-            "spacing_approximations",
-            SpacingApproximations(modeling_options=self.options["modeling_options"]),
-            promotes_inputs=["total_length_cables"],
-        )
-
-        # Add the LandBOSSE component
-        self.add_subsystem(
-            "landbosse",
-            LandBOSSE(),
-            promotes_inputs=[
-                "*",
-                (
-                    "turbine_spacing_rotor_diameters",
-                    "internal_turbine_spacing_rotor_diameters",
-                ),
-                (
-                    "row_spacing_rotor_diameters",
-                    "internal_row_spacing_rotor_diameters",
-                ),
-            ],
-            promotes_outputs=["*"],  # Expose all outputs from LandBOSSE
-        )
-
-        # Connect the turbine and row spacing outputs from the approximations to LandBOSSE
-        self.connect(
-            "spacing_approximations.primary_turbine_spacing_diameters",
-            "internal_turbine_spacing_rotor_diameters",
-        )
-
-        self.connect(
-            "spacing_approximations.secondary_turbine_spacing_diameters",
-            "internal_row_spacing_rotor_diameters",
-        )
 
 
 class SpacingApproximations(om.ExplicitComponent):