summaryrefslogtreecommitdiff
path: root/environment
diff options
context:
space:
mode:
authorChris Dyer <redpony@gmail.com>2014-09-07 13:57:52 -0400
committerChris Dyer <redpony@gmail.com>2014-09-07 13:57:52 -0400
commit2bc24dd0f10e2acbad118d5fce5aecdff6a90764 (patch)
tree99a79b38f1c293f299522c0ff080c045b346b179 /environment
parentb40c064987b1fb188daf040a068a459711385eac (diff)
parentf33ab2ff3f1cf135ffb80721e1f4d71d124bc8f9 (diff)
Merge pull request #50 from pks/master
alignment features, PassThroughN features, dtrain update, mira qsub, and pro fix
Diffstat (limited to 'environment')
-rw-r--r--environment/LocalConfig.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/environment/LocalConfig.pm b/environment/LocalConfig.pm
index 4fa0ab74..29a1cbea 100644
--- a/environment/LocalConfig.pm
+++ b/environment/LocalConfig.pm
@@ -69,10 +69,10 @@ my $CCONFIG = {
# 'DefaultJobs' => 12,
# },
'cluster.cl.uni-heidelberg.de' => {
- 'HOST_REGEXP' => qr/node25/,
+ 'HOST_REGEXP' => qr/(node\d\d\.cluster\.lan|cluster\.cl\.uni-heidelberg\.de)/i,
'JobControl' => 'qsub',
- 'QSubMemFlag' => '-l h_vmem=',
- 'DefaultJobs' => 13,
+ 'QSubMemFlag' => '-l mem_free=',
+ 'DefaultJobs' => 14,
},
'LOCAL' => { # LOCAL must be last in the list!!!
'HOST_REGEXP' => qr//,