[Fudaa-svn-commit] SF.net SVN: fudaa:[7547] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr/post

[<de...@us...>]

Revision: 7547
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7547&view=rev
Author:   deniger
Date:     2012-08-14 00:25:15 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceComparator.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceProjected.java

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceComparator.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceComparator.java	2012-08-14 00:14:01 UTC (rev 7546)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceComparator.java	2012-08-14 00:25:15 UTC (rev 7547)
@@ -143,7 +143,7 @@
   @Override
   public EfData getInitData(final int _varIdx, final int _timeIdx) {
     H2dVariableType src = srcVariable_[_varIdx];
-    final EfData refData = ref_.getData(src, _timeIdx);
+    EfData refData = ref_.getData(src, _timeIdx);
     if (compVar_ != null && compVar_.containsKey(src)) {
       src = (H2dVariableType) compVar_.get(src);
     }
@@ -155,7 +155,7 @@
       if (refData.isElementData()) {
         projData = EfLib.getElementDataDanger(projData, proj_.getGrid());
       } else {
-        projData = proj_.getGrid().getNeighbors().getDataNodeSimple(projData);
+        refData = EfLib.getElementDataDanger(refData, ref_.getGrid());
       }
     }
 

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceProjected.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceProjected.java	2012-08-14 00:14:01 UTC (rev 7546)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceProjected.java	2012-08-14 00:25:15 UTC (rev 7547)
@@ -267,13 +267,14 @@
     final double[] res = new double[nbDestSupport];
     final boolean srcIsRubar = srcInit_.containsElementVar();
     EfData datas = srcInit_.getData(_varIdx, _srcTimeIdx);
+    if (datas == null) {
+      throw new IOException(DodicoLib.getS("Fichier invalide"));
+    }
     //for rubar, all values must be defined on meshes:
     if (srcIsRubar && !datas.isElementData()) {
       datas = EfLib.getElementDataDanger(datas, srcInit_.getGrid());
     }
-    if (datas == null) {
-      throw new IOException(DodicoLib.getS("Fichier invalide"));
-    }
+
     final EfGridInterface srcGrid = srcInit_.getGrid();
     for (int i = 0; i < nbDestSupport; i++) {
       /*

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