Changeset 374 for palm/trunk

Timestamp:

Aug 28, 2009 10:50:21 AM (15 years ago)

Author:

raasch

Message:

mrun adjustments for ice2 and for ssh calls of restart jobs

Location:

palm/trunk/SCRIPTS

Files:

• mrun (modified) (3 diffs)
• subjob (modified) (1 diff)

palm/trunk/SCRIPTS/mrun

@@ -3165 +3165 @@
                    if [[ $( echo $mpilib | cut -c1-3 ) = mpt ]]
                    then
-#                      export MPI_LAUNCH_TIMEOUT=360
                           # MPI_DSM_DISTRIBUTE not necessary when MPI_DSM_CPULIST is set
                           # export MPI_DSM_DISTRIBUTE=1
                           # MPI_DSM_CPULIST: pin MPI processes to cores
-                       export MPI_DSM_CPULIST="0,1,4,5,2,3,6,7:allhosts"
+                      export MPI_DSM_CPULIST="0,1,4,5,2,3,6,7:allhosts"
                           # MPI_IB_RAILS: use both IB rails on ICE2
                       export MPI_BUFS_PER_HOST=512
@@ -3178 +3177 @@
                    elif [[ $( echo $mpilib | cut -c1-3 ) = mva ]]
                    then
-#                      ulimit -s 300000   # A too large stack size causes problems
-#                      export MV2_NUM_PORTS=2
-#                      export MV2_CPU_MAPPING=0:1:2:3
+                      export MV2_NUM_PORTS=2
+                      export MV2_CPU_MAPPING=0,1,4,5,2,3,6,7
                       mpiexec -np $ii  ./a.out  $ROPTS  < runfile_atmos
                    fi
@@ -4061 +4059 @@
                 then
                       # WORKAROUND AUF SCIROCCO AM TIT
-                   print  "PATH=\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc "  |  ssh $return_addres -l $return_username 
+                   print  "PATH=\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc "  |  ssh $return_addres -l $return_username
+                elif [[ $(echo $return_addres | grep -c "130.75.105") = 1 ]]
+                then
+                   ssh $return_addres -l $return_username "PATH=\$PATH:$LOCAL_MRUN_PATH;export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/muksoft/packages/intel/Compiler/11.0/083/lib/intel64/;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc "
                 else
                    ssh $return_addres -l $return_username "PATH=\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc "

palm/trunk/SCRIPTS/subjob

@@ -775 +775 @@
 module load ifort/11.0.069
 module load $mpilib
-# module load mvapich2/1.2rc1-intel
-# module load mvapich2
 module load netcdf
-#export LD_LIBRARY_PATH=/sw/intel/cce/10.1.015/lib:/sw/intel/fce/10.1.015/lib:/sw/dataformats/netcdf/3.6.2/lib:\$LD_LIBRARY_PATH
+
 echo ld_library_path=\$LD_LIBRARY_PATH