Skip to content

Commit ac13779

Browse files
committed
remove stale toolchain files, apply format fixes
1 parent 8fd88cd commit ac13779

93 files changed

Lines changed: 15061 additions & 20359 deletions

File tree

Some content is hidden

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

.ffmt_cache/hashes

Lines changed: 76 additions & 76 deletions
Large diffs are not rendered by default.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,4 @@ benchmarks/*.png
113113
cce_*/
114114
cce_*.log
115115
run_cce_*.sh
116+
.ffmt_cache/

misc/runners/common/rebalance-runners.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,16 @@ done
106106
# Add offline runners to be placed
107107
for i in "${offline[@]}"; do to_place+=("offline $i"); done
108108

109+
# Shuffle to_place so sequential runner numbers spread across nodes
110+
# (avoids overloading one node when jobs arrive in number order)
111+
shuffled=()
112+
while [ ${#to_place[@]} -gt 0 ]; do
113+
rand=$(( RANDOM % ${#to_place[@]} ))
114+
shuffled+=("${to_place[$rand]}")
115+
to_place=("${to_place[@]:0:$rand}" "${to_place[@]:$((rand+1))}")
116+
done
117+
to_place=("${shuffled[@]}")
118+
109119
# Assign to underloaded nodes
110120
moves=()
111121
for entry in "${to_place[@]}"; do

misc/runners/common/runner-lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ gh_list_runners() {
2121

2222
# Get a registration token for new runners.
2323
gh_registration_token() {
24-
gh api "orgs/$ORG/actions/runners/registration-token" --jq .token
24+
gh api "orgs/$ORG/actions/runners/registration-token" -X POST --jq .token
2525
}
2626

2727
# Get the latest runner binary version.

misc/runners/phoenix/config.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ SSH_OPTS="-o ConnectTimeout=5"
1515

1616
# Parent directories containing actions-runner-*/ installations on shared storage.
1717
RUNNER_PARENT_DIRS=(
18-
/storage/scratch1/6/sbryngelson3/mfc-runners
1918
/storage/project/r-sbryngelson3-0/sbryngelson3/mfc-runners-2
2019
)
2120

src/common/include/1dHardcodedIC.fpp

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,28 @@
55

66
#:def Hardcoded1D()
77
select case (patch_icpp(patch_id)%hcid)
8-
case (150) ! 1D Smooth Alfven Case for MHD
8+
case (150) ! 1D Smooth Alfven Case for MHD
99
! velocity
1010
q_prim_vf(momxb + 1)%sf(i, 0, 0) = 0.1_wp*sin(2._wp*pi*x_cc(i))
1111
q_prim_vf(momxb + 2)%sf(i, 0, 0) = 0.1_wp*cos(2._wp*pi*x_cc(i))
1212

1313
! magnetic field
1414
q_prim_vf(B_idx%end - 1)%sf(i, 0, 0) = 0.1_wp*sin(2._wp*pi*x_cc(i))
1515
q_prim_vf(B_idx%end)%sf(i, 0, 0) = 0.1_wp*cos(2._wp*pi*x_cc(i))
16-
1716
case (170)
18-
! This hardcoded case can be used to start a simulation with initial conditions given from a known 1D profile (e.g. Cantera, SDtoolbox)
17+
! This hardcoded case can be used to start a simulation with initial conditions given from a known 1D profile (e.g. Cantera,
18+
! SDtoolbox)
1919
@: HardcodedReadValues()
20-
2120
case (180)
22-
! This is patch is hard-coded for test suite optimization used in the
23-
! 1D_shuoser cases: "patch_icpp(2)%alpha_rho(1)": "1 + 0.2*sin(5*x)"
21+
! This is patch is hard-coded for test suite optimization used in the 1D_shuoser cases: "patch_icpp(2)%alpha_rho(1)": "1 +
22+
! 0.2*sin(5*x)"
2423
if (patch_id == 2) then
2524
q_prim_vf(contxb + 0)%sf(i, 0, 0) = 1 + 0.2*sin(5*x_cc(i))
2625
end if
27-
2826
case (181)
29-
! This is patch is hard-coded for test suite optimization used in the
30-
! 1D_titarevtorro cases: "patch_icpp(2)%alpha_rho(1)": "1 + 0.1*sin(20*x*pi)"
27+
! This is patch is hard-coded for test suite optimization used in the 1D_titarevtorro cases: "patch_icpp(2)%alpha_rho(1)":
28+
! "1 + 0.1*sin(20*x*pi)"
3129
q_prim_vf(contxb + 0)%sf(i, 0, 0) = 1 + 0.1*sin(20*x_cc(i)*pi)
32-
3330
case (182)
3431
! This patch is a hard-coded for test suite optimization (multiple component diffusion)
3532
x_mid_diffu = 0.05_wp/2.0_wp
@@ -51,16 +48,11 @@
5148

5249
temp = (320.0_wp - 1350.0_wp)*profile_shape + 1350.0_wp
5350

54-
molar_mass_inv = y1/31.998_wp + &
55-
y2/18.01508_wp + &
56-
y3/16.04256_wp + &
57-
y4/28.0134_wp
51+
molar_mass_inv = y1/31.998_wp + y2/18.01508_wp + y3/16.04256_wp + y4/28.0134_wp
5852

5953
q_prim_vf(contxb)%sf(i, 0, 0) = 1.01325_wp*(10.0_wp)**5/(temp*8.3144626_wp*1000.0_wp*molar_mass_inv)
60-
6154
case default
6255
call s_int_to_str(patch_id, iStr)
63-
call s_mpi_abort("Invalid hcid specified for patch "//trim(iStr))
56+
call s_mpi_abort("Invalid hcid specified for patch " // trim(iStr))
6457
end select
65-
6658
#:enddef

0 commit comments

Comments
 (0)