Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add "cooling" build type to CI build matrices #343

Merged
merged 3 commits into from
Oct 17, 2023
Merged

Add "cooling" build type to CI build matrices #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9440a4d
Add "cooling" build type to CI build matrices
bcaddy Sep 22, 2023
5f5d025
Add cooling to tools/clang-tidy_runner.sh
bcaddy Sep 28, 2023
2d4b8fe
Fixes for readability-braces-around-statements checks
bcaddy Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .clang-tidy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ Checks: "*,
-cert-dcl37-c,
-cert-dcl51-cpp,
-cppcoreguidelines-pro-bounds-constant-array-index,
-google-readability-braces-around-statements,
-hicpp-braces-around-statements,

google-readability-avoid-underscore-in-googletest-name,
google-upgrade-googletest-case,
Expand All @@ -45,7 +47,6 @@ Checks: "*,
-bugprone-implicit-widening-of-multiplication-result,
-bugprone-narrowing-conversions,
-bugprone-switch-missing-default-case,
-bugprone-switch-missing-default-case,
-cert-env33-c,
-cert-err33-c,
-cert-err34-c,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
make-type: [hydro, gravity, disk, particles, cosmology, mhd, dust]
make-type: [hydro, gravity, disk, particles, cosmology, mhd, dust, cooling]
# The CUDA container can be added with {name: "CUDA", link: "docker://chollahydro/cholla:cuda_github"}
container: [{name: "HIP",link: "docker://chollahydro/cholla:rocm_github"}]

Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pipeline
axis
{
name 'CHOLLA_MAKE_TYPE'
values 'hydro', 'gravity', 'disk', 'particles', 'cosmology', 'mhd', 'dust'
values 'hydro', 'gravity', 'disk', 'particles', 'cosmology', 'mhd', 'dust', 'cooling'
}
}

Expand Down
6 changes: 4 additions & 2 deletions src/reconstruction/ppmp_cuda.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,10 +738,12 @@ __device__ void Interface_Values_PPM(Real q_imo, Real q_i, Real q_ipo, Real del_
if ((*q_R - q_i) * (q_i - *q_L) <= 0) *q_L = *q_R = q_i;

// steep gradient criterion (Fryxell Eqn 53, Fig 12)
if (6.0 * (*q_R - *q_L) * (q_i - 0.5 * (*q_L + *q_R)) > (*q_R - *q_L) * (*q_R - *q_L))
if (6.0 * (*q_R - *q_L) * (q_i - 0.5 * (*q_L + *q_R)) > (*q_R - *q_L) * (*q_R - *q_L)) {
*q_L = 3.0 * q_i - 2.0 * (*q_R);
if (6.0 * (*q_R - *q_L) * (q_i - 0.5 * (*q_L + *q_R)) < -(*q_R - *q_L) * (*q_R - *q_L))
}
if (6.0 * (*q_R - *q_L) * (q_i - 0.5 * (*q_L + *q_R)) < -(*q_R - *q_L) * (*q_R - *q_L)) {
*q_R = 3.0 * q_i - 2.0 * (*q_L);
}

*q_L = fmax(fmin(q_i, q_imo), *q_L);
*q_L = fmin(fmax(q_i, q_imo), *q_L);
Expand Down
2 changes: 1 addition & 1 deletion tools/clang-tidy_runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cholla_root="$(dirname "$(dirname "$(readlink -fm "$0")")")"
cd $cholla_root

# Run all clang-tidy build types in parallel
builds=( hydro gravity disk particles cosmology mhd dust)
builds=( hydro gravity disk particles cosmology mhd dust cooling)
for build in "${builds[@]}"
do
make tidy TYPE=$build &
Expand Down