Merge develop changes into main

.github/workflows/python-tests-consolidated.yaml

@@ -150,7 +150,7 @@ jobs:
   test-examples:
     name: Run all examples
     needs: find-examples
-    if: needs.find-examples.outputs.scripts != '[]'  # Add this line
+    if: needs.find-examples.outputs.scripts != '[]'  # skip empty
     strategy:
       fail-fast: false
       matrix:
@@ -208,7 +208,7 @@ jobs:
   find-examples_nb:
     name: Find all example notebooks
     needs: [test-unit, test-system]
-    if: needs.find-examples_nb.outputs.scripts != '[]'  # Add this line
+    if: needs.find-examples_nb.outputs.scripts != '[]'  # skip empty
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code

ard/api/default_systems/ard_system_onshore_batch.yaml

@@ -0,0 +1,104 @@
+type: group
+systems:
+  layout2aep:
+    type: group
+    promotes: ["*"]
+    approx_totals:
+      method: "fd"
+      step: 1.0E-3
+      form: "central"
+      step_calc: "rel_avg"
+    systems:
+      layout:
+        type: component
+        module: ard.layout.gridfarm
+        object: GridFarmLayout
+        promotes: ["*"]
+        kwargs:
+          modeling_options:
+      aepFLORIS:
+        type: component
+        module: ard.farm_aero.floris
+        object: FLORISBatchPower
+        promotes: ["x_turbines", "y_turbines", "AEP_farm"]
+        kwargs:
+          modeling_options:
+          data_path:
+          case_title: "default"
+    approx_totals:
+      method: "fd"
+      step: 1.0E-3
+      form: "central"
+      step_calc: "rel_avg"
+  boundary:
+    type: component
+    module: ard.layout.boundary
+    object: FarmBoundaryDistancePolygon
+    promotes: ["*"]
+    kwargs:
+      modeling_options:
+  landuse:
+    type: component
+    module: ard.layout.gridfarm
+    object: GridFarmLanduse
+    promotes: ["*"]
+    kwargs:
+      modeling_options:
+  collection:
+    type: component
+    module: ard.collection.optiwindnet_wrap
+    object: OptiwindnetCollection
+    promotes: ["*"]
+    kwargs:
+      modeling_options:
+  spacing_constraint:
+    type: component
+    module: ard.layout.spacing
+    object: TurbineSpacing
+    promotes: ["*"]
+    kwargs:
+      modeling_options:
+  tcc:
+    type: component
+    module: ard.cost.wisdem_wrap
+    object: TurbineCapitalCosts
+    promotes: [
+      "turbine_number",
+      "machine_rating",
+      "tcc_per_kW",
+      "offset_tcc_per_kW",
+    ]
+  landbosse:
+    type: component
+    module: ard.cost.wisdem_wrap
+    object: LandBOSSEWithSpacingApproximations
+    promotes: [
+      "total_length_cables",
+    ]
+    kwargs:
+      modeling_options:
+  opex:
+    type: component
+    module: ard.cost.wisdem_wrap
+    object: OperatingExpenses
+    promotes: [
+      "turbine_number",
+      "machine_rating",
+      "opex_per_kW"
+    ]
+  financese:
+    type: component
+    module: ard.cost.wisdem_wrap
+    object: FinanceSEGroup
+    promotes: [
+      "turbine_number",
+      "machine_rating",
+      "tcc_per_kW",
+      "offset_tcc_per_kW",
+      "opex_per_kW",
+    ]
+    kwargs:
+      modeling_options:
+connections:
+  - ["AEP_farm", "financese.plant_aep_in"]
+  - ["landbosse.total_capex_kW", "financese.bos_per_kW"]

ard/api/interface.py

@@ -64,6 +64,7 @@ def set_up_ard_model(input_dict: Union[str, dict], root_data_path: str = None):
     # load default system if requested and available
     available_default_systems = [
         "onshore",
+        "onshore_batch",
         "onshore_no_cable_design",
         "offshore_monopile",
         "offshore_monopile_no_cable_design",

ard/farm_aero/floris.py

@@ -374,13 +374,14 @@ def compute(self, inputs, outputs):
         self.fmodel.run()
 
         # dump the yaml to re-run this case on demand
-        FLORISFarmComponent.dump_floris_yamlfile(self, self.dir_floris)
+        # FLORISFarmComponent.dump_floris_yamlfile(self, self.dir_floris)
 
         # FLORIS computes the powers
         outputs["AEP_farm"] = FLORISFarmComponent.get_AEP_farm(self)
         outputs["power_farm"] = FLORISFarmComponent.get_power_farm(self)
-        outputs["power_turbines"] = FLORISFarmComponent.get_power_turbines(self)
-        outputs["thrust_turbines"] = FLORISFarmComponent.get_thrust_turbines(self)
+        if self.options["modeling_options"]["aero"]["return_turbine_output"]:
+            outputs["power_turbines"] = FLORISFarmComponent.get_power_turbines(self)
+            outputs["thrust_turbines"] = FLORISFarmComponent.get_thrust_turbines(self)
 
 
 class FLORISAEP(templates.FarmAEPTemplate):

ard/farm_aero/placeholder.py

@@ -67,16 +67,17 @@ def setup(self):
             np.zeros((self.N_wind_conditions,)),
             units="W",
         )
