Merge pull request #61 from scemama/master

merge

configure

@@ -54,7 +54,7 @@ function execute () {
     sleep 1
     echo ""
     printf "\e[0;94m"
-    eval "set -x ; $_command set +x" || exit -1
+    ( eval "set -x ; $_command set +x" ) || exit -1
     printf "\e[m"
     echo ""
 }
@@ -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,"

etc/ninja.rc

@@ -4,7 +4,7 @@ export NINJA=${QP_ROOT}/bin/ninja
 
 function ninja () {
   if [[ -f ${QP_ROOT}/build.ninja ]] ; then
-	exec ninja "$@"
+	${QP_ROOT}/bin/ninja "$@"
   else
 	>&2 echo "Error: build.ninja does not exists.
 You need to run ./configure  first."

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