From b16edd29e7959901b4676914fbcd319343f9a013 Mon Sep 17 00:00:00 2001 From: ydamour Date: Thu, 25 Nov 2021 10:28:44 +0100 Subject: [PATCH] fixed error --- config/ifort.cfg | 2 +- config/ifort_debug.cfg | 2 +- config/ifort_rome.cfg | 2 +- scripts/verif_omp/update_comp.sh | 22 ++++++++++++++++------ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/config/ifort.cfg b/config/ifort.cfg index 714c4b10..0382360a 100644 --- a/config/ifort.cfg +++ b/config/ifort.cfg @@ -9,7 +9,7 @@ FC : ifort -fpic LAPACK_LIB : -mkl=parallel -lirc -lsvml -limf -lipps IRPF90 : irpf90 -IRPF90_FLAGS : --ninja --align=32 -DINTEL +IRPF90_FLAGS : --ninja --align=32 -DINTEL # Global options ################ diff --git a/config/ifort_debug.cfg b/config/ifort_debug.cfg index 9b718380..d70b1465 100644 --- a/config/ifort_debug.cfg +++ b/config/ifort_debug.cfg @@ -9,7 +9,7 @@ FC : ifort -fpic LAPACK_LIB : -mkl=parallel -lirc -lsvml -limf -lipps IRPF90 : irpf90 -IRPF90_FLAGS : --ninja --align=32 --assert -DINTEL +IRPF90_FLAGS : --ninja --align=32 --assert -DINTEL # Global options ################ diff --git a/config/ifort_rome.cfg b/config/ifort_rome.cfg index 5ed01227..1ac78717 100644 --- a/config/ifort_rome.cfg +++ b/config/ifort_rome.cfg @@ -9,7 +9,7 @@ FC : ifort -fpic LAPACK_LIB : -mkl=parallel -lirc -lsvml -limf -lipps IRPF90 : irpf90 -IRPF90_FLAGS : --ninja --align=32 -DINTEL +IRPF90_FLAGS : --ninja --align=32 -DINTEL # Global options ################ diff --git a/scripts/verif_omp/update_comp.sh b/scripts/verif_omp/update_comp.sh index 2199c3f6..14b644de 100755 --- a/scripts/verif_omp/update_comp.sh +++ b/scripts/verif_omp/update_comp.sh @@ -21,17 +21,27 @@ else list_files=${LIST} echo "Files that will be modified:" echo $list_files - + + # Flags that must be added + FLAGS=$(./check_required_setup.sh $COMP) + # Add the flags for file in $list_files do echo $file - ACTUAL=$(grep "IRPF90_FLAGS : --openmp" $file) - FLAGS=$(./check_required_setup.sh $COMP) - SPACE=" " - BASE="IRPF90_FLAGS : --openmp" - NEW=${BASE}${SPACE}${FLAGS} + BASE="IRPF90_FLAGS : --ninja" + ACTUAL=$(grep "$BASE" $file) + # To have only one time each flag + grep " -DSET_MAX_ACT" $file && ${ACTUAL/" -DSET_MAX"/""} + grep " -DSET_NESTED" $file && ${ACTUAL/" -DSET_NESTED"/""} + SPACE=" " + + NEW=${ACTUAL}${SPACE}${FLAGS} + + # Debug + #echo ${NEW} + sed "s/${ACTUAL}/${NEW}/" $file # -i # to change the files done