[Fudaa-svn-commit] SF.net SVN: fudaa:[3786] trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/ sinavi3/Sinavi3Implementation.java

[<fa...@us...>]

Revision: 3786
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3786&view=rev
Author:   fargeix
Date:     2008-08-12 15:47:33 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
Connexion au serveur sinavi

Modified Paths:
--------------
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Implementation.java

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Implementation.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Implementation.java	2008-08-12 15:46:15 UTC (rev 3785)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Implementation.java	2008-08-12 15:47:33 UTC (rev 3786)
@@ -2371,56 +2371,64 @@
 	 
 	 final String os = System.getProperty("os.name");
 	    final String path = cheminServeur();
+	    final SParametresSinavi32 par = (SParametresSinavi32)projet_.getParam("parametres");
+	    int graineEnCours=par.donneesGenerales.graine;
+	    int dureeEnCours = par.donneesGenerales.nombreJours;
 	    System.out.println("**\nLe chemin des serveurs est:\n "+path+" \n**");
 	    try {
 	      String[] cmd;
 	      
 	      if (os.startsWith("Windows")) {
-	        cmd = new String[2];
-	        if(progFortran==0)
-	        	cmd[0] = path + "bin" + "\\win\\sinaviGenarr_win.exe";
-	        else
-	        	cmd[0] = path + "bin" + "\\win\\sinavi_win.exe";
-	      //  cmd[1] = path + "bin" + "\\win\\";
-	        cmd[1] = nomEtude;
+	    	  cmd = new String[4];
+	    	  if(progFortran==0)
+	    		  cmd[0] = path + "bin" + "\\win\\sinaviGenarr_win.exe";
+	    	  else
+	    		  cmd[0] = path + "bin" + "\\win\\sinavi_win.exe";
+
+	    	  //  cmd[1] = path + "bin" + "\\win\\";
+	    	  cmd[1] = nomEtude;
+	    	  cmd[2]= Integer.toString(dureeEnCours);
+	    	  cmd[3]= Integer.toString(graineEnCours);
 	      } else {
-	    	 // System.out.println("* yo 2 *");
-	        cmd = new String[2];
-	        if(progFortran==0)
-	        	cmd[0] = path + "bin" + "/linux/sinaviGenarr_linux.x";
-	        else
-	        	cmd[0] = path + "bin" + "/linux/sinavi_linux.x";
-	        //cmd[1] = path + "bin" + "/linux/";
-	        cmd[1] = nomEtude;
-	          }
+	    	  // System.out.println("* yo 2 *");
+	    	  cmd = new String[2];
+	    	  if(progFortran==0)
+	    		  cmd[0] = path + "bin" + "/linux/sinaviGenarr_linux.x";
+	    	  else
+	    		  cmd[0] = path + "bin" + "/linux/sinavi_linux.x";
+	    	  //cmd[1] = path + "bin" + "/linux/";
+	    	  cmd[1] = nomEtude;
+	    	  cmd[2]= Integer.toString(dureeEnCours);
+	    	  cmd[3]= Integer.toString(graineEnCours);
+	      }
 	      System.out.println("**\nLa commande ex\xE9cut\xE9e est: \n "+cmd[0] + " " + cmd[1] +"\n**");
-			
-	      
+
+
 	      try {
-	        final CExec ex = new CExec();
-	        ex.setCommand(cmd);
-	        ex.setOutStream(System.out);
-	        ex.setErrStream(System.err);
-	        ex.exec();
+	    	  final CExec ex = new CExec();
+	    	  ex.setCommand(cmd);
+	    	  ex.setOutStream(System.out);
+	    	  ex.setErrStream(System.err);
+	    	  ex.exec();
 	      }
 	      catch (final Throwable _e1) {
-	        System.out.println("Erreur rencontr\xE9e lors de l'execution du code de calcul");
-	        _e1.printStackTrace();
-	        new BuDialogError(this.getApp(),isSinavi_,"Erreur rencontr\xE9e lors de l'execution du code de calcul").activate();
-	        return false;
+	    	  System.out.println("Erreur rencontr\xE9e lors de l'execution du code de calcul");
+	    	  _e1.printStackTrace();
+	    	  new BuDialogError(this.getApp(),isSinavi_,"Erreur rencontr\xE9e lors de l'execution du code de calcul").activate();
+	    	  return false;
 	      }
 	     
 	    }
 	    catch (final Exception ex) {
-	      System.out.println("Erreur lors de l'execution du code de calcul");
-	      if(progFortran==0)
-	      new BuDialogMessage(this.getApp(),isSinavi_,"Impossible d'executer le g\xE9n\xE9rateur de navire genarr").activate();
-	      else
-	    	  new BuDialogMessage(this.getApp(),isSinavi_,"Impossible d'executer le noyau de calcul Sinavi").activate();
-	      return false;
+	    	System.out.println("Erreur lors de l'execution du code de calcul");
+	    	if(progFortran==0)
+	    		new BuDialogMessage(this.getApp(),isSinavi_,"Impossible d'executer le g\xE9n\xE9rateur de navire genarr").activate();
+	    	else
+	    		new BuDialogMessage(this.getApp(),isSinavi_,"Impossible d'executer le noyau de calcul Sinavi").activate();
+	    	return false;
 	    }
-	 
-	 return true;
+
+	    return true;
  }
   
   


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.