Skip to content

Commit cef5dd5

Browse files
loganozloganoz
committed
Clean up. Put ChandrasekarRoe CI in correct position.
1 parent 8816cb3 commit cef5dd5

2 files changed

Lines changed: 95 additions & 98 deletions

File tree

‎.github/workflows/CI_parallel.yml‎

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -136,25 +136,6 @@ jobs:
136136
make MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES
137137
138138
139-
#
140-
# 0) CYLINDER ChandrasekarRoe
141-
# ------------------
142-
143-
- name: Build NSCylinderChandrasekarRoe
144-
working-directory: ./Solver/test/NavierStokes/CylinderChandrasekarRoe/SETUP
145-
run: |
146-
source /opt/intel/oneapi/setvars.sh || true
147-
make MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
148-
if: '!cancelled()'
149-
150-
- name: Run NSCylinderChandrasekarRoe
151-
working-directory: ./Solver/test/NavierStokes/CylinderChandrasekarRoe
152-
run: |
153-
source /opt/intel/oneapi/setvars.sh || true
154-
mpiexec -n 8 ./horses3d.ns CylinderChandrasekarRoe.control
155-
if: '!cancelled()'
156-
157-
158139
########################################################################
159140
####### EULER ########
160141
########################################################################
@@ -497,9 +478,26 @@ jobs:
497478
mpiexec -n 64 ./horses3d.ns CylinderVreman.control
498479
if: '!cancelled()'
499480

481+
#
482+
# 9) CYLINDER ChandrasekarRoe
483+
# ------------------
484+
485+
- name: Build NSCylinderChandrasekarRoe
486+
working-directory: ./Solver/test/NavierStokes/CylinderChandrasekarRoe/SETUP
487+
run: |
488+
source /opt/intel/oneapi/setvars.sh || true
489+
make MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
490+
if: '!cancelled()'
491+
492+
- name: Run NSCylinderChandrasekarRoe
493+
working-directory: ./Solver/test/NavierStokes/CylinderChandrasekarRoe
494+
run: |
495+
source /opt/intel/oneapi/setvars.sh || true
496+
mpiexec -n 64 ./horses3d.ns CylinderChandrasekarRoe.control
497+
if: '!cancelled()'
500498

501499
#
502-
# 9) TAYLOR GREEN VORTEX
500+
# 10) TAYLOR GREEN VORTEX
503501
# ----------------------
504502

505503
- name: Build TaylorGreen
@@ -517,7 +515,7 @@ jobs:
517515
if: '!cancelled()'
518516

519517
#
520-
# 10) TAYLOR GREEN VORTEX KEP BR2
518+
# 11) TAYLOR GREEN VORTEX KEP BR2
521519
# -----------------------------
522520

523521
- name: Build TaylorGreenKEP_BR2
@@ -535,7 +533,7 @@ jobs:
535533
if: '!cancelled()'
536534

537535
#
538-
# 11) TAYLOR GREEN VORTEX KEPEC IP
536+
# 12) TAYLOR GREEN VORTEX KEPEC IP
539537
# -------------------------------
540538

541539
- name: Build TaylorGreenKEPEC_IP
@@ -553,7 +551,7 @@ jobs:
553551
if: '!cancelled()'
554552

555553
#
556-
# 12) CYLINDER FAS
554+
# 13) CYLINDER FAS
557555
# ---------------
558556

559557
# - name: Build NSCylinderFAS
@@ -569,7 +567,7 @@ jobs:
569567
# mpiexec -n 64 ./horses3d.ns CylinderFAS.control
570568

571569
#
572-
# 13) CYLINDER IP+BDF2
570+
# 14) CYLINDER IP+BDF2
573571
# -------------------
574572

575573
#Deactivated because a mismatch in the accuracy
@@ -582,7 +580,7 @@ jobs:
582580
# run: mpiexec -n 64 ./horses3d.ns CylinderIP_BDF2.control
583581

584582
#
585-
# 14) CYLINDER DIFFERENT ORDERS
583+
# 15) CYLINDER DIFFERENT ORDERS
586584
# ----------------------------
587585
#?
588586
- name: Build NSCylinderDifferentOrders
@@ -600,7 +598,7 @@ jobs:
600598
if: '!cancelled()'
601599

602600
#
603-
# 15) ENTROPY CONSERVING TEST
601+
# 16) ENTROPY CONSERVING TEST
604602
# ----------------------------
605603

606604
- name: Build EntropyConservingTest
@@ -618,7 +616,7 @@ jobs:
618616
if: '!cancelled()'
619617

620618
#
621-
# 16) ENERGY CONSERVING TEST
619+
# 17) ENERGY CONSERVING TEST
622620
# ----------------------------
623621

624622
- name: Build EnergyConservingTest
@@ -636,7 +634,7 @@ jobs:
636634
if: '!cancelled()'
637635

