[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/test/h2d TestBord.java,1.6,1.7 TestMaillage.java,1.9,1.10

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

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

Modified Files:
	TestBord.java TestMaillage.java 
Log Message:
Ajout de fonctionnalites au modele h2d


Index: TestBord.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/h2d/TestBord.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestBord.java	25 Nov 2003 10:12:00 -0000	1.6
--- TestBord.java	11 Dec 2003 12:41:29 -0000	1.7
***************
*** 96,100 ****
      assertFalse(b.isBeginIdxSelected(13, 130));
      int nbP= 20;
!     b.setBordType(H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE);
      assertEquals(-1, b.isIntersectBy(0, 11, nbP));
      assertEquals(0, b.isIntersectBy(0, 12, nbP));
--- 96,100 ----
      assertFalse(b.isBeginIdxSelected(13, 130));
      int nbP= 20;
!     b.setBoundaryType(H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE);
      assertEquals(-1, b.isIntersectBy(0, 11, nbP));
      assertEquals(0, b.isIntersectBy(0, 12, nbP));
***************
*** 105,109 ****
      assertEquals(0, b.isIntersectBy(19, 15, nbP));
      assertEquals(-1, b.isIntersectBy(19, 11, nbP));
!     b.setBordType(H2dBoundaryType.SOLIDE);
      assertEquals(-1, b.isIntersectBy(0, 12, nbP));
      assertEquals(0, b.isIntersectBy(13, 14, nbP));
--- 105,109 ----
      assertEquals(0, b.isIntersectBy(19, 15, nbP));
      assertEquals(-1, b.isIntersectBy(19, 11, nbP));
!     b.setBoundaryType(H2dBoundaryType.SOLIDE);
      assertEquals(-1, b.isIntersectBy(0, 12, nbP));
      assertEquals(0, b.isIntersectBy(13, 14, nbP));
***************
*** 113,117 ****
      b.setIdxDeb(16);
      b.setIdxFin(5);
!     b.setBordType(H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE);
      assertEquals(-1, b.isIntersectBy(6, 15, nbP));
      assertEquals(0, b.isIntersectBy(4, 12, nbP));
--- 113,117 ----
      b.setIdxDeb(16);
      b.setIdxFin(5);
!     b.setBoundaryType(H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE);
      assertEquals(-1, b.isIntersectBy(6, 15, nbP));
      assertEquals(0, b.isIntersectBy(4, 12, nbP));
***************
*** 119,123 ****
      assertEquals(1, b.isIntersectBy(17, 4, nbP));
      assertEquals(2, b.isIntersectBy(15, 6, nbP));
!     b.setBordType(H2dBoundaryType.SOLIDE);
      assertEquals(-1, b.isIntersectBy(5, 16, nbP));
      assertEquals(0, b.isIntersectBy(4, 14, nbP));
--- 119,123 ----
      assertEquals(1, b.isIntersectBy(17, 4, nbP));
      assertEquals(2, b.isIntersectBy(15, 6, nbP));
!     b.setBoundaryType(H2dBoundaryType.SOLIDE);
      assertEquals(-1, b.isIntersectBy(5, 16, nbP));
      assertEquals(0, b.isIntersectBy(4, 14, nbP));

Index: TestMaillage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/h2d/TestMaillage.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TestMaillage.java	25 Nov 2003 10:12:00 -0000	1.9
--- TestMaillage.java	11 Dec 2003 12:41:29 -0000	1.10
***************
*** 138,148 ****
      initMaillage();
      H2dElement el= mail_.getElement(0);
!     assertEquals(el.getPtIndex()[0], 0);
!     assertEquals(el.getPtIndex()[1], 2);
!     assertEquals(el.getPtIndex()[2], 1);
      el= mail_.getElement(1);
!     assertEquals(el.getPtIndex()[0], 1);
!     assertEquals(el.getPtIndex()[1], 2);
!     assertEquals(el.getPtIndex()[2], 3);
      assertEquals(mail_.isElementTrigoOriente(0), -1);
      assertEquals(mail_.isElementTrigoOriente(1), -1);
--- 138,148 ----
      initMaillage();
      H2dElement el= mail_.getElement(0);
!     assertEquals(el.getPtIndex(0), 0);
!     assertEquals(el.getPtIndex(1), 2);
!     assertEquals(el.getPtIndex(2), 1);
      el= mail_.getElement(1);
!     assertEquals(el.getPtIndex(0), 1);
!     assertEquals(el.getPtIndex(1), 2);
!     assertEquals(el.getPtIndex(2), 3);
      assertEquals(mail_.isElementTrigoOriente(0), -1);
      assertEquals(mail_.isElementTrigoOriente(1), -1);
***************
*** 156,162 ****
      initMaillageT6();
      H2dElement el= mail_.getElement(0);
!     assertEquals(el.getPtIndex()[0], 0);
!     assertEquals(el.getPtIndex()[1], 9);
!     assertEquals(el.getPtIndex()[2], 2);
      for (int i= 0; i < 9; i++) {
        assertEquals(mail_.isElementTrigoOriente(i), -1);
--- 156,162 ----
      initMaillageT6();
      H2dElement el= mail_.getElement(0);
!     assertEquals(el.getPtIndex(0), 0);
!     assertEquals(el.getPtIndex(1), 9);
!     assertEquals(el.getPtIndex(2), 2);
      for (int i= 0; i < 9; i++) {
        assertEquals(mail_.isElementTrigoOriente(i), -1);
***************
*** 200,214 ****
      int n= bord.getNbPt(0);
      assertEquals(n, 6);
!     assertEquals(0, bord.getIdx(0, 0));
!     assertEquals(1, bord.getIdx(0, 1));
!     assertEquals(6, bord.getIdx(0, 2));
!     assertEquals(8, bord.getIdx(0, 3));
!     assertEquals(7, bord.getIdx(0, 4));
!     assertEquals(4, bord.getIdx(0, 5));
      n= bord.getNbPt(1);
      assertEquals(n, 3);
!     assertEquals(2, bord.getIdx(1, 0));
!     assertEquals(5, bord.getIdx(1, 1));
!     assertEquals(3, bord.getIdx(1, 2));
    }
    public void testBord() {
--- 200,214 ----
      int n= bord.getNbPt(0);
      assertEquals(n, 6);
!     assertEquals(0, bord.getIdxGlobal(0, 0));
!     assertEquals(1, bord.getIdxGlobal(0, 1));
!     assertEquals(6, bord.getIdxGlobal(0, 2));
!     assertEquals(8, bord.getIdxGlobal(0, 3));
!     assertEquals(7, bord.getIdxGlobal(0, 4));
!     assertEquals(4, bord.getIdxGlobal(0, 5));
      n= bord.getNbPt(1);
      assertEquals(n, 3);
!     assertEquals(2, bord.getIdxGlobal(1, 0));
!     assertEquals(5, bord.getIdxGlobal(1, 1));
!     assertEquals(3, bord.getIdxGlobal(1, 2));
    }
    public void testBord() {
***************
*** 233,256 ****
      int n= bord.getNbPt(0);
      assertEquals(n, 12);
!     assertEquals(0, bord.getIdx(0, 0));
!     assertEquals(11, bord.getIdx(0, 1));
!     assertEquals(1, bord.getIdx(0, 2));
!     assertEquals(23, bord.getIdx(0, 3));
!     assertEquals(6, bord.getIdx(0, 4));
!     assertEquals(26, bord.getIdx(0, 5));
!     assertEquals(8, bord.getIdx(0, 6));
!     assertEquals(24, bord.getIdx(0, 7));
!     assertEquals(7, bord.getIdx(0, 8));
!     assertEquals(21, bord.getIdx(0, 9));
!     assertEquals(4, bord.getIdx(0, 10));
!     assertEquals(14, bord.getIdx(0, 11));
      n= bord.getNbPt(1);
      assertEquals(n, 6);
!     assertEquals(2, bord.getIdx(1, 0));
!     assertEquals(17, bord.getIdx(1, 1));
!     assertEquals(5, bord.getIdx(1, 2));
!     assertEquals(20, bord.getIdx(1, 3));
!     assertEquals(3, bord.getIdx(1, 4));
!     assertEquals(12, bord.getIdx(1, 5));
    }
    public void testT3T6() {
--- 233,256 ----
      int n= bord.getNbPt(0);
      assertEquals(n, 12);
!     assertEquals(0, bord.getIdxGlobal(0, 0));
!     assertEquals(11, bord.getIdxGlobal(0, 1));
!     assertEquals(1, bord.getIdxGlobal(0, 2));
!     assertEquals(23, bord.getIdxGlobal(0, 3));
!     assertEquals(6, bord.getIdxGlobal(0, 4));
!     assertEquals(26, bord.getIdxGlobal(0, 5));
!     assertEquals(8, bord.getIdxGlobal(0, 6));
!     assertEquals(24, bord.getIdxGlobal(0, 7));
!     assertEquals(7, bord.getIdxGlobal(0, 8));
!     assertEquals(21, bord.getIdxGlobal(0, 9));
!     assertEquals(4, bord.getIdxGlobal(0, 10));
!     assertEquals(14, bord.getIdxGlobal(0, 11));
      n= bord.getNbPt(1);
      assertEquals(n, 6);
!     assertEquals(2, bord.getIdxGlobal(1, 0));
!     assertEquals(17, bord.getIdxGlobal(1, 1));
!     assertEquals(5, bord.getIdxGlobal(1, 2));
!     assertEquals(20, bord.getIdxGlobal(1, 3));
!     assertEquals(3, bord.getIdxGlobal(1, 4));
!     assertEquals(12, bord.getIdxGlobal(1, 5));
    }
    public void testT3T6() {