Changeset 7753 for trunk/NEMOGCM/SETTE/prepare_job.sh

Timestamp:

2017-03-03T12:46:59+01:00 (7 years ago)

Author:

mocavero

Message:

Reverting trunk to remove OpenMP

File:

• trunk/NEMOGCM/SETTE/prepare_job.sh (modified) (5 diffs)

trunk/NEMOGCM/SETTE/prepare_job.sh

@@ -68 +68 @@
 #
 
-usage=" Usage : ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_FLAG JOB_FILE NUM_XIO_SERVERS NUM_OMP_THREADS"
+usage=" Usage : ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_FLAG JOB_FILE NUM_XIO_SERVERS"
 usage=" example : ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg 8 SHORT no/yes $JOB_FILE 0 2"
 
@@ -94 +94 @@
 JOB_FILE=$5
 NXIO_PROC=$6
-NOMP_THR=$7
 
 # export EXE_DIR. This directory is used to execute model 
@@ -294 +293 @@
                                 echo NB_PROC_NODE ${NB_PROC_NODE}
                                 ;;
-                        ifort_athena_*)
-                                NB_PROC_NODE=$(( 16 / NOMP_THR ))
-            ;;
          *)
             NB_NODES=${NB_PROC}
@@ -309 +305 @@
              -e"s/TOTAL_NPROCS/${TOTAL_NPROCS}/" \
              -e"s/NPROCS/${NB_PROC}/" \
-             -e"s/OMP_NTHR/${NOMP_THR}/" \
              -e"s/NXIOPROCS/${NXIO_PROC}/" \
              -e"s:DEF_SETTE_DIR:${SETTE_DIR}:" -e"s:DEF_INPUT_DIR:${INPUT_DIR}:" \
@@ -326 +321 @@
               XC40_METO*)
                     cat run_sette_test.job | sed -e"s/SELECT/${SELECT}/" > run_sette_test1.job
-                    mv run_sette_test1.job run_sette_test.job
-                    ;;
-              ifort_athena_*)
-                    cat run_sette_test.job | sed -e"s/NPROC_NODE/${NB_PROC_NODE}/" > run_sette_test1.job
                     mv run_sette_test1.job run_sette_test.job
                     ;;