November 2009 - Isis-fish-commits - mailman.cloud.codelutin.com

r2786 - isis-fish/trunk/src/main/assembly
by chatellier＠users.labs.libre-entreprise.org 30 Nov '09

30 Nov '09

Author: chatellier Date: 2009-11-30 10:48:26 +0000 (Mon, 30 Nov 2009) New Revision: 2786 Modified: isis-fish/trunk/src/main/assembly/go.bat Log: Am?\195?\169lioration du script de d?\195?\169marrage d'isis (bat) Modified: isis-fish/trunk/src/main/assembly/go.bat =================================================================== --- isis-fish/trunk/src/main/assembly/go.bat 2009-11-27 15:49:22 UTC (rev 2785) +++ isis-fish/trunk/src/main/assembly/go.bat 2009-11-30 10:48:26 UTC (rev 2786) @@ -3,17 +3,17 @@ if NOT "%R_HOME%"=="" GOTO rfound :norfound -echo R_HOME not found > debug.txt +echo [Script] R_HOME not found > debug.txt 2>&1 goto startisis :rfound -set Path=%Path%;%R_HOME%/bin +echo [Script] R_HOME found with value %R_HOME% > debug.txt 2>&1 goto startisis :startisis -echo Isis staring... -echo R_HOME = %R_HOME% > debug.txt -java -Xmx512M -Djava.library.path=jri -DR.type=jni -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 >> debug.txt 2>&1 +echo [Script] Isis starting... +echo [Script] Path = %Path% >> debug.txt 2>&1 +java -Xmx1024M -Djava.library.path=jri -DR.type=jni -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 >> debug.txt 2>&1 goto end :end

1 0

r2785 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 27 Nov '09

27 Nov '09

Author: chatellier Date: 2009-11-27 15:49:22 +0000 (Fri, 27 Nov 2009) New Revision: 2785 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java Log: Fix broken test on equation factors Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-11-27 15:48:52 UTC (rev 2784) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-11-27 15:49:22 UTC (rev 2785) @@ -293,14 +293,14 @@ public void testFactorPreScriptEquation() throws IOException, TemplateException, StorageException, TopiaException { // factor - Factor<Double,Double> factorEquation = new Factor<Double,Double>("test equation"); + Factor<Double,Double> factorEquation = new Factor<Double,Double>("test.equation.name"); EquationContinuousDomain domain1 = new EquationContinuousDomain(); domain1.setReferenceValue(3.0); domain1.setOperator("-"); domain1.setCoefficient(0.1); - domain1.setVariableName("PopulationEquation.K1"); + domain1.setVariableName("K1"); factorEquation.setDomain(domain1); - factorEquation.setPath("org.nuiton.equation1#testFactorPreScriptEquation"); + factorEquation.setPath("fr.ifremer.equation1#testFactorPreScriptEquation"); factorEquation.setValueForIdentifier(0.1); log.info("Script = " + domain1.getClass().getSimpleName()); @@ -325,10 +325,12 @@ log.info("Script = " + scriptContent); //Assert.assertTrue(scriptContent.indexOf("\"PopulationEquation.K1\", 0.68, \"-\"") != -1); - // FIXME important - // le nom doit être positionné par l'UI, pas ici !!! - Assert.assertTrue(scriptContent.indexOf("\"test equation.PopulationEquation.K1\", 0.68, \"-\"") != -1); + // le nom de la valeur de la variable n'apparait pas "en elle meme" + // dans le prescript, il y a seulement le nom + // du facteur. Charge à l'UI de savoir comment l'afficher + Assert.assertTrue(scriptContent.indexOf("\"test.equation.name\", 0.68, \"-\"") != -1); + Assert.assertTrue(scriptContent.indexOf("K1") == -1); } /**

1 0

r2784 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 27 Nov '09

27 Nov '09

Author: chatellier Date: 2009-11-27 15:48:52 +0000 (Fri, 27 Nov 2009) New Revision: 2784 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java Log: Fix stop condition for dependant plan generator thread Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-11-27 15:47:20 UTC (rev 2783) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-11-27 15:48:52 UTC (rev 2784) @@ -228,7 +228,7 @@ do { Thread.sleep(2000); } while (!subControl.isStopSimulationRequest() && - (subControl.getProgress() == 0 || control.getProgress() < control.getProgressMax()) + (subControl.getProgress() == 0 || subControl.getProgress() < subControl.getProgressMax()) && !SimulationStorage.exists(control.getId())); }

1 0

r2783 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 27 Nov '09

27 Nov '09

