[Fudaa-svn-commit] SF.net SVN: fudaa:[4156] trunk/fudaa_devel/dodico/src/org/fudaa/dodico

[<cla...@us...>]

Revision: 4156
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4156&view=rev
Author:   clavreul
Date:     2008-11-03 18:37:26 +0000 (Mon, 03 Nov 2008)

Log Message:
-----------
dicos telemac v5p8 
albe derniere mise au point
prepro ef : interpolation des vecteurs

Modified Paths:
--------------
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/albe/DResultatsAlbe.java
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/ef/interpolation/EfInterpolator.java
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/albe/DResultatsAlbe.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/albe/DResultatsAlbe.java	2008-11-03 16:11:51 UTC (rev 4155)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/albe/DResultatsAlbe.java	2008-11-03 18:37:26 UTC (rev 4156)
@@ -350,6 +350,7 @@
     }
     catch (final FileNotFoundException _e2) {
       System.out.println("le fichier r\xE9sultats " + _nomFichier + " est introuvable.");
+      System.out.println("le chemin courant est : " + System.getProperties().get("user.dir") );
       System.out.println("V\xE9rifiez l'existance du sous-r\xE9pertoire tmp dans le r\xE9pertoire de Fudaa-Albe");
     }
     catch (final IOException _e1) {

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/ef/interpolation/EfInterpolator.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/ef/interpolation/EfInterpolator.java	2008-11-03 16:11:51 UTC (rev 4155)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/ef/interpolation/EfInterpolator.java	2008-11-03 18:37:26 UTC (rev 4156)
@@ -57,22 +57,23 @@
   }
 
   public double getValue(int _pt1, int _pt2, double _coef1, double _coef2, CtuluVariable _v, int _tIdx)
-      throws IOException {
-    if (isVect(_v)) {
+  throws IOException {
+	  //Interpolation sur les vecteurs - ca peut servir ulterieurement
+	  // if (isVect(_v)) {
 
-      CtuluVariable vx = vect_.getVxSafe(_v);
-      CtuluVariable vy = vect_.getVySafe(_v);;
-      double vx1 = data_.getData(vx, _tIdx, _pt1);
-      double vx2 = data_.getData(vx, _tIdx, _pt2);
-      double vy1 = data_.getData(vy, _tIdx, _pt1);
-      double vy2 = data_.getData(vy, _tIdx, _pt2);
-      double n = getMid(InterpolationVectorContainer.getNorme(vx1, vy1), InterpolationVectorContainer
-          .getNorme(vx2, vy2), _coef1, _coef2);
-      double t = getMid(InterpolationVectorContainer.getTheta(vx1, vy1), InterpolationVectorContainer
-          .getTheta(vx2, vy2), _coef1, _coef2);
-      return vect_.isVx(_v) ? InterpolationVectorContainer.getVx(n, t) : InterpolationVectorContainer.getVy(n, t);
-    }
-    return getMid(data_.getData(_v, _tIdx, _pt1), data_.getData(_v, _tIdx, _pt2), _coef1, _coef2);
+	  // CtuluVariable vx = vect_.getVxSafe(_v);
+	  // CtuluVariable vy = vect_.getVySafe(_v);;
+	  //  double vx1 = data_.getData(vx, _tIdx, _pt1);
+	  //  double vx2 = data_.getData(vx, _tIdx, _pt2);
+	  //  double vy1 = data_.getData(vy, _tIdx, _pt1);
+	  //  double vy2 = data_.getData(vy, _tIdx, _pt2);
+	  //  double n = getMid(InterpolationVectorContainer.getNorme(vx1, vy1), InterpolationVectorContainer
+	  //     .getNorme(vx2, vy2), _coef1, _coef2);
+	  // double t = getMid(InterpolationVectorContainer.getTheta(vx1, vy1), InterpolationVectorContainer
+	  //     .getTheta(vx2, vy2), _coef1, _coef2);
+	  // return vect_.isVx(_v) ? InterpolationVectorContainer.getVx(n, t) : InterpolationVectorContainer.getVy(n, t);
+	  //}
+	  return getMid(data_.getData(_v, _tIdx, _pt1), data_.getData(_v, _tIdx, _pt2), _coef1, _coef2);
 
   }
 

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java	2008-11-03 16:11:51 UTC (rev 4155)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java	2008-11-03 18:37:26 UTC (rev 4156)
@@ -31,10 +31,10 @@
   public final static TelemacDicoManager INSTANCE = new TelemacDicoManager();
 
   static {
-    final String[] versions = new String[] { "v5p4", "v5p5", "v5p6", "v5p7" };
+    final String[] versions = new String[] { "v5p4", "v5p5", "v5p6", "v5p7","v5p8" };
     final Map map = new HashMap(11);
     map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getArtemisId()), versions);
-    map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getEstel2dId()), new String[] { "v5p4", "v5p5", "v5p7" });
+    map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getEstel2dId()), new String[] { "v5p4", "v5p5", "v5p7","v5p8" });
     map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getPostel3dId()), versions);
     map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getSisypheId()), versions);
     map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getStbtelId()), versions);


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