Index: trunk/Mars/datacenter/scripts/setup.phido.fact.mc
===================================================================
--- trunk/Mars/datacenter/scripts/setup.phido.fact.mc	(revision 10038)
+++ trunk/Mars/datacenter/scripts/setup.phido.fact.mc	(revision 10039)
@@ -94,31 +94,18 @@
 
 
+#
 #setup for jobmanager
-sleeptime=60 #30
-sleeptimelimit=360 #360
-errorsleeptimedefault=60 #60
-max=200 #maximum number of processes for one script in case there are more than one and the others do not have anything to do
-totalmax=200 #maximum number of processes (total) overwrites pnototal(we) in case it is smaller
+#
+sleeptime=900 #900
 
-#
-# 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=(       200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 )
-pnototalwe=(     200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 )
-
-pnocorsika=(     200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 )
-pnocorsikawe=(   200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 200 )
+algorithm=1
+tosubmittotal=150 #150
+limitidle=10
 
 # set variables for jobmanager 
 scripts=( "runcorsika"  ) 
 scriptscolname=( "Corsika" ) 
-pnosweek=( ${pnocorsika[@]} ) 
-pnoswe=( ${pnocorsikawe[@]} ) 
+ratio=( 1 )
+maxjobs=( 800 )
 
 # settings for pbs
Index: trunk/Mars/datacenter/scripts/setup.wue.fact.mc
===================================================================
--- trunk/Mars/datacenter/scripts/setup.wue.fact.mc	(revision 10038)
+++ trunk/Mars/datacenter/scripts/setup.wue.fact.mc	(revision 10039)
@@ -84,42 +84,28 @@
 
 
+#
 #setup for jobmanager
-sleeptime=30 #30
+#
+sleeptime=600 #30
 sleeptimelimit=360 #360
 errorsleeptimedefault=60 #60
-max=20 #maximum number of processes for one script in case there are more than one and the others do not have anything to do
-totalmax=32 #maximum number of processes (total) overwrites pnototal(we) in case it is smaller
 
-#
-# 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
-# 
-
+algorithm=2
 #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=(       32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 )
 pnototalwe=(     32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 )
 
-pnocorsika=(     10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
-pnoceres=(       25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 )
-pnocallisto=(    32 32 32 32 32 30 30 18 18 20 20 20 20 20 20 20 20 20 20 18 18 30 30 32 )
-pnostar=(        20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
-
-pnocorsikawe=(   10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 )
-pnocereswe=(     25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 )
-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=(      20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 )
 
 # set variables for jobmanager 
 #scripts=( "runcorsika" "runceres" "runcallisto_mc" "runstar_mc" ) 
 #scriptscolname=( "Corsika" "Ceres" "Callisto" "Star" ) 
-#pnosweek=( ${pnocorsika[@]} ${pnoceres[@]} ${pnocallisto[@]} ${pnostar[@]} ) 
-#pnoswe=( ${pnocorsikawe[@]} ${pnocereswe[@]} ${pnocallistowe[@]} ${pnostarwe[@]} ) 
+#ratio=( 0.2 0.6 0.1 0.1 )
+#maxjobs=( 20 20 25 25 )
 
 scripts=( "runceres" "runcallisto_mc" "runstar_mc" ) 
 scriptscolname=( "Ceres" "Callisto" "Star" ) 
-pnosweek=( ${pnoceres[@]} ${pnocallisto[@]} ${pnostar[@]} ) 
-pnoswe=( ${pnocereswe[@]} ${pnocallistowe[@]} ${pnostarwe[@]} ) 
+ratio=( 0.6 0.2 0.2 )
+maxjobs=( 30 25 25 )
 
+# further wishlist: adapt ratio automatically
+