Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5519] trunk/soft/fudaa-crue
|
From: <chr...@us...> - 2009-12-01 17:02:32
|
Revision: 5519
http://fudaa.svn.sourceforge.net/fudaa/?rev=5519&view=rev
Author: chrisc83
Date: 2009-12-01 17:02:25 +0000 (Tue, 01 Dec 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DefaultValues.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/PropertyValidatorsBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHGeneralBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java
trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/ihmMessages.properties
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java 2009-11-30 16:57:22 UTC (rev 5518)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java 2009-12-01 17:02:25 UTC (rev 5519)
@@ -830,7 +830,7 @@
writeCom("");
writeCom(" Modulation du pas de temps au cours de la procedure de stabilisation ");
- ecritLignesD(pdtVar);
+ ecritLignesD(data.getParamCalc().getDateDebSce(), pdtVar);
}
// Ecriture Lignes E
@@ -1075,7 +1075,7 @@
writeCom("");
writeCom(" Modulation du pas de temps au cours de la procedure de stabilisation ");
- ecritLignesD(pdtVar);
+ ecritLignesD(pcal.getDateDebSce(), pdtVar);
}
// Ecriture Lignes E
@@ -1133,20 +1133,24 @@
* @param pdtVar
* @throws IOException
*/
- private void ecritLignesD(final PdtVar pdtVar) throws IOException {
+ private void ecritLignesD(final LocalDateTime hDeb, final PdtVar pdtVar) throws IOException {
// Ligne D1
fortranWriter.stringField(0, "VARDT");
fortranWriter.writeFields();
+ Duration startDuration = new Duration(hDeb.toDateTime().getMillis());
+
// Lignes D2
for (int i = 0, imax = pdtVar.getElemPdt().size(); i < imax; i++) {
final ElemPdt elemPdt = pdtVar.getElemPdt().get(i);
final int nbPas = elemPdt.getNbrPdt();
final Duration duree = elemPdt.getDureePdt();
- fortranWriter.intField(0, nbPas);
+ fortranWriter.stringField(0, DateDurationConverter.durationToCrueFormat(startDuration));
fortranWriter.stringField(1, DateDurationConverter.durationToCrueFormat(duree));
fortranWriter.writeFields();
+
+ startDuration = startDuration.plus(duree.getMillis() * nbPas);
}
// Ligne D3
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DefaultValues.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DefaultValues.java 2009-11-30 16:57:22 UTC (rev 5518)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/metier/emh/DefaultValues.java 2009-12-01 17:02:25 UTC (rev 5519)
@@ -114,7 +114,7 @@
*Nombre de Froude limite supérieur pour l'annulation linéaire du terme d'inertie ; par défaut, égal à max(1,0 ;
* FrLinInf)
*/
- public static final double FR_LIN_SUP = CrueNumberUtils.INFINI;
+ public static final double FR_LIN_SUP = 1D;
/**
* Débit limite inférieur admissible
*/
@@ -171,6 +171,19 @@
public static final double PM_TOL_ND_Z = 0.01;
/**
+ * Écart de cotes dans le cadre de la définition d'une SectionIdem.
+ */
+ public static final double DZ_SECTION_IDEM = 0.0;
+ /**
+ * Coefficient de frottement de Strickler dans le lit de stockage (lit tel que IsLitActif=false).
+ */
+ public static final double K_STO = 0.0;
+ /**
+ * Cote de référence du modèle.
+ */
+ public static final double Z_REF = 0.0;
+
+ /**
* P0Y0M1DT0H0M0S
*/
public static final Duration DUREE_SCENARIO = DateDurationConverter.getDuration(1, 0, 0, 0);
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/PropertyValidatorsBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/PropertyValidatorsBuilder.java 2009-11-30 16:57:22 UTC (rev 5518)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/PropertyValidatorsBuilder.java 2009-12-01 17:02:25 UTC (rev 5519)
@@ -10,14 +10,14 @@
import java.util.List;
import java.util.Map;
-import com.memoire.fu.FuLog;
-
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluLibFile;
-import org.fudaa.dodico.crue.common.CrueNumberUtils;
+import org.fudaa.dodico.crue.metier.emh.DefaultValues;
import org.fudaa.dodico.crue.metier.emh.EMH;
+import com.memoire.fu.FuLog;
+
/**
* Lit les limites des propriétés numériques dans un fichier.
*
@@ -80,41 +80,39 @@
private void buildDefaultValues() {
if (defaultValues == null) {
defaultValues = new TObjectDoubleHashMap();
- defaultValues.put("coefBeta", 1d);
- defaultValues.put("coefConv", 0d);
- defaultValues.put("coefCtrLim", 0.65d);
- defaultValues.put("coefD", 1d);
- defaultValues.put("coefDiv", 0d);
- defaultValues.put("coefPdc", 1d);
- defaultValues.put("coefPond", 0.5d);
- defaultValues.put("coefRelaxQ", 1d);
- defaultValues.put("coefRelaxZ", 1d);
- defaultValues.put("coefRuis", 1d);
- defaultValues.put("coefRuis", 1d);
- defaultValues.put("coefSinuo", 1d);
- defaultValues.put("crMaxFlu", CrueNumberUtils.INFINI);
- defaultValues.put("crMaxTor", CrueNumberUtils.INFINI);
- defaultValues.put("dzSectionIdem", 0);
- defaultValues.put("frLinInf", CrueNumberUtils.INFINI);
- defaultValues.put("frLinSup", CrueNumberUtils.INFINI);
- defaultValues.put("ksto", 0);
- defaultValues.put("nbrPdtDecoup", 1);
- defaultValues.put("NbrPdtMax", 40);
- defaultValues.put("pm_ProfPlat", 0.00001);
- defaultValues.put("pm_PenteRupture", 0.00001);
- defaultValues.put("pm_PenteRupture", 0.00001);
- defaultValues.put("pm_Decal", 0.02);
- defaultValues.put("pm_LargSeuil", 100);
- defaultValues.put("pm_PdxMax", 200);
- defaultValues.put("pm_VarPdxMax", 1);
- defaultValues.put("pm_PenteMax", 0.01);
- defaultValues.put("pm_TolNdZ", 0.01);
- defaultValues.put("qLimInf", -CrueNumberUtils.INFINI);
- defaultValues.put("qLimSup", CrueNumberUtils.INFINI);
- defaultValues.put("theta", 0.75);
- defaultValues.put("tolMaxQ", 0.01);
- defaultValues.put("tolMaxZ", 0.001);
- defaultValues.put("zref", 0.00);
+ defaultValues.put("coefBeta", DefaultValues.COEF_BETA);
+ defaultValues.put("coefConv", DefaultValues.COEF_CONV);
+ defaultValues.put("coefCtrLim", DefaultValues.COEF_CTR_LIM);
+ defaultValues.put("coefD", DefaultValues.COEF_D);
+ defaultValues.put("coefDiv", DefaultValues.COEF_DIV);
+ defaultValues.put("coefPdc", DefaultValues.COEF_PDC);
+ defaultValues.put("coefPond", DefaultValues.COEF_POND);
+ defaultValues.put("coefRelaxQ", DefaultValues.COEF_RELAX_Q);
+ defaultValues.put("coefRelaxZ", DefaultValues.COEF_RELAX_Z);
+ defaultValues.put("coefRuis", DefaultValues.COEF_RUIS);
+ defaultValues.put("coefSinuo", DefaultValues.COEF_SINUO);
+ defaultValues.put("crMaxFlu", DefaultValues.CR_MAX_FLU);
+ defaultValues.put("crMaxTor", DefaultValues.CR_MAX_TOR);
+ defaultValues.put("dzSectionIdem", DefaultValues.DZ_SECTION_IDEM);
+ defaultValues.put("frLinInf", DefaultValues.FR_LIN_INF);
+ defaultValues.put("frLinSup", DefaultValues.FR_LIN_SUP);
+ defaultValues.put("ksto", DefaultValues.K_STO);
+ defaultValues.put("nbrPdtDecoup", DefaultValues.NBR_PDT_DECOUP);
+ defaultValues.put("nbrPdtMax", DefaultValues.NBR_PDT_MAX);
+ defaultValues.put("pm_ProfPlat", DefaultValues.PM_PROF_PLAT);
+ defaultValues.put("pm_PenteRupture", DefaultValues.PM_PENTE_RUPTURE);
+ defaultValues.put("pm_Decal", DefaultValues.PM_DECAL);
+ defaultValues.put("pm_LargSeuil", DefaultValues.PM_LARG_SEUIL);
+ defaultValues.put("pm_PdxMax", DefaultValues.PM_PDX_MAX);
+ defaultValues.put("pm_VarPdxMax", DefaultValues.PM_VAR_PDX_MAX);
+ defaultValues.put("pm_PenteMax", DefaultValues.PM_PDX_MAX);
+ defaultValues.put("pm_TolNdZ", DefaultValues.PM_TOL_ND_Z);
+ defaultValues.put("qLimInf", DefaultValues.Q_LIM_INF);
+ defaultValues.put("qLimSup", DefaultValues.Q_LIM_SUP);
+ defaultValues.put("theta", DefaultValues.THETA);
+ defaultValues.put("tolMaxQ", DefaultValues.TOL_MAX_Q);
+ defaultValues.put("tolMaxZ", DefaultValues.TOL_MAX_Z);
+ defaultValues.put("zref", DefaultValues.Z_REF);
}
}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHGeneralBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHGeneralBuilder.java 2009-11-30 16:57:22 UTC (rev 5518)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/EMHGeneralBuilder.java 2009-12-01 17:02:25 UTC (rev 5519)
@@ -12,6 +12,7 @@
import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader;
import org.fudaa.dodico.crue.io.neuf.FCBValueObject.AbstractEntete;
import org.fudaa.dodico.crue.metier.emh.EMH;
+import org.fudaa.dodico.crue.metier.emh.EMHModeleBase;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.emh.InfosEMH;
import org.fudaa.dodico.crue.metier.emh.ObjetNomme;
@@ -65,10 +66,31 @@
* @return modele du tree.
*/
public static DefaultTreeTableModel buildTreeScenario(final EMHScenario data) {
+ // TODO Traduire les différents textes des noeuds.
final DefaultMutableTreeTableNode root = new DefaultMutableTreeTableNode("root");
if (!data.isEmpty()) {
+ final TreeNodeString rootScenario = new TreeNodeString("Scénarios");
+ root.add(rootScenario);
+
+ addNodesForEMH(rootScenario, data);
+
+ final TreeNodeString rootModels = new TreeNodeString("Modèles");
+ root.add(rootModels);
+
+ final TreeNodeString rootSubModels = new TreeNodeString("Sous-modèles");
+ root.add(rootSubModels);
+
+ for (final EMHModeleBase emhModel : data.getModeles()) {
+ addNodesForEMH(rootModels, emhModel);
+
+ for (final EMH emh : emhModel.getSousModele()) {
+ addNodesForEMH(rootSubModels, emh);
+
+ }
+ }
+
final TreeNodeString rootNodes = new TreeNodeString("Noeuds");
root.add(rootNodes);
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java 2009-11-30 16:57:22 UTC (rev 5518)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFilleEMH.java 2009-12-01 17:02:25 UTC (rev 5519)
@@ -7,15 +7,15 @@
import javax.swing.JScrollPane;
import javax.swing.ListSelectionModel;
-import com.memoire.bu.BuInternalFrame;
-import com.memoire.bu.BuList;
-
import org.fudaa.fudaa.crue.builder.EMHGeneralBuilder;
import org.fudaa.fudaa.crue.common.FCrueResource;
import org.fudaa.fudaa.crue.projet.CrueProjet;
import org.jdesktop.swingx.JXTreeTable;
import org.jdesktop.swingx.treetable.DefaultTreeTableModel;
+import com.memoire.bu.BuInternalFrame;
+import com.memoire.bu.BuList;
+
/**
* Affichage rapide des EMH.
*
Modified: trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/ihmMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/ihmMessages.properties 2009-11-30 16:57:22 UTC (rev 5518)
+++ trunk/soft/fudaa-crue/fudaa/src/main/resources/org/fudaa/fudaa/crue/common/ihmMessages.properties 2009-12-01 17:02:25 UTC (rev 5519)
@@ -74,7 +74,7 @@
ihm.frame.chgt.format.crue9.crue10 = G\u00E9n\u00E9ration Crue 9 <=> Crue 10
ihm.genererCrue10.action = G\u00E9n\u00E9rer les fichiers Crue 10
ihm.genererCrue9.action = G\u00E9n\u00E9rer les fichiers Crue 9
-ihm.gerer.emhs = GEstion des EMH
+ihm.gerer.emhs = Gestion des EMH
ihm.gerer.etude = G\u00E9rer \u00E9tude
ihm.gerer.modeles = G\u00E9rer mod\u00E8les
ihm.gerer.scenarios = G\u00E9rer sc\u00E9narios
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
