Changeset 182 for palm/trunk/SCRIPTS

Timestamp:

Aug 4, 2008 9:07:43 AM (16 years ago)

Author:

raasch

Message:

further mpi-version adjustments for sgi-ice

Location:

palm/trunk/SCRIPTS

Files:

• .mrun.config.default (modified) (1 diff)
• mbuild (modified) (1 diff)
• mrun (modified) (2 diffs)
• subjob (modified) (1 diff)

palm/trunk/SCRIPTS/.mrun.config.default

@@ -15 +15 @@
 # characters of the host identifier should be "lc" (Linux cluster), "ibm"
 # (IBM-AIX), or "nec" (NEC-SX), respectively.
+%host_identifier   service100  lcsgih
+%host_identifier   r1*         lcsgih
+%host_identifier   h01*        lcsgih
+%host_identifier   r2*         lcsgib
+%host_identifier   b01*        lcsgib
 %host_identifier   bora        lcmuk
 %host_identifier   cs*         nech

palm/trunk/SCRIPTS/mbuild

@@ -1307 +1307 @@
              then
 
-                print ". /usr/share/modules/init/bash; module load mvapich/mvapich-0.9.9-intel; cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll
-#                print ". /usr/share/modules/init/bash; module load mvapich2/1.2-intel; cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll
+#                print ". /usr/share/modules/init/bash; module load mvapich/mvapich-0.9.9-intel; cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll
+                print ". /usr/share/modules/init/bash; module load mvapich2/1.2rc1-intel; cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll
 
              elif [[ $remote_host = lctit ]]

palm/trunk/SCRIPTS/mrun

@@ -2249 +2249 @@
           locat=compile
 
-  # WORKAROUND: REMOVE IF LATER, BUT KEEP THE EXIT!
+  # WORKAROUND: REMOVE IF CONSTRUCT LATER, BUT KEEP THE EXIT!
           if [[ $localhost != lcsgib  &&  $localhost != lcsgih ]]
           then
              exit
+          else
+             locat=normal
           fi
        else
@@ -2799 +2801 @@
                    ulimit -s 30000
                    ulimit -a
-                   mpirun_rsh -hostfile $PBS_NODEFILE -np $ii  OMP_NUM_THREADS=$OMP_NUM_THREADS  palm  $ROPTS
-#                   export MV2_NUM_PORTS=2
+#                   mpirun_rsh -hostfile $PBS_NODEFILE -np $ii  OMP_NUM_THREADS=$OMP_NUM_THREADS  palm  $ROPTS
+                   export MV2_NUM_PORTS=2
 #                   export MV2_CPU_MAPPING=0:1:2:3
-#                   mpiexec    ./palm  $ROPTS
+                   mpiexec    ./palm  $ROPTS
                 elif [[ $host = lcxt4 ]]
                 then

palm/trunk/SCRIPTS/subjob

@@ -685 +685 @@
 
 . /usr/share/modules/init/bash
-module load mvapich/mvapich-0.9.9-intel
-# module load mvapich2/1.2-intel
+# module load mvapich/mvapich-0.9.9-intel
+module load mvapich2/1.2rc1-intel
 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