Skip to content

Commit 6f562fa

Browse files
authored
Merge pull request #16 from loganoz/CylinderChandrasekarRoeCI
Cylinder chandrasekar roe CI
2 parents 2a05fdb + fb3f116 commit 6f562fa

File tree

4 files changed

+736
-30
lines changed

4 files changed

+736
-30
lines changed

.github/workflows/CI_parallel_NS.yml

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -467,9 +467,26 @@ jobs:
467467
mpiexec -n 8 ./horses3d.ns CylinderVreman.control
468468
if: '!cancelled()'
469469

470+
#
471+
# 8) CYLINDER ChandrasekarRoe
472+
# ------------------
473+
474+
- name: Build NSCylinderChandrasekarRoe
475+
working-directory: ./Solver/test/NavierStokes/CylinderChandrasekarRoe/SETUP
476+
run: |
477+
source /opt/intel/oneapi/setvars.sh || true
478+
make ns MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
479+
if: '!cancelled()'
480+
481+
- name: Run NSCylinderChandrasekarRoe
482+
working-directory: ./Solver/test/NavierStokes/CylinderChandrasekarRoe
483+
run: |
484+
source /opt/intel/oneapi/setvars.sh || true
485+
mpiexec -n 8 ./horses3d.ns CylinderChandrasekarRoe.control
486+
if: '!cancelled()'
470487

471488
#
472-
# 8) TAYLOR GREEN VORTEX
489+
# 9) TAYLOR GREEN VORTEX
473490
# ----------------------
474491

475492
- name: Build TaylorGreen
@@ -487,7 +504,7 @@ jobs:
487504
if: '!cancelled()'
488505

489506
#
490-
# 9) TAYLOR GREEN VORTEX KEP BR2
507+
# 10) TAYLOR GREEN VORTEX KEP BR2
491508
# -----------------------------
492509
# GPU
493510
# - name: Build TaylorGreenKEP_BR2
@@ -505,7 +522,7 @@ jobs:
505522
# if: '!cancelled()'
506523

507524
#
508-
# 10) TAYLOR GREEN VORTEX KEPEC IP
525+
# 11) TAYLOR GREEN VORTEX KEPEC IP
509526
# -------------------------------
510527

511528
#GPU
@@ -524,7 +541,7 @@ jobs:
524541
# if: '!cancelled()'
525542

526543
#
527-
# 11) CYLINDER FAS
544+
# 12) CYLINDER FAS
528545
# ---------------
529546

530547
#GPU
@@ -541,7 +558,7 @@ jobs:
541558
# mpiexec -n 8 ./horses3d.ns CylinderFAS.control
542559

543560
#
544-
# 12) CYLINDER IP+BDF2
561+
# 13) CYLINDER IP+BDF2
545562
# -------------------
546563

547564
#Deactivated because a mismatch in the accuracy
@@ -554,7 +571,7 @@ jobs:
554571
# run: mpiexec -n 8 ./horses3d.ns CylinderIP_BDF2.control
555572

556573
#
557-
# 13) CYLINDER DIFFERENT ORDERS
574+
# 14) CYLINDER DIFFERENT ORDERS
558575
# ----------------------------
559576
#GPU
560577
# - name: Build NSCylinderDifferentOrders
@@ -572,7 +589,7 @@ jobs:
572589
# if: '!cancelled()'
573590

574591
#
575-
# 14) ENTROPY CONSERVING TEST
592+
# 15) ENTROPY CONSERVING TEST
576593
# ----------------------------
577594
# GPU
578595
# - name: Build EntropyConservingTest
@@ -590,7 +607,7 @@ jobs:
590607
# if: '!cancelled()'
591608

592609
#
593-
# 15) ENERGY CONSERVING TEST
610+
# 16) ENERGY CONSERVING TEST
594611
# ----------------------------
595612

596613
# GPU
@@ -609,7 +626,7 @@ jobs:
609626
# if: '!cancelled()'
610627

611628
#
612-
# 16) NACA0012 Steady
629+
# 17) NACA0012 Steady
613630
# ----------------------------
614631

615632
# GPU
@@ -628,7 +645,7 @@ jobs:
628645
# if: '!cancelled()'
629646

630647
#
631-
# 17) NACA0012 Unsteady Dual Time Stepping
648+
# 18) NACA0012 Unsteady Dual Time Stepping
632649
# ----------------------------
633650

634651
- name: Build DualTimeStepping
@@ -646,7 +663,7 @@ jobs:
646663
if: '!cancelled()'
647664

648665
#
649-
# 18) Manufactured Solution for Spalart-Almaras
666+
# 19) Manufactured Solution for Spalart-Almaras
650667
# ----------------------------
651668

652669
# - name: Build ManufacturedSolutionsSA
@@ -662,7 +679,7 @@ jobs:
662679
# mpiexec -n 8 ./horses3d.nssa MSSA.control
663680

