From 1651516a214fe0fa4e5afba1abf58cc777066572 Mon Sep 17 00:00:00 2001 From: Yen-Chen Chen <yen-chen.chen@kit.edu> Date: Fri, 12 Apr 2024 13:47:46 +0000 Subject: [PATCH] Re-sync mo_fortran_tools with the master branch (icon-libraries/libfortran-support!87) ## What is the bug `mo_fortran_tools` was updated during the release preparation MR. Merged-by: Jonas Jucker <jonas.jucker@env.ethz.ch> Changelog: bugfix --- src/mo_fortran_tools.F90 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mo_fortran_tools.F90 b/src/mo_fortran_tools.F90 index c5ba60d..b1db528 100644 --- a/src/mo_fortran_tools.F90 +++ b/src/mo_fortran_tools.F90 @@ -467,6 +467,8 @@ CONTAINS END SUBROUTINE swap_int !> + !! Expand array by given size + !! !! Expand a 1D character array by given size. !! SUBROUTINE resize_arr_c1d(arr, nelem) @@ -1780,12 +1782,11 @@ CONTAINS minval_1d = HUGE(minval_1d) - !$ACC PARALLEL DEFAULT(PRESENT) COPY(minval_1d) ASYNC(1) REDUCTION(MIN: minval_1d) IF(lacc) - !$ACC LOOP GANG VECTOR + !$ACC PARALLEL LOOP GANG VECTOR DEFAULT(PRESENT) ASYNC(1) REDUCTION(MIN: minval_1d) IF(lacc) DO i = 1, s1 minval_1d = MIN(minval_1d, var(i)) ! The loop is equivalent to MINVAL(var(:)) END DO - !$ACC END PARALLEL + !$ACC END PARALLEL LOOP !$ACC WAIT ! required to sync result back to CPU #else minval_1d = MINVAL(var(:)) @@ -2338,11 +2339,11 @@ CONTAINS LOGICAL, INTENT(IN), OPTIONAL :: lacc #ifdef _OPENACC - IF ((.NOT. PRESENT(lacc))) THEN + IF (.NOT. PRESENT(lacc)) THEN CALL finish(routine_name, ' must not be called without lacc.') ELSE IF (.NOT. lacc) THEN - CALL finish(routine_name, ' not supported on ACC host.') + CALL finish(routine_name, ' not supported in ACC host mode.') END IF END IF #endif -- GitLab