Skip to content

Commit 7ff7dfd

Browse files
authored
Merge branch 'master' into prcode
2 parents 6e1a155 + 84355ee commit 7ff7dfd

File tree

26 files changed

+857
-729
lines changed

26 files changed

+857
-729
lines changed

.github/workflows/frontier/submit.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ sbatch <<EOT
2222
#SBATCH -N 1 # Number of nodes required
2323
#SBATCH -n 8 # Number of cores required
2424
#SBATCH -t 02:00:00 # Duration of the job (Ex: 15 mins)
25-
#SBATCH -q debug # QOS Name
2625
#SBATCH -o$job_slug.out # Combined output and error messages file
2726
#SBATCH -W # Do not exit until the submitted job terminates.
2827

.github/workflows/line-count.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Check Line Counts
1+
name: Lines of Code
22

33
on: [push, pull_request, workflow_dispatch]
44

.github/workflows/lint-source.yml

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
1-
name: Lint Source Code
1+
name: Lint Source
22

33
on: [push, pull_request, workflow_dispatch]
44

55
jobs:
6-
lint:
7-
name: Lint Source Code
8-
runs-on: macos-latest
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+
21+
lint-source:
22+
name: Lint Source
23+
runs-on: 'ubuntu-latest'
924

1025
steps:
1126
- uses: actions/checkout@v4
@@ -14,10 +29,4 @@ jobs:
1429
run: pip install fortitude-lint ansi2txt
1530

1631
- name: Lint the source code
17-
run: fortitude check --ignore=E001,S001,S101,M011,F001,S041,T001 ./src/*/* &> lint.txt || true
18-
19-
- name: Sanitize
20-
run: cat lint.txt | ansi2txt > lint2.txt
21-
22-
- name: Output Summary
23-
run: cat lint2.txt << EOF > $GITHUB_STEP_SUMMARY
32+
run: fortitude check --ignore=E001,S001,S101,M011,F001,S041,T001 ./src/*/* || true

.github/workflows/lint.yml renamed to .github/workflows/lint-toolchain.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name: Lint
1+
name: Lint Toolchain
22

33
on: [push, pull_request, workflow_dispatch]
44

55
jobs:
6-
docs:
6+
lint-toolchain:
77
name: Lint Toolchain
88
runs-on: ubuntu-latest
99

docs/documentation/case.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ For example, $m=n=p=499$ discretizes the domain into $500^3$ cells.
125125
When the simulation is 2D/axi-symmetric or 1D, it requires that $p=0$ or $p=n=0$, respectively.
126126

127127
- `stretch_[x,y,z]` activates grid stretching in the $[x,y,z]$ directions.
128-
The grid is gradually stretched such that the domain boundaries are pushed away from the origin along a specified axis. WENO7 does not support grid stretching.
128+
The grid is gradually stretched such that the domain boundaries are pushed away from the origin along a specified axis.
129129

130130
- `a_[x,y,z]`, `[x,y,z]_a`, and `[x,y,z]_b` are parameters that define the grid stretching function. When grid stretching along the $x$ axis is considered, the stretching function is given as:
131131

@@ -412,7 +412,7 @@ Note that `time_stepper = 3` specifies the total variation diminishing (TVD), th
412412

413413
- `adap_dt` activates the Strang operator splitting scheme which splits flux and source terms in time marching, and an adaptive time stepping strategy is implemented for the source term. It requires ``bubbles = 'T'``, ``polytropic = 'T'``, ``adv_n = 'T'`` and `time_stepper = 3`.
414414

415-
- `weno_order` specifies the order of WENO scheme that is used for spatial reconstruction of variables by an integer of 1, 3, 5, and 7, that correspond to the 1st, 3rd, 5th, and 7th order, respectively. WENO7 does not support grid stretching.
415+
- `weno_order` specifies the order of WENO scheme that is used for spatial reconstruction of variables by an integer of 1, 3, 5, and 7, that correspond to the 1st, 3rd, 5th, and 7th order, respectively.
416416

417417
- `weno_eps` specifies the lower bound of the WENO nonlinear weights.
418418
It is recommended to set `weno_eps` to $10^{-6}$ for WENO-JS, and to $10^{-40}$ for other WENO variants.
@@ -423,7 +423,7 @@ It is recommended to set `weno_eps` to $10^{-6}$ for WENO-JS, and to $10^{-40}$
423423

424424
- `wenoz_q` specifies the power parameter `q` used in the WENO-Z scheme. It controls how aggressively the smoothness coefficients scale the weights. A higher value of `wenoz_q` increases the sensitivity to smoothness, improving stability but worsening numerical dissipation. For WENO3 and WENO5, `q=1` is fixed, so `wenoz_q` must not be set. For WENO7, `wenoz_q` can be set to 2, 3, or 4.
425425

426-
- `teno` activates the TENO scheme in place of the default WENO-JS scheme ([Fu et al., 2016](references.md#Fu16)). TENO is a variant of the ENO scheme that is the least dissipative, but could be less robust for extreme cases. It uses a threshold to identify smooth and non-smooth stencils, and applies optimal weights to the smooth stencils. Only available for `weno_order = 5` and `7`. Requires `teno_CT` to be set.
426+
- `teno` activates the TENO scheme in place of the default WENO-JS scheme ([Fu et al., 2016](references.md#Fu16)). TENO is a variant of the ENO scheme that is the least dissipative, but could be less robust for extreme cases. It uses a threshold to identify smooth and non-smooth stencils, and applies optimal weights to the smooth stencils. Only available for `weno_order = 5` and `7`. Requires `teno_CT` to be set. Does not support grid stretching.
427427

428428
- `teno_CT` specifies the threshold for the TENO scheme. This dimensionless constant, also known as $C_T$, sets a threshold to identify smooth and non-smooth stencils. Larger values make the scheme more robust but also more dissipative. A recommended value for teno_CT is `1e-6`. When adjusting this parameter, it is recommended to try values like `1e-5` or `1e-7` for TENO5. A smaller value can be used for TENO7.
429429

src/pre_process/m_checker.fpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ contains
116116

117117
! Common checks for all directions (stretch_x, stretch_y, and stretch_z)
118118
#:for X in ['x', 'y', 'z']
119-
@:PROHIBIT(stretch_${X}$ .and. weno_order == 7, "weno_order = 7 does not support stretched grids")
120119
@:PROHIBIT(stretch_${X}$ .and. old_grid, "old_grid and stretch_${X}$ are incompatible")
121120
@:PROHIBIT(stretch_${X}$ .and. f_is_default(a_${X}$), "a_${X}$ must be set with stretch_${X}$ enabled")
122121
@:PROHIBIT(stretch_${X}$ .and. f_is_default(${X}$_a), "${X}$_a must be set with stretch_${X}$ enabled")

0 commit comments

Comments
 (0)