664681
#
665-
# 19) Flat-Plate test case for Spalart-Almaras
682+
# 20) Flat-Plate test case for Spalart-Almaras
666683
# ----------------------------
667684

668685
# - name: Build FlatPlateSA
@@ -678,7 +695,7 @@ jobs:
678695
# mpiexec -n 8 ./horses3d.nssa FlatPlate.control
679696

680697
#
681-
# 20) Numerical Jacobian for BIRK5
698+
# 21) Numerical Jacobian for BIRK5
682699
# --------------------------------
683700

684701
# Does not work with this setup 02/01/2023
@@ -693,7 +710,7 @@ jobs:
693710
# source /opt/intel/oneapi/setvars.sh || true
694711
# mpiexec -n 8 ./horses3d.ns Cylinder.control
695712
#
696-
# 21) Forward facing step with SVV
713+
# 22) Forward facing step with SVV
697714
# --------------------------------
698715

699716
# GPU
@@ -712,7 +729,7 @@ jobs:
712729
# if: '!cancelled()'
713730

714731
#
715-
# 20) Forward facing step with SSPRK33 and limiter
732+
# 23) Forward facing step with SSPRK33 and limiter
716733
# ------------------------------------------------
717734

718735
# GPU
@@ -731,7 +748,7 @@ jobs:
731748
# if: '!cancelled()'
732749

733750
#
734-
# 21) Forward facing step with SSPRK43
751+
# 24) Forward facing step with SSPRK43
735752
# ------------------------------------
736753
# GPU
737754
# - name: Build ForwardFacingStep_SSPRK43
@@ -749,7 +766,7 @@ jobs:
749766
# if: '!cancelled()'
750767

751768
#
752-
# 22) Taylor-Green vortex with SVV-LES
769+
# 25) Taylor-Green vortex with SVV-LES
753770
# ------------------------------------
754771

755772
# GPU
@@ -768,7 +785,7 @@ jobs:
768785
# if: '!cancelled()'
769786

770787
#
771-
# 23) IBM CYLINDER
788+
# 26) IBM CYLINDER
772789
# -------------------
773790

774791
- name: Build IBM_Cylinder
@@ -786,7 +803,7 @@ jobs:
786803
if: '!cancelled()'
787804

788805
#
789-
# 24) Mach 2 cylinder with GMM shock capturing
806+
# 27) Mach 2 cylinder with GMM shock capturing
790807
# --------------------------------------------
791808
# GPU
792809
# - name: Build CylinderGMM
@@ -804,7 +821,7 @@ jobs:
804821
# if: '!cancelled()'
805822

806823
#
807-
# 25) Cylinder with Reinforcement Learning p-adaptation
824+
# 28) Cylinder with Reinforcement Learning p-adaptation
808825
# --------------------------------------------
809826
# GPU
810827
# - name: Build Cylinder_pAdaptationRL
@@ -822,7 +839,7 @@ jobs:
822839
# if: '!cancelled()'
823840

824841
#
825-
# 26) IBM Cylinder with Reinforcement Learning p-adaptation
842+
# 29) IBM Cylinder with Reinforcement Learning p-adaptation
826843
# --------------------------------------------
827844
# GPU
828845
# - name: Build IBM_Cylinder_pAdaptationRL
@@ -840,7 +857,7 @@ jobs:
840857
# if: '!cancelled()'
841858

842859
#
843-
# 27) Cylinder with Overenriching and Reinforcement Learning p-adaptation
860+
# 30) Cylinder with Overenriching and Reinforcement Learning p-adaptation
844861
# --------------------------------------------
845862
# GPU
846863
# - name: Build Cylinder_Overenriching_pAdaptationRL
@@ -858,7 +875,7 @@ jobs:
858875
# if: '!cancelled()'
859876

860877
#
861-
# 28) Cylinder with Euler-RK3 hybrid temporal scheme and Reinforcement Learning p-adaptation
878+
# 31) Cylinder with Euler-RK3 hybrid temporal scheme and Reinforcement Learning p-adaptation
862879
# --------------------------------------------
863880
# GPU
864881
# - name: Build EulerRK3_pAdaptationRL
@@ -876,7 +893,7 @@ jobs:
876893
# if: '!cancelled()'
877894

878895
#
879-
# 29) Cylinder with acoustics and Reinforcement Learning p-adaptation
896+
# 32) Cylinder with acoustics and Reinforcement Learning p-adaptation
880897
# --------------------------------------------
881898
# GPU
882899
# - name: Build Cylinder_acoustics_pAdaptationRL
@@ -894,7 +911,7 @@ jobs:
894911
# if: '!cancelled()'
895912

896913
#
897-
# 30) Virtual surfaces with acoustics and Reinforcement Learning p-adaptation
914+
# 33) Virtual surfaces with acoustics and Reinforcement Learning p-adaptation
898915
# --------------------------------------------
899916
# This test case only runs with gfortran as we do not support hdf5 with ifort in the github actions
900917
# HDF5 is not activated in Github when parallel mode is used
@@ -912,7 +929,7 @@ jobs:
912929
# mpiexec -n 64 ./horses3d.ns virtualSurfaces_acoustics_pAdaptationRL.control
913930
# if: ('!cancelled()' && matrix.compiler == 'gfortran')
914931
#
915-
# 31) Actuator Line (AL) Interpolation formulation
932+
# 34) Actuator Line (AL) Interpolation formulation
916933
# --------------------------------------------
917934
# GPU
918935
# - name: Build AL_interpolation
@@ -931,7 +948,7 @@ jobs:
931948

932949

933950
#
934-
# 32) Actuator Line (AL) projection formulation
951+
# 35) Actuator Line (AL) projection formulation
935952
# --------------------------------------------
936953
# GPU
937954
# - name: Build AL_projection
@@ -949,7 +966,7 @@ jobs:
949966
# if: '!cancelled()'
950967

951968
#
952-
# 33) Cylinder with Adaptive Time Step and Reinforcement Learning p-adaptation
969+
# 36) Cylinder with Adaptive Time Step and Reinforcement Learning p-adaptation
953970
# --------------------------------------------
954971
# GPU
955972
# - name: Build Cylinder_AdaptiveTimeStep_pAdaptationRL
@@ -967,7 +984,7 @@ jobs:
967984
# if: '!cancelled()'
968985

969986
#
970-
# 34) Atmospheric Boundary Layer (ABL) mapping to boundary
987+
# 37) Atmospheric Boundary Layer (ABL) mapping to boundary
971988
# --------------------------------------------
972989
# GPU
973990
# - name: Build ABL_BoundaryMapping
@@ -993,7 +1010,7 @@ jobs:
9931010
# if: '!cancelled()'
9941011

9951012
#
996-
# 35) Actuator Line (AL) external controller module
1013+
# 38) Actuator Line (AL) external controller module
9971014
# --------------------------------------------
9981015
# GPU
9991016
# - name: Build ActuatorLineController

Solver/configure

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ TEST_CASES="./Euler/BoxAroundCircle \
5454
./NavierStokes/CylinderSmagorinsky \
5555
./NavierStokes/CylinderWALE \
5656
./NavierStokes/CylinderVreman \
57+
./NavierStokes/CylinderChandrasekarRoe \
5758
./NavierStokes/IBM_Cylinder \
5859
./NavierStokes/DualTimeStepping \
5960
./NavierStokes/EntropyConservingTest \
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
Flow equations = "NS"
2+
mesh file name = "../../TestMeshes/CylinderNSpol3.mesh"
3+
Polynomial order = 3
4+
Number of time steps = 100
5+
Output Interval = 10
6+
Number of plot points = 5
7+
Convergence tolerance = 1.d-10
8+
cfl = 0.3
9+
dcfl = 0.3
10+
mach number = 0.3
11+
Reynolds number = 200.0
12+
AOA theta = 0.0
13+
AOA phi = 90.0
14+
solution file name = "RESULTS/Cylinder.hsol"
15+
save gradients with solution = .true.
16+
restart = .false.
17+
restart file name = "RESULTS/Cylinder.hsol"
18+
riemann solver = Roe
19+
Discretization nodes = Gauss-Lobatto
20+
inviscid discretization = Split-Form
21+
averaging = Chandrasekar
22+
Viscous discretization = BR1
23+
24+
#define boundary InnerCylinder
25+
type = NoSlipWall
26+
#end
27+
28+
#define boundary Front__Back__Left
29+
type = Inflow
30+
#end
31+
32+
#define boundary Bottom__Top
33+
type = FreeSlipWall
34+
#end
35+
36+
#define boundary Right
37+
type = Outflow
38+
#end
39+
40+
41+
#define surface monitor 1
42+
Name = cyl-drag
43+
Marker = innercylinder
44+
Variable = drag
45+
Direction = [0.0,0.0,1.0]
46+
Reference surface = 1.0
47+
#end
48+
49+
#define surface monitor 2
50+
Name = cyl-lift
51+
Marker = innercylinder
52+
Variable = lift
53+
Direction = [1.0,0.0,0.0]
54+
Reference surface = 1.0
55+
#end
56+
57+
#define probe 1
58+
Name = wake_u
59+
Position = [0.0,2.0,4.0]
60+
Variable = u
61+
#end
62+
63+
!#define statistics
64+
! Sampling interval = 10
65+
! Starting iteration = 15
66+
! Starting time = 0.0
67+
! @start*
68+
! @stop
69+
!#end

0 commit comments

Comments
 (0)