Merge branch 'dev' of github.com:cfrontin/WindSE into dev

NREL · Mar 6, 2024 · 21c002a · 21c002a
2 parents f92c79a + af9dd1c
commit 21c002a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/CI_every_PR.yml b/.github/workflows/CI_every_PR.yml
@@ -29,26 +29,26 @@ jobs:
           conda activate test-environment
           conda list
 
+      - name: Run parallel regression tests within WindSE
+        shell: pwsh
+        run: |
+          conda activate test-environment
+          pytest -sv --cov=windse tests/test_regression_parallel.py
+
       # - name: Run parallel regression tests within WindSE
       #   shell: pwsh
       #   run: |
       #     conda activate test-environment
-      #     pytest -sv --cov=windse tests/test_regression_parallel.py
+      #     cd tests/9-Regression
+      #     mpirun -n 2 windse run ALM_Unsteady.yaml -p general:name:ALM_Unsteady_np_2
 
       # - name: Run parallel regression tests within WindSE
       #   shell: pwsh
       #   run: |
       #     conda activate test-environment
       #     cd tests/9-Regression
-      #     mpirun -n 2 windse run ALM_Unsteady.yaml -p general:name:ALM_Unsteady_np_2
-
-      - name: Run parallel regression tests within WindSE
-        shell: pwsh
-        run: |
-          conda activate test-environment
-          cd tests/9-Regression
-          mpirun -n 2 python -u ../../windse_driver/driver.py run ALM_Unsteady.yaml -p general:name:ALM_Unsteady_np_2
-          # mpirun -n 2 python -u ../../windse_driver/driver.py run Floating_ALM.yaml -p general:name:Floating_ALM_np_2
+      #     mpirun -n 2 python -u ../../windse_driver/driver.py run ALM_Unsteady.yaml -p general:name:ALM_Unsteady_np_2
+      #     # mpirun -n 2 python -u ../../windse_driver/driver.py run Floating_ALM.yaml -p general:name:Floating_ALM_np_2
 
       - name: Run all regression tests within WindSE
         shell: pwsh

diff --git a/environment.yaml b/environment.yaml
@@ -4,6 +4,7 @@ channels:
   - defaults
 dependencies:
   - python=3.10
+  - mpich=4.1.2=hd33e60e_101
   # - mpich=4.0.3
   - coveralls
   - dolfin-adjoint=2019.1.0