Author: chatellier Date: 2009-11-12 17:15:10 +0000 (Thu, 12 Nov 2009) New Revision: 2753 Modified: isis-fish/branches/isis-fish-3.2.0.8/changelog.txt isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-qsub.seq Log: Increase heap memory for non AS simulation too Modified: isis-fish/branches/isis-fish-3.2.0.8/changelog.txt =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/changelog.txt 2009-11-12 16:07:02 UTC (rev 2752) +++ isis-fish/branches/isis-fish-3.2.0.8/changelog.txt 2009-11-12 17:15:10 UTC (rev 2753) @@ -1,3 +1,10 @@ +isis-fish (3.2.0.10) stable; urgency=high + + * Increase default java memory for caparmor jobs (2Go) + * Fix a problem with dependant plans not bloqued on current simulation + + -- jeu. nov. 12 18:05:49 CET 2009 + isis-fish (3.2.0.9) stable; urgency=high * Add file redirection in caparmor simulation launch scripts @@ -2,3 +9,3 @@ --- mer. oct. 21 14:27:05 CEST 2009 + -- mer. oct. 21 14:27:05 CEST 2009 @@ -9,7 +16,7 @@ * Fix compilation directory per simulation problem (aspect were defined before simulation context definition) --- mar. oct. 20 12:21:46 CEST 2009 + -- mar. oct. 20 12:21:46 CEST 2009 isis-fish (3.2.0.7) stable; urgency=low Modified: isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-qsub.seq =================================================================== --- isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-qsub.seq 2009-11-12 16:07:02 UTC (rev 2752) +++ isis-fish/branches/isis-fish-3.2.0.8/src/main/resources/templates/ssh/isis-launch-with-qsub.seq 2009-11-12 17:15:10 UTC (rev 2753) @@ -6,7 +6,7 @@ module load java/1.6.0 <#if simulationprescript?length > 0> -/home3/caparmor/poussin/jdk1.6.0_13/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false --simulateRemotellyWithPreScript "${simulationid}" "${simulationzip}" "${simulationresultzip}" "${simulationprescript}" >& "${isistemp}output-${simulationid}" +/home3/caparmor/poussin/jdk1.6.0_13/bin/java -Xmx2000M -jar isis-fish*.jar --option launch.ui false --simulateRemotellyWithPreScript "${simulationid}" "${simulationzip}" "${simulationresultzip}" "${simulationprescript}" >& "${isistemp}output-${simulationid}" <#else> -/home3/caparmor/poussin/jdk1.6.0_13/bin/java -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" >& "${isistemp}output-${simulationid}" +/home3/caparmor/poussin/jdk1.6.0_13/bin/java -Xmx2000M -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" >& "${isistemp}output-${simulationid}" </#if> \ No newline at end of file