Skip to content

Commit b2635e3

Browse files
committed
fix: Cray ftn continuation and AMD flang case-opt array mismatch
m_time_steppers.fpp: remove invalid trailing & on call to s_compute_moment_of_inertia (Cray ftn rejects blank continuation lines). m_re_visc.fpp: add #:include 'case.fpp'. Without it, MFC_CASE_OPTIMIZATION is undefined (False) during Fypp preprocessing, so AMD case-opt builds take the USING_AMD dimension(3) path while callers that include case.fpp take the dimension(num_fluids) path — causing 'actual argument has fewer elements' errors when num_fluids != 3.
1 parent b2f262c commit b2635e3

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/simulation/m_re_visc.fpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
!! @file m_re_visc.f90
33
!! @brief Contains module m_re_visc
44

5+
#:include 'case.fpp'
56
#:include 'macros.fpp'
67

78
!> @brief The module contains routines that compute viscosity-related quantities for both Newtonian and non-Newtonian fluids.

src/simulation/m_time_steppers.fpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -762,9 +762,8 @@ contains
762762
! update the angular velocity with the torque value
763763
patch_ib(i)%angular_vel = (patch_ib(i)%angular_vel*patch_ib(i)%moment) + (rk_coef(s, &
764764
& 3)*dt*patch_ib(i)%torque/rk_coef(s, 4)) ! add the torque to the angular momentum
765-
call s_compute_moment_of_inertia(i, &
766-
& patch_ib(i)%angular_vel) &
767-
& ! update the moment of inertia to be based on the direction of the angular momentum
765+
! update the moment of inertia based on the direction of the angular momentum
766+
call s_compute_moment_of_inertia(i, patch_ib(i)%angular_vel)
768767
patch_ib(i)%angular_vel = patch_ib(i)%angular_vel/patch_ib(i) &
769768
& %moment ! convert back to angular velocity with the new moment of inertia
770769
end if

0 commit comments

Comments
 (0)