add disembl limits

[jabaws.git] / conf / Executable.properties

diff --git a/conf/Executable.properties b/conf/Executable.properties
index 0a9b5cd..4b1cb00 100644 (file)
--- a/conf/Executable.properties
+++ b/conf/Executable.properties
@@ -43,6 +43,8 @@ cluster.tcoffee.bin=/homes/pvtroshin/workspace/jaba2/binaries/src/tcoffee/t_coff
 #/sw/bin/t_coffee\r
 # Sub matrix support does not work \r
 #tcoffee.-matrix.path=binaries/matrices\r
+# This variable is required by tcoffee\r
+tcoffee.bin.env=HOME_4_TCOFFEE#jobsout;\r
 tcoffee.presets.file=conf/settings/TcoffeePresets.xml\r
 tcoffee.parameters.file=conf/settings/TcoffeeParameters.xml\r
 tcoffee.limits.file=conf/settings/TcoffeeLimits.xml\r
@@ -70,10 +72,21 @@ jronn.cluster.cpunum=4
 jronn.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
-### Disembl configuration - NOT DISTRIBUTED ### \r
+### Disembl configuration Tisean - Disembl dependancy cannot be redistributed (!) ### \r
 #local.disembl.bin.windows= \r
-local.disembl.bin=/homes/pvtroshin/soft/DisEMBL-1.4raw/DisEMBL.py\r
-cluster.disembl.bin=/homes/pvtroshin/soft/DisEMBL-1.4raw/DisEMBL.py\r
-#disembl.parameters.file=conf/settings/JronnParameters.xml\r
-disembl.limits.file=conf/settings/JronnLimits.xml\r
+local.disembl.bin=binaries/src/disembl/DisEMBL.py\r
+cluster.disembl.bin=/homes/pvtroshin/jaba2/binaries/src/disembl/DisEMBL.py\r
+disembl.parameters.file=conf/settings/DisemblParameters.xml\r
+disembl.limits.file=conf/settings/DisemblLimits.xml\r
 disembl.cluster.settings=-l h_cpu=24:00:00 -l h_vmem=6000M -l ram=6000M\r
+\r
+### AACon configuration ###\r
+local.aacon.bin.windows=D:\\Java\\jdk1.6.0_14\\bin\\java.exe \r
+local.aacon.bin=/sw/java/latest/bin/java\r
+cluster.aacon.bin=/sw/java/latest/bin/java\r
+aacon.jar.file=binaries/aaconservation.jar\r
+aacon.parameters.file=conf/settings/AAConParameters.xml\r
+aacon.presets.file=conf/settings/AAConPresets.xml\r
+aacon.limits.file=conf/settings/AAConLimits.xml\r
+#TODO jronn.jvm.options=-Xms32M -Xmx512M\r
+aacon.cluster.cpunum=4\r