From: pvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Date: Tue, 21 Jun 2011 12:29:09 +0000 (+0000)
Subject: Revert multithreading support for mafft as it does not seem to work
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=65ae3bb2e2811bad1a86bf0f87522f88d7ca1542;p=jabaws.git

Revert multithreading support for mafft as it does not seem to work

git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4295 e3abac25-378b-4346-85de-24260fe3988d
---

diff --git a/conf/Executable.properties b/conf/Executable.properties
index 2c82b95..7ee672f 100644
--- a/conf/Executable.properties
+++ b/conf/Executable.properties
@@ -36,8 +36,7 @@ mafft.--aamatrix.path=binaries/matrices
 mafft.presets.file=conf/settings/MafftPresets.xml
 mafft.parameters.file=conf/settings/MafftParameters.xml
 mafft.limits.file=conf/settings/MafftLimits.xml
-mafft.cluster.cpunum=4
-mafft.cluster.settings=-q 64bit-pri.q -pe smp 4 -l h_cpu=24:00:00 -l h_vmem=1700M -l ram=1700M
+mafft.cluster.settings=-l h_cpu=24:00:00 -l h_vmem=6000M -l ram=6000M
 
 
 ### Tcoffee configuration ###