From: Sasha Sherstnev Date: Thu, 8 Aug 2013 12:13:30 +0000 (+0100) Subject: uncomment limit files in order to make some tests successful X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=586d8e952170d31e57f15f06373c02893a7692e5;p=jabaws.git uncomment limit files in order to make some tests successful --- diff --git a/conf/Executable.properties b/conf/Executable.properties index 11a4f24..95b969b 100644 --- a/conf/Executable.properties +++ b/conf/Executable.properties @@ -61,7 +61,7 @@ ########################################################################################### -# CLUSTAL CONFIGURATION # +# CLUSTAL W CONFIGURATION # ########################################################################################### local.clustalw.bin.windows = binaries/windows/clustalw2.exe local.clustalw.bin = binaries/src/clustalw/src/clustalw2 @@ -70,7 +70,7 @@ local.clustalw.bin = binaries/src/clustalw/src/clustalw2 clustalw.-matrix.path = binaries/matrices clustalw.presets.file = conf/settings/ClustalPresets.xml clustalw.parameters.file = conf/settings/ClustalParameters.xml -#clustalw.limits.file = conf/settings/ClustalLimits.xml +clustalw.limits.file = conf/settings/ClustalLimits.xml #clustalw.cluster.settings =-l h_cpu=24:00:00 -l ram=6000M @@ -83,7 +83,7 @@ local.clustalo.bin = binaries/src/clustalo/src/clustalo ### This parameter specifies the directory where the matrices files are stored #clustalo.presets.file = conf/settings/ClustaloPresets.xml clustalo.parameters.file = conf/settings/ClustaloParameters.xml -#clustalo.limits.file = conf/settings/ClustaloLimits.xml +clustalo.limits.file = conf/settings/ClustaloLimits.xml ### ClustalO can be run on multiple CPUs on the cluster. This parameter specifies CPU #NN clustalo.cluster.cpunum = 4 ### This reserves a slot with CPUNUM on the cluster for the task @@ -100,7 +100,7 @@ local.muscle.bin = binaries/src/muscle/muscle muscle.-matrix.path = binaries/matrices muscle.presets.file = conf/settings/MusclePresets.xml muscle.parameters.file = conf/settings/MuscleParameters.xml -#muscle.limits.file = conf/settings/MuscleLimits.xml +muscle.limits.file = conf/settings/MuscleLimits.xml #muscle.cluster.settings = -l h_cpu=24:00:00 -l ram=6000M @@ -115,7 +115,7 @@ mafft.bin.env = MAFFT_BINARIES#binaries/src/mafft/binaries;FASTA_4_MAFF 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.limits.file = conf/settings/MafftLimits.xml #mafft.cluster.settings = -l h_cpu=24:00:00 -l ram=6000M @@ -128,7 +128,7 @@ local.tcoffee.bin = binaries/src/tcoffee/t_coffee_source/t_coffee tcoffee.bin.env = HOME_4_TCOFFEE#jobsout; tcoffee.presets.file = conf/settings/TcoffeePresets.xml tcoffee.parameters.file = conf/settings/TcoffeeParameters.xml -#tcoffee.limits.file = conf/settings/TcoffeeLimits.xml +tcoffee.limits.file = conf/settings/TcoffeeLimits.xml ### Tcoffee can be executed on multiple CPUs if run on the cluster. This parameter defines CPUs #N #tcoffee.cluster.cpunum = 4 ### This paramer defines queue setting with CPUNUM on the cluster @@ -141,7 +141,7 @@ tcoffee.parameters.file = conf/settings/TcoffeeParameters.xml local.probcons.bin = binaries/src/probcons/probcons #cluster.probcons.bin = /home/jabaws/binaries/src/probcons/probcons probcons.parameters.file = conf/settings/ProbconsParameters.xml -#probcons.limits.file = conf/settings/ProbconsLimits.xml +probcons.limits.file = conf/settings/ProbconsLimits.xml ### This parameter defines queue settings for PROBCON on the cluster #probcons.cluster.settings = -l h_cpu=24:00:00 -l ram=6000M @@ -155,7 +155,7 @@ probcons.parameters.file = conf/settings/ProbconsParameters.xml #local.jronn.bin = /sw/java/latest/bin/java #cluster.jronn.bin = /sw/java/latest/bin/java jronn.jar.file = binaries/windows/bj3.0.4p-jronn.jar -#jronn.limits.file = conf/settings/JronnLimits.xml +jronn.limits.file = conf/settings/JronnLimits.xml ## Jronn can use multiple CPUs. This parameter specifies the number of CPUs #jronn.cluster.cpunum = 4 ### This reserves a slot with CPUNUM on the cluster for the task @@ -167,7 +167,7 @@ jronn.jar.file = binaries/windows/bj3.0.4p-jronn.jar ########################################################################################### local.disembl.bin = binaries/src/disembl/DisEMBL.py #cluster.disembl.bin = /home/jabaws/binaries/src/disembl/DisEMBL.py -#disembl.limits.file = conf/settings/DisemblLimits.xml +disembl.limits.file = conf/settings/DisemblLimits.xml #disembl.cluster.settings = -l h_cpu=24:00:00 -l ram=6000M @@ -191,7 +191,7 @@ local.iupred.bin = binaries/src/iupred/iupred iupred.bin.env = IUPred_PATH#binaries/src/iupred #cluster.iupred.bin = /home/jabaws/binaries/src/iupred/iupred iupred.parameters.file = conf/settings/IUPredParameters.xml -#iupred.limits.file = conf/settings/IUPredLimits.xml +iupred.limits.file = conf/settings/IUPredLimits.xml #iupred.cluster.settings = -l h_cpu=24:00:00 -l ram=6000M @@ -206,7 +206,7 @@ iupred.parameters.file = conf/settings/IUPredParameters.xml aacon.jar.file = binaries/windows/aaconservation.jar aacon.parameters.file = conf/settings/AAConParameters.xml aacon.presets.file = conf/settings/AAConPresets.xml -#aacon.limits.file = conf/settings/AAConLimits.xml +aacon.limits.file = conf/settings/AAConLimits.xml ### AACon can use multiple CPUs. This parameter defines the number of CPUs: #aacon.cluster.cpunum = 4 ### This parameter defines queue settings for AACON on the cluster