update tests

Author: BTV25

ard/farm_aero/flowfarm.py

@@ -235,7 +235,7 @@ def _evaluate_sparse(self, x_eval_np):
         )
 
         self._cached_sparse_x = x_eval_np.copy()
-        self._cached_sparse_aep = float(aep_val)
+        self._cached_sparse_aep = float(np.asarray(aep_val).ravel()[0])
         self._cached_sparse_grad = np.asarray(grad_val).ravel().copy()
 
     def _evaluate_farm(self, x_eval_np):
@@ -254,7 +254,7 @@ def _evaluate_farm(self, x_eval_np):
         aep_val = calculate_aep_bang(self.farm, x_eval)
 
         self._cached_farm_x = x_eval_np.copy()
-        self._cached_farm_aep = float(aep_val)
+        self._cached_farm_aep = float(np.asarray(aep_val).ravel()[0])
 
     def _compute_aep(self, inputs, outputs):
         """Compute farm AEP using regular calculate_aep!(farm, x)."""

test/flowfarm/integration/test_flowfarm_integration.py

@@ -12,15 +12,12 @@
     pytest -m "not julia" ...
 """
 
-from pathlib import Path
-
 import numpy as np
 import openmdao.api as om
 import pytest
 import yaml
 
 import ard
-import ard.utils.test_utils
 
 # ---------------------------------------------------------------------------
 # Shared test data
@@ -170,7 +167,7 @@ def test_partials_check(self):
         )
         for key, vals in data.items():
             rel_err = vals.get("rel error")
-            if rel_err is not None:
+            if rel_err is not None and rel_err.forward is not None:
                 assert (
                     abs(rel_err.forward) < 0.01
                 ), f"Partial derivative rel error too large for {key}: {rel_err.forward:.4f}"
@@ -189,48 +186,3 @@ def test_aep_decreases_with_closer_spacing(self):
 
         assert aep_tight < aep_spread
 
-
-# ---------------------------------------------------------------------------
-# Pyrite regression  (generated on first run with rewrite=True)
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.julia
-class TestFLOWFarmAEPPyrite:
-
-    def setup_method(self):
-        from ard.farm_aero.flowfarm import FLOWFarmAEP
-
-        modeling_options = _make_aep_modeling_options()
-        model = om.Group()
-        model.add_subsystem(
-            "aepFLOWFarm", FLOWFarmAEP(modeling_options=modeling_options)
-        )
-        prob = om.Problem(model)
-        prob.setup()
-
-        n_side = 3
-        X, Y = _grid_layout(n_side, _SPACING, _ROTOR_DIAMETER)
-        prob.set_val("aepFLOWFarm.x_turbines", X)
-        prob.set_val("aepFLOWFarm.y_turbines", Y)
-        prob.set_val("aepFLOWFarm.yaw_turbines", np.zeros(len(X)))
-        prob.run_model()
-        self.prob = prob
-
-    def test_aep_pyrite(self, subtests):
-        test_data = {
-            "aep_farm": self.prob.get_val("aepFLOWFarm.AEP_farm", units="GW*h"),
-            "power_farm": self.prob.get_val("aepFLOWFarm.power_farm", units="MW"),
-        }
-        pyrite_path = Path(__file__).parent / "test_flowfarm_aep_pyrite.npz"
-
-        pyrite_data = ard.utils.test_utils.pyrite_validator(
-            test_data,
-            pyrite_path,
-            rtol_val=5e-3,
-            # rewrite=True,  # uncomment to regenerate reference data
-        )
-
-        for key in test_data:
-            with subtests.test(key):
-                assert np.allclose(test_data[key], pyrite_data[key], rtol=5e-3)