|
From: <de...@us...> - 2012-10-30 15:26:52
|
Revision: 7830
http://fudaa.svn.sourceforge.net/fudaa/?rev=7830&view=rev
Author: deniger
Date: 2012-10-30 15:26:43 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
am?\195?\169lioration support format serafin dans Fudaa
Modified Paths:
--------------
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTarageMng.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacParameters.java
trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/telemac/TestJSerafin.java
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTarageMng.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTarageMng.java 2012-10-30 15:26:18 UTC (rev 7829)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTarageMng.java 2012-10-30 15:26:43 UTC (rev 7830)
@@ -23,7 +23,6 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluCommand;
@@ -39,7 +38,6 @@
import org.fudaa.dodico.mesure.EvolutionReguliereAbstract;
import org.fudaa.dodico.mesure.EvolutionReguliereInterface;
-import com.jhlabs.math.BlackFunction;
import com.memoire.fu.FuLog;
/**
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacParameters.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacParameters.java 2012-10-30 15:26:18 UTC (rev 7829)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/telemac/H2dTelemacParameters.java 2012-10-30 15:26:43 UTC (rev 7830)
@@ -371,7 +371,16 @@
public boolean isNodalPropertiesModifiable() {
return getNodalProperties() != null && !getNodalProperties().isEmpty();
}
+
+ boolean xyDoublePrecision;
+ public boolean isXyDoublePrecision() {
+ return xyDoublePrecision;
+ }
+
+
+
+
/**
* Mise a jour une seule fois.
*
Modified: trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/telemac/TestJSerafin.java
===================================================================
--- trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/telemac/TestJSerafin.java 2012-10-30 15:26:18 UTC (rev 7829)
+++ trunk/business/dodico-h2d/io/src/test/java/org/fudaa/dodico/telemac/TestJSerafin.java 2012-10-30 15:26:43 UTC (rev 7830)
@@ -189,13 +189,17 @@
final int nbTimeStep = initTimeStep + 100;
SerafinInterface newInter = new SerafinInterface() {
-
@Override
public boolean isVolumique() {
return r.isVolumique();
}
@Override
+ public boolean isXYdoublePrecision() {
+ return r.isXYdoublePrecision();
+ }
+
+ @Override
public boolean isElement(int _idx) {
return r.isElement(_idx);
}
@@ -222,7 +226,9 @@
@Override
public double getValue(int _numVariable, int _pasTemps, int _ptIdx) throws IOException {
- if (_pasTemps < initTimeStep) { return r.getValue(_numVariable, _pasTemps, _ptIdx); }
+ if (_pasTemps < initTimeStep) {
+ return r.getValue(_numVariable, _pasTemps, _ptIdx);
+ }
return Math.random();
}
@@ -243,7 +249,9 @@
@Override
public double getTimeStep(int _i) {
- if (_i < initTimeStep) return r.getTimeStep(_i);
+ if (_i < initTimeStep) {
+ return r.getTimeStep(_i);
+ }
return maxTime + (1 + _i - initTimeStep) * delta;
}
@@ -296,5 +304,4 @@
System.err.println(f2);
}
-
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|