-        self.add_output(
-            "power_turbines",
-            np.zeros((self.N_turbines, self.N_wind_conditions)),
-            units="W",
-        )
-        self.add_output(
-            "thrust_turbines",
-            np.zeros((self.N_turbines, self.N_wind_conditions)),
-            units="N",
-        )
+        if self.return_turbine_output:
+            self.add_output(
+                "power_turbines",
+                np.zeros((self.N_turbines, self.N_wind_conditions)),
+                units="W",
+            )
+            self.add_output(
+                "thrust_turbines",
+                np.zeros((self.N_turbines, self.N_wind_conditions)),
+                units="N",
+            )
 
     def setup_partials(self):
         """Derivative setup for OM component."""

ard/farm_aero/templates.py

@@ -312,6 +312,12 @@ def setup(self):
         # add the outputs we want for a batched power analysis:
         #   - farm and turbine powers
         #   - turbine thrusts
+
+        # self.add_output(
+        #     "AEP_farm",
+        #     np.array([0.0]),
+        #     units="W*h",
+        # )
         self.add_output(
             "AEP_farm",
             0.0,
@@ -322,16 +328,18 @@ def setup(self):
             np.zeros((self.N_wind_conditions,)),
             units="W",
         )
-        self.add_output(
-            "power_turbines",
-            np.zeros((self.N_turbines, self.N_wind_conditions)),
-            units="W",
-        )
-        self.add_output(
-            "thrust_turbines",
-            np.zeros((self.N_turbines, self.N_wind_conditions)),
-            units="N",
-        )
+
+        if self.options["modeling_options"]["aero"]["return_turbine_output"]:
+            self.add_output(
+                "power_turbines",
+                np.zeros((self.N_turbines, self.N_wind_conditions)),
+                units="W",
+            )
+            self.add_output(
+                "thrust_turbines",
+                np.zeros((self.N_turbines, self.N_wind_conditions)),
+                units="N",
+            )
 
     def setup_partials(self):
         """Derivative setup for OM component."""
@@ -357,8 +365,13 @@ def compute(self, inputs, outputs):
 
         # the following should be set
         outputs["power_farm"] = np.zeros((self.N_wind_conditions,))
-        outputs["power_turbines"] = np.zeros((self.N_turbines, self.N_wind_conditions))
-        outputs["thrust_turbines"] = np.zeros((self.N_turbines, self.N_wind_conditions))
+        if self.options["modeling_options"]["aero"]["return_turbine_output"]:
+            outputs["power_turbines"] = np.zeros(
+                (self.N_turbines, self.N_wind_conditions)
+            )
+            outputs["thrust_turbines"] = np.zeros(
+                (self.N_turbines, self.N_wind_conditions)
+            )
 
 
 class FarmAEPTemplate(FarmAeroTemplate):
@@ -443,16 +456,17 @@ def setup(self):
             np.zeros((self.N_wind_conditions,)),
             units="W",
         )
-        self.add_output(
-            "power_turbines",
-            np.zeros((self.N_turbines, self.N_wind_conditions)),
-            units="W",
-        )
-        self.add_output(
-            "thrust_turbines",
-            np.zeros((self.N_turbines, self.N_wind_conditions)),
-            units="N",
-        )
+        if self.options["modeling_options"]["aero"]["return_turbine_output"]:
+            self.add_output(
+                "power_turbines",
+                np.zeros((self.N_turbines, self.N_wind_conditions)),
+                units="W",
+            )
+            self.add_output(
+                "thrust_turbines",
+                np.zeros((self.N_turbines, self.N_wind_conditions)),
+                units="N",
+            )
         # ... more outputs can be added here
 
     def setup_partials(self):

ard/layout/gridfarm.py

@@ -91,8 +91,8 @@ def setup(self):
         angle_skew = self.modeling_options["layout"]["angle_skew"]
 
         # add four-parameter grid farm layout DVs
-        self.add_input("spacing_primary", spacing_primary)
-        self.add_input("spacing_secondary", spacing_secondary)
+        self.add_input("spacing_primary", spacing_primary, units="unitless")
+        self.add_input("spacing_secondary", spacing_secondary, units="unitless")
         self.add_input("angle_orientation", angle_orientation, units="deg")
         self.add_input("angle_skew", angle_skew, units="deg")
 
