[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux TestINP.java,1.7,1.8

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv9006/test/reflux

Modified Files:
	TestINP.java 
Log Message:
Correction bug 797184
Amelioration lecture format reflux/telemac


Index: TestINP.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux/TestINP.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestINP.java	22 Aug 2003 15:51:13 -0000	1.7
--- TestINP.java	2 Sep 2003 08:41:25 -0000	1.8
***************
*** 96,110 ****
      H2dRefluxBordIndexGeneral bord=
        H2dRefluxBordIndexGeneral.findBordWithIndex(1430, 1421, _t.getBords());
!     assertEquals(H2dBordType.SOLIDE, bord.getBord());
      bord=
        H2dRefluxBordIndexGeneral.findBordWithIndex(1412, 1403, _t.getBords());
!     assertEquals(H2dBordType.SOLIDE, bord.getBord());
!     itemp= new int[] { 1430, 1421, 1412, 1403, 1394 };
!     for (int i= itemp.length - 1; i > 0; i--) {
!       cl= getForIndex(tabCl, itemp[i]);
!       assertEquals(H2dClType.PERMANENT, cl.getRugositeType());
!       assertEquals(3d, cl.getRugosite(), eps_);
! 
!     }
  
      //H2dElement[] elems=t.getMaillage().getElts();
--- 96,107 ----
      H2dRefluxBordIndexGeneral bord=
        H2dRefluxBordIndexGeneral.findBordWithIndex(1430, 1421, _t.getBords());
!     assertEquals(H2dBordType.SOLIDE_FROTTEMENT, bord.getBord());
!     assertEquals(H2dClType.PERMANENT, bord.getRugositeType());
!     assertEquals(3d, bord.getRugosite(), eps_);
      bord=
        H2dRefluxBordIndexGeneral.findBordWithIndex(1412, 1403, _t.getBords());
!     assertEquals(H2dBordType.SOLIDE_FROTTEMENT, bord.getBord());
!     assertEquals(H2dClType.PERMANENT, bord.getRugositeType());
!     assertEquals(3d, bord.getRugosite(), eps_);
  
      //H2dElement[] elems=t.getMaillage().getElts();
***************
*** 122,126 ****
      assertEquals(prTemp.getVariableType(), H2dVariableType.VISCOSITE);
      assertEquals(prTemp.getValeurTransitoireNb(), 0);
!     assertEquals(prTemp.getPermanentNb(), 0);
      assertEquals(prTemp.getValeurLibreNb(), 0);
      assertEquals(prTemp.getDefaultValue(), 0.01, eps_);
--- 119,123 ----
      assertEquals(prTemp.getVariableType(), H2dVariableType.VISCOSITE);
      assertEquals(prTemp.getValeurTransitoireNb(), 0);
!     assertEquals(prTemp.getPermanentSpecifieNb(), 0);
      assertEquals(prTemp.getValeurLibreNb(), 0);
      assertEquals(prTemp.getDefaultValue(), 0.01, eps_);
***************
*** 128,134 ****
      assertEquals(prTemp.getVariableType(), H2dVariableType.RUGOSITE);
      assertEquals(prTemp.getValeurTransitoireNb(), 0);
!     assertEquals(prTemp.getPermanentNb(), 0);
      assertEquals(prTemp.getValeurLibreNb(), 0);
      assertEquals(prTemp.getDefaultValue(), 0.025, eps_);
  
      prTemp= propelem[2];
--- 125,132 ----
      assertEquals(prTemp.getVariableType(), H2dVariableType.RUGOSITE);
      assertEquals(prTemp.getValeurTransitoireNb(), 0);
!     assertEquals(prTemp.getPermanentSpecifieNb(), 0);
      assertEquals(prTemp.getValeurLibreNb(), 0);
      assertEquals(prTemp.getDefaultValue(), 0.025, eps_);
+     assertEquals(prTemp.getPermanentValueForIndex(1), 0.025, eps_);
  
      prTemp= propelem[2];
***************
*** 137,141 ****
        H2dVariableType.ALPHA_LONGUEUR_MELANGE);
      assertEquals(prTemp.getValeurTransitoireNb(), 0);
!     assertEquals(prTemp.getPermanentNb(), 0);
      assertEquals(prTemp.getValeurLibreNb(), 0);
      assertEquals(prTemp.getDefaultValue(), 0.0, eps_);
--- 135,139 ----
        H2dVariableType.ALPHA_LONGUEUR_MELANGE);
      assertEquals(prTemp.getValeurTransitoireNb(), 0);
