Changeset 1622 for palm/trunk/SCRIPTS/mrun

Timestamp:

Jul 20, 2015 6:21:36 AM (9 years ago)

Author:

heinze

Message:

bugfix for Mistral (lcbullhh)

File:

• palm/trunk/SCRIPTS/mrun (modified) (5 diffs)

palm/trunk/SCRIPTS/mrun

@@ -22 +22 @@
 # Current revisions:
 # ------------------
-# 
+# bugfix for Mistral (lcbullhh)
 # 
 # Former revisions:
@@ -1967 +1967 @@
  fi
 
-
-
     # OUTPUT OF THE MRUN-HEADER
  calltime=$(date)
@@ -3493 +3491 @@
                 # COPY HOSTFILE FROM SOURCE DIRECTORY OR CREATE IT, IF IT
                 # DOES NOT EXIST
-             if [[  $host != lccrayb  && $host != lccrayf  && $host != lccrayh  &&  $host != lckyuh  &&  $host != lckyut ]]
+             if [[  $host != lcbullhh  && $host != lccrayb  &&  $host != lccrayf  && $host != lccrayh  &&  $host != lckyuh  &&  $host != lckyut ]]
+
              then
                 if [[ -f $hostfile ]]
@@ -3542 +3541 @@
                     aprun  -n $ii  -N $tasks_per_node  a.out  $ROPTS  < runfile_atmos
 #                    aprun  -n $ii  -ss  -r2  -j1  a.out  $ROPTS  < runfile_atmos
+
+                elif [[ $host = lcbullhh ]]
+                then
+                   export OMPI_MCA_pml=cm
+                   export OMPI_MCA_mtl=mxm
+                   export OMPI_MCA_coll=^ghc
+                   export OMPI_MCA_mtl_mxm_np=0
+                   export MXM_RDMA_PORTS=mlx5_0:1
+                   export MXM_LOG_LEVEL=ERROR 
+                   export OMP_NUM_THREADS=$threads_per_task
+                   export KMP_AFFINITY=verbose,granularity=core,compact,1
+                   export KMP_STACKSIZE=64m
+
+                   srun  --nodes=$nodes --ntasks-per-node=$tasks_per_node ./a.out  
+
                 elif [[ $host = lccrayf ]]
                 then
@@ -3663 +3677 @@
              mpirun  -np $ii  -hostfile $PBS_NODEFILE ./a.out  $ROPTS
 
-          elif [[ $host = lcbullhh ]]
-          then
-             export OMPI_MCA_pml=cm
-             export OMPI_MCA_mtl=mxm
-             export OMPI_MCA_coll=^ghc
-             export OMPI_MCA_mtl_mxm_np=0
-             export MXM_RDMA_PORTS=mlx5_0:1
-             export MXM_LOG_LEVEL=ERROR 
-             export OMP_NUM_THREADS=$threads_per_task
-             export KMP_AFFINITY=verbose,granularity=core,compact,1
-             export KMP_STACKSIZE=64m
-
-             srun  --nodes=$nodes --ntasks-per-node=$tasks_per_node ./a.out  
           else
              mpprun  -n $numprocs  a.out  $ROPTS