[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac SerafinArchConvertGUI.java,1.2,1.3 TestCL.java,1.5,1.6 TestCas.java,1.2,1.3 TestLiquide.java,1.4,1.5 TestSerafin.java,1.9,1.10 TestSerafinArchConvert.java,1.2,1.3

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

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

Modified Files:
	SerafinArchConvertGUI.java TestCL.java TestCas.java 
	TestLiquide.java TestSerafin.java TestSerafinArchConvert.java 
Log Message:
Maj des projets hydraulique 2d


Index: SerafinArchConvertGUI.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/SerafinArchConvertGUI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SerafinArchConvertGUI.java	4 Jul 2003 14:22:41 -0000	1.2
--- SerafinArchConvertGUI.java	18 Aug 2003 11:05:20 -0000	1.3
***************
*** 231,235 ****
          try
          {
!           SerafinWriter w  = new SerafinWriter(SerafinFileFormat.getInstance());
            if (isInSparc_)
              w.setMachineID(FortranBinaryInputStream.X86);
--- 231,235 ----
          try
          {
!           SerafinWriter w  = new SerafinWriter(SerafinFileFormat.getInstance().getLastVersionImpl());
            if (isInSparc_)
              w.setMachineID(FortranBinaryInputStream.X86);
***************
*** 283,287 ****
      try
      {
!       final SerafinReader reader = new SerafinReader(SerafinFileFormat.getInstance());
          reader.setFile(new FileInputStream(_f));
          reader.setProgressReceiver(progression_);
--- 283,287 ----
      try
      {
!       final SerafinReader reader = new SerafinReader(SerafinFileFormat.getInstance().getLastVersionImpl());
          reader.setFile(new FileInputStream(_f));
          reader.setProgressReceiver(progression_);

Index: TestCL.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestCL.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestCL.java	4 Jul 2003 14:22:41 -0000	1.5
--- TestCL.java	18 Aug 2003 11:05:20 -0000	1.6
***************
*** 207,211 ****
        TelemacCLInterface inter=getInter(fic_);
        File tmpFile=createTempFile();
!       FileOperationSynthese syntheseR=TelemacCLFileFormat.getInstance().write(tmpFile, inter, null);
        assertNull(syntheseR.getAnalyze());
        _interfaceTest(getInter(tmpFile));
--- 207,211 ----
        TelemacCLInterface inter=getInter(fic_);
        File tmpFile=createTempFile();
!       FileOperationSynthese syntheseR=TelemacCLFileFormat.getInstance().getLastVersionImpl().write(tmpFile, inter, null);
        assertNull(syntheseR.getAnalyze());
        _interfaceTest(getInter(tmpFile));
***************
*** 216,220 ****
      {
        FileOperationSynthese syntheseR= new FileOperationSynthese();
!       TelemacCLInterface r=TelemacCLFileFormat.getInstance().read(_f, syntheseR, null);
        assertNull(syntheseR.getAnalyze());
        return r;
--- 216,220 ----
      {
        FileOperationSynthese syntheseR= new FileOperationSynthese();
!       TelemacCLInterface r=TelemacCLFileFormat.getInstance().getLastVersionImpl().read(_f, syntheseR, null);
        assertNull(syntheseR.getAnalyze());
        return r;

Index: TestCas.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestCas.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestCas.java	4 Jul 2003 14:22:41 -0000	1.2
--- TestCas.java	18 Aug 2003 11:05:20 -0000	1.3
***************
*** 20,24 ****
  import org.fudaa.dodico.dico.DicoCasWriter;
  import org.fudaa.dodico.fichiers.FileOperationSynthese;
! import org.fudaa.dodico.telemac.io.TelemacCasFileFormat;
  import org.fudaa.dodico.test.TestIO;
  
--- 20,24 ----
  import org.fudaa.dodico.dico.DicoCasWriter;
  import org.fudaa.dodico.fichiers.FileOperationSynthese;
! import org.fudaa.dodico.telemac.io.Telemac2dFileFormat;
  import org.fudaa.dodico.test.TestIO;
  
***************
*** 42,46 ****
      DicoCasInterface inter = _r;
      assertEquals(inter.getNbInput(), 28);
!     DicoModelAbstract dico = TelemacCasFileFormat.getInstance().getDico();
      DicoEntite ent = dico.getEntite("CONDITIONS INITIALES");
      String t = inter.getValue(ent);
--- 42,46 ----
      DicoCasInterface inter = _r;
      assertEquals(inter.getNbInput(), 28);
!     DicoModelAbstract dico = Telemac2dFileFormat.getInstance().getLastVersionImpl().getDico();
      DicoEntite ent = dico.getEntite("CONDITIONS INITIALES");
      String t = inter.getValue(ent);
***************
*** 64,68 ****
        DicoCasInterface inter=getInter(fic_);
        File tmpFile=createTempFile();
!       FileOperationSynthese syntheseR=TelemacCasFileFormat.getInstance().write(tmpFile, inter, null);
        assertNull(syntheseR.getAnalyze());
        _interfaceTest(getInter(tmpFile));
--- 64,68 ----
        DicoCasInterface inter=getInter(fic_);
        File tmpFile=createTempFile();
!       FileOperationSynthese syntheseR=Telemac2dFileFormat.getInstance().getLastVersionImpl().writeCas(tmpFile, inter, null);
        assertNull(syntheseR.getAnalyze());
        _interfaceTest(getInter(tmpFile));
***************
*** 73,77 ****
      {
        FileOperationSynthese syntheseR= new FileOperationSynthese();
!       DicoCasInterface r=TelemacCasFileFormat.getInstance().read(_f, syntheseR, null);
        assertNull(syntheseR.getAnalyze());
        return r;
--- 73,77 ----
      {
        FileOperationSynthese syntheseR= new FileOperationSynthese();
!       DicoCasInterface r=Telemac2dFileFormat.getInstance().getLastVersionImpl().readCas(_f, syntheseR, null);
        assertNull(syntheseR.getAnalyze());
        return r;

Index: TestLiquide.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestLiquide.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestLiquide.java	6 Aug 2003 08:36:31 -0000	1.4
--- TestLiquide.java	18 Aug 2003 11:05:20 -0000	1.5
***************
*** 76,80 ****
        TelemacLiquideInterface inter=getInter(fic_);
        File tmpFile=createTempFile();
!       FileOperationSynthese syntheseR=TelemacLiquideFileFormat.getInstance().write(tmpFile, inter, null);
        assertNull(syntheseR.getAnalyze());
        _interfaceTest(getInter(tmpFile));
--- 76,80 ----
        TelemacLiquideInterface inter=getInter(fic_);
        File tmpFile=createTempFile();
!       FileOperationSynthese syntheseR=TelemacLiquideFileFormat.getInstance().getLastVersionImpl().write(tmpFile, inter, null);
        assertNull(syntheseR.getAnalyze());
        _interfaceTest(getInter(tmpFile));
***************
*** 85,89 ****
      {
        FileOperationSynthese syntheseR= new FileOperationSynthese();
!       TelemacLiquideInterface r=TelemacLiquideFileFormat.getInstance().read(_f, syntheseR, null);
        assertNull(syntheseR.getAnalyze());
        return r;
--- 85,89 ----
      {
        FileOperationSynthese syntheseR= new FileOperationSynthese();
!       TelemacLiquideInterface r=TelemacLiquideFileFormat.getInstance().getLastVersionImpl().read(_f, syntheseR, null);
        assertNull(syntheseR.getAnalyze());
        return r;

Index: TestSerafin.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestSerafin.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TestSerafin.java	6 Aug 2003 08:36:31 -0000	1.9
--- TestSerafin.java	18 Aug 2003 11:05:20 -0000	1.10
***************
*** 10,14 ****
--- 10,18 ----
  import java.io.File;
  
+ import org.apache.tools.ant.taskdefs.TempFile;
+ 
  import org.fudaa.dodico.commun.DodicoLib;
+ import org.fudaa.dodico.fichiers.FileFormat;
+ import org.fudaa.dodico.fichiers.FileFormatVersion;
  import org.fudaa.dodico.fichiers.FileOperationSynthese;
  import org.fudaa.dodico.h2d.H2dElement;
***************
*** 21,24 ****
--- 25,29 ----
  import org.fudaa.dodico.telemac.io.SerafinInterface;
  import org.fudaa.dodico.telemac.io.SerafinMNTAdapter;
+ import org.fudaa.dodico.telemac.io.SerafinWriter;
  import org.fudaa.dodico.test.TestIO;
  /**
***************
*** 27,44 ****
   */
  
! public class TestSerafin extends TestIO
! {
    SerafinInterface inter_;
-   
  
    /** */
!   public TestSerafin()
!   {
      super("exemple.res");
!     inter_=getInter(fic_);
    }
  
!   public void _interfaceTest(SerafinInterface _t)
!   {
      assertNotNull(_t);
      //TITRE
--- 32,45 ----
   */
  
! public class TestSerafin extends TestIO {
    SerafinInterface inter_;
  
    /** */
!   public TestSerafin() {
      super("exemple.res");
!     inter_= getInter(fic_);
    }
  
!   public void _interfaceTest(SerafinInterface _t) {
      assertNotNull(_t);
      //TITRE
***************
*** 49,60 ****
      assertEquals(_t.getNbv1(), 6);
      //TEXT
!     String temp = _t.getVariable(0);
      assertEquals(temp, "VITESSE U");
!     temp = _t.getVariable(5);
      assertEquals(temp, "VITESSE SCALAIRE");
      //LUNIT
!     temp = _t.getUnite(1);
      assertEquals(temp, "M/S");
!     temp = _t.getUnite(4);
      assertEquals(temp, "M");
      //IPARAM
--- 50,61 ----
      assertEquals(_t.getNbv1(), 6);
      //TEXT
!     String temp= _t.getVariable(0);
      assertEquals(temp, "VITESSE U");
!     temp= _t.getVariable(5);
      assertEquals(temp, "VITESSE SCALAIRE");
      //LUNIT
!     temp= _t.getUnite(1);
      assertEquals(temp, "M/S");
!     temp= _t.getUnite(4);
      assertEquals(temp, "M");
      //IPARAM
***************
*** 63,67 ****
      assertEquals(_t.getIdate(), 0);
      //NELEM
!     H2dMaillage maillage = _t.getMaillage();
      assertEquals(maillage.getEltNb(), 3087);
      //NPOIN1
--- 64,68 ----
      assertEquals(_t.getIdate(), 0);
      //NELEM
!     H2dMaillage maillage= _t.getMaillage();
      assertEquals(maillage.getEltNb(), 3087);
      //NPOIN1
***************
*** 70,76 ****
      assertEquals(maillage.getEltType(), H2dElement.T3);
      //IKLE1
!     assertEquals(maillage.getElts()[0].getPtIndex()[1], 1545);
      assertEquals(
!       maillage.getElts()[maillage.getEltNb() - 1].getPtIndex()[0],
        219);
      //IPOBO1
--- 71,77 ----
      assertEquals(maillage.getEltType(), H2dElement.T3);
      //IKLE1
!     assertEquals(maillage.getElement(0).getPtIndex()[1], 1545);
      assertEquals(
!       maillage.getElement(maillage.getEltNb() - 1).getPtIndex()[0],
        219);
      //IPOBO1
***************
*** 80,100 ****
      assertEquals(
        maillage.getPt(9).getX(),
!       (double) Float.intBitsToFloat(1160462115),
        eps_);
      //Y1
      assertEquals(
        maillage.getPt(11).getY(),
!       (double) Float.intBitsToFloat(1140111573),
        eps_);
      //Nombre de pas temps
!     int tempInt = _t.getNbPasDeTemps();
      assertEquals(tempInt, 2);
!     double tempDouble = _t.getPasDeTemps()[1];
!     assertEquals(tempDouble, (double) Float.intBitsToFloat(1153138688), eps_);
      //pas de temps 1, variable 3
      //premiere variable
      assertEquals(
        _t.getDonnees(0, 2, 0),
!       (double) Float.intBitsToFloat(1076258406),
        eps_);
      //pas de temps 2, variable 4
--- 81,101 ----
      assertEquals(
        maillage.getPt(9).getX(),
!       (double)Float.intBitsToFloat(1160462115),
        eps_);
      //Y1
      assertEquals(
        maillage.getPt(11).getY(),
!       (double)Float.intBitsToFloat(1140111573),
        eps_);
      //Nombre de pas temps
!     int tempInt= _t.getNbPasDeTemps();
      assertEquals(tempInt, 2);
!     double tempDouble= _t.getPasDeTemps(1);
!     assertEquals(tempDouble, (double)Float.intBitsToFloat(1153138688), eps_);
      //pas de temps 1, variable 3
      //premiere variable
      assertEquals(
        _t.getDonnees(0, 2, 0),
!       (double)Float.intBitsToFloat(1076258406),
        eps_);
      //pas de temps 2, variable 4
***************
*** 102,145 ****
      assertEquals(
        _t.getDonnees(1, 3, maillage.getPtsNb() - 1),
!       (double) Float.intBitsToFloat(1093124747),
        eps_);
    }
  
!   public void testMntAdapter()
!   {
!     SerafinInterface t = inter_;
      assertNotNull(t);
!     int id = SerafinMNTAdapter.getIndex(t, "HAUTEUR D'EAU");
      assertEquals(id, 2);
!     SerafinMNTAdapter a = new SerafinMNTAdapter(t, id, 0);
!     try
!     {
!       String[] r = a.read();
        if (r != null)
          DodicoLib.printStringArray(r);
        assertNull(r);
!       MNTZone[] zones = a.getMNTZones();
        assertNotNull(zones);
        assertNotNull(zones[0]);
!       MNTSemis semis = zones[0].getSemis();
        assertNotNull(semis);
        //X1
        assertEquals(
          semis.getX(9),
!         (double) Float.intBitsToFloat(1160462115),
          eps_);
        //Y1
        assertEquals(
          semis.getY(11),
!         (double) Float.intBitsToFloat(1140111573),
          eps_);
  
        assertEquals(
          semis.getZ(0),
!         (double) Float.intBitsToFloat(1076258406),
          eps_);
!     }
!     catch (Exception _e)
!     {
        _e.printStackTrace();
      }
--- 103,142 ----
      assertEquals(
        _t.getDonnees(1, 3, maillage.getPtsNb() - 1),
!       (double)Float.intBitsToFloat(1093124747),
        eps_);
    }
  
!   public void testMntAdapter() {
!     SerafinInterface t= inter_;
      assertNotNull(t);
!     int id= SerafinMNTAdapter.getIndex(t, "HAUTEUR D'EAU");
      assertEquals(id, 2);
!     SerafinMNTAdapter a= new SerafinMNTAdapter(t, id, 0);
!     try {
!       String[] r= a.read();
        if (r != null)
          DodicoLib.printStringArray(r);
        assertNull(r);
!       MNTZone[] zones= a.getMNTZones();
        assertNotNull(zones);
        assertNotNull(zones[0]);
!       MNTSemis semis= zones[0].getSemis();
        assertNotNull(semis);
        //X1
        assertEquals(
          semis.getX(9),
!         (double)Float.intBitsToFloat(1160462115),
          eps_);
        //Y1
        assertEquals(
          semis.getY(11),
!         (double)Float.intBitsToFloat(1140111573),
          eps_);
  
        assertEquals(
          semis.getZ(0),
!         (double)Float.intBitsToFloat(1076258406),
          eps_);
!     } catch (Exception _e) {
        _e.printStackTrace();
      }
***************
*** 150,159 ****
       *
       */
!   public void testEcriture()
!   {
!     SerafinInterface inter = inter_;
!     File tmpFile = createTempFile();
!     FileOperationSynthese syntheseR =
!       SerafinFileFormat.getInstance().write(tmpFile, inter, null);
      if (syntheseR.getAnalyze() != null)
        assertFalse(syntheseR.getAnalyze().containsErrors());
--- 147,157 ----
       *
       */
!   public void testEcriture() {
!     SerafinInterface inter= inter_;
!     File tmpFile= createTempFile();
!     SerafinWriter w= SerafinFileFormat.getInstance().getLastVersionImpl().createSerafinWriter();
!     w.setMachineSPARC();
!     FileOperationSynthese syntheseR= FileFormatVersion.initOperation(w, null, tmpFile);
!     w.write(inter, syntheseR);
      if (syntheseR.getAnalyze() != null)
        assertFalse(syntheseR.getAnalyze().containsErrors());
***************
*** 162,196 ****
    }
  
!   public SerafinInterface getInter(File _f)
!   {
!     FileOperationSynthese syntheseR = new FileOperationSynthese();
!     SerafinInterface r =
!       SerafinFileFormat.getInstance().read(_f, syntheseR, null);
      if (syntheseR.getAnalyze() != null)
        assertFalse(syntheseR.getAnalyze().containsErrors());
      return r;
    }
!   
!   
!   public void testRechercheFrontiereWithIpobo()
!   {
!     SerafinInterface inter=inter_;
!     H2dLib.computeBord(inter.getMaillage(), inter.getPtsFrontiere(), null);
!     H2dMaillageBord b=inter.getMaillage().getPtsFrontiere();
      assertEquals(b.getBordInternNb(), 1);
    }
!   
!   public void testRechercheFrontiereinterne()
!     {
!       SerafinInterface inter=inter_;
!       inter.getMaillage().computeBord(null);
!       assertTrue(inter.getMaillage().getPtsFrontiere().isSame(inter.getPtsFrontiere()));
!     }
  
    /**
     *
     */
!   public void testLecture()
!   {
      _interfaceTest(inter_);
  
--- 160,190 ----
    }
  
!   public SerafinInterface getInter(File _f) {
!     FileOperationSynthese syntheseR= new FileOperationSynthese();
!     SerafinInterface r=
!       SerafinFileFormat.getInstance().getLastVersionImpl().read(_f, syntheseR, null);
      if (syntheseR.getAnalyze() != null)
        assertFalse(syntheseR.getAnalyze().containsErrors());
      return r;
    }
! 
!   public void testRechercheFrontiereWithIpobo() {
!     SerafinInterface inter= inter_;
!     H2dMaillage.computeBord(inter.getMaillage(), inter.getPtsFrontiere(), null);
!     H2dMaillageBord b= inter.getMaillage().getPtsFrontiere();
      assertEquals(b.getBordInternNb(), 1);
    }
! 
!   public void testRechercheFrontiereinterne() {
!     SerafinInterface inter= inter_;
!     inter.getMaillage().computeBordV2(null);
!     assertTrue(
!       inter.getMaillage().getPtsFrontiere().isSame(inter.getPtsFrontiere()));
!   }
  
    /**
     *
     */
!   public void testLecture() {
      _interfaceTest(inter_);
  

Index: TestSerafinArchConvert.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestSerafinArchConvert.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestSerafinArchConvert.java	4 Jul 2003 14:22:41 -0000	1.2
--- TestSerafinArchConvert.java	18 Aug 2003 11:05:20 -0000	1.3
***************
*** 39,43 ****
    public static void main(String[] args)
    {
!     SerafinFileFormat format=SerafinFileFormat.getInstance();
      if(args.length<2)
      {
--- 39,43 ----
    public static void main(String[] args)
    {
!     SerafinFileFormat.SerafinVersion format=SerafinFileFormat.getInstance().getLastVersionImpl();
      if(args.length<2)
      {