Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5503] trunk/soft/fudaa-crue
|
From: <chr...@us...> - 2009-11-27 17:09:23
|
Revision: 5503
http://fudaa.svn.sourceforge.net/fudaa/?rev=5503&view=rev
Author: chrisc83
Date: 2009-11-27 17:09:05 +0000 (Fri, 27 Nov 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueModeleBuilder.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheScenario.java
Added Paths:
-----------
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/M6-0_c9.dc
trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/M6-0_c9.dh
Modified: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java 2009-11-26 16:57:55 UTC (rev 5502)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java 2009-11-27 17:09:05 UTC (rev 5503)
@@ -11,8 +11,42 @@
import org.fudaa.dodico.crue.io.common.CrueData;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.common.IOMessages;
-import org.fudaa.dodico.crue.metier.emh.*;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPerm;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermBrancheOrificeManoeuvre;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermNoeudNiveauContinuQapp;
+import org.fudaa.dodico.crue.metier.emh.CalcPseudoPermNoeudNiveauContinuZimpose;
+import org.fudaa.dodico.crue.metier.emh.CalcTrans;
+import org.fudaa.dodico.crue.metier.emh.CalcTransBrancheOrificeManoeuvre;
+import org.fudaa.dodico.crue.metier.emh.CalcTransBrancheSaintVenantQruis;
+import org.fudaa.dodico.crue.metier.emh.CalcTransNoeudNiveauContinuQapp;
+import org.fudaa.dodico.crue.metier.emh.CalcTransNoeudNiveauContinuTarage;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
+import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
+import org.fudaa.dodico.crue.metier.emh.DonCLimM;
+import org.fudaa.dodico.crue.metier.emh.DonCLimMScenario;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrt;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.DonPrtCIniBranche;
+import org.fudaa.dodico.crue.metier.emh.DonPrtCIniNoeudNiveauContinu;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.EnumFormulePdc;
+import org.fudaa.dodico.crue.metier.emh.EnumSensOuv;
+import org.fudaa.dodico.crue.metier.emh.EnumTypeLoi;
+import org.fudaa.dodico.crue.metier.emh.EnumVerbosite;
+import org.fudaa.dodico.crue.metier.emh.EvolutionFF;
+import org.fudaa.dodico.crue.metier.emh.Loi;
+import org.fudaa.dodico.crue.metier.emh.LoiDF;
+import org.fudaa.dodico.crue.metier.emh.LoiFF;
+import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
+import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
+import org.fudaa.dodico.crue.metier.emh.Pdt;
+import org.fudaa.dodico.crue.metier.emh.PdtCst;
+import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
+import org.fudaa.dodico.crue.validation.ValidateEMHProperties;
+import org.fudaa.dodico.crue.validation.ValidateEMHProperties.IdValidator;
/**
* Tests junit pour les fichiers DH IO. fortran, .
@@ -36,6 +70,9 @@
protected static final String FICHIER_TEST_MODELE3_DLHY = "/fichierTest/Modele3.dlhy.xml";
protected static final String FICHIER_TEST_MODELE3_DCLM = "/fichierTest/Modele3.dclm.xml";
+ protected static final String FICHIER_TEST_M6_0_C9_DH = "/fichierTest/M6-0_c9.dh";
+ protected static final String FICHIER_TEST_M6_0_C9_DC = "/fichierTest/M6-0_c9.dc";
+
/**
* Test de lecture
*/
@@ -64,6 +101,34 @@
testAnalyser(readModele.getAnalyse());
}
+ public void testLectureM6_0_C9() {
+ final CrueIOResu<CrueData> data = readM6_0_C9();
+ testM6_0_C9(data);
+ }
+
+ private void testM6_0_C9(final CrueIOResu<CrueData> data) {
+ final ValidateEMHProperties propValidator = new ValidateEMHProperties();
+ final IdValidator res = propValidator.validateNoms(data.getMetier().getAllSimpleEMH());
+ final CtuluAnalyze nomValidationRes = res.getRes();
+
+ assertFalse(nomValidationRes.containsErrors());
+ /*
+ * final EMHBrancheSaintVenant findBrancheByReference = (EMHBrancheSaintVenant) data.getMetier()
+ * .findBrancheByReference("b27"); final DonCalcSansPrtBrancheSaintVenant dcsp =
+ * EMHHelper.getFirstOfClass(findBrancheByReference.getInfosEMH(), DonCalcSansPrtBrancheSaintVenant.class);
+ * assertDoubleEquals(0.25 * 1.25, dcsp.getCoefRuis()); final CalcTransBrancheSaintVenantQruis trans =
+ * EMHHelper.getFirstOfClass(findBrancheByReference.getInfosEMH(), CalcTransBrancheSaintVenantQruis.class);
+ * assertEquals(109, trans.getLoi().getEvolutionFF().getPtEvolutionFF().size());
+ */
+ }
+
+ private CrueIOResu<CrueData> readM6_0_C9() {
+ final CtuluAnalyze analyzer = new CtuluAnalyze(IOMessages.RESOURCE_BUNDLE);
+ final CrueIOResu<CrueData> data = readModele(analyzer, FICHIER_TEST_M6_0_C9_DC, FICHIER_TEST_M6_0_C9_DH);
+ testAnalyser(analyzer);
+ return data;
+ }
+
public void testLectureModele7() {
final CrueIOResu<CrueData> data = readModele7();
testModele7(data);
Added: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/M6-0_c9.dc
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/M6-0_c9.dc (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/M6-0_c9.dc 2009-11-27 17:09:05 UTC (rev 5503)
@@ -0,0 +1,293 @@
+* Donn\xE9es g\xE9n\xE9rales
+* --------------------------
+* 5 lignes de titre
+TITRE CrueX - Structuration des donn\xE9es
+TITRE
+TITRE Mod\xE8le de test pour les pas de temps variables
+TITRE
+TITRE PBa Nov09 sur la base de Modele3-0
+*
+* Configuration des r\xE8gles
+R_SLARGE 110.
+*
+* dal theta isorti
+COEFF 1.00 0.75 1
+*
+*
+* D\xE9finition des branches
+* --------------------------
+*
+* Branche B1: Saint-Venant
+BRANCHE Br_B1 Nd_N1 Nd_N2 20
+DISTANCE 100.00 100.00 100.00 100.00 100.00
+PROF ST_Prof11 St_PROF10 St_PROF9 St_PROF8 St_PROF7
+PROF St_PROF6A
+DISTMAX 50.
+*
+* Branche B2: Saint-Venant
+BRANCHE Br_B2 Nd_N2 Nd_N3 20
+DISTANCE 100.00 100.00 100.00
+PROF St_PROF6B St_PROF5 St_PROF4 St_PROF3A
+*
+* Branche B3: Seuil transversal
+BRANCHE Br_B3 Nd_N3 Nd_N4 2
+BORDA 1.
+* Larg Zseuil Cdebit Cpdc
+SEUIL 20.00 0.60 0.900
+SEUIL 8.00 2.20 0.900 1.000
+* nom des profils amont et aval
+PROF St_PROF3AM St_PROF3AV
+*
+* Branche B4: Saint-Venant
+BRANCHE Br_B4 Nd_N4 Nd_N5 20
+DISTANCE 100.00 100.00
+PROF St_PROF3B St_PROF2 St_PROF1
+*
+* Branche B5: Seuil lateral
+BRANCHE Br_B5 Nd_N2 Nd_N6 4
+BORDA 1.
+* Larg Zseuil Cdebit Cpdc
+SEUIL 100.00 3.78 0.900 1.000
+SEUIL 100.00 3.82 0.900
+*
+* Branche B6: Strickler
+BRANCHE Br_B6 Nd_N6 Nd_N7 6
+DISTANCE 400.00
+PROF St_PROFSTR1 St_PROFSTR2
+*
+* Branche B8: Orifice
+BRANCHE Br_B8 Nd_N7 Nd_N5 5
+CCTRMAX 0.65
+* Zrad Haut Larg Cdeb Sens
+CLAPET 3.00 1.50 20.0 0.90 0
+*
+*
+* D\xE9finition des frottements
+* --------------------------
+*
+STRIREF Fk_K0 0.00
+*
+* Branches Saint-Venant
+STRIREFZ Fk_Prof11MIN 0.00 30. 11.00 30.
+STRIREFZ Fk_Prof11MAJ 0.00 15. 10.00 15.
+STRIREFZ Fk_PROF10MIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF10MAJ 0.00 15. 10.00 15.
+STRIREFZ Fk_PROF9MIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF9MAJ 0.00 15. 10.00 15.
+STRIREFZ Fk_PROF8MIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF8MAJ 0.00 15. 10.00 15.
+STRIREFZ Fk_PROF7MIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF7MAJ 0.00 15. 10.00 15.
+STRIREFZ Fk_PROF6AMIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF6AMAJ 0.00 15. 10.00 15.
+STRIREFZ Fk_PROF6BMIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF6BMAJ 0.00 15. 10.00 15.
+STRIREFZ Fk_PROF5MIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF5MAJ 0.00 15. 10.00 15.
+STRIREFZ Fk_PROF4MIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF4MAJ 0.00 15. 10.00 15.
+STRIREFZ Fk_PROF3AMIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF3AMAJ 0.00 15. 10.00 15.
+STRIREFZ Fk_PROF3BMIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF3BMAJ 0.00 15. 10.00 15.
+STRIREFZ Fk_PROF2MIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF2MAJ 0.00 15. 10.00 15.
+STRIREFZ Fk_PROF1MIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF1MAJ 0.00 15. 10.00 15.
+*
+* Branches Strickler
+STRIREFZ Fk_PROFSTR1MIN 0.00 30. 11.00 30.
+STRIREFZ Fk_PROFSTR2MIN 0.00 30. 11.00 30.
+*
+* Branches seuil
+STRIREFZ Fk_PROF3AMMIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF3AMMAJ 0.00 15. 10.00 15.
+STRIREFZ Fk_PROF3AVMIN 0.00 30. 10.00 30.
+STRIREFZ Fk_PROF3AVMAJ 0.00 15. 10.00 15.
+*
+*
+* D\xE9finition des profils
+* --------------------------
+*
+* Profils Saint-Venant
+PROFIL ST_Prof11
+LIMITEJ 1 3 4 7 8 10
+STRIC Fk_K0 Fk_Prof11MAJ Fk_Prof11MIN Fk_Prof11MAJ Fk_K0
+X/Z 0.00 6.10 2.00 5.10 32.00 4.10 62.00 3.10
+X/Z 66.00 1.10 86.00 1.10 90.00 3.10 120.00 4.10
+X/Z 150.00 5.10 152.00 6.10
+ACTIF 2 3 4
+LIT Lt_MAJD 2
+LIT Lt_MINEUR 3
+LIT Lt_MAJG 4
+LIT Lt_STOCKAGE 1 5
+*
+PROFIL St_PROF10
+LIMITEJ 1 3 4 7 8 10
+STRIC Fk_K0 Fk_PROF10MAJ Fk_PROF10MIN Fk_PROF10MAJ Fk_K0
+X/Z 0.00 6.00 2.00 5.00 32.00 4.00 62.00 3.00
+X/Z 66.00 1.00 86.00 1.00 90.00 3.00 120.00 4.00
+X/Z 150.00 5.00 152.00 6.00
+ACTIF 2 3 4
+LIT Lt_MAJD 2
+LIT Lt_MINEUR 3
+LIT Lt_MAJG 4
+LIT Lt_STOCKAGE 1 5
+*
+PROFIL St_PROF9
+LIMITEJ 1 3 4 7 8 10
+STRIC Fk_K0 Fk_PROF9MAJ Fk_PROF9MIN Fk_PROF9MAJ Fk_K0
+X/Z 0.00 5.90 2.00 4.90 32.00 3.90 62.00 2.90
+X/Z 66.00 0.90 86.00 0.90 90.00 2.90 120.00 3.90
+X/Z 150.00 4.90 152.00 5.90
+ACTIF 2 3 4
+LIT Lt_MAJD 2
+LIT Lt_MINEUR 3
+LIT Lt_MAJG 4
+LIT Lt_STOCKAGE 1 5
+*
+PROFIL St_PROF8
+LIMITEJ 1 3 4 7 8 10
+STRIC Fk_K0 Fk_PROF8MAJ Fk_PROF8MIN Fk_PROF8MAJ Fk_K0
+X/Z 0.00 5.80 2.00 4.80 32.00 3.80 62.00 2.80
+X/Z 66.00 0.80 86.00 0.80 90.00 2.80 120.00 3.80
+X/Z 150.00 4.80 152.00 5.80
+ACTIF 2 3 4
+LIT Lt_MAJD 2
+LIT Lt_MINEUR 3
+LIT Lt_MAJG 4
+LIT Lt_STOCKAGE 1 5
+*
+PROFIL St_PROF7
+LIMITEJ 1 3 4 7 8 10
+STRIC Fk_K0 Fk_PROF7MAJ Fk_PROF7MIN Fk_PROF7MAJ Fk_K0
+X/Z 0.00 5.70 2.00 4.70 32.00 3.70 62.00 2.70
+X/Z 66.00 0.70 86.00 0.70 90.00 2.70 120.00 3.70
+X/Z 150.00 4.70 152.00 5.70
+ACTIF 2 3 4
+LIT Lt_MAJD 2
+LIT Lt_MINEUR 3
+LIT Lt_MAJG 4
+LIT Lt_STOCKAGE 1 5
+*
+PROFIL St_PROF6A
+LIMITEJ 1 3 4 7 8 10
+STRIC Fk_K0 Fk_PROF6AMAJ Fk_PROF6AMIN Fk_PROF6AMAJ Fk_K0
+X/Z 0.00 5.60 2.00 4.60 32.00 3.60 62.00 2.60
+X/Z 66.00 0.60 86.00 0.60 90.00 2.60 120.00 3.60
+X/Z 150.00 4.60 152.00 5.60
+ACTIF 2 3 4
+LIT Lt_MAJD 2
+LIT Lt_MINEUR 3
+LIT Lt_MAJG 4
+LIT Lt_STOCKAGE 1 5
+*
+PROFIDEM St_PROF6B St_PROF6A 0.
+*
+PROFINT St_PROF5
+*
+PROFIL St_PROF4
+LIMITEJ 1 3 4 7 8 10
+STRIC Fk_K0 Fk_PROF4MAJ Fk_PROF4MIN Fk_PROF4MAJ Fk_K0
+X/Z 0.00 5.40 2.00 4.40 32.00 3.40 62.00 2.40
+X/Z 66.00 0.40 86.00 0.40 90.00 2.40 120.00 3.40
+X/Z 150.00 4.40 152.00 5.40
+ACTIF 2 3 4
+LIT Lt_MAJD 2
+LIT Lt_MINEUR 3
+LIT Lt_MAJG 4
+LIT Lt_STOCKAGE 1 5
+*
+PROFIL St_PROF3A
+LIMITEJ 1 3 4 7 8 10
+STRIC Fk_K0 Fk_PROF3AMAJ Fk_PROF3AMIN Fk_PROF3AMAJ Fk_K0
+X/Z 0.00 5.30 2.00 4.30 32.00 3.30 62.00 2.30
+X/Z 66.00 0.30 86.00 0.30 90.00 2.30 120.00 3.30
+X/Z 150.00 4.30 152.00 5.30
+ACTIF 2 3 4
+LIT Lt_MAJD 2
+LIT Lt_MINEUR 3
+LIT Lt_MAJG 4
+LIT Lt_STOCKAGE 1 5
+*
+PROFIDEM St_PROF3AM St_PROF3A
+*
+PROFIL St_PROF3AV
+LIMITEJ 1 3 4 7 8 10
+STRIC Fk_K0 Fk_PROF3AVMAJ Fk_PROF3AVMIN Fk_PROF3AVMAJ Fk_K0
+X/Z 0.00 5.30 2.00 4.30 32.00 3.30 62.00 2.30
+X/Z 66.00 0.30 86.00 0.30 90.00 2.30 120.00 3.30
+X/Z 150.00 4.30 152.00 5.30
+ACTIF 2 3 4
+LIT Lt_MAJD 2
+LIT Lt_MINEUR 3
+LIT Lt_MAJG 4
+LIT Lt_STOCKAGE 1 5
+*
+PROFIL St_PROF3B
+LIMITEJ 1 3 4 7 8 10
+STRIC Fk_K0 Fk_PROF3BMAJ Fk_PROF3BMIN Fk_PROF3BMAJ Fk_K0
+X/Z 0.00 5.30 2.00 4.30 32.00 3.30 62.00 2.30
+X/Z 66.00 0.30 86.00 0.30 90.00 2.30 120.00 3.30
+X/Z 150.00 4.30 152.00 5.30
+ACTIF 2 3 4
+LIT Lt_MAJD 2
+LIT Lt_MINEUR 3
+LIT Lt_MAJG 4
+LIT Lt_STOCKAGE 1 5
+*
+PROFIL St_PROF2
+LIMITEJ 1 3 4 7 8 10
+STRIC Fk_K0 Fk_PROF2MAJ Fk_PROF2MIN Fk_PROF2MAJ Fk_K0
+X/Z 0.00 5.20 2.00 4.20 32.00 3.20 62.00 2.20
+X/Z 66.00 0.20 86.00 0.20 90.00 2.20 120.00 3.20
+X/Z 150.00 4.20 152.00 5.20
+ACTIF 2 3 4
+LIT Lt_MAJD 2
+LIT Lt_MINEUR 3
+LIT Lt_MAJG 4
+LIT Lt_STOCKAGE 1 5
+*
+PROFIL St_PROF1
+LIMITEJ 1 3 4 7 8 10
+STRIC Fk_K0 Fk_PROF1MAJ Fk_PROF1MIN Fk_PROF1MAJ Fk_K0
+X/Z 0.00 5.10 2.00 4.10 32.00 3.10 62.00 2.10
+X/Z 66.00 0.10 86.00 0.10 90.00 2.10 120.00 3.10
+X/Z 150.00 4.10 152.00 5.10
+ACTIF 2 3 4
+LIT Lt_MAJD 2
+LIT Lt_MINEUR 3
+LIT Lt_MAJG 4
+LIT Lt_STOCKAGE 1 5
+*
+* Profils Strickler
+PROFIL St_PROFSTR1
+LIMITEJ 1 4
+STRIC Fk_PROFSTR1MIN
+X/Z 0.00 2.00 0.00 0.80 50.00 0.80 50.00 2.00
+*
+PROFIL St_PROFSTR2
+STRIC Fk_PROFSTR2MIN
+LIMITEJ 1 4
+X/Z 0.00 2.00 0.00 0.40 50.00 0.40 50.00 2.00
+*
+*
+* D\xE9finition des casiers
+* --------------------------
+*
+CASIER Nd_N6
+RUIS 0.000000
+PROFCAS 100.00
+LIMITEJ 1 2
+X/Z 0.00 0.30 100.00 0.30
+PROFCAS 100.00
+LIMITEJ 2 4
+X/Z -100.00 0.50 0.00 0.40
+X/Z 50.00 0.30 100.00 0.20
+*
+CASIER Nd_N7
+RUIS 0.000000
+* nbval xlong ideb ifin
+PROFCAS 200.00
+LIMITEJ 1 2
+X/Z 0.00 0.20 100.00 0.20
Added: trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/M6-0_c9.dh
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/M6-0_c9.dh (rev 0)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/fichierTest/M6-0_c9.dh 2009-11-27 17:09:05 UTC (rev 5503)
@@ -0,0 +1,108 @@
+* Donn\xE9es g\xE9n\xE9rales
+* --------------------------
+* 5 lignes de titre
+CrueX - Structuration des donn\xE9es
+
+Mod\xE8le de test pour les pas de temps variables
+
+PBa Nov09 sur la base de Modele3-0
+*
+* ical cru cofqrq isorti ile trepr
+ 2 0 0 0 1 0 0 0 0
+*
+*
+* D\xE9bits initiaux dans les branches
+* --------------------------
+ Br_B1 100.000 Br_B2 100.000 Br_B3 100.000 Br_B4 100.000
+ Br_B5 .000 Br_B6 .000 Br_B8 .000
+FIN
+*
+*
+* Niveaux initiaux aux noeuds
+* --------------------------
+ Nd_N1 3.676 Nd_N2 3.222 Nd_N3 2.779 Nd_N4 2.624
+ Nd_N5 2.000 Nd_N6 2.926 Nd_N7 2.926
+FIN
+*
+*
+* Donn\xE9es permanentes
+* --------------------------
+* dtperm tolz tolq icalmx iprint ndecou
+ 0 1 0 0 0.001 0.01 40 0 1
+*
+* D\xE9finition des types des conditions aux limites
+Nd_N1 2
+Nd_N5 1
+Br_B8 41
+FIN
+*
+* Pseudo-pas de temps variable pour les calculs pseudo-permanents
+VARDT
+10 0 00 01 00
+100 0 01 00 00
+FIN
+*
+* Valeurs des conditions aux limites (r\xE9gimes permanents)
+ 100. 2.0 100.
+ 100. 1.5 90.
+FIN
+*
+*
+* Donnees transitoires
+* --------------------------
+* dt tmax tdeb hdeb nts
+0 00 01 00 0 24 00 00 0 00 00 00 0 00 00 00 60
+*
+* D\xE9finition des types des conditions aux limites
+Nd_N1 2
+Nd_N5 3
+Br_B8 41
+FIN
+*
+* Pas de temps variable pour le calcul transitoire
+VARDT
+0 00 00 00 0 00 01 00
+0 01 00 00 0 00 10 00
+FIN
+*
+* Valeurs des conditions aux limites: d\xE9bit entrant \xE0 l'amont (noeud N1)
+* ilecam
+ 2
+*
+* tj th tm ts Q
+ 0 0 0 0 100.
+ 0 1 0 0 100.
+ 0 3 0 0 125.
+ 0 4 0 0 150.
+ 0 5 0 0 200.
+ 0 7 0 0 400.
+ 0 9 0 0 450.
+ 0 11 0 0 480.
+ 0 12 0 0 500.
+ 0 13 0 0 480.
+ 0 15 0 0 450.
+ 0 17 0 0 400.
+ 0 19 0 0 200.
+ 0 20 0 0 150.
+ 0 21 0 0 125.
+ 0 23 0 0 100.
+ 0 24 0 0 100.
+FIN
+*
+* Valeurs des conditions aux limites: loi Q(Z) \xE0 l'aval (noeud N5)
+* Zbas Dz
+ 1. 0.5
+*
+ 0 -100. -150. -175. -200. -240. -300. -350. -400. -500.
+FIN
+*
+* Valeurs des conditions aux limites et manoeuvres: vanne manoeuvr\xE9e par le haut (branche B8)
+* ilecam
+ 2
+*
+* tj th tm ts Q
+ 0 0 0 0 90.
+ 0 5 0 0 90.
+ 0 6 0 0 50.
+ 0 24 0 0 100.
+FIN
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueModeleBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueModeleBuilder.java 2009-11-26 16:57:55 UTC (rev 5502)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueModeleBuilder.java 2009-11-27 17:09:05 UTC (rev 5503)
@@ -28,6 +28,7 @@
*/
public static BuIcon iconeScenario_ = FCrueResource.CRUE.getIcon("scenario_32");
public static BuIcon iconeModele_ = FCrueResource.CRUE.getIcon("modele_32");
+ public static BuIcon iconeSousModele_ = FCrueResource.CRUE.getIcon("sous-modele_32");
/**
* Construit une bu list avec l'ensemble des scenarios du logiciel
@@ -54,7 +55,12 @@
final DefaultListModel model = new DefaultListModel();
if (baseModeles != null) {
for (final ObjetNomme modele : baseModeles) {
- final BuLabel label = new BuLabel(iconeModele_);
+ final BuLabel label;
+ if (modele instanceof ManagerEMHSousModele) {
+ label = new BuLabel(iconeSousModele_);
+ } else {
+ label = new BuLabel(iconeModele_);
+ }
label.setText(modele.getNom());
model.addElement(label);
}
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java 2009-11-26 16:57:55 UTC (rev 5502)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/builder/CrueTreeProject.java 2009-11-27 17:09:05 UTC (rev 5503)
@@ -152,6 +152,10 @@
return r == scenario.getRunCourant();
}
+ public boolean isLoaded() {
+ return scenario.isLoaded();
+ }
+
@Override
public Object getValueAt(final int column) {
if (column == 0) {
@@ -275,9 +279,11 @@
* Icone propre aux scenarios
*/
public static BuIcon iconeScenario = FCrueResource.CRUE.getIcon("scenario");
- public static BuIcon iconeScenarioCourant = FCrueResource.CRUE.getIcon("correct");
+ public static BuIcon iconeScenarioCourant = FCrueResource.CRUE.getIcon("element-courant-non-charge");
+ public static BuIcon iconeScenarioCourantCharge = FCrueResource.CRUE.getIcon("element-courant-charge");
public static BuIcon iconeRun = FCrueResource.CRUE.getIcon("run");
- public static BuIcon iconeRunCourant = FCrueResource.CRUE.getIcon("correct");
+ public static BuIcon iconeRunCourant = FCrueResource.CRUE.getIcon("element-courant-non-charge");
+ public static BuIcon iconeRunCourantCharge = FCrueResource.CRUE.getIcon("element-courant-charge");
public static BuIcon iconeModele = FCrueResource.CRUE.getIcon("modele");
public static BuIcon iconeSousModele = FCrueResource.CRUE.getIcon("sous-modele");
@@ -302,14 +308,15 @@
if (value instanceof TreeNodeScenario) {
if (((TreeNodeScenario) value).isCourant()) {
- setIcon(iconeScenarioCourant);
+ setIcon(((TreeNodeScenario) value).getS().isLoaded() ? iconeScenarioCourantCharge : iconeScenarioCourant);
} else {
setIcon(iconeScenario);
}
setToolTipText("Scénario");
} else if (value instanceof TreeNodeRun) {
- setIcon(((TreeNodeRun) value).isCourant() ? iconeRunCourant : iconeRun);
+ setIcon(((TreeNodeRun) value).isCourant() ? (((TreeNodeRun) value).isLoaded() ? iconeRunCourantCharge
+ : iconeRunCourant) : iconeRun);
} else if ((value instanceof TreeNodeModele) || (value instanceof TreeNodeModeleRun)) {
setIcon(iconeModele);
} else if (value instanceof TreeNodeSousModele) {
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheScenario.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheScenario.java 2009-11-26 16:57:55 UTC (rev 5502)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/view/CrueFicheScenario.java 2009-11-27 17:09:05 UTC (rev 5503)
@@ -215,10 +215,14 @@
if (crueProjet_.getProject().getScenarioCourant() != null
&& crueProjet_.getProject().getScenarioCourant() == scenario) {
- labelScenarCourant.setIcon(FCrueResource.CRUE.getIcon("correct"));
+ if (crueProjet_.getProject().getScenarioCourant().isLoaded()) {
+ labelScenarCourant.setIcon(FCrueResource.CRUE.getIcon("element-courant-charge"));
+ } else {
+ labelScenarCourant.setIcon(FCrueResource.CRUE.getIcon("element-courant-non-charge"));
+ }
labelScenarCourant.setText(Messages.getString("ihm.label.id.scenario.current.true"));
} else {
- labelScenarCourant.setIcon(FCrueResource.CRUE.getIcon("erreur-fatale"));
+ labelScenarCourant.setIcon(FCrueResource.CRUE.getIcon("element-non-courant"));
labelScenarCourant.setText(Messages.getString("ihm.label.id.scenario.current.false"));
}
labelId.setText(CtuluLibString.EMPTY_STRING);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|