June 2010 - Isis-fish-commits - mailman.cloud.codelutin.com

r3073 - isis-fish/branches
by bleny＠users.labs.libre-entreprise.org June 28, 2010

June 28, 2010

Author: bleny Date: 2010-06-28 11:48:31 +0000 (Mon, 28 Jun 2010) New Revision: 3073 Log: creating a branch to add the support for diswork Added: isis-fish/branches/3.3.0.4-disworksupport/

1 0

r3072 - isis-fish/trunk/src/main/resources/templates/ssh
by chatellier＠users.labs.libre-entreprise.org June 25, 2010

June 25, 2010

Author: chatellier Date: 2010-06-25 09:41:24 +0000 (Fri, 25 Jun 2010) New Revision: 3072 Log: Reduce memory (can't use more than 2Go in 32bits) Modified: isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl Modified: isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-06-25 07:57:06 UTC (rev 3071) +++ isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-06-25 09:41:24 UTC (rev 3072) @@ -5,7 +5,7 @@ #source /usr/share/modules/init/csh #module load java/1.6.0 -<#assign commonCommand="${javapath} -Xmx2500M -jar isis-fish*.jar --option launch.ui false --option perform.vcsupdate false --option perform.migration false --option perform.cron false" /> +<#assign commonCommand="${javapath} -Xmx2000M -jar isis-fish*.jar --option launch.ui false --option perform.vcsupdate false --option perform.migration false --option perform.cron false" /> <#if qsubmutiplejob> <#-- localsimulationid is short simulation id version --> <#assign localsimulationid='${simulationid}_$PBS_ARRAY_INDEX' />

1 0

r3071 - isis-fish/trunk/src/main/assembly
by chatellier＠users.labs.libre-entreprise.org June 25, 2010

June 25, 2010

Author: chatellier Date: 2010-06-25 07:57:06 +0000 (Fri, 25 Jun 2010) New Revision: 3071 Log: R_HOME/R.type is now displayed by isis himself :) Modified: isis-fish/trunk/src/main/assembly/go.bat Modified: isis-fish/trunk/src/main/assembly/go.bat =================================================================== --- isis-fish/trunk/src/main/assembly/go.bat 2010-06-18 16:17:03 UTC (rev 3070) +++ isis-fish/trunk/src/main/assembly/go.bat 2010-06-25 07:57:06 UTC (rev 3071) @@ -1,19 +1,5 @@ @echo off -if NOT "%R_HOME%"=="" GOTO rfound - -:norfound -echo [Script] R_HOME not found > debug.txt 2>&1 -goto startisis - -:rfound -echo [Script] R_HOME found with value %R_HOME% > debug.txt 2>&1 -goto startisis - -:startisis 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

r3070 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org June 18, 2010

June 18, 2010

Author: chatellier Date: 2010-06-18 16:17:03 +0000 (Fri, 18 Jun 2010) New Revision: 3070 Log: Add R.type properties Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-06-18 15:59:51 UTC (rev 3069) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-06-18 16:17:03 UTC (rev 3070) @@ -317,9 +317,10 @@ log.info("Java VM: " + System.getProperty("java.vm.name")); log.info("System arch: " + System.getProperty("os.arch")); log.info("R_HOME: " + System.getenv("R_HOME")); + log.info("R.type: " + System.getProperty("R.type")); log.info("PATH: " + System.getenv("PATH")); } - + // first load converter and matrixFactory initConvertersAndMatrixFactory();

1 0

r3069 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org June 18, 2010

June 18, 2010

Author: chatellier Date: 2010-06-18 15:59:51 +0000 (Fri, 18 Jun 2010) New Revision: 3069 Log: Add usefull system info in debug.txt file. Modified: isis-fish/trunk/changelog.txt Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-06-18 15:58:55 UTC (rev 3068) +++ isis-fish/trunk/changelog.txt 2010-06-18 15:59:51 UTC (rev 3069) @@ -1,5 +1,6 @@ isis-fish (3.3.0.4) stable; urgency=low + * Add more startup information in debug.txt file (arch, R_HOME, PATH) * Add 64bits jri native libraries * Fix dependant simulation plans execution (beforeSimulation/afterSimulation) * Reduce spaces in strategies edition

1 0

r3068 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org June 18, 2010

June 18, 2010