638636
#
639-
# 17) NACA0012 Steady
637+
# 18) NACA0012 Steady
640638
# ----------------------------
641639

642640
- name: Build NACA0012
@@ -654,7 +652,7 @@ jobs:
654652
if: '!cancelled()'
655653

656654
#
657-
# 18) NACA0012 Unsteady Dual Time Stepping
655+
# 19) NACA0012 Unsteady Dual Time Stepping
658656
# ----------------------------
659657

660658
- name: Build DualTimeStepping
@@ -672,7 +670,7 @@ jobs:
672670
if: '!cancelled()'
673671

674672
#
675-
# 19) Manufactured Solution for Spalart-Almaras
673+
# 20) Manufactured Solution for Spalart-Almaras
676674
# ----------------------------
677675

678676
# - name: Build ManufacturedSolutionsSA
@@ -688,7 +686,7 @@ jobs:
688686
# mpiexec -n 64 ./horses3d.nssa MSSA.control
689687

690688
#
691-
# 20) Flat-Plate test case for Spalart-Almaras
689+
# 21) Flat-Plate test case for Spalart-Almaras
692690
# ----------------------------
693691

694692
# - name: Build FlatPlateSA
@@ -704,7 +702,7 @@ jobs:
704702
# mpiexec -n 64 ./horses3d.nssa FlatPlate.control
705703

706704
#
707-
# 21) Numerical Jacobian for BIRK5
705+
# 22) Numerical Jacobian for BIRK5
708706
# --------------------------------
709707

710708
# Does not work with this setup 02/01/2023
@@ -719,7 +717,7 @@ jobs:
719717
# source /opt/intel/oneapi/setvars.sh || true
720718
# mpiexec -n 64 ./horses3d.ns Cylinder.control
721719
#
722-
# 22) Forward facing step with SVV
720+
# 23) Forward facing step with SVV
723721
# --------------------------------
724722

725723
- name: Build ForwardFacingStepSVV
@@ -738,7 +736,7 @@ jobs:
738736
continue-on-error: true # Allows this step to fail without failing the workflow
739737

740738
#
741-
# 23) Forward facing step with SSPRK33 and limiter
739+
# 24) Forward facing step with SSPRK33 and limiter
742740
# ------------------------------------------------
743741

744742
- name: Build ForwardFacingStep_SSPRK33
@@ -757,7 +755,7 @@ jobs:
757755
continue-on-error: true # Allows this step to fail without failing the workflow
758756

759757
#
760-
# 24) Forward facing step with SSPRK43
758+
# 25) Forward facing step with SSPRK43
761759
# ------------------------------------
762760

763761
- name: Build ForwardFacingStep_SSPRK43
@@ -776,7 +774,7 @@ jobs:
776774
continue-on-error: true # Allows this step to fail without failing the workflow
777775

778776
#
779-
# 25) Taylor-Green vortex with SVV-LES
777+
# 26) Taylor-Green vortex with SVV-LES
780778
# ------------------------------------
781779

782780
- name: Build TaylorGreenSVVLES
@@ -794,7 +792,7 @@ jobs:
794792
if: '!cancelled()'
795793

796794
#
797-
# 26) IBM CYLINDER
795+
# 27) IBM CYLINDER
798796
# -------------------
799797

800798
- name: Build IBM_Cylinder
@@ -812,7 +810,7 @@ jobs:
812810
if: '!cancelled()'
813811

814812
#
815-
# 27) Mach 2 cylinder with GMM shock capturing
813+
# 28) Mach 2 cylinder with GMM shock capturing
816814
# --------------------------------------------
817815

818816
- name: Build CylinderGMM
@@ -830,7 +828,7 @@ jobs:
830828
if: '!cancelled()'
831829

832830
#
833-
# 28) Cylinder with Reinforcement Learning p-adaptation
831+
# 29) Cylinder with Reinforcement Learning p-adaptation
834832
# --------------------------------------------
835833
# - name: Build Cylinder_pAdaptationRL
836834
# working-directory: ./Solver/test/NavierStokes/Cylinder_pAdaptationRL/SETUP
@@ -847,7 +845,7 @@ jobs:
847845
# if: '!cancelled()'
848846

849847
#
850-
# 29) IBM Cylinder with Reinforcement Learning p-adaptation
848+
# 30) IBM Cylinder with Reinforcement Learning p-adaptation
851849
# --------------------------------------------
852850
# - name: Build IBM_Cylinder_pAdaptationRL
853851
# working-directory: ./Solver/test/NavierStokes/IBM_Cylinder_pAdaptationRL/SETUP
@@ -864,7 +862,7 @@ jobs:
864862
# if: '!cancelled()'
865863

