[Fudaa-svn-commit] SF.net SVN: fudaa:[8864] trunk/business/dodico-h2d/io/src/main/java/org/ fudaa/dodico/telemac

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

Revision: 8864
          http://sourceforge.net/p/fudaa/svn/8864
Author:   deniger
Date:     2014-10-09 20:18:51 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
upgrade de versions

Modified Paths:
--------------
    trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/TelemacDicoManager.java
    trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac2dv7p0.java

Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/TelemacDicoManager.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/TelemacDicoManager.java	2014-10-09 19:56:29 UTC (rev 8863)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/TelemacDicoManager.java	2014-10-09 20:18:51 UTC (rev 8864)
@@ -43,7 +43,7 @@
     final Map map = new HashMap(11);
     map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getArtemisId()), versions);
     map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getEstel2dId()), new String[]{
-              "v5p9", "v6p0"});
+      "v5p9", "v6p0"});
     map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getPostel3dId()), new String[]{
       "v5p9", "v6p0", "v6p2", "v6p3"});
     map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getSisypheId()), versions);
@@ -108,17 +108,17 @@
    * @return une version de telemac 2d.
    */
   public Telemac2dFileFormat.TelemacVersion createTelemac2dVersionImpl(final Telemac2dFileFormat _ft,
-                                                                       final DicoModelAbstract _dico, final int _language) {
+          final DicoModelAbstract _dico, final int _language) {
     return _ft.createVersion(_dico);
   }
 
   public TelemacDicoFileFormatVersion createTelemacVersionImpl(final Telemac2dFileFormat _ft,
-                                                               final DicoModelAbstract _dico, final int _language) {
+          final DicoModelAbstract _dico, final int _language) {
     return createTelemac2dVersionImpl(_ft, _dico, _language);
   }
 
   public CtuluResult<DicoModelAbstract> getDicoModel(final DicoCasFileFormat _ft, final String _v, final File _f,
-                                                     final int _language, ProgressionInterface progression) {
+          final int _language, ProgressionInterface progression) {
     CtuluResult<DicoModelAbstract> res = new CtuluResult<DicoModelAbstract>();
     if (_f != null) {
       DicoDynamiqueGenerator generator = DicoDynamiqueGenerator.loadGenerator(_f, progression);
@@ -132,8 +132,8 @@
   }
 
   public CtuluResult<TelemacDicoFileFormatVersion> createTelemacVersionImpl(final DicoCasFileFormat _ft,
-                                                                            final String _versionKnown, final File _dicoFile,
-                                                                            final int _language, ProgressionInterface progression) {
+          final String _versionKnown, final File _dicoFile,
+          final int _language, ProgressionInterface progression) {
     CtuluResult<DicoModelAbstract> res = getDicoModel(_ft, _versionKnown, _dicoFile, _language, progression);
     CtuluResult<TelemacDicoFileFormatVersion> finalRes = new CtuluResult<TelemacDicoFileFormatVersion>();
     finalRes.setAnalyze(res.getAnalyze());
@@ -144,23 +144,23 @@
   }
 
   public TelemacDicoFileFormatVersion createTelemacVersionImpl(final DicoCasFileFormat _ft,
-                                                               final DicoModelAbstract model, final int _language) {
+          final DicoModelAbstract model, final int _language) {
 
     if (Telemac2dFileFormat.getInstance() == _ft) {
       return createTelemac2dVersionImpl((Telemac2dFileFormat) _ft, model,
-                                        _language);
+              _language);
     }
     if (model == null) {
       return null;
     }
     if (_ft.getName().equals(H2dTelemacDicoParams.getSubief2dId())) {
       return new TelemacSubief2dFileFormatVersion(_ft,
-                                                  model);
+              model);
     }
     if (_ft.getName().equals(H2dTelemacDicoParams.getStbtelId())) {
       return new TelemacStbtelFileFormatVersion(_ft,
-                                                model);
+              model);
     }
     return new TelemacDicoFileFormatVersion(_ft, model);
   }
-}
\ No newline at end of file
+}

Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac2dv7p0.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac2dv7p0.java	2014-10-09 19:56:29 UTC (rev 8863)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac2dv7p0.java	2014-10-09 20:18:51 UTC (rev 8864)
@@ -1797,15 +1797,15 @@
 
     valueByLanguage[0]="ORDONNEES DES SOURCES";
     valueByLanguage[1]="ORDINATES OF SOURCES";