Author: chatellier Date: 2010-06-18 15:58:55 +0000 (Fri, 18 Jun 2010) New Revision: 3068 Log: Add usefull system info in debug.txt file. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-06-18 15:07:30 UTC (rev 3067) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-06-18 15:58:55 UTC (rev 3068) @@ -312,11 +312,12 @@ // i18n is not inited here if (log.isInfoEnabled()) { log.info("Starting Isis-Fish with args : " + java.util.Arrays.toString(args)); - StringBuilder builder = new StringBuilder(); - builder.append(SimpleDateFormat.getInstance().format(new java.util.Date())); - builder.append(" Java version: ").append(System.getProperty("java.runtime.version")); - builder.append(" Isis-fish version: ").append(IsisConfig.getVersion()); - log.info(builder.toString()); + log.info("Date: " + SimpleDateFormat.getInstance().format(new java.util.Date())); + log.info("Java version: " + System.getProperty("java.runtime.version")); + log.info("Java VM: " + System.getProperty("java.vm.name")); + log.info("System arch: " + System.getProperty("os.arch")); + log.info("R_HOME: " + System.getenv("R_HOME")); + log.info("PATH: " + System.getenv("PATH")); } // first load converter and matrixFactory

1 0

r3067 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org June 18, 2010

June 18, 2010

Author: chatellier Date: 2010-06-18 15:07:30 +0000 (Fri, 18 Jun 2010) New Revision: 3067 Log: Add 64bits jri windows dll and linux so Modified: isis-fish/trunk/changelog.txt Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-06-18 15:06:35 UTC (rev 3066) +++ isis-fish/trunk/changelog.txt 2010-06-18 15:07:30 UTC (rev 3067) @@ -1,5 +1,6 @@ isis-fish (3.3.0.4) stable; urgency=low + * Add 64bits jri native libraries * Fix dependant simulation plans execution (beforeSimulation/afterSimulation) * Reduce spaces in strategies edition * Fix parameter edition for non primitive types in user script (Double...)

1 0

r3066 - in isis-fish/trunk/src/main/assembly: . x64
by chatellier＠users.labs.libre-entreprise.org June 18, 2010

June 18, 2010

Author: chatellier Date: 2010-06-18 15:06:35 +0000 (Fri, 18 Jun 2010) New Revision: 3066 Log: Add 64bits jri windows dll and linux so Added: isis-fish/trunk/src/main/assembly/x64/ isis-fish/trunk/src/main/assembly/x64/jri.dll isis-fish/trunk/src/main/assembly/x64/libjri.so Modified: isis-fish/trunk/src/main/assembly/bin.xml Modified: isis-fish/trunk/src/main/assembly/bin.xml =================================================================== --- isis-fish/trunk/src/main/assembly/bin.xml 2010-06-18 10:05:57 UTC (rev 3065) +++ isis-fish/trunk/src/main/assembly/bin.xml 2010-06-18 15:06:35 UTC (rev 3066) @@ -56,5 +56,13 @@ <source>src/main/assembly/x86/libjri.so</source> <outputDirectory>jri</outputDirectory> </file> + <file> + <source>src/main/assembly/x64/jri.dll</source> + <outputDirectory>jri64</outputDirectory> + </file> + <file> + <source>src/main/assembly/x64/libjri.so</source> + <outputDirectory>jri64</outputDirectory> + </file> </files> </assembly> \ No newline at end of file Added: isis-fish/trunk/src/main/assembly/x64/jri.dll =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/assembly/x64/jri.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/assembly/x64/libjri.so =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/assembly/x64/libjri.so ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream

1 0

r3065 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org June 18, 2010

June 18, 2010

Author: chatellier Date: 2010-06-18 10:05:57 +0000 (Fri, 18 Jun 2010) New Revision: 3065 Log: Modification de la condition d'arret pour les plans indepandants (un peu dure a lire quand meme :( ) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 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 2010-06-17 12:15:54 UTC (rev 3064) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2010-06-18 10:05:57 UTC (rev 3065) @@ -229,10 +229,16 @@ SimulationControl subControl = subItem.getControl(); do { Thread.sleep(2000); + + // on boucle tant que: + // - la simulation n'a pas été arreté + // - la simulation n'est pas a 0 + // - la simulation n'est aps à la fin + // - la simulation n'existe pas localement } while (!subControl.isStopSimulationRequest() && - (subControl.getProgress() == 0 || subControl.getProgress() < subControl.getProgressMax()) - && !SimulationStorage.exists(subControl.getId())); - + (subControl.getProgress() == 0 || subControl.getProgress() < subControl.getProgressMax() + || !SimulationStorage.exists(subControl.getId()))); + // FIXME on fait manuellement le post simulation pour // plans dépendant if (!subControl.isStopSimulationRequest()) {

1 0

r3064 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org June 17, 2010

June 17, 2010

Author: chatellier Date: 2010-06-17 12:15:54 +0000 (Thu, 17 Jun 2010) New Revision: 3064 Log: Update mavenpom Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-06-17 12:07:56 UTC (rev 3063) +++ isis-fish/trunk/pom.xml 2010-06-17 12:15:54 UTC (rev 3064) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.1.3</version> + <version>2.1.5</version> </parent> <groupId>ifremer</groupId>

1 0