866864
#
867-
# 30) Cylinder with Overenriching and Reinforcement Learning p-adaptation
865+
# 31) Cylinder with Overenriching and Reinforcement Learning p-adaptation
868866
# --------------------------------------------
869867
- name: Build Cylinder_Overenriching_pAdaptationRL
870868
working-directory: ./Solver/test/NavierStokes/Cylinder_Overenriching_pAdaptationRL/SETUP
@@ -881,7 +879,7 @@ jobs:
881879
if: '!cancelled()'
882880

883881
#
884-
# 31) Cylinder with Euler-RK3 hybrid temporal scheme and Reinforcement Learning p-adaptation
882+
# 32) Cylinder with Euler-RK3 hybrid temporal scheme and Reinforcement Learning p-adaptation
885883
# --------------------------------------------
886884
# - name: Build EulerRK3_pAdaptationRL
887885
# working-directory: ./Solver/test/NavierStokes/EulerRK3_pAdaptationRL/SETUP
@@ -898,7 +896,7 @@ jobs:
898896
# if: '!cancelled()'
899897

900898
#
901-
# 32) Cylinder with acoustics and Reinforcement Learning p-adaptation
899+
# 33) Cylinder with acoustics and Reinforcement Learning p-adaptation
902900
# --------------------------------------------
903901
- name: Build Cylinder_acoustics_pAdaptationRL
904902
working-directory: ./Solver/test/NavierStokes/Cylinder_acoustics_pAdaptationRL/SETUP
@@ -915,7 +913,7 @@ jobs:
915913
if: '!cancelled()'
916914

917915
#
918-
# 33) Virtual surfaces with acoustics and Reinforcement Learning p-adaptation
916+
# 34) Virtual surfaces with acoustics and Reinforcement Learning p-adaptation
919917
# --------------------------------------------
920918
# This test case only runs with gfortran as we do not support hdf5 with ifort in the github actions
921919
# HDF5 is not activated in Github when parallel mode is used
@@ -933,7 +931,7 @@ jobs:
933931
# mpiexec -n 64 ./horses3d.ns virtualSurfaces_acoustics_pAdaptationRL.control
934932
# if: ('!cancelled()' && matrix.compiler == 'gfortran')
935933
#
936-
# 34) Actuator Line (AL) Interpolation formulation
934+
# 35) Actuator Line (AL) Interpolation formulation
937935
# --------------------------------------------
938936
- name: Build AL_interpolation
939937
working-directory: ./Solver/test/NavierStokes/ActuatorLineInterpolation/SETUP
@@ -951,7 +949,7 @@ jobs:
951949

952950

953951
#
954-
# 35) Actuator Line (AL) projection formulation
952+
# 36) Actuator Line (AL) projection formulation
955953
# --------------------------------------------
956954
- name: Build AL_projection
957955
working-directory: ./Solver/test/NavierStokes/ActuatorLineProjection/SETUP
@@ -968,7 +966,7 @@ jobs:
968966
if: '!cancelled()'
969967

970968
#
971-
# 36) Cylinder with Adaptive Time Step and Reinforcement Learning p-adaptation
969+
# 37) Cylinder with Adaptive Time Step and Reinforcement Learning p-adaptation
972970
# --------------------------------------------
973971
- name: Build Cylinder_AdaptiveTimeStep_pAdaptationRL
974972
working-directory: ./Solver/test/NavierStokes/Cylinder_AdaptiveTimeStep_pAdaptationRL/SETUP
@@ -987,7 +985,7 @@ jobs:
987985

988986

989987
#
990-
# 34) Atmospheric Boundary Layer (ABL) mapping to boundary
988+
# 38) Atmospheric Boundary Layer (ABL) mapping to boundary
991989
# --------------------------------------------
992990

993991
# - name: Build ABL_BoundaryMapping
@@ -1013,7 +1011,7 @@ jobs:
10131011
# if: '!cancelled()'
10141012

10151013
#
1016-
# 35) Actuator Line (AL) external controller module
1014+
# 39) Actuator Line (AL) external controller module
10171015
# --------------------------------------------
10181016
# - name: Build ActuatorLineController
10191017
# working-directory: ./Solver/test/NavierStokes/ActuatorLineController/SETUP
@@ -1035,7 +1033,7 @@ jobs:
10351033
# if: '!cancelled()'
10361034

10371035
#
1038-
# 34) Cylinder with Reinforcement Learning p-adaptation and Gauss-Lobatto nodes
1036+
# 40) Cylinder with Reinforcement Learning p-adaptation and Gauss-Lobatto nodes
10391037
# --------------------------------------------
10401038
- name: Build Cylinder_pAdaptationRL_GaussLobatto
10411039
working-directory: ./Solver/test/NavierStokes/Cylinder_pAdaptationRL_GaussLobatto/SETUP

0 commit comments

Comments
 (0)