Changeset 376 for palm/trunk/SCRIPTS

Timestamp:

Sep 3, 2009 10:12:29 AM (15 years ago)

Author:

raasch

Message:

bugfix concerning output of averaged 2d/3d quantities

Location:

palm/trunk/SCRIPTS

Files:

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

palm/trunk/SCRIPTS/mrun

@@ -3178 +3178 @@
                    then
                       export MV2_NUM_PORTS=2
-                      export MV2_CPU_MAPPING=0,1,4,5,2,3,6,7
+                      #  The default setting of MV2_CPU_MAPPING gives best results
+                      #  export MV2_CPU_MAPPING=0,1,4,5,2,3,6,7
                       mpiexec -np $ii  ./a.out  $ROPTS  < runfile_atmos
                    fi

palm/trunk/SCRIPTS/subjob

@@ -105 +105 @@
      # 25/08/09 - BjornM- adapted for lck
      # 26/08/09 - Marcus- caurus admitted; optional qos feature hiprio on lcsgi
+     # 03/09/09 - Siggi - PBS sgi feature directive only used if explicitly
+     #                    set in the config file by the user
 
     # VARIABLENVEREINBARUNGEN + DEFAULTWERTE
@@ -744 +746 @@
  then
 
+    if [[ "$sgi_feature" != "" ]]
+    then
+       feature_directive="#PBS -l feature=$sgi_feature"
+    else
+       feature_directive=""
+    fi
+
     if [[ $queue = testq  ||  $queue = workq ]]
     then
@@ -765 +774 @@
 #PBS -l walltime=$timestring
 #PBS -l nodes=$nodes:ppn=${tasks_per_node}
-#PBS -l feature=$sgi_feature
 #PBS -l naccesspolicy=$node_usage
 #PBS -o $remote_dayfile
 #PBS -j oe
+$feature_directive
 $queue_directive
 $email_directive