!     assertEquals(prTemp.getPermanentSpecifieNb(), 0);
      assertEquals(prTemp.getValeurLibreNb(), 0);
      assertEquals(prTemp.getDefaultValue(), 0.0, eps_);
***************
*** 143,150 ****
      prTemp= propelem[3];
      assertEquals(prTemp.getVariableType(), H2dVariableType.PERTE_CHARGE);
!     assertEquals(prTemp.getValeurTransitoireNb(), 0);
!     assertEquals(prTemp.getPermanentNb(), 792);
!     assertEquals(prTemp.getValeurLibreNb(), 0);
!     assertEquals(prTemp.getDefaultValue(), 0.0, eps_);
  
      for (int i= 790; i >= 0; i--) {
--- 141,149 ----
      prTemp= propelem[3];
      assertEquals(prTemp.getVariableType(), H2dVariableType.PERTE_CHARGE);
!     assertEquals(0,prTemp.getValeurTransitoireNb());
!     assertEquals(792,prTemp.getPermanentSpecifieNb());
!     assertEquals(0,prTemp.getValeurLibreNb());
!     assertEquals(0.0,prTemp.getDefaultValue(), eps_);
!     assertEquals(0.0,prTemp.getPermanentValueForIndex(0), eps_);
  
      for (int i= 790; i >= 0; i--) {
***************
*** 210,214 ****
      FileOperationSynthese syntheseR=
        INPFileFormat.getInstance().getLastINPVersionImpl().read(_f, null);
!     INPInterface r=(INPInterface)syntheseR.getSource(); 
      if (syntheseR.containsMessages())
        syntheseR.getAnalyze().toAnalyze().printResume();
--- 209,213 ----
      FileOperationSynthese syntheseR=
        INPFileFormat.getInstance().getLastINPVersionImpl().read(_f, null);
!     INPInterface r= (INPInterface)syntheseR.getSource();
      if (syntheseR.containsMessages())
        syntheseR.getAnalyze().toAnalyze().printResume();
***************
*** 243,250 ****
      assertEquals(1, maillageBord.getBordNb());
      H2dRefluxBordManager mng= param.getBords();
!     assertEquals(mng.getFrontiereBordNb(), 1);
!     H2dRefluxBordManager.BordParFrontiere frontiere0= mng.getFrontiereBord(0);
!     assertEquals(1, frontiere0.getBordNb());
!     assertTrue(frontiere0.getBord(0).isUnique());
  
    }
--- 242,252 ----
      assertEquals(1, maillageBord.getBordNb());
      H2dRefluxBordManager mng= param.getBords();
!     assertEquals(mng.getFrontiereNb(), 1);
!     H2dRefluxBordManager.BordParFrontiere frontiere0= mng.getFrontiereBords(0);
!     assertEquals(2, frontiere0.getBordNb());
!     assertEquals(H2dBordType.SOLIDE, frontiere0.getBord(0).getType());
!     assertEquals(
!       H2dBordType.SOLIDE_FROTTEMENT,
!       frontiere0.getBord(1).getType());
  
    }
***************
*** 265,281 ****
        return;
      }
! 
!     FileOperationSynthese syntheseR= INPFileFormat.getInstance().getLastINPVersionImpl().read(
!     f,
!     null);
!     INPInterface inpInter=(INPInterface)syntheseR.getSource();
      DodicoAnalyze infos= syntheseR.getAnalyze().toAnalyze();
      if (infos != null)
        infos.printResume();
  
!     if (inpInter != null) {
!       System.out.println(inpInter.getTypeProjet().toString());
!       DodicoLib.printFields(inpInter, false);
!     }
  
    }
--- 267,290 ----
        return;
      }
!     INPFileFormat.INPVersion version=
!       INPFileFormat.getInstance().getLastINPVersionImpl();
!     FileOperationSynthese syntheseR= version.read(f, new ProgressionTestAdapter());
!     INPInterface inpInter= (INPInterface)syntheseR.getSource();
      DodicoAnalyze infos= syntheseR.getAnalyze().toAnalyze();
      if (infos != null)
        infos.printResume();
  
!     if ((infos != null) && (infos.containsFatalError()))
!       return;
!     fileName= (String)arg.get("-o");
!     if (fileName == null)
!       fileName= (String)arg.get("-out");
!     if (fileName == null)
!       return;
!     f= new File(fileName);
!     long t1= System.currentTimeMillis();
!     version.write(f, inpInter,  new ProgressionTestAdapter());
!     long t2= System.currentTimeMillis();
!     System.out.println("temps ecriture " + (t2 - t1));
  
    }