ClustalO settings

[jabaws.git] / conf / Executable.properties

diff --git a/conf/Executable.properties b/conf/Executable.properties
index 7471956..7864ebf 100644 (file)
--- a/conf/Executable.properties
+++ b/conf/Executable.properties
@@ -74,13 +74,17 @@ clustalw.parameters.file=conf/settings/ClustalParameters.xml
 \r
 ######                 CLUSTAL OMEGA CONFIGURATION                ######\r
 local.clustalo.bin.windows=binaries/windows/clustalo/clustalo.exe\r
-local.clustalo.bin=binaries/src/clustalo/clustalo\r
-#cluster.clustalo.bin=/homes/pvtroshin/workspace/jaba2/binaries/src/clustalo/clustalo\r
+local.clustalo.bin=binaries/src/clustalo/src/clustalo\r
+cluster.clustalo.bin=/homes/pvtroshin/workspace/jaba2/binaries/src/clustalo/src/clustalo\r
 ## This parameters specifies the directory where the matrices files are stored   \r
-clustalo.presets.file=conf/settings/ClustalPresets.xml\r
-clustalo.parameters.file=conf/settings/ClustalParameters.xml\r
-#clustalo.limits.file=conf/settings/ClustalLimits.xml\r
-#clustalo.cluster.settings=-l h_cpu=24:00:00 -l h_vmem=6000M -l ram=6000M\r
+#clustalo.presets.file=conf/settings/ClustaloPresets.xml\r
+clustalo.parameters.file=conf/settings/ClustaloParameters.xml\r
+clustalo.limits.file=conf/settings/ClustaloLimits.xml\r
+## ClustalO can be executed on multiple CPUs if run on the cluster. \r
+## This parameter specifies the number of CPUs to use\r
+clustalo.cluster.cpunum=4\r
+## This reserves a slot with CPUNUM on the cluster for the task\r
+clustalo.cluster.settings=-q 64bit-pri.q -pe smp 4 -l h_vmem=1700M -l ram=1700M -l h_cpu=24:00:00  \r
 \r
 \r
 ######                 MUSCLE CONFIGURATION                 ######\r