fudaa-cvs-commit

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

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

Modified Files:
	TestCorEleBth.java TestDunes.java TestINP.java canal_s.inp 
Log Message:
Ajout de fonctionnalites au modele h2d


Index: TestCorEleBth.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux/TestCorEleBth.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TestCorEleBth.java	25 Nov 2003 10:12:01 -0000	1.11
--- TestCorEleBth.java	11 Dec 2003 12:41:29 -0000	1.12
***************
*** 60,83 ****
      assertEquals(d, dLu, eps_);
      //test sur l'element 33
!     int[] elems= maill.getElement(33).getPtIndex();
      assertEquals(maill.getEltNb(), 792);
!     assertEquals(elems.length, 6);
      int i= 306;
!     int iLu= elems[0];
      assertEquals(i, iLu);
      i= 307;
!     iLu= elems[1];
      assertEquals(i, iLu);
      i= 308;
!     iLu= elems[2];
      assertEquals(i, iLu);
      i= 298;
!     iLu= elems[3];
      assertEquals(i, iLu);
      i= 288;
!     iLu= elems[4];
      assertEquals(i, iLu);
      i= 297;
!     iLu= elems[5];
      assertEquals(i, iLu);
    }
--- 60,83 ----
      assertEquals(d, dLu, eps_);
      //test sur l'element 33
!     H2dElement ele=maill.getElement(33);
      assertEquals(maill.getEltNb(), 792);
!     assertEquals(maill.getElement(33).getPtNb(), 6);
      int i= 306;
!     int iLu= ele.getPtIndex(0);
      assertEquals(i, iLu);
      i= 307;
!     iLu= ele.getPtIndex(1);
      assertEquals(i, iLu);
      i= 308;
!     iLu= ele.getPtIndex(2);
      assertEquals(i, iLu);
      i= 298;
!     iLu= ele.getPtIndex(3);
      assertEquals(i, iLu);
      i= 288;
!     iLu= ele.getPtIndex(4);
      assertEquals(i, iLu);
      i= 297;
!     iLu= ele.getPtIndex(5);
      assertEquals(i, iLu);
    }

Index: TestDunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux/TestDunes.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TestDunes.java	25 Nov 2003 10:12:02 -0000	1.12
--- TestDunes.java	11 Dec 2003 12:41:29 -0000	1.13
***************
*** 12,15 ****
--- 12,16 ----
  import com.memoire.bu.BuTask;
  import org.fudaa.dodico.commun.DodicoLib;
+ import org.fudaa.dodico.commun.DodicoUIDefault;
  import org.fudaa.dodico.commun.ProgressionBuAdapter;
  import org.fudaa.dodico.dunes.io.DunesFileFormat;
***************
*** 19,22 ****
--- 20,24 ----
  import org.fudaa.dodico.h2d.H2dGrid;
  import org.fudaa.dodico.h2d.H2dPoint;
+ import org.fudaa.dodico.olb.OLBExec;
  import org.fudaa.dodico.test.TestIO;
  /**
***************
*** 63,78 ****
      temp= t.getMaillage().getEltNb();
      assertEquals(temp, 9);
!     int[] indices= t.getMaillage().getElement(1).getPtIndex();
!     temp= indices.length;
      assertEquals(temp, 3);
!     assertEquals(indices[0], 4);
!     assertEquals(indices[1], 0);
!     assertEquals(indices[2], 5);
!     indices= t.getMaillage().getElement(6).getPtIndex();
!     temp= indices.length;
      assertEquals(temp, 3);
!     assertEquals(indices[0], 4);
!     assertEquals(indices[1], 5);
!     assertEquals(indices[2], 6);
    }
    /**
--- 65,80 ----
      temp= t.getMaillage().getEltNb();
      assertEquals(temp, 9);
!     H2dElement el=t.getMaillage().getElement(1);
!     temp= el.getPtNb();
      assertEquals(temp, 3);
!     assertEquals(el.getPtIndex(0), 4);
!     assertEquals(el.getPtIndex(1), 0);
!     assertEquals(el.getPtIndex(2), 5);
!     el=t.getMaillage().getElement(6);
!     temp= el.getPtNb();
      assertEquals(temp, 3);
!     assertEquals(el.getPtIndex(0), 4);
!     assertEquals(el.getPtIndex(1), 5);
!     assertEquals(el.getPtIndex(2), 6);
    }
    /**
***************
*** 104,107 ****
--- 106,116 ----
    public void testLecture() {
      _interfaceTest(getInter(fic_));
+   }
+   
+   public void testOlb(){
+     H2dGrid f=getInter(fic_).getMaillage();
+     OLBExec exec=new OLBExec();
+     H2dGrid f2=exec.computeGrid(f, null,DodicoUIDefault.INSTANCE);
+     assertNotNull(f2);
    }
    public static void main(String[] args) {

Index: TestINP.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux/TestINP.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** TestINP.java	25 Nov 2003 10:12:02 -0000	1.13
--- TestINP.java	11 Dec 2003 12:41:29 -0000	1.14
***************
*** 16,19 ****
--- 16,20 ----
  import org.fudaa.dodico.dico.DicoEntite;
  import org.fudaa.dodico.fichiers.FileOperationSynthese;
+ import org.fudaa.dodico.h2d.H2dElement;
  import org.fudaa.dodico.h2d.H2dTimeStepGroup;
  import org.fudaa.dodico.h2d.H2dGrid;
***************
*** 96,142 ****
      assertEquals(H2dBcType.PERMANENT, bord.getRugositeType());
      assertEquals(3d, bord.getRugosite(), eps_);
-     //H2dElement[] elems=t.getMaillage().getElts();
      assertEquals(t.getMaillage().getEltNb(), 792);
!     itemp= t.getMaillage().getElement(791).getPtIndex();
!     assertEquals(itemp[0], 1788);
!     assertEquals(itemp[1], 1789);
!     assertEquals(itemp[2], 1790);
!     assertEquals(itemp[3], 1780);
!     assertEquals(itemp[4], 1770);
!     assertEquals(itemp[5], 1779);
      H2dNodalPropertyMixte[] propelem= t.getPropElementaires();
      H2dNodalPropertyMixte prTemp= propelem[0];
-     assertEquals(prTemp.getVariableType(), H2dVariableType.VISCOSITE);
      assertEquals(prTemp.getValeurTransitoireNb(), 0);
!     assertEquals(prTemp.getPermanentSpecifieNb(), 0);
!     assertEquals(prTemp.getValeurLibreNb(), 0);
!     assertEquals(prTemp.getDefaultValue(), 0.01, eps_);
      prTemp= propelem[1];
!     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];
!     assertEquals(
!       prTemp.getVariableType(),
!       H2dVariableType.ALPHA_LONGUEUR_MELANGE);
!     assertEquals(prTemp.getValeurTransitoireNb(), 0);
!     assertEquals(prTemp.getPermanentSpecifieNb(), 0);
!     assertEquals(prTemp.getValeurLibreNb(), 0);
!     assertEquals(prTemp.getDefaultValue(), 0.0, eps_);
      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--) {
        if (i != 758)
!         assertEquals(prTemp.getPermanentValueForIndex(i), 0.0, eps_);
        else
!         assertEquals(prTemp.getPermanentValueForIndex(i), 0.01, eps_);
      }
      String[] fics= t.getFichiers();
--- 97,128 ----
      assertEquals(H2dBcType.PERMANENT, bord.getRugositeType());
      assertEquals(3d, bord.getRugosite(), eps_);
      assertEquals(t.getMaillage().getEltNb(), 792);
!     H2dElement el=t.getMaillage().getElement(791);
!     assertEquals(el.getPtIndex(0), 1788);
!     assertEquals(el.getPtIndex(1), 1789);
!     assertEquals(el.getPtIndex(2), 1790);
!     assertEquals(el.getPtIndex(3), 1780);
!     assertEquals(el.getPtIndex(4), 1770);
!     assertEquals(el.getPtIndex(5), 1779);
      H2dNodalPropertyMixte[] propelem= t.getPropElementaires();
      H2dNodalPropertyMixte prTemp= propelem[0];
      assertEquals(prTemp.getValeurTransitoireNb(), 0);
!     assertEquals(792, prTemp.getNbPermanentPt());
      prTemp= propelem[1];
!     assertEquals(0, prTemp.getValeurTransitoireNb());
!     assertEquals(792, prTemp.getNbPermanentPt());
!     assertEquals(prTemp.getPermanentValueFor(1), 0.025, eps_);
      prTemp= propelem[2];
!     assertEquals(0, prTemp.getValeurTransitoireNb());
!     assertEquals(792, prTemp.getNbPermanentPt());
      prTemp= propelem[3];
      assertEquals(0, prTemp.getValeurTransitoireNb());
!     assertEquals(792, prTemp.getNbPermanentPt());
!     assertEquals(0.0, prTemp.getPermanentValueFor(0), eps_);
      for (int i= 790; i >= 0; i--) {
        if (i != 758)
!         assertEquals(prTemp.getPermanentValueFor(i), 0.0, eps_);
        else
!         assertEquals(prTemp.getPermanentValueFor(i), 0.01, eps_);
      }
      String[] fics= t.getFichiers();
***************
*** 155,159 ****
      assertEquals(gt.getNbPasTemps(), 1);
      assertEquals(gt.getSchema(), H2dResolutionSchemaType.STATIONNAIRE);
!     assertEquals(gt.getMethode(), H2dResolutionMethodType.SELECT_LUMPING);
      assertEquals(gt.getRelaxation(), 1, eps_);
      assertEquals(gt.getPrecision(), 0.001, eps_);
--- 141,145 ----
      assertEquals(gt.getNbPasTemps(), 1);
      assertEquals(gt.getSchema(), H2dResolutionSchemaType.STATIONNAIRE);
!     assertEquals(gt.getMethode(), H2dResolutionMethodType.SELECT_LUMPING_BCD);
      assertEquals(gt.getRelaxation(), 1, eps_);
      assertEquals(gt.getPrecision(), 0.001, eps_);
***************
*** 224,228 ****
      assertEquals(mng.getGrid().getFrontiers().getNbFrontier(), 1);
      H2dRefluxBcManager.RefluxMiddleFrontier frontiere0=
!       mng.getRefluxBorderByFrontier(0);
      H2dRefluxBoundaryCondition cl;
      for (int i= 0; i < n; i += 2) {
--- 210,214 ----
      assertEquals(mng.getGrid().getFrontiers().getNbFrontier(), 1);
      H2dRefluxBcManager.RefluxMiddleFrontier frontiere0=
!       mng.getRefluxMiddleFrontier(0);
      H2dRefluxBoundaryCondition cl;
      for (int i= 0; i < n; i += 2) {
***************
*** 234,238 ****
        cl= (H2dRefluxBoundaryCondition)frontiere0.getCl(i);
        assertTrue(cl.isMiddle());
!       if ((i == 1421) || (i == 1403)) {
          assertTrue(cl.isMiddleWithFriction());
          H2dRefluxBoundaryConditionMiddleFriction clFr= cl.getMiddleFriction();
--- 220,224 ----
        cl= (H2dRefluxBoundaryCondition)frontiere0.getCl(i);
        assertTrue(cl.isMiddle());
!       if ((cl.getIndexPt() == 1421) || (cl.getIndexPt() == 1403)) {
          assertTrue(cl.isMiddleWithFriction());
          H2dRefluxBoundaryConditionMiddleFriction clFr= cl.getMiddleFriction();
***************
*** 240,245 ****
          assertEquals(3, clFr.getFriction(), eps_);
          assertEquals(H2dBcType.PERMANENT, clFr.getFrictionType());
!       } else
          assertFalse(cl.isMiddleWithFriction());
      }
    }
--- 226,232 ----
          assertEquals(3, clFr.getFriction(), eps_);
          assertEquals(H2dBcType.PERMANENT, clFr.getFrictionType());
!       } else {
          assertFalse(cl.isMiddleWithFriction());
+       }
      }
    }

Index: canal_s.inp
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux/canal_s.inp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** canal_s.inp	1 Apr 2003 13:52:07 -0000	1.1
--- canal_s.inp	11 Dec 2003 12:41:29 -0000	1.2
***************
*** 3559,3563 ****
  VIT_NU_CON 
  STATIONNAIRE 
! SELUMP                     1.0    0.0010      0.05    2
  COEFFICIENTS              00.0    1.0000     2.000      3.00    4.0000      5.00
                           6.000    7.0000      8.00
--- 3559,3563 ----
  VIT_NU_CON 
  STATIONNAIRE 
! SELUMP_BCD                 1.0    0.0010      0.05    2
  COEFFICIENTS              00.0    1.0000     2.000      3.00    4.0000      5.00
                           6.000    7.0000      8.00