[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/mascaret ConvH1D_Masc.java,1.8,1.9

[Jean-Marc L. <jm_...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14375/mascaret

Modified Files:
	ConvH1D_Masc.java 
Log Message:


Index: ConvH1D_Masc.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/ConvH1D_Masc.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ConvH1D_Masc.java	22 Apr 2004 14:22:39 -0000	1.8
--- ConvH1D_Masc.java	29 Apr 2004 17:56:09 -0000	1.9
***************
*** 656,663 ****
          } else if (s instanceof ISeuilDenoye) {
            ISeuilDenoye d= (ISeuilDenoye)s;
!           if (iparamGen.regime().value() == LRegime._TRANSCRITIQUE) {
!             sMas.type= 6; // type du seuil : Zam=f(Q)
            } else {
!             sMas.type = 2; // type du seuil : Zam=f(Q)
            }
            sMas.coteCrete= d.coteCrete();
--- 656,665 ----
          } else if (s instanceof ISeuilDenoye) {
            ISeuilDenoye d= (ISeuilDenoye)s;
!           if (d.loi().amont()) {
!             //  Z=f(Q)
!             sMas.type= 2;
            } else {
!             // Q=f(Z)
!             sMas.type = 6;
            }
            sMas.coteCrete= d.coteCrete();
***************
*** 1097,1104 ****
          else if (l instanceof ILoiTarage) {
            ILoiTarage ll= (ILoiTarage)l;
!           if (ll.amont())
!             loisMas.lois[i].type= 4;//type de loi : 4->"COURBE DE TARAGE Z=f(Q)"
!           else
!             loisMas.lois[i].type= 5;//type de loi : 5->"COURBE DE TARAGE Q=f(Z)"
          }
          else if (l instanceof ILoiSeuil) {
--- 1099,1109 ----
          else if (l instanceof ILoiTarage) {
            ILoiTarage ll= (ILoiTarage)l;
!           if (ll.amont()) {
!             // amont <=> Z=f(Q)
!             loisMas.lois[i].type = 4; //type de loi : 4->"COURBE DE TARAGE Z=f(Q)"
!           } else {
!             // aval <=> Q=f(Z)
!             loisMas.lois[i].type = 5; //type de loi : 5->"COURBE DE TARAGE Q=f(Z)"
!           }
          }
          else if (l instanceof ILoiSeuil) {