diff --git a/src/common/include/parallel_macros.fpp b/src/common/include/parallel_macros.fpp index b1382ec49a..d8e230dcab 100644 --- a/src/common/include/parallel_macros.fpp +++ b/src/common/include/parallel_macros.fpp @@ -67,10 +67,11 @@ #:if not isinstance(function_name, str) #:stop "When using cray_noinline, function name must be given and given as a string" #:endif - #:set cray_noinline_directive = ('!DIR$ NOINLINE ' + function_name).strip('\n') + #:set cray_noinline_directive = ('!DIR$ INLINENEVER ' + function_name).strip('\n') #ifdef _CRAYFTN #if MFC_OpenACC $:acc_directive + $:cray_noinline_directive #elif MFC_OpenMP $:omp_directive #else @@ -91,6 +92,7 @@ #ifdef _CRAYFTN #if MFC_OpenACC $:acc_directive + $:cray_directive #elif MFC_OpenMP $:omp_directive #else diff --git a/src/common/m_variables_conversion.fpp b/src/common/m_variables_conversion.fpp index 2417da1adf..3b0126179d 100644 --- a/src/common/m_variables_conversion.fpp +++ b/src/common/m_variables_conversion.fpp @@ -80,7 +80,7 @@ contains !> Compute the pressure from the appropriate equation of state subroutine s_compute_pressure(energy, alf, dyn_p, pi_inf, gamma, rho, qv, rhoYks, pres, T, stress, mom, G, pres_mag) - $:GPU_ROUTINE(function_name='s_compute_pressure',parallelism='[seq]', cray_noinline=True) + $:GPU_ROUTINE(function_name='s_compute_pressure',parallelism='[seq]', cray_inline=True) real(stp), intent(in) :: energy, alf real(wp), intent(in) :: dyn_p @@ -499,7 +499,6 @@ contains real(wp) :: E, D !< Prim/Cons variables within Newton-Raphson iteration real(wp) :: f, dGa_dW, dp_dW, df_dW !< Functions within Newton-Raphson iteration integer :: iter !< Newton-Raphson iteration counter - $:GPU_PARALLEL_LOOP(collapse=3, private='[alpha_K, alpha_rho_K, Re_K, nRtmp, rho_K, gamma_K, pi_inf_K, qv_K, dyn_pres_K, & & rhoYks, B, pres, vftmp, nbub_sc, G_K, T, pres_mag, Ga, B2, m2, S, W, dW, E, D, f, dGa_dW, dp_dW, & & df_dW, iter]')