Merge branch 'main' into main

README.md

@@ -9,7 +9,7 @@
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3531965.svg)](https://doi.org/10.5281/zenodo.3531965)
 
 SHARPy is a nonlinear aeroelastic analysis package originally developed at the Department of Aeronautics, Imperial
-College London. It can be used for the structural, aerodynamic and aeroelastic analysis of flexible wings, aircraft and wind turbines.
+College London. It can be used for the structural, aerodynamic and aeroelastic analysis of flexible wings, aircraft and wind turbines. It is shared here under a BSD 3-Clause permissive license.
 
 ![XHALE](./docs/source/_static/XHALE-render.jpg)
 

docs/source/content/installation.md

@@ -72,7 +72,7 @@ or running any SHARPy cases.
     ```
 
 4. Create the conda environment that SHARPy will use. Change `environment_new.yml` to read `environment_macos.yml`
-   if you are installing SHARPy on Mac OS X.
+   if you are installing SHARPy on Mac OS (Intel), or `environment_macos_arm64.yml` if installing on Mac OS (Apple Silicon).
     ```bash
     cd sharpy/utils
     conda env create -f environment_new.yml

sharpy/utils/generate_cases.py

@@ -1342,7 +1342,7 @@ def assembly_aerodynamics(self, *args):
             if self.m_distribution.lower() == 'user_defined':
                 self.user_defined_m_distribution = self.user_defined_m_distribution + aerodynamics_to_add.user_defined_m_distribution
             if self.polars is not None:
-                self.polars = self.polars + aerodynamics_to_add.polars
+                self.polars = np.array([self.polars, aerodynamics_to_add.polars])
             total_num_airfoils += len(aerodynamics_to_add.airfoils[:, 0, 0])
             # total_num_surfaces += len(aerodynamics_to_add.surface_m)
             total_num_surfaces += np.sum(aerodynamics_to_add.surface_m != -1)