@@ -227,20 +227,26 @@ def setup(self):
         self.add_input(
             "spacing_primary",
             self.modeling_options["layout"]["spacing_primary"],
+            units="unitless",
+            desc="turbine row spacing in rotor diameters",
         )
         self.add_input(
             "spacing_secondary",
             self.modeling_options["layout"]["spacing_secondary"],
+            units="unitless",
+            desc="turbine column spacing (along rows) in rotor diameters",
         )
         self.add_input(
             "angle_orientation",
             self.modeling_options["layout"]["angle_orientation"],
             units="deg",
+            desc="orientation in degrees clockwise with respect to North",
         )
         self.add_input(
             "angle_skew",
             self.modeling_options["layout"]["angle_skew"],
             units="deg",
+            desc="clockwise skew angle of turbine rows",
         )
 
         self.add_output(

ard/viz/layout.py

@@ -153,7 +153,7 @@ def plot_layout(
 
     # show, save, or return
     if save_path is not None:
-        plt.savefig(save_path, save_kwargs)
+        plt.savefig(save_path, **save_kwargs)
 
     if show_image:
         plt.show()

examples/01_onshore/inputs/ard_system.yaml

@@ -8,6 +8,8 @@ modeling_options:
     spacing_secondary: 7.0
     angle_orientation: 0.0
     angle_skew: 0.0
+  aero:
+    return_turbine_output: True
   floris:
     peak_shaving_fraction: 0.2
     peak_shaving_TI_threshold: 0.0

examples/02_offshore_fixed/inputs/ard_system.yaml

@@ -8,6 +8,8 @@ modeling_options: &modeling_options
     spacing_secondary: 7.0
     angle_orientation: 0.0
     angle_skew: 0.0
+  aero:
+    return_turbine_output: True
   collection:
     max_turbines_per_string: 8
     solver_name: highs

examples/03_offshore_floating_custom_system/inputs/ard_system.yaml

@@ -13,6 +13,8 @@ modeling_options: &modeling_options
     min_mooring_line_length_m: 500.0
     N_anchor_dimensions: 2
   site_depth: 50.0
+  aero:
+    return_turbine_output: True
   collection:
     max_turbines_per_string: 8
     solver_name: highs

examples/05_onshore_batch/inputs/NREL_Reference_5MW_126.csv

@@ -0,0 +1,51 @@
+Wind Speed [m/s],Power [kW],Cp [-],Thrust [kN],Ct [-]
+3,40.52,0.208546508,77.66,1.132034888
+4,177.67,0.385795061,121.90,0.999470963
+5,403.9,0.449038264,174.88,0.917697381
+6,737.59,0.474546985,236.23,0.860849503
+7,1187.18,0.480994449,304.55,0.815371198
+7.1,1239.25,0.481172749,311.87,0.811614904
+7.2,1292.52,0.481235678,319.27,0.807939328
+7.3,1347.32,0.481305875,326.77,0.80443352
+7.4,1403.26,0.481238912,334.35,0.800993851
+7.5,1460.7,0.481167356,342.03,0.79768116
+7.6,1519.64,0.481081935,349.82,0.794529244
+7.7,1580.17,0.481007003,357.72,0.791495834
+7.8,1642.11,0.480880409,365.71,0.788560434
+7.9,1705.76,0.480789285,374.51,0.787217182
+8,1771.17,0.480737341,384.00,0.787127977
+9,2518.55,0.480111543,485.21,0.785839257
+10,3448.38,0.479218839,597.48,0.783812219
+10.1,3552.14,0.479120347,609.30,0.783568108
+10.2,3657.95,0.479022984,621.23,0.783328285
+10.3,3765.12,0.478834971,631.75,0.781194418
+10.4,3873.93,0.478597234,640.86,0.777292539
+10.5,3984.48,0.478324162,650.02,0.773464375
+10.6,4096.58,0.477994289,659.23,0.769690236
+10.7,4210.72,0.477665338,668.51,0.766001924
+10.8,4326.15,0.477253698,677.81,0.762348072
+10.9,4443.4,0.476819542,687.17,0.758760824
+11,4562.5,0.476368667,696.60,0.755242872
+11.1,4683.42,0.475896732,706.08,0.751792927
+11.2,4806.16,0.475404347,715.65,0.748434131
+11.3,4929.93,0.474814698,725.25,0.745113997
+11.4,5000.92,0.469087611,711.09,0.717806682
+11.5,5000.16,0.456886723,677.65,0.672204789
+11.6,4999.98,0.445156758,654.72,0.63831272
+11.7,4999.96,0.433837552,636.70,0.610176496
+11.8,4999.98,0.422902868,621.40,0.585456847
+11.9,5000,0.412332387,607.97,0.563222111
+12,5000,0.402110045,595.94,0.542912273
+13,5000.01,0.316270768,514.41,0.399312061
+14,5000.01,0.253224057,463.93,0.310517829
+15,5000.02,0.205881042,426.43,0.248633226
+16,5000,0.169640239,397.20,0.203543725
+17,5000.02,0.141430529,373.66,0.169616419
+18,5000.03,0.119144335,354.36,0.143478955
+19,5000.02,0.101304591,338.30,0.122938861
+20,5000.04,0.086856409,324.77,0.106515296
+21,5000.02,0.075029591,312.72,0.093026095
+22,5000.05,0.065256635,301.23,0.081648606
+23,5000.01,0.057109143,291.13,0.072197368
+24,5000,0.050263779,282.71,0.064388275
+25,5000.04,0.044470536,275.29,0.057782745