Develop updates to incorporate main

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

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

README.md

@@ -1,7 +1,7 @@
 
 # Ard
 
-[![CI/CD test suite](https://github.com/WISDEM/Ard/actions/workflows/python-tests-consolidated.yaml/badge.svg?branch=develop)](https://github.com/WISDEM/Ard/actions/workflows/python-tests-consolidated.yaml/badge.svg?branch=develop)
+[![CI/CD test suite](https://github.com/WISDEM/Ard/actions/workflows/python-tests-consolidated.yaml/badge.svg?branch=main)](https://github.com/WISDEM/Ard/actions/workflows/python-tests-consolidated.yaml)
 
 ![Ard logo](assets/logomaker/logo.png)
 
@@ -20,7 +20,7 @@ Moreover, the design of any *one* of these aspects affects all the rest!
 In brief, we are designing `Ard` to be: principled, modular, extensible, and effective, to allow resource-specific wind farm layout optimization with realistic, well-posed constraints, holistic and complex objectives, and natural incorporation of multiple fidelities and disciplines.
 
 ## Documentation
-Ard documentation is available at [https://wisdem.github.io/Ard/]()
+Ard documentation is available at [https://wisdem.github.io/Ard](https://wisdem.github.io/Ard)
 
 ## Installation instructions
 
@@ -94,6 +94,7 @@ The goals during the development of `Ard` are to be:
    - build yourself the ones we don't have
 3) effective
     - robustly tested and testable at both unit and system levels
+
 These principles guide us to implement, using [`OpenMDAO`](https://openmdao.org) as a backbone, a multi-disciplinary design, analysis, and optimization (MDAO) model of the wind farm layout problem, a toolset to accomplish the capability goals of `Ard`, to:
 1) allow optimization of wind farm layouts for specific wind resource profiles
 2) enable the incorporation of realistic but well-posed constraints

ard/api/interface.py

@@ -74,7 +74,7 @@ def set_up_ard_model(input_dict: Union[str, dict], root_data_path: str = None):
 
     if isinstance(input_dict["system"], str):
         if input_dict["system"] in available_default_systems:
-            system = load_yaml(ASSET_DIR / f"ard_system_{input_dict["system"]}.yaml")
+            system = load_yaml(ASSET_DIR / f"ard_system_{input_dict['system']}.yaml")
 
             input_dict["system"] = replace_key_value(
                 target_dict=system,
@@ -84,7 +84,7 @@ def set_up_ard_model(input_dict: Union[str, dict], root_data_path: str = None):
         else:
             raise (
                 ValueError(
-                    f"invalid default system '{input_dict["system"]}' specified. Must be one of {available_default_systems}"
+                    f"invalid default system '{input_dict['system']}' specified. Must be one of {available_default_systems}"
                 )
             )
 

ard/farm_aero/floris.py

@@ -297,9 +297,9 @@ class FLORISBatchPower(templates.BatchFarmPowerTemplate, FLORISFarmComponent):
     case_title : str
         a "title" for the case, used to disambiguate runs in practice (inherited
         from `FLORISFarmComponent`)
-    # modeling_options : dict
-    #     a modeling options dictionary (inherited via
-    #     `templates.BatchFarmPowerTemplate`)
+    modeling_options : dict
+        a modeling options dictionary (inherited via
+        `templates.BatchFarmPowerTemplate`)
     wind_query : floris.wind_data.WindRose
         a WindQuery objects that specifies the wind conditions that are to be
         computed (inherited from `templates.BatchFarmPowerTemplate`)
@@ -398,9 +398,9 @@ class FLORISAEP(templates.FarmAEPTemplate):
     case_title : str
         a "title" for the case, used to disambiguate runs in practice (inherited
         from `FLORISFarmComponent`)
-    # modeling_options : dict
-    #     a modeling options dictionary (inherited via
-    #     `templates.FarmAEPTemplate`)
+    modeling_options : dict
+        a modeling options dictionary (inherited via
+        `templates.FarmAEPTemplate`)
     wind_query : floris.wind_data.WindRose
         a WindQuery objects that specifies the wind conditions that are to be
         computed (inherited from `templates.FarmAEPTemplate`)

docs/_config.yml

@@ -13,7 +13,7 @@ copyright: '2024'
 # See https://jupyterbook.org/content/execute.html
 execute:
   execute_notebooks: auto
-  timeout: 120
+  timeout: 180
   # timeout: 420 # Give each notebook cell 7 minutes to execute
 
 # Define the name of the latex output file for PDF builds