Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8476] trunk/business/dodico-h2d/io/src/main/java/org/ fudaa/dodico/telemac/dico
|
From: <de...@us...> - 2013-09-02 19:19:29
|
Revision: 8476
http://sourceforge.net/p/fudaa/svn/8476
Author: deniger
Date: 2013-09-02 19:19:26 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
maj des dicos
Modified Paths:
--------------
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoSisyphev6p3.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac2dv6p3.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac3dv6p3.java
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoSisyphev6p3.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoSisyphev6p3.java 2013-09-01 20:20:40 UTC (rev 8475)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoSisyphev6p3.java 2013-09-02 19:19:26 UTC (rev 8476)
@@ -2333,9 +2333,9 @@
//start FORMULATION POUR DEPOT ET EROSION
typeEntier=new DicoDataType.Entier();
- choiceKeys=new String[]{"1","2"};
- choiceValues=new String[][] {{"KRONE ET PARTHENIADES","FREDSOE / ROUSE"}
- ,{"KRONE ET PARTHENIADES","FREDSOE / ROUSE"} };
+ choiceKeys=new String[]{"1","2","3","4"};
+ choiceValues=new String[][] {{"KRONE ET PARTHENIADES","FREDSOE / ROUSE","SOULSBY - VAN RIJN 'S CONCENTRATION","MODELE DE MILES"}
+ ,{"KRONE ET PARTHENIADES","FREDSOE / ROUSE","SOULSBY - VAN RIJN 'S CONCENTRATION","MILES APPROXIMATION"} };
typeEntier.setChoice(choiceKeys,choiceValues[languageIndex_]);
valueByLanguage[0]="FORMULATION POUR DEPOT ET EROSION";
@@ -2356,9 +2356,9 @@
//start LOI DE FROTTEMENT SUR LE FOND
typeEntier=new DicoDataType.Entier();
- choiceKeys=new String[]{"1","2","3","4","5"};
- choiceValues=new String[][] {{"","CHEZY","STRICKLER","MANNING","NIKURADSE"}
- ,{"","CHEZY","STRICKLER","MANNING","NIKURADSE"} };
+ choiceKeys=new String[]{"0","1","2","3","4","5"};
+ choiceValues=new String[][] {{"FOND PLAT","EQUILIBRIUM SAND RIPPLES (WAVES ONLY)","CHEZY","STRICKLER","MANNING","NIKURADSE"}
+ ,{"FLAT BOTTOM","EQUILIBRIUM SAND RIPPLES (WAVES ONLY)","CHEZY","STRICKLER","MANNING","NIKURADSE"} };
typeEntier.setChoice(choiceKeys,choiceValues[languageIndex_]);
valueByLanguage[0]="LOI DE FROTTEMENT SUR LE FOND";
@@ -3627,22 +3627,22 @@
valueByLanguage[0]="TRAITEMENT DES FLUX AUX FRONTIERES";
valueByLanguage[1]="TREATMENT OF FLUXES AT THE BOUNDARIES";
- entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeEntier);
- entiteSimple.setNiveau(1);
+ entiteVecteur=new DicoEntite.Vecteur(valueByLanguage[languageIndex_],typeEntier,";");
+ entiteVecteur.setNiveau(1);
valueByLanguage[0]="Utilise pour les schemas PSI et N, avec option 2, on ne retrouve"
+"\npas exactement les valeurs imposees des traceurs,"
+"\nmais le flux est correct";
valueByLanguage[1]="Used so far only with the PSI and N schemes."
+"\nWith option 2, Dirichlet prescribed values are not obeyed,"
+"\nbut the fluxes are correct";
- entiteSimple.setAide(valueByLanguage[languageIndex_]);
+ entiteVecteur.setAide(valueByLanguage[languageIndex_]);
valueByLanguage[0]="PARAMETRES NUMERIQUES";
valueByLanguage[1]="NUMERICAL PARAMETERS";
- entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
+ entiteVecteur.setRubrique(valueByLanguage[languageIndex_]);
valueByLanguage[0]="1";
valueByLanguage[1]="1";
- entiteSimple.setDefautValue(valueByLanguage[languageIndex_]);
- entites[149]=entiteSimple.getImmutable();
+ entiteVecteur.setDefautValue(valueByLanguage[languageIndex_]);
+ entites[149]=entiteVecteur.getImmutable();
//start OPTION DU MODELE DE TASSEMENT
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac2dv6p3.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac2dv6p3.java 2013-09-01 20:20:40 UTC (rev 8475)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac2dv6p3.java 2013-09-02 19:19:26 UTC (rev 8476)
@@ -879,7 +879,6 @@
//start NOMBRE DE FLOTTEURS
typeEntier=new DicoDataType.Entier();
- typeEntier.setControle(0,10);
valueByLanguage[0]="NOMBRE DE FLOTTEURS";
valueByLanguage[1]="NUMBER OF DROGUES";
@@ -2594,8 +2593,8 @@
//start CONDITIONS INITIALES
typeChaine=new DicoDataType.Chaine();
choiceKeys=null;
- choiceValues=new String[][] {{"COTE NULLE","COTE CONSTANTE","HAUTEUR NULLE","HAUTEUR CONSTANTE","PARTICULIERES","ALTIMETRIE SATELLITE TPXO"}
- ,{"ZERO ELEVATION","CONSTANT ELEVATION","ZERO DEPTH","CONSTANT DEPTH","SPECIAL","TPXO SATELLITE ALTIMETRY"} };
+ choiceValues=new String[][] {{"COTE NULLE","COTE CONSTANTE","HAUTEUR NULLE","HAUTEUR CONSTANTE","PARTICULIERES","SPECIAL","ALTIMETRIE SATELLITE TPXO"}
+ ,{"ZERO ELEVATION","CONSTANT ELEVATION","ZERO DEPTH","CONSTANT DEPTH","SPECIAL","PARTICULAR","TPXO SATELLITE ALTIMETRY"} };
typeChaine.setChoice(choiceValues[languageIndex_],choiceKeys);
valueByLanguage[0]="CONDITIONS INITIALES";
@@ -4094,7 +4093,7 @@
typeChaine=new DicoDataType.Chaine();
choiceKeys=null;
choiceValues=new String[][] {{"SAINT-VENANT EF","SAINT-VENANT VF","BOUSSINESQ"}
- ,{"SAINT-VENANT EF","SAINT-VENANT VF","BOUSSINESQ"} };
+ ,{"SAINT-VENANT FE","SAINT-VENANT FV","BOUSSINESQ"} };
typeChaine.setChoice(choiceValues[languageIndex_],choiceKeys);
valueByLanguage[0]="EQUATIONS";
@@ -4110,7 +4109,7 @@
valueByLanguage[1]="NUMERICAL PARAMETERS";
entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
valueByLanguage[0]="SAINT-VENANT EF";
- valueByLanguage[1]="SAINT-VENANT EF";
+ valueByLanguage[1]="SAINT-VENANT FE";
entiteSimple.setDefautValue(valueByLanguage[languageIndex_]);
entites[163]=entiteSimple.getImmutable();
@@ -5614,22 +5613,22 @@
valueByLanguage[0]="TRAITEMENT DES FLUX AUX FRONTIERES";
valueByLanguage[1]="TREATMENT OF FLUXES AT THE BOUNDARIES";
- entiteSimple=new DicoEntite.Simple(valueByLanguage[languageIndex_],typeEntier);
- entiteSimple.setNiveau(1);
+ entiteVecteur=new DicoEntite.Vecteur(valueByLanguage[languageIndex_],typeEntier,";");
+ entiteVecteur.setNiveau(1);
valueByLanguage[0]="Utilise pour les schemas SUPG, PSI et N, avec option 2, on ne retrouve"
+"\npas exactement les valeurs imposees des traceurs,"
+"\nmais le flux est correct";
valueByLanguage[1]="Used so far only with the SUPG, PSI and N schemes."
+"\nWith option 2, Dirichlet prescribed values are not obeyed,"
+"\nbut the fluxes are correct";
- entiteSimple.setAide(valueByLanguage[languageIndex_]);
+ entiteVecteur.setAide(valueByLanguage[languageIndex_]);
valueByLanguage[0]="PARAMETRES NUMERIQUES";
valueByLanguage[1]="NUMERICAL PARAMETERS";
- entiteSimple.setRubrique(valueByLanguage[languageIndex_]);
+ entiteVecteur.setRubrique(valueByLanguage[languageIndex_]);
valueByLanguage[0]="1";
valueByLanguage[1]="1";
- entiteSimple.setDefautValue(valueByLanguage[languageIndex_]);
- entites[238]=entiteSimple.getImmutable();
+ entiteVecteur.setDefautValue(valueByLanguage[languageIndex_]);
+ entites[238]=entiteVecteur.getImmutable();
//start OPTION POUR LES CONDITIONS AUX LIMITES DE MAREE
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac3dv6p3.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac3dv6p3.java 2013-09-01 20:20:40 UTC (rev 8475)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/dico/DicoTelemac3dv6p3.java 2013-09-02 19:19:26 UTC (rev 8476)
@@ -211,7 +211,6 @@
//start NOMBRE DE FLOTTEURS
typeEntier=new DicoDataType.Entier();
- typeEntier.setControle(0,10);
valueByLanguage[0]="NOMBRE DE FLOTTEURS";
valueByLanguage[1]="NUMBER OF DROGUES";
@@ -2201,14 +2200,17 @@
//start VARIABLES POUR LES SORTIES GRAPHIQUES 2D
typeChaine=new DicoDataType.Chaine();
- choiceKeys=new String[]{"U","V","C","H","S","B","TA1","F","Q","I",
+ choiceKeys=new String[]{"U","V","C","H","S","B","TA1","TA2","TA3","TA4",
+ "TA5","TA6","TA7","TA8","TA9","TA*","TA**","F","Q","I",
"J","M","X","Y","P","W","RB","FD","EF","DP",
"PRIVE1","PRIVE2","PRIVE3","PRIVE4","QS","QSX","QSY","US","MAXZ","TMXZ"};
- choiceValues=new String[][] {{"vitesse moyenne suivant l'axe des x (m/s)","vitesse moyenne suivant l'axe des y (m/s)","celerite (m/s)","hauteur d'eau (m)","cote de surface libre (m)","cote du fond (m)","TAx concentrations des traceurs, x numero du traceur","nombre de Froude (m)","debit scalaire (m2/s)","debit suivant x (m2/s)",
+ choiceValues=new String[][] {{"vitesse moyenne suivant l'axe des x (m/s)","vitesse moyenne suivant l'axe des y (m/s)","celerite (m/s)","hauteur d'eau (m)","cote de surface libre (m)","cote du fond (m)","concentration du traceur 1","concentration du traceur 2","concentration du traceur 3","concentration du traceur 4",
+ "concentration du traceur 5","concentration du traceur 6","concentration du traceur 7","concentration du traceur 8","concentration du traceur 9","concentrations des traceurs de 1 a 9","concentrations des traceurs de 10 a 99","nombre de Froude (m)","debit scalaire (m2/s)","debit suivant x (m2/s)",
"debit suivant y (m2/s)","norme de la vitesse (m/s)","vent suivant l'axe des x (m/s)","vent suivant l'axe des y (m/s)","pression atmospherique (Pa)","coefficient de frottement","cote des fonds non erodables (m)","epaisseur des depots frais (m)","flux d'erosion (kg/m3/s)","probabilite de depot",
"tableau de travail PRIVE 1","tableau de travail PRIVE 2","tableau de travail PRIVE 3","tableau de travail PRIVE 4","debit solide (m2/s)","debit solide suivant x (m2/s)","debit solide suivant y (m2/s)","vitesse de frottement (m/s)","valeur maximum de la cote de "
+"\n l eau au cours du calcul (m)","temps correspondant a ce niveau maximum (s)"}
- ,{"depth averaged velocity along x axis (m/s)","depth averaged velocity along y axis (m/s)","celerity (m/s)","water depth (m)","free surface elevation (m)","bottom elevation (m)","TAx concentrations for tracers, x is the tracer number","Froude number (m)","scalar discharge (m2/s)","discharge along x (m2/s)",
+ ,{"depth averaged velocity along x axis (m/s)","depth averaged velocity along y axis (m/s)","celerity (m/s)","water depth (m)","free surface elevation (m)","bottom elevation (m)","concentration for tracer 1","concentration for tracer 2","concentration for tracer 3","concentration for tracer 4",
+ "concentration for tracer 5","concentration for tracer 6","concentration for tracer 7","concentration for tracer 8","concentration for tracer 9","concentrations for tracers from 1 to 9","concentrations for tracers from 10 to 99","Froude number (m)","scalar discharge (m2/s)","discharge along x (m2/s)",
"discharge along y (m2/s)","norm of velocity (m/s)","wind along x axis (m/s)","wind along y axis (m/s)","atmospheric pressure (Pa)","friction coefficient","non erodible bottom elevation (m)","thickness of the fresh deposits (m)","erosion rate (kg/m3/s)","probability of deposition",
"work array PRIVE 1","work array PRIVE 2","work array PRIVE 3","work array PRIVE 4","solid discharge (m2/s)","solid discharge along x (m2/s)","solid discharge along y (m2/s)","friction velocity (m/s)","maximum value of the free surface "
+"\n elevation during the computation (m)","time corresponding to this maximum elevation (s)"} };
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
