Merge upstream/master into pr-1290, resolve formatting conflicts

Author: sbryngelson

.ffmt.toml

@@ -0,0 +1,18 @@
+# MFC Fortran formatting configuration
+# These are the defaults — this file makes them explicit.
+
+indent-width = 4
+keyword-case = "lower"
+normalize-keywords = true
+indent-fypp = true
+
+[whitespace]
+relational = true
+logical = true
+plusminus = true
+multdiv = false
+power = false
+assignment = true
+declaration = true
+comma = true
+slice-colon = false

.gitignore

@@ -113,3 +113,4 @@ benchmarks/*.png
 cce_*/
 cce_*.log
 run_cce_*.sh
+.ffmt_cache/

docs/documentation/case.md

@@ -359,7 +359,7 @@ Definitions for currently implemented immersed boundary patch types are listed i
 
 - `c`, `t`, `p`, and `m` specify the parameters for a NACA airfoil.
 `m` is the maximum camber, `p` is the location of maximum camber, `c` is the coord length, and `t` is the thickness.
-Additional details on this specification can be found in [The Naca Airfoil Series](https://web.stanford.edu/~cantwell/AA200_Course_Material/The%20NACA%20airfoil%20series.pdf)
+Additional details on this specification can be found in [NACA airfoil](https://en.wikipedia.org/wiki/NACA_airfoil).
 
 - `slip` applies a slip boundary to the surface of the patch if true and a no-slip boundary condition to the surface if false.
 

misc/runners/common/rebalance-runners.sh

@@ -106,6 +106,16 @@ done
 # Add offline runners to be placed
 for i in "${offline[@]}"; do to_place+=("offline $i"); done
 
+# Shuffle to_place so sequential runner numbers spread across nodes
+# (avoids overloading one node when jobs arrive in number order)
+shuffled=()
+while [ ${#to_place[@]} -gt 0 ]; do
+    rand=$(( RANDOM % ${#to_place[@]} ))
+    shuffled+=("${to_place[$rand]}")
+    to_place=("${to_place[@]:0:$rand}" "${to_place[@]:$((rand+1))}")
+done
+to_place=("${shuffled[@]}")
+
 # Assign to underloaded nodes
 moves=()
 for entry in "${to_place[@]}"; do

misc/runners/common/runner-lib.sh

@@ -21,7 +21,7 @@ gh_list_runners() {
 
 # Get a registration token for new runners.
 gh_registration_token() {
-    gh api "orgs/$ORG/actions/runners/registration-token" --jq .token
+    gh api "orgs/$ORG/actions/runners/registration-token" -X POST --jq .token
 }
 
 # Get the latest runner binary version.

misc/runners/phoenix/config.sh

@@ -15,7 +15,6 @@ SSH_OPTS="-o ConnectTimeout=5"
 
 # Parent directories containing actions-runner-*/ installations on shared storage.
 RUNNER_PARENT_DIRS=(
-    /storage/scratch1/6/sbryngelson3/mfc-runners
     /storage/project/r-sbryngelson3-0/sbryngelson3/mfc-runners-2
 )
 

src/common/include/1dHardcodedIC.fpp

@@ -5,32 +5,29 @@
 
 #:def Hardcoded1D()
     select case (patch_icpp(patch_id)%hcid)
-    case (150) ! 1D Smooth Alfven Case for MHD
+    case (150)  ! 1D Smooth Alfven Case for MHD
         ! velocity
         q_prim_vf(momxb + 1)%sf(i, 0, 0) = 0.1_wp*sin(2._wp*pi*x_cc(i))
         q_prim_vf(momxb + 2)%sf(i, 0, 0) = 0.1_wp*cos(2._wp*pi*x_cc(i))
 
         ! magnetic field
         q_prim_vf(B_idx%end - 1)%sf(i, 0, 0) = 0.1_wp*sin(2._wp*pi*x_cc(i))
         q_prim_vf(B_idx%end)%sf(i, 0, 0) = 0.1_wp*cos(2._wp*pi*x_cc(i))
-
-    case (170)
-        ! This hardcoded case can be used to start a simulation with initial conditions given from a known 1D profile (e.g. Cantera, SDtoolbox)
+    case (170)  ! 1D profile from external data (e.g. Cantera, SDtoolbox)
+        ! This hardcoded case can be used to start a simulation with initial conditions given from a known 1D profile (e.g. Cantera,
+        ! SDtoolbox)
         @: HardcodedReadValues()
-
-    case (180)
-        ! This is patch is hard-coded for test suite optimization used in the
-        ! 1D_shuoser cases: "patch_icpp(2)%alpha_rho(1)": "1 + 0.2*sin(5*x)"
+    case (180)  ! Shu-Osher problem
+        ! This is patch is hard-coded for test suite optimization used in the 1D_shuoser cases: "patch_icpp(2)%alpha_rho(1)": "1 +
+        ! 0.2*sin(5*x)"
         if (patch_id == 2) then
             q_prim_vf(contxb + 0)%sf(i, 0, 0) = 1 + 0.2*sin(5*x_cc(i))
         end if
-
-    case (181)
-        ! This is patch is hard-coded for test suite optimization used in the
-        ! 1D_titarevtorro cases: "patch_icpp(2)%alpha_rho(1)": "1 + 0.1*sin(20*x*pi)"
+    case (181)  ! Titarev-Torro problem
+        ! This is patch is hard-coded for test suite optimization used in the 1D_titarevtorro cases: "patch_icpp(2)%alpha_rho(1)":
+        ! "1 + 0.1*sin(20*x*pi)"
         q_prim_vf(contxb + 0)%sf(i, 0, 0) = 1 + 0.1*sin(20*x_cc(i)*pi)
-
-    case (182)
+    case (182)  ! Multi-component diffusion
         ! This patch is a hard-coded for test suite optimization (multiple component diffusion)
         x_mid_diffu = 0.05_wp/2.0_wp
         width_sq = (2.5_wp*10.0_wp**(-3.0_wp))**2
@@ -51,16 +48,11 @@
 
         temp = (320.0_wp - 1350.0_wp)*profile_shape + 1350.0_wp
 
-        molar_mass_inv = y1/31.998_wp + &
-                         y2/18.01508_wp + &
-                         y3/16.04256_wp + &
-                         y4/28.0134_wp
+        molar_mass_inv = y1/31.998_wp + y2/18.01508_wp + y3/16.04256_wp + y4/28.0134_wp
 
         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)
-
     case default
         call s_int_to_str(patch_id, iStr)
-        call s_mpi_abort("Invalid hcid specified for patch "//trim(iStr))
+        call s_mpi_abort("Invalid hcid specified for patch " // trim(iStr))
     end select
-
 #:enddef