Author: chatellier Date: 2009-11-27 15:47:20 +0000 (Fri, 27 Nov 2009) New Revision: 2783 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: Do not do nuiton migration on caparmor Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-11-27 15:38:25 UTC (rev 2782) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-11-27 15:47:20 UTC (rev 2783) @@ -135,8 +135,6 @@ log.warn(_("Error during vcs initialisation"), eee); } - doNuitonMigration(); - if (log.isInfoEnabled()) { log.info(_("isisfish.launching", config.getElapsedTimeAsString())); } @@ -554,6 +552,12 @@ */ public static void launchUI() { if (config.isLaunchUI()) { + + // migration must be done in UI envirronement and + // must nerver be done in caparmor + // TODO set it here for now, ui is not displayed on caparmor + doNuitonMigration(); + // init simulater manager SimulationService.getService();

1 0

r2782 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 27 Nov '09

27 Nov '09

Author: chatellier Date: 2009-11-27 15:38:25 +0000 (Fri, 27 Nov 2009) New Revision: 2782 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Call with -1 for standalone simulations Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-11-27 15:34:58 UTC (rev 2781) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-11-27 15:38:25 UTC (rev 2782) @@ -872,7 +872,7 @@ // prescript uploaded, delete simulationPSBScript.delete(); - sendStartSimulationRequest(sshSession, simulationid, scriptRemotePath, 1); + sendStartSimulationRequest(sshSession, simulationid, scriptRemotePath, -1); } else {

1 0

r2781 - isis-fish/trunk/src/main/resources/templates/ssh
by chatellier＠users.labs.libre-entreprise.org 27 Nov '09

27 Nov '09

Author: chatellier Date: 2009-11-27 15:34:58 +0000 (Fri, 27 Nov 2009) New Revision: 2781 Modified: isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl Log: Retrait d'une } en trop Modified: isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2009-11-27 13:50:30 UTC (rev 2780) +++ isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2009-11-27 15:34:58 UTC (rev 2781) @@ -15,7 +15,7 @@ <#assign localsimulationoutput='${isistemp}simulation-${simulationid}_$PBS_ARRAY_INDEX-output.txt' /> <#else> <#assign localsimulationid='${simulationid}' /> - <#assign localsimulationzip='${simulationzip}}' /> + <#assign localsimulationzip='${simulationzip}' /> <#assign localsimulationresultzip='${simulationresultzip}' /> <#assign localsimulationprescript='${simulationprescript}' /> <#assign localsimulationoutput='${isistemp}simulation-${simulationid}-output.txt' />

1 0

r2780 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 27 Nov '09

27 Nov '09

Author: chatellier Date: 2009-11-27 13:50:30 +0000 (Fri, 27 Nov 2009) New Revision: 2780 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Remove non significant log message Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-11-27 13:08:17 UTC (rev 2779) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-11-27 13:50:30 UTC (rev 2780) @@ -593,7 +593,6 @@ if (launcher != null) { for (SimulatorLauncher l : executors.keySet()) { if (launcher == l) { - log.info(_("Add to %s queue", l)); SimulationExecutor executor = executors.get(l); executor.execute(job); return;

1 0

r2779 - isis-fish/trunk/src/main/resources/templates/prescript
by chatellier＠users.labs.libre-entreprise.org 27 Nov '09

27 Nov '09

Author: chatellier Date: 2009-11-27 13:08:17 +0000 (Fri, 27 Nov 2009) New Revision: 2779 Modified: isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl Log: Fix factor name in prescript Modified: isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl 2009-11-27 10:35:39 UTC (rev 2778) +++ isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl 2009-11-27 13:08:17 UTC (rev 2779) @@ -40,7 +40,8 @@ /* Factor : ${factor.name} */ <#-- Following is java instanceof equivalent --> <#if factor.domain.class.simpleName.equals("EquationContinuousDomain")> - context.setValue("${factor.name}.${factor.domain.variableName}", ${factor.value}, "${factor.domain.operator}"); + <#-- context.setValue("${factor.name}.${factor.domain.variableName}", ${factor.value}, "${factor.domain.operator}"); --> + context.setValue("${factor.name}", ${factor.value}, "${factor.domain.operator}"); <#else> <#assign value=factor.value /> <#assign serializedValue=beanUtils.convert(value)/>

1 0

r2778 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 27 Nov '09

27 Nov '09

Author: chatellier Date: 2009-11-27 10:35:39 +0000 (Fri, 27 Nov 2009) New Revision: 2778 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Fix standalone simulations. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2009-11-27 10:32:10 UTC (rev 2777) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2009-11-27 10:35:39 UTC (rev 2778) @@ -64,8 +64,10 @@ /** * La simulation doit être lancée seule, sinon les simulations sont * indépendantes et peuvent être lancées groupées. + * + * Default to {@code true}. */ - protected boolean standaloneSimulation; + protected boolean standaloneSimulation = true; /** * Simulation number in non standalone simulation. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-11-27 10:32:10 UTC (rev 2777) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-11-27 10:35:39 UTC (rev 2778) @@ -773,7 +773,7 @@ // set item additionnal informations SimulationItem itemN = subJobN.getItem(); - itemN.setStandaloneSimulation(true); // idependant plan + itemN.setStandaloneSimulation(false); // independant plan // - 1 because planContext.getNumber() is set to next simulation to generate itemN.setSimulationNumber(planContext.getNumber() - 1);

1 0

r2777 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 27 Nov '09

27 Nov '09

Author: chatellier Date: 2009-11-27 10:32:10 +0000 (Fri, 27 Nov 2009) New Revision: 2777 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Parameters has been swapped Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-11-27 10:12:49 UTC (rev 2776) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-11-27 10:32:10 UTC (rev 2777) @@ -871,8 +871,8 @@ // prescript uploaded, delete simulationPSBScript.delete(); - - sendStartSimulationRequest(sshSession, scriptRemotePath, simulationid, 1); + + sendStartSimulationRequest(sshSession, simulationid, scriptRemotePath, 1); } else {

1 0