From ee145094582bb90ab286ebc986505da0773fb416 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Wed, 16 Jan 2019 00:00:00 +0100 Subject: [PATCH] Bug with gortran6 --- configure | 2 +- src/utils/sort.irp.f | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure b/configure index a6ca3daa..3ec98e14 100755 --- a/configure +++ b/configure @@ -431,7 +431,7 @@ if [[ -n $CONFIG ]] ; then fi if [[ -f ${QP_ROOT}/build.ninja ]] ; then - exec ${QP_ROOT}/bin/qpsh + [[ -z ${TRAVIS} ]] && exec ${QP_ROOT}/bin/qpsh else echo "" echo "${QP_ROOT}/build.ninja does not exist," diff --git a/src/utils/sort.irp.f b/src/utils/sort.irp.f index cfe421b2..ed9932c9 100644 --- a/src/utils/sort.irp.f +++ b/src/utils/sort.irp.f @@ -550,23 +550,23 @@ BEGIN_TEMPLATE endif - !$OMP PARALLEL DEFAULT(SHARED) if (isize > 1000000) - !$OMP SINGLE +! !$OMP PARALLEL DEFAULT(SHARED) if (isize > 1000000) +! !$OMP SINGLE if (i3>1_$int_type) then - !$OMP TASK FIRSTPRIVATE(iradix_new,i3) SHARED(x,iorder) if(i3 > 1000000) +! !$OMP TASK FIRSTPRIVATE(iradix_new,i3) SHARED(x,iorder) if(i3 > 1000000) call $Xradix_sort$big(x,iorder,i3,iradix_new-1) - !$OMP END TASK +! !$OMP END TASK endif if (isize-i3>1_$int_type) then - !$OMP TASK FIRSTPRIVATE(iradix_new,i3) SHARED(x,iorder) if(isize-i3 > 1000000) +! !$OMP TASK FIRSTPRIVATE(iradix_new,i3) SHARED(x,iorder) if(isize-i3 > 1000000) call $Xradix_sort$big(x(i3+1_$int_type),iorder(i3+1_$int_type),isize-i3,iradix_new-1) - !$OMP END TASK +! !$OMP END TASK endif - !$OMP TASKWAIT - !$OMP END SINGLE - !$OMP END PARALLEL +! !$OMP TASKWAIT +! !$OMP END SINGLE +! !$OMP END PARALLEL return endif