diff --git a/NEWS.txt b/NEWS.txt index 9148be08e87f07a59791a76c06184ed56534c5f1..b446a1b2ae293fda2910a729fecd52144b572793 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,5 +1,6 @@ Latest changes ============== +MASCARET: Fix Bazin's friction Law KHIONE: Addition of a new formula to compute under ice cover friction A new default value of 0.02 m1/3/s is set for under cover friction diff --git a/sources/mascaret/Modules/m_debitance_s.f90 b/sources/mascaret/Modules/m_debitance_s.f90 index 1b36db02a5450d517a9dcb3890d3ea84f3b78fd4..343c94eba974195c42d54f5f4598805f85ba5b28 100644 --- a/sources/mascaret/Modules/m_debitance_s.f90 +++ b/sources/mascaret/Modules/m_debitance_s.f90 @@ -104,7 +104,7 @@ module M_DEBITANCE_S !---------------------------------------------------- case(LOI_FROTTEMENT_BAZIN) - chezy = 45._DOUBLE / ( 1._DOUBLE + CF1 / RH1 ) + chezy = 87._DOUBLE / ( 1._DOUBLE + CF1 / RH1**W12 ) end select diff --git a/sources/mascaret/ModulesDeriv/m_debitance_s_b.f90 b/sources/mascaret/ModulesDeriv/m_debitance_s_b.f90 index 612b5929ef07c3a37ad5695c9bec78b9355cc3b9..25f1a819ae155bc36c024a365f1776a02317773f 100644 --- a/sources/mascaret/ModulesDeriv/m_debitance_s_b.f90 +++ b/sources/mascaret/ModulesDeriv/m_debitance_s_b.f90 @@ -90,7 +90,7 @@ CONTAINS !---------------------------------------------------- ! BAZIN Chezy(i) en fonction de RH et mb (fixe) !---------------------------------------------------- - chezy = 45._DOUBLE/(1._DOUBLE+cf1/rh1) + chezy = 87._DOUBLE / ( 1._DOUBLE + CF1 / RH1**W12 ) CALL PUSHCONTROL3B(4) CASE DEFAULT CALL PUSHCONTROL3B(0) diff --git a/sources/mascaret/ModulesDeriv/m_debitance_s_d.f90 b/sources/mascaret/ModulesDeriv/m_debitance_s_d.f90 index ca6812b02902e7501e02df7c4791bfd2f1d099bf..9c1371bb54a31c577766bfac5aac9b7fe3d0c2a2 100644 --- a/sources/mascaret/ModulesDeriv/m_debitance_s_d.f90 +++ b/sources/mascaret/ModulesDeriv/m_debitance_s_d.f90 @@ -89,9 +89,8 @@ MODULE M_DEBITANCE_S_D !---------------------------------------------------- ! BAZIN Chezy(i) en fonction de RH et mb (fixe) !---------------------------------------------------- - chezyd = -(45._DOUBLE*(cf1d*rh1-cf1*rh1d)/rh1**2/(1._DOUBLE+cf1/& -& rh1)**2) - chezy = 45._DOUBLE/(1._DOUBLE+cf1/rh1) + chezyd = 43.5_DOUBLE*(cf1*rh1d-2*cf1d*rh1)/(2._DOUBLE*rh1**W12*(cf1+rh1**W12)**2) + chezy = 87._DOUBLE/(1._DOUBLE+cf1/rh1**w12) CASE DEFAULT chezyd = 0.D0 END SELECT