[Fudaa-svn-commit] SF.net SVN: fudaa:[8525] trunk/soft/fudaa-mascaret/server/src

[<bma...@us...>]

Revision: 8525
          http://sourceforge.net/p/fudaa/svn/8525
Author:   bmarchan
Date:     2013-10-18 08:19:32 +0000 (Fri, 18 Oct 2013)
Log Message:
-----------
Mascaret : Formule Lefort 2007

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleLefort2007.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleLefort2007.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleLefort2007.java	2013-10-18 08:01:47 UTC (rev 8524)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleLefort2007.java	2013-10-18 08:19:32 UTC (rev 8525)
@@ -24,7 +24,7 @@
     double larg = _adapter.getValue(MetierDescriptionVariable.B1, _ibief, _itps, _isect);
     double ks = _adapter.getValue(MetierDescriptionVariable.KMIN, _ibief, _itps, _isect);
     double qmin = _adapter.getValue(MetierDescriptionVariable.QMIN, _ibief, _itps, _isect);
-    double h = _adapter.getValue(MetierDescriptionVariable.HMOY, _ibief, _itps, _isect);
+    double h = _adapter.getValue(MetierDescriptionVariable.Y, _ibief, _itps, _isect);
 
     double nu = _params.getViscosite();
     double diam = _params.getDmoyen();
@@ -108,7 +108,7 @@
   public MetierDescriptionVariable[] getRequiredVariable() {
     return new MetierDescriptionVariable[] { 
         MetierDescriptionVariable.CHAR, MetierDescriptionVariable.QMIN, MetierDescriptionVariable.B1, 
-        MetierDescriptionVariable.KMIN, MetierDescriptionVariable.HMOY 
+        MetierDescriptionVariable.KMIN, MetierDescriptionVariable.Y 
     };
   }
 

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java	2013-10-18 08:01:47 UTC (rev 8524)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java	2013-10-18 08:19:32 UTC (rev 8525)
@@ -19,8 +19,8 @@
   private static List<MetierFormuleSediment> formules_=new ArrayList<MetierFormuleSediment>();  
   static {
 //    formules_.add(MetierDescriptionVariable.QS_ENGELUND);
-//    formules_.add(MetierDescriptionVariable.QS_LEFORT07);
     formules_.add(new MetierFormuleLefort1991());
+    formules_.add(new MetierFormuleLefort2007());
     formules_.add(new MetierFormuleMeyerPeter());
 //    formules_.add(MetierDescriptionVariable.QS_RECKING10);
 //    formules_.add(MetierDescriptionVariable.QS_RECKING11);

Modified: trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java	2013-10-18 08:01:47 UTC (rev 8524)
+++ trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java	2013-10-18 08:19:32 UTC (rev 8525)
@@ -78,7 +78,7 @@
         return debits[_itps];
       }
       // Hauteurs
-      else if (_var.nom().equals(MetierDescriptionVariable.HMOY.nom())) {
+      else if (_var.nom().equals(MetierDescriptionVariable.Y.nom())) {
         return hauteurs[_itps];
       }
       throw new AssertionFailedError();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.