-    entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeReel);
-    entiteSimple.setNiveau(1);
+    entiteVecteur=new DicoEntite.Vecteur(valueByLanguage[languageIndex_],typeReel,";");
+    entiteVecteur.setNiveau(1);
     valueByLanguage[0]="Valeurs des ordonnees des sources de debit et de traceur.";
     valueByLanguage[1]="ordinates of sources of flowrate and/or tracer";
-    entiteSimple.setAide(valueByLanguage[languageIndex_]);
+    entiteVecteur.setAide(valueByLanguage[languageIndex_]);
     valueByLanguage[0]="EQUATIONS, SOURCES";
     valueByLanguage[1]="EQUATIONS, SOURCE TERMS";
-    entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
-    entites[67]=entiteSimple.getImmutable();
+    entiteVecteur.setRubrique(valueByLanguage[languageIndex_]);
+    entites[67]=entiteVecteur.getImmutable();
 
 
     //start DEBITS DES SOURCES
@@ -1813,15 +1813,15 @@
 
     valueByLanguage[0]="DEBITS DES SOURCES";
     valueByLanguage[1]="WATER DISCHARGE OF SOURCES";
-    entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeReel);
-    entiteSimple.setNiveau(1);
+    entiteVecteur=new DicoEntite.Vecteur(valueByLanguage[languageIndex_],typeReel,";");
+    entiteVecteur.setNiveau(1);
     valueByLanguage[0]="Valeurs des debits des sources.";
     valueByLanguage[1]="values of water discharge of sources";
-    entiteSimple.setAide(valueByLanguage[languageIndex_]);
+    entiteVecteur.setAide(valueByLanguage[languageIndex_]);
     valueByLanguage[0]="EQUATIONS, SOURCES";
     valueByLanguage[1]="EQUATIONS, SOURCE TERMS";
-    entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
-    entites[68]=entiteSimple.getImmutable();
+    entiteVecteur.setRubrique(valueByLanguage[languageIndex_]);
+    entites[68]=entiteVecteur.getImmutable();
 
 
     //start VALEURS DES TRACEURS DES SOURCES
@@ -1845,17 +1845,17 @@
 
     valueByLanguage[0]="VITESSES DES SOURCES SELON X";
     valueByLanguage[1]="VELOCITIES OF THE SOURCES ALONG X";
-    entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeReel);
-    entiteSimple.setNiveau(1);
+    entiteVecteur=new DicoEntite.Vecteur(valueByLanguage[languageIndex_],typeReel,";");
+    entiteVecteur.setNiveau(1);
     valueByLanguage[0]="Vitesses du courant a chacune des sources. Si elles ne sont pas"
     +"\ndonnees, on considere que la vitesse est celle du courant";
     valueByLanguage[1]="Velocities at the sources. If they are not given, the velocity"
     +"\nof the flow at this location is taken";
-    entiteSimple.setAide(valueByLanguage[languageIndex_]);
+    entiteVecteur.setAide(valueByLanguage[languageIndex_]);
     valueByLanguage[0]="EQUATIONS, SOURCES";
     valueByLanguage[1]="EQUATIONS, SOURCE TERMS";
-    entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
-    entites[70]=entiteSimple.getImmutable();
+    entiteVecteur.setRubrique(valueByLanguage[languageIndex_]);
+    entites[70]=entiteVecteur.getImmutable();
 
 
     //start VITESSES DES SOURCES SELON Y
@@ -1863,15 +1863,15 @@
 
     valueByLanguage[0]="VITESSES DES SOURCES SELON Y";
     valueByLanguage[1]="VELOCITIES OF THE SOURCES ALONG Y";
-    entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeReel);
-    entiteSimple.setNiveau(1);
+    entiteVecteur=new DicoEntite.Vecteur(valueByLanguage[languageIndex_],typeReel,";");
+    entiteVecteur.setNiveau(1);
     valueByLanguage[0]="Vitesses du courant a chacune des sources";
     valueByLanguage[1]="Velocities at the sources";
-    entiteSimple.setAide(valueByLanguage[languageIndex_]);
+    entiteVecteur.setAide(valueByLanguage[languageIndex_]);
     valueByLanguage[0]="EQUATIONS, SOURCES";
     valueByLanguage[1]="EQUATIONS, SOURCE TERMS";
-    entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
-    entites[71]=entiteSimple.getImmutable();
+    entiteVecteur.setRubrique(valueByLanguage[languageIndex_]);
+    entites[71]=entiteVecteur.getImmutable();
 
 
     //start COEFFICIENTS DE DECENTREMENT

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