[Fudaa-svn-commit] SF.net SVN: fudaa:[8547] trunk/soft/fudaa-mascaret/server/src/main/java/org /fudaa/dodico/hydraulique1d/metier

[<bma...@us...>]

Revision: 8547
          http://sourceforge.net/p/fudaa/svn/8547
Author:   bmarchan
Date:     2013-12-12 10:22:45 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
Mascaret : Fix plantage sur calcul des resultats sedmientaires moyenn?\195?\169s si manque des variables hydrau

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsTemporelSpatial.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsTemporelSpatial.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsTemporelSpatial.java	2013-12-12 09:51:37 UTC (rev 8546)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsTemporelSpatial.java	2013-12-12 10:22:45 UTC (rev 8547)
@@ -478,12 +478,13 @@
     
     return true;
   }
-  
+
   /**
    * 
    * @param _var Variable dont on veut r\xE9cuperer les r\xE9sultats.
    * @return Un tableau \xE0 3 dimensions [nbbief][nbtps][nbsect], repr\xE9sentant les
-   *         r\xE9sultats pour la variable en entr\xE9e
+   *         r\xE9sultats pour la variable en entr\xE9e, ou null s'ils n'y a pas de
+   *         r\xE9sultats pour la variable.
    */
   public double[][][] getResultsVariable(MetierDescriptionVariable _var) {
     int ind=getIndiceVariable(_var.nom());

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java	2013-12-12 09:51:37 UTC (rev 8546)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java	2013-12-12 10:22:45 UTC (rev 8547)
@@ -107,6 +107,7 @@
       int nbTps=res_.valPas().length;
       
       double[][][] vals=res_.getResultsVariable(_var);
+      if (vals==null) return;
 
       double[][][] moyVals = new double[nbBief][nbTps][];
       for (int ibief = 0; ibief < nbBief; ibief++) {

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