Skip to content

Commit 3896c71

Browse files
authored
Merge branch 'MFlowCode:master' into master
2 parents 4bd75ed + 55dfcf5 commit 3896c71

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+2245
-426
lines changed

.github/workflows/bench.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,21 @@ name: 'Benchmark'
33
on: pull_request
44

55
jobs:
6+
file-changes:
7+
name: Detect File Changes
8+
runs-on: 'ubuntu-latest'
9+
outputs:
10+
checkall: ${{ steps.changes.outputs.checkall }}
11+
steps:
12+
- name: Clone
13+
uses: actions/checkout@v4
14+
15+
- name: Detect Changes
16+
uses: dorny/paths-filter@v3
17+
id: changes
18+
with:
19+
filters: ".github/file-filter.yml"
20+
621
self:
722
name: Georgia Tech | Phoenix (NVHPC)
823
if: github.repository == 'MFlowCode/MFC'
@@ -12,6 +27,9 @@ jobs:
1227
runs-on:
1328
group: phoenix
1429
labels: gt
30+
env:
31+
ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
32+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
1533
steps:
1634
- name: Clone - PR
1735
uses: actions/checkout@v3

.github/workflows/coverage.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,10 @@ jobs:
4242
- name: Upload coverage reports to Codecov
4343
uses: codecov/[email protected]
4444
with:
45-
token: ${{ secrets.CODECOV_TOKEN }}
45+
token: ${{ secrets.CODECOV_TOKEN }}
46+
fail_ci_if_error: true
47+
verbose: true
48+
version: v0.6.0
49+
env:
50+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
51+

.github/workflows/test.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
11
name: 'Test Suite'
22

3-
on:
4-
push:
5-
paths:
6-
- '**.f90'
7-
- '**.fpp'
8-
- '**.py'
9-
- '**.yml'
10-
- 'mfc.sh'
11-
- 'golden.txt'
12-
- 'CMakeLists.txt'
13-
- 'requirements.txt'
14-
15-
pull_request:
16-
17-
workflow_dispatch:
3+
on: [push, pull_request, workflow_dispatch]
184

195
jobs:
206
file-changes:
@@ -140,6 +126,9 @@ jobs:
140126
runs-on:
141127
group: phoenix
142128
labels: ${{ matrix.lbl }}
129+
env:
130+
ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
131+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
143132
steps:
144133
- name: Clone
145134
uses: actions/checkout@v3

.typos.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ nd = "nd"
1313
iy = "iy"
1414
HPE = "HPE"
1515
alph = "alph"
16+
gam = "gam"
17+
Gam = "Gam"
18+
strang = "strang"
19+
Strang = "Strang"
1620

1721
[files]
1822
extend-exclude = ["docs/documentation/references*", "tests/", "toolchain/cce_simulation_workgroup_256.sh"]

benchmarks/viscous_weno5_sgb_mono/case.py

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
procs = DICT["nodes"] * DICT["tasks_per_node"]
2929
ncells = math.floor(ppg * procs * ARGS["gbpp"])
3030
s = math.floor((ncells / 2.0) ** (1/3))
31-
Nx, Ny, Nz = 2*s, s, s
31+
Nx, Ny, Nz = s, s, 2*s
3232

3333
x0 = 10.E-04
3434
y0 = 10.E-04
@@ -86,8 +86,8 @@
8686
cfl = 0.01
8787
Ldomain = 20.E-03
8888
L = Ldomain/x0
89-
dx = L/float(Nx)
90-
dt = cfl*dx*c0/cact
89+
dz = L/float(Nz)
90+
dt = cfl*dz*c0/cact
9191
Lpulse = 0.3*Ldomain
9292
Tpulse = Lpulse/cact
9393

@@ -98,12 +98,12 @@
9898
# ==========================================================
9999

100100
# Computational Domain Parameters ==========================
101-
'x_domain%beg' : -10.E-03/x0,
102-
'x_domain%end' : 10.E-03/x0,
101+
'x_domain%beg' : -5.E-03/x0,
102+
'x_domain%end' : 5.E-03/x0,
103103
'y_domain%beg' : -5.E-03/y0,
104-
'y_domain%end' : 5.E-03/y0,
105-
'z_domain%beg' : -5.E-03/z0,
106-
'z_domain%end' : 5.E-03/z0,
104+
'y_domain%end' : 5.E-03/y0,
105+
'z_domain%beg' : -10.E-03/z0,
106+
'z_domain%end' : 10.E-03/z0,
107107
'stretch_x' : 'F',
108108
'cyl_coord' : 'F',
109109
'm' : Nx,
@@ -154,9 +154,9 @@
154154
'patch_icpp(1)%x_centroid' : 0.,
155155
'patch_icpp(1)%y_centroid' : 0.,
156156
'patch_icpp(1)%z_centroid' : 0.,
157-
'patch_icpp(1)%length_x' : 20.E-03/x0,
157+
'patch_icpp(1)%length_x' : 10.E-03/x0,
158158
'patch_icpp(1)%length_y' : 10.E-03/y0,
159-
'patch_icpp(1)%length_z' : 10.E-03/z0,
159+
'patch_icpp(1)%length_z' : 20.E-03/z0,
160160
'patch_icpp(1)%vel(1)' : 0.0,
161161
'patch_icpp(1)%vel(2)' : 0.0,
162162
'patch_icpp(1)%vel(3)' : 0.0,
@@ -172,9 +172,9 @@
172172
'patch_icpp(2)%x_centroid' : 0.,
173173
'patch_icpp(2)%y_centroid' : 0.,
174174
'patch_icpp(2)%z_centroid' : 0.,
175-
'patch_icpp(2)%length_x' : 5.E-03/x0,
175+
'patch_icpp(2)%length_x' : 10.E-03/x0,
176176
'patch_icpp(2)%length_y' : 10.E-03/y0,
177-
'patch_icpp(2)%length_z' : 10.E-03/z0,
177+
'patch_icpp(2)%length_z' : 5.E-03/z0,
178178
'patch_icpp(2)%alter_patch(1)' : 'T',
179179
'patch_icpp(2)%vel(1)' : 0.0,
180180
'patch_icpp(2)%vel(2)' : 0.0,
@@ -230,7 +230,8 @@
230230
# Acoustic source ==========================================
231231
'Monopole' : 'T',
232232
'num_mono' : 1,
233-
'Mono(1)%loc(1)' : -5.E-03/x0,
233+
'Mono(1)%support' : 4,
234+
'Mono(1)%loc(3)' : -5.E-03/x0,
234235
'Mono(1)%npulse' : 1,
235236
'Mono(1)%dir' : 1.,
236237
'Mono(1)%pulse' : 1,

0 commit comments

Comments
 (0)