From a3f1fce4aabaa9717936e902ac2c58f73574e923 Mon Sep 17 00:00:00 2001 From: Manu Date: Fri, 27 Jun 2014 10:36:40 +0200 Subject: [PATCH] selectors_max fixed --- scripts/generate_h_apply.py | 4 ++-- scripts/qpackage | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/generate_h_apply.py b/scripts/generate_h_apply.py index 083a91ba..9b589a3d 100755 --- a/scripts/generate_h_apply.py +++ b/scripts/generate_h_apply.py @@ -212,7 +212,7 @@ class H_apply(object): self.data["declarations"] += """ double precision, intent(inout) :: select_max_out""" - self.data["params_post"] += ", select_max(i_generator)" + self.data["params_post"] += ", select_max(min(i_generator,size(select_max,1)))" self.data["size_max"] = str(1024*128) self.data["copy_buffer"] = """ call copy_h_apply_buffer_to_wf @@ -242,8 +242,8 @@ class H_apply(object): !$ call omp_unset_lock(lck) cycle endif + select_max(i_generator) = 0.d0 endif - select_max(i_generator) = 0.d0 """ diff --git a/scripts/qpackage b/scripts/qpackage index 9d49673f..d6306b6a 100755 --- a/scripts/qpackage +++ b/scripts/qpackage @@ -18,9 +18,9 @@ fi ##################### declare -A EXECUTABLES -for EXE in $(find $QPACKAGE_ROOT/src -type f -executable | grep -e "$QPACKAGE_ROOT/src/[^/]*/[^/]*$") +for EXE in $(find $QPACKAGE_ROOT/src -type f -executable | grep -e "$QPACKAGE_ROOT/src/[^/]*/[^/]*$") do - EXECUTABLES["$(basename "${EXE}")"]="${EXE}" + EXECUTABLES[$(basename ${EXE})]="${EXE}" done function print_list() @@ -122,6 +122,3 @@ esac - - -