Changeset 544 for palm/trunk/SCRIPTS

Timestamp:

Aug 17, 2010 10:44:58 AM (14 years ago)

Author:

maronga

Message:

adjustments for lcxt4

Location:

palm/trunk/SCRIPTS

Files:

• mbuild (modified) (3 diffs)
• mrun (modified) (3 diffs)
• subjob (modified) (2 diffs)

palm/trunk/SCRIPTS/mbuild

@@ -109 +109 @@
      #                    parallel make for utility programs
      # 12/03/10 - Siggi - bugfix: remode_md was given a wrong value
+     # 16/08/10 - BjornM- bugfix: call of modules on local host, new workaround
+     #                    for lcxt4
 
 
@@ -1225 +1227 @@
     else
 
+          # workaround for lcxt4
+       if [[ $remote_host = lcxt4 ]]
+       then
+          . /opt/modules/default/init/ksh
+       fi
+
+       # first load modules, if given
+       if [[ "$modules" != "" ]]
+       then
+          module load ${modules}
+       fi
+
+
        if [[ $compile_utility_programs = false ]]
        then
@@ -1255 +1270 @@
           echo " "
           echo "  *** execute \"make\" on local host"
-
-             # first load modules, if given
-          if [[ "$modules" != "" ]]
-          then
-             module load ${modules}
-          fi
 
           make  $make_options  PROG=$mainprog  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$loader_options"  2>&1 | tee ${remote_host}_last_make_protokoll

palm/trunk/SCRIPTS/mrun

@@ -208 +208 @@
      #                     lcsgih/lcsgib is done using the names 
      #                     hicegate0/bicegate0 instead of the IP addresses
+     # 17/08/10 - BjornM - adjustments for interactive runs on lcxt4
 
 
@@ -2534 +2535 @@
        else
           [[ $localhost = lctit ]]  &&  export LM_LICENSE_FILE=27050@tggls
+          [[ $localhost = lcxt4 ]]  &&  . /opt/modules/default/init/ksh
           [[ "$module_calls" != "" ]]  &&  eval $module_calls
           make $mopts -f Makefile PROG=a.out  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$fopts"  LDFLAGS="$lopts"
@@ -3313 +3315 @@
                 elif [[ $host = lcxt4  ||  $host = lcxt5m ]]
                 then
-                   aprun  -n $ii  -N $tasks_per_node  a.out  $ROPTS  < runfile_atmos
+                    aprun  -n $ii  -N $tasks_per_node  a.out  $ROPTS  < runfile_atmos
                 else
                    mpiexec  -machinefile hostfile  -n $ii  a.out  < runfile_atmos  $ROPTS

palm/trunk/SCRIPTS/subjob

@@ -117 +117 @@
      # 01/03/10 - Siggi - loading of modules controlled by environment variable
      #                    module_calls
+     # 17/08/10 - BjörnM- re-adjustments for lcxt4 (location of qsub)
 
 
@@ -360 +361 @@
         (lck)     remote_addres=165.132.26.61; submcom=/usr/torque/bin/qsub;;
         (lctit)   queue=lctit; remote_addres=172.17.75.161; submcom=/n1ge/TITECH_GRID/tools/bin/n1ge;;
-        (lcxt4)   remote_addres=129.177.20.113; submcom=/opt/torque/2.3.0/bin/qsub;;
+        (lcxt4)   remote_addres=129.177.20.113; submcom=/opt/torque/2.4.9-snap.201005191035/bin/qsub;;
         (lcxt5m)  remote_addres=193.166.211.144; submcom=/opt/pbs/10.1.0.91350/bin/qsub;;
         (nech)    qsubmem=memsz_job; qsubtime=cputim_job; remote_addres=136.172.44.147; submcom="/usr/local/bin/qsub";;