Merge remote-tracking branch 'upstream/develop' into phase2

WISDEM · Nov 14, 2023 · 2b529dc · 2b529dc
2 parents 1a7e92f + 6f9de45
commit 2b529dc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ WEIS integrates in a unique workflow four models:
 Software Model Versions:
 Software        |       Version
 ---             |       ---
-OpenFAST        |       3.4.0
+OpenFAST        |       3.5.0
 ROSCO           |       develop ([05d7b3b](https://github.com/NREL/ROSCO/commit/05d7b3b948c12ad40892941b6f92f3b08f5c6894))
 WISDEM          |       develop ([6f15fc9](https://github.com/WISDEM/WISDEM/commit/6f15fc9ed7f7fd1282d32af5518d2ae37dbc9466))
 

diff --git a/environment.yml b/environment.yml
@@ -48,7 +48,6 @@ dependencies:
   - setuptools
   - simpy
   - slycot
-  - smt
   - sortedcontainers
   - sphinx
   - sphinxcontrib-applehelp
@@ -66,6 +65,7 @@ dependencies:
     - dearpygui
     - marmot-agents
     - osqp
+    - smt
 # Needs to be done outside of environment file:
 #  - m2w64-toolchain # [win]
 #  - libpython # [win]

diff --git a/setup.py b/setup.py
@@ -75,6 +75,10 @@ def build_extension(self, ext):
             elif (mycompiler.find('ifort') >= 0 or mycompiler.find('icc') >= 0 or
                   mycompiler.find('icpc') >= 0):
                 tune = '-xHost'
+
+            elif platform.system() == 'Darwin':
+                # clang doesn't support -march=native
+                tune = '-mtune=native'
 
             else:
                 tune = '-march=native -mtune=native'