From: pvtroshin Date: Tue, 16 Aug 2011 13:22:10 +0000 (+0000) Subject: Minor changes X-Git-Url: http://source.jalview.org/gitweb/?p=jabaws.git;a=commitdiff_plain;h=7d95ae4c69a42a125d385912a49b31b38ac99e3b Minor changes git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4526 e3abac25-378b-4346-85de-24260fe3988d --- diff --git a/TODO.txt b/TODO.txt index 03ad987..4dc9f9b 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,4 +1,7 @@ -server war - obtaining command line binaries +reset execution statistic in VM! + ++ regerate javadoc ++ server war - obtaining command line binaries Write help on + execution stats diff --git a/conf/Executable.properties b/conf/Executable.properties index ec1b885..dcb5d5a 100644 --- a/conf/Executable.properties +++ b/conf/Executable.properties @@ -75,16 +75,16 @@ clustalw.parameters.file=conf/settings/ClustalParameters.xml ###### CLUSTAL OMEGA CONFIGURATION ###### local.clustalo.bin.windows=binaries/windows/clustalo/clustalo.exe local.clustalo.bin=binaries/src/clustalo/src/clustalo -cluster.clustalo.bin=/homes/pvtroshin/workspace/jaba2/binaries/src/clustalo/src/clustalo +#cluster.clustalo.bin=/homes/pvtroshin/workspace/jaba2/binaries/src/clustalo/src/clustalo ## This parameters 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 executed on multiple CPUs if run on the cluster. ## This parameter specifies the number of CPUs to use -clustalo.cluster.cpunum=4 +#clustalo.cluster.cpunum=4 ## This reserves a slot with CPUNUM on the cluster for the task -clustalo.cluster.settings=-q 64bit-pri.q -pe smp 4 -l ram=1700M -l h_cpu=24:00:00 +#clustalo.cluster.settings=-q 64bit-pri.q -pe smp 4 -l ram=1700M -l h_cpu=24:00:00 ###### MUSCLE CONFIGURATION ###### diff --git a/website/download.html b/website/download.html index 4cf7605..5feb188 100644 --- a/website/download.html +++ b/website/download.html @@ -107,7 +107,7 @@ page -