[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/mascaret CConversionHydraulique1d.java,1.2,1.3 DCalculMascaret.java,1.2,1.3

[<jm_...@us...>]

Update of /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/mascaret
In directory sc8-pr-cvs1:/tmp/cvs-serv1427/mascaret

Modified Files:
	CConversionHydraulique1d.java DCalculMascaret.java 
Log Message:
Correction bugs


Index: CConversionHydraulique1d.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/CConversionHydraulique1d.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CConversionHydraulique1d.java	18 Mar 2003 13:01:27 -0000	1.2
--- CConversionHydraulique1d.java	17 May 2003 21:28:29 -0000	1.3
***************
*** 326,329 ****
--- 326,330 ----
  
    private final static SParametresMaillage getMaillageMas(IMaillage maillage, IReseau ireseau) {
+     System.out.println("getMaillageMas(...)");
      IDefinitionSectionsParSeries def;
      SParametresMaillageClavier maillClavMas = new SParametresMaillageClavier();
***************
*** 363,367 ****
            double xDeb = def.unitaires()[i].zone().abscisseDebut();
            IBief bief = def.unitaires()[i].zone().biefRattache();
!           IProfil profDebutPlage = bief.profils()[bief.getIndiceProfilAbscisse(xDeb)];
            //def.unitaires()[i].zone().biefRattache().getIndiceProfilAbscisse(xDeb)
            maillClavMas.num1erProfPlage[i]=ireseau.getNumeroApparitionProfil(profDebutPlage);
--- 364,368 ----
            double xDeb = def.unitaires()[i].zone().abscisseDebut();
            IBief bief = def.unitaires()[i].zone().biefRattache();
!           IProfil profDebutPlage = bief.profils()[Math.abs(bief.getIndiceProfilAbscisse(xDeb))];
            //def.unitaires()[i].zone().biefRattache().getIndiceProfilAbscisse(xDeb)
            maillClavMas.num1erProfPlage[i]=ireseau.getNumeroApparitionProfil(profDebutPlage);
***************
*** 369,373 ****
            double xFin = def.unitaires()[i].zone().abscisseFin();
            bief = def.unitaires()[i].zone().biefRattache();
!           IProfil profFinPlage = bief.profils()[bief.getIndiceProfilAbscisse(xFin)];
            maillClavMas.numDerProfPlage[i]=ireseau.getNumeroApparitionProfil(profFinPlage);
            //maillClavMas.numDerProfPlage[i]=def.unitaires()[i].zone().biefRattache().getIndiceProfilAbscisse(xFin);
--- 370,374 ----
            double xFin = def.unitaires()[i].zone().abscisseFin();
            bief = def.unitaires()[i].zone().biefRattache();
!           IProfil profFinPlage = bief.profils()[Math.abs(bief.getIndiceProfilAbscisse(xFin))];
            maillClavMas.numDerProfPlage[i]=ireseau.getNumeroApparitionProfil(profFinPlage);
            //maillClavMas.numDerProfPlage[i]=def.unitaires()[i].zone().biefRattache().getIndiceProfilAbscisse(xFin);

Index: DCalculMascaret.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DCalculMascaret.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DCalculMascaret.java	18 Mar 2003 13:01:27 -0000	1.2
--- DCalculMascaret.java	17 May 2003 21:28:29 -0000	1.3
***************
*** 137,140 ****
--- 137,141 ----
  
      String os=System.getProperty("os.name");
+     System.out.println("os="+os);
      String drive;
      String path=cheminServeur();
***************
*** 155,159 ****
      if (ficEcran.exists())ficEcran.delete();
      File ficDamocles=null;
!     if (os.startsWith("Windows") ) ficDamocles=new File(path+"listing.damoc");
      else ficDamocles=new File(path+nomEtude+".listing");
      if (ficDamocles.exists())ficDamocles.delete();
--- 156,160 ----
      if (ficEcran.exists())ficEcran.delete();
      File ficDamocles=null;
!     if (os.startsWith("Windows") || os.startsWith("Linux")) ficDamocles=new File(path+"listing.damoc");
      else ficDamocles=new File(path+nomEtude+".listing");
      if (ficDamocles.exists())ficDamocles.delete();