Changeset 9075 for trunk/MagicSoft/Mars

Timestamp:

08/04/08 10:08:03 (16 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2008/08/04 Daniela Dorner
+
+   * datacenter/scripts/setup:
+     - changed order of scripts (now: ganymed, star, callisto)
+     - adapted number of allowed processes (more CPUs available now)
+
+
 
  2008/08/03 Daniela Dorner

trunk/MagicSoft/Mars/datacenter/scripts/setup

@@ -20 +20 @@
 #   Author(s): Daniela Dorner  05/2005 <mailto:dorner@astro.uni-wuerzburg.de>
 #
-#   Copyright: MAGIC Software Development, 2000-2007
+#   Copyright: MAGIC Software Development, 2000-2008
 #
 #
@@ -66 +66 @@
 sleeptimelimit=360 #360
 errorsleeptimedefault=60 #60
-max=18 #maximum number of processes
+#max=18 #maximum number of processes
+max=42 #maximum number of processes
 
 #scripts=( "runcallisto" "runstar" "runganymed" "dodatacheck" )
 #scriptscolname=( "fCallisto" "fStar" "fGanymed" "fDataCheckDone" )
-datascripts=( "runcallisto" "runstar" "runganymed" )
-datascriptscolname=( "fCallisto" "fStar" "fGanymed" )
+#datascripts=( "runcallisto" "runstar" "runganymed" )
+#datascriptscolname=( "fCallisto" "fStar" "fGanymed" )
+datascripts=( "runganymed" "runstar" "runcallisto" )
+datascriptscolname=( "fGanymed" "fStar" "fCallisto" )
+
+#
+# FIXME: 
+# max anz an prozessen setzen
+# besser Verhaeltnis zwischen den Prozessen und das am besten noch 
+# automatisch anpassen 
+# evtl noch maximale anz an callistos setzen
+# 
 
 #hour:            0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
-pnototal=(       26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26)
-pnototalwe=(     26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26)
+pnototal=(       42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 )
+pnototalwe=(     42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 )
 
-pnocallisto=(    12 12 12 12 12 10 10  9  9  8  8  8  8  8  8  8  8  8  8  9  9 10 10 12 )
-pnostar=(         8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8 )
-pnoganymed=(      4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4 )
+pnocallisto=(    32 32 32 32 32 20 20 18 18 12 12 12 12 12 12 12 12 12 12 18 18 20 20 32 )
+pnostar=(        10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
+pnoganymed=(      7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7 )
 #pnodatacheck=(   20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
 
-pnocallistowe=(  12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 )
-pnostarwe=(       8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8 )
-pnoganymedwe=(    4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4 )
+pnocallistowe=(  32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 )
+pnostarwe=(      10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
+pnoganymedwe=(    7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7  7 )
 #pnodatacheckwe=( 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
 
 #pnosweek=( ${pnocallisto[@]} ${pnostar[@]} ${pnoganymed[@]} ${pnodatacheck[@]} )
 #pnoswe=( ${pnocallistowe[@]} ${pnostarwe[@]} ${pnoganymedwe[@]} ${pnodatacheckwe[@]} )
-pnosweek=( ${pnocallisto[@]} ${pnostar[@]} ${pnoganymed[@]} )
-pnoswe=( ${pnocallistowe[@]} ${pnostarwe[@]} ${pnoganymedwe[@]} )
+#pnosweek=( ${pnocallisto[@]} ${pnostar[@]} ${pnoganymed[@]} )
+#pnoswe=( ${pnocallistowe[@]} ${pnostarwe[@]} ${pnoganymedwe[@]} )
+pnosweek=( ${pnoganymed[@]} ${pnostar[@]} ${pnocallisto[@]} )
+pnoswe=( ${pnoganymedwe[@]} ${pnostarwe[@]} ${pnocallistowe[@]} )
 
 # values for mc production