Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8545] trunk/soft/fudaa-mascaret/server/src
|
From: <bma...@us...> - 2013-12-12 09:48:20
|
Revision: 8545
http://sourceforge.net/p/fudaa/svn/8545
Author: bmarchan
Date: 2013-12-12 09:48:17 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
Mascaret : correction formulation
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleEngelundHansen.java
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/MetierFormuleMeyerPeter.java
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2010.java
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/MetierFormuleSmartJaggi.java
trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleVanRijn.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/MetierFormuleEngelundHansen.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleEngelundHansen.java 2013-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleEngelundHansen.java 2013-12-12 09:48:17 UTC (rev 8545)
@@ -17,16 +17,15 @@
double pente = _adapter.getValue(MetierDescriptionVariable.PENE, _ibief, _itps, _isect);
double larg = _adapter.getValue(MetierDescriptionVariable.B1, _ibief, _itps, _isect);
- double qmin = _adapter.getValue(MetierDescriptionVariable.QMIN, _ibief, _itps, _isect);
- double h1 = _adapter.getValue(MetierDescriptionVariable.Y, _ibief, _itps, _isect);
+ double rh1 = _adapter.getValue(MetierDescriptionVariable.RH1, _ibief, _itps, _isect);
+ double vmin = _adapter.getValue(MetierDescriptionVariable.VMIN, _ibief, _itps, _isect);
double dens = _params.getDensiteMateriau();
double d50 = _params.getD50();
RetTauMoy taumoy = calculerTaumoy(_params, _adapter, _ibief, _isect, _itps);
double teta = taumoy.tetaD50;
- double rh1 = (h1 * larg) / (larg + 2 * h1);
- double f = 2 * 9.81 * rh1 * pente / Math.pow((qmin / (h1 * larg)), 2);
+ double f = 2 * 9.81 * rh1 * pente / Math.pow(vmin, 2);
double qs = larg * 0.1 / f * Math.pow((9.81 * (dens - 1) * Math.pow(d50, 3)), 0.5) * Math.pow(teta, (5. / 2));
return qs;
@@ -35,11 +34,11 @@
@Override
public MetierDescriptionVariable[] getRequiredVariable() {
return new MetierDescriptionVariable[] {
- MetierDescriptionVariable.B1,
- MetierDescriptionVariable.CHAR,
- MetierDescriptionVariable.QMIN,
- MetierDescriptionVariable.KMIN,
- MetierDescriptionVariable.Y
+ MetierDescriptionVariable.B1,
+ MetierDescriptionVariable.CHAR,
+ MetierDescriptionVariable.KMIN,
+ MetierDescriptionVariable.RH1,
+ MetierDescriptionVariable.VMIN
};
}
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-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleLefort2007.java 2013-12-12 09:48:17 UTC (rev 8545)
@@ -31,7 +31,6 @@
double dens = _params.getDensiteMateriau();
double d90 = _params.getD90();
double d30 = _params.getD30();
- double d50 = _params.getD50();
// ' initialisation des colonnes et des lignes
// Col_Lefort07 = Range("Lefort07").Column
@@ -107,8 +106,11 @@
@Override
public MetierDescriptionVariable[] getRequiredVariable() {
return new MetierDescriptionVariable[] {
- MetierDescriptionVariable.CHAR, MetierDescriptionVariable.QMIN, MetierDescriptionVariable.B1,
- MetierDescriptionVariable.KMIN, MetierDescriptionVariable.Y
+ MetierDescriptionVariable.CHAR,
+ MetierDescriptionVariable.QMIN,
+ MetierDescriptionVariable.B1,
+ MetierDescriptionVariable.KMIN,
+ MetierDescriptionVariable.Y
};
}
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleMeyerPeter.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleMeyerPeter.java 2013-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleMeyerPeter.java 2013-12-12 09:48:17 UTC (rev 8545)
@@ -51,9 +51,8 @@
return new MetierDescriptionVariable[] {
MetierDescriptionVariable.B1,
MetierDescriptionVariable.CHAR,
- MetierDescriptionVariable.QMIN,
MetierDescriptionVariable.KMIN,
- MetierDescriptionVariable.Y
+ MetierDescriptionVariable.RH1
};
}
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2010.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2010.java 2013-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2010.java 2013-12-12 09:48:17 UTC (rev 8545)
@@ -3,8 +3,6 @@
import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpacialI;
-import com.memoire.fu.FuLog;
-
/**
* Calcul s\xE9dimentaire avec la formule de Recking 2010.
*
@@ -20,7 +18,6 @@
double pente = _adapter.getValue(MetierDescriptionVariable.PENE, _ibief, _itps, _isect);
double larg = _adapter.getValue(MetierDescriptionVariable.B1, _ibief, _itps, _isect);
double qmin = _adapter.getValue(MetierDescriptionVariable.QMIN, _ibief, _itps, _isect);
-// double h = _adapter.getValue(MetierDescriptionVariable.Y, _ibief, _itps, _isect);
double dens = _params.getDensiteMateriau();
double d84 = _params.getD84();
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-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java 2013-12-12 09:48:17 UTC (rev 8545)
@@ -117,15 +117,14 @@
double kr = _params.getRugosite();
double ks = _adapter.getValue(MetierDescriptionVariable.KMIN, _ibief, _itps, _isect);
double pente = _adapter.getValue(MetierDescriptionVariable.PENE, _ibief, _itps, _isect);
- double larg = _adapter.getValue(MetierDescriptionVariable.B1, _ibief, _itps, _isect);
- double h1 = _adapter.getValue(MetierDescriptionVariable.Y, _ibief, _itps, _isect);
+ double rh1 = _adapter.getValue(MetierDescriptionVariable.RH1, _ibief, _itps, _isect);
double d50 = _params.getD50();
double diam = _params.getDmoyen();
double dens = _params.getDensiteMateriau();
// Calcul de tau
- double rh1 = (h1 * larg) / (larg + 2. * h1);
+// double rh1 = (h1 * larg) / (larg + 2. * h1);
double tau = 9.81 * 1000. * rh1 * pente;
double kpeau;
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSmartJaggi.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSmartJaggi.java 2013-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSmartJaggi.java 2013-12-12 09:48:17 UTC (rev 8545)
@@ -36,8 +36,7 @@
MetierDescriptionVariable.CHAR,
MetierDescriptionVariable.QMIN,
MetierDescriptionVariable.KMIN,
- MetierDescriptionVariable.B1,
- MetierDescriptionVariable.Y
+ MetierDescriptionVariable.RH1
};
}
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleVanRijn.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleVanRijn.java 2013-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleVanRijn.java 2013-12-12 09:48:17 UTC (rev 8545)
@@ -16,8 +16,8 @@
public double calculer(MetierParametresSediment _params, MetierResultatsTemporelSpacialI _adapter, int _ibief, int _isect, int _itps) {
double larg = _adapter.getValue(MetierDescriptionVariable.B1, _ibief, _itps, _isect);
- double qmin = _adapter.getValue(MetierDescriptionVariable.QMIN, _ibief, _itps, _isect);
- double h1 = _adapter.getValue(MetierDescriptionVariable.Y, _ibief, _itps, _isect);
+ double rh1 = _adapter.getValue(MetierDescriptionVariable.RH1, _ibief, _itps, _isect);
+ double vmin = _adapter.getValue(MetierDescriptionVariable.VMIN, _ibief, _itps, _isect);
double dens = _params.getDensiteMateriau();
double d50 = _params.getD50();
@@ -37,8 +37,8 @@
// Qmin = Cells(ligne, Col_deb_cible)
// H1 = Cells(ligne, Col_H)
- double rh1 = (h1 * larg) / (larg + 2 * h1);
- double u = qmin / (larg * h1);
+// double rh1 = (h1 * larg) / (larg + 2 * h1);
+// double u = qmin / (larg * h1);
double det = d50 * Math.pow(((9.81 * (dens - 1)) / Math.pow(nu, 2)), (1. / 3));
// 'calcul de uc*^2 via la courbe de schield
@@ -66,7 +66,7 @@
}
double ucetCarre = 9.81 * (dens - 1) * d50 * (alfa * Math.pow(det, beta));
- double uet = Math.pow(9.81, 0.5) * u / (18 * Math.log10(4 * rh1 / d90));
+ double uet = Math.pow(9.81, 0.5) * vmin / (18 * Math.log10(4 * rh1 / d90));
double t;
if (Math.pow(uet, 2) > ucetCarre) {
@@ -83,9 +83,9 @@
@Override
public MetierDescriptionVariable[] getRequiredVariable() {
return new MetierDescriptionVariable[] {
- MetierDescriptionVariable.QMIN,
MetierDescriptionVariable.B1,
- MetierDescriptionVariable.Y
+ MetierDescriptionVariable.RH1,
+ MetierDescriptionVariable.VMIN
};
}
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-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java 2013-12-12 09:48:17 UTC (rev 8545)
@@ -97,6 +97,19 @@
else if (_var.nom().equals(MetierDescriptionVariable.Y.nom())) {
return hauteurs[_itps];
}
+ else if (_var.nom().equals(MetierDescriptionVariable.RH1.nom())) {
+ double larg=50;
+ double h1=hauteurs[_itps];
+ return (h1 * larg) / (larg + 2 * h1);
+ }
+ else if (_var.nom().equals(MetierDescriptionVariable.VMIN.nom())) {
+ double larg=50;
+ double h1=hauteurs[_itps];
+ double qmin=debits[_itps];
+ return qmin / (h1 * larg);
+ }
+
+ // Rayon hydraulique
throw new AssertionFailedError();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
