Changeset 9457 for trunk/MagicSoft/Mars

Timestamp:

06/12/09 14:32:19 (15 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/jobmanager (modified) (2 diffs)
• datacenter/scripts/setup (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -38 +38 @@
    * macros/starvisyear.C:
      - added includes for compiling
+
+   * datacenter/scripts/sourcefile:
+     - replaced case- by if-statement in checklock()
+     - added more information to the output to the lockfile
+     - added processlog in makedir()
+     - improved processlog output and layout of queries
+     - added option to query only jobs for one node
+
+   * datacenter/scripts/jobmanager:
+     - added option for production of cta mc
+
+   * datacenter/scripts/jobmanager, datacenter/scripts/setup:
+     - added $totalmax which can overwrite $pnototal[$hour]
 
 

trunk/MagicSoft/Mars/datacenter/scripts/jobmanager

@@ -53 +53 @@
          pnosweek=( ${pnocorsika[@]} ${pnoreflector[@]} ${pnocamera[@]} )
          pnoswe=( ${pnocorsikawe[@]} ${pnoreflectorwe[@]} ${pnocamerawe[@]} )
+         break
+         ;;
+  ctamc) echo "running jobmanager for cta mc" >> $jmscriptlog 2>&1
+         scripts=( "runsimtel" )
+         scriptscolname=( "fCorsikaSimtelArray" )
+         pnosweek=( ${pnosimtel[@]} )
+         pnoswe=( ${pnosimtelwe[@]} )
          break
          ;;
@@ -146 +153 @@
       #get total number of allowed process for current time
       hour=`date +%k`
-      totalpno=${pnototal[$hour]}
+      #totalpno=${pnototal[$hour]}
+      if [ ${pnototal[$hour]} -lt $totalmax ]
+      then
+         totalpno=${pnototal[$hour]}
+      else
+         totalpno=$totalmax
+      fi
+      
       #choose array according to the day of the week
       dayofweek=`date +%u`

trunk/MagicSoft/Mars/datacenter/scripts/setup

@@ -75 +75 @@
 sleeptimelimit=360 #360
 errorsleeptimedefault=60 #60
-max=42 #maximum number of processes
+max=42 #maximum number of processes for one script in case there are more than one and the others do not have anything to do
+totalmax=40 #maximum number of processes (total) overwrites pnototal(we) in case it is smaller
 
 #