Changeset 127

Timestamp:

09/22/17 17:28:45 (7 years ago)

Author:

aquiquet

Message:

Revision of parameterised beta: dependency on the effective water pressure no longer given on a loglog scale

File:

• trunk/SOURCES/dragging_param_beta_mod.f90 (modified) (5 diffs)

trunk/SOURCES/dragging_param_beta_mod.f90

@@ -36 +36 @@
 real :: betamin   ! betamin : (Pa) frottement mini sous les streams
 
-real :: beta_slope       ! = A in: logB = A log Neff +K
-real :: beta_intercept   ! = K in: logB = A log Neff +K
+real :: beta_slope        ! = A in:     B = A x Neff ** K
+real :: beta_expo         ! = K in:     B = A x Neff ** K
 
 real,dimension(nx,ny) :: neff   ! pression effective noeuds majeurs
@@ -61 +61 @@
 implicit none
 
-! local variables, defining the rugosity-enhanced flow
-real :: expo_slope
-real :: pente_min, pente_max
-
-namelist/drag_param_beta/beta_intercept,beta_slope,betamax,betamin,coef_ile
+namelist/drag_param_beta/beta_slope,beta_expo,betamax,betamin,coef_ile
 
 if (itracebug.eq.1)  call tracebug(' dragging avec neff et slope')
@@ -82 +78 @@
 write(num_rep_42,428) '&drag_param_beta          ! nom du bloc dragging param beta'
 write(num_rep_42,*)
-write(num_rep_42,*) 'beta_intercept        = ', beta_intercept
 write(num_rep_42,*) 'beta_slope            = ', beta_slope
+write(num_rep_42,*) 'beta_expo             = ', beta_expo
 write(num_rep_42,*) 'betamax               = ', betamax
 write(num_rep_42,*) 'betamin               = ', betamin
 write(num_rep_42,*)'/'                            
-write(num_rep_42,428) '! Intercept & slope of linear reg on loglog'
+write(num_rep_42,428) '! Slope & expo of beta = - slope x Neff ** expo'
 
 !-------------------------------------------------------------------
@@ -181 +177 @@
 !$OMP END DO
 
-
 !$OMP WORKSHARE
 
 ! new parametrisation of beta on Neff:
-!betamx(:,:)=exp(beta_intercept * log(10.) )*neffmx(:,:)**(beta_slope)
-!betamy(:,:)=exp(beta_intercept * log(10.) )*neffmy(:,:)**(beta_slope)
-betamx(:,:)= (10.**beta_intercept)*(neffmx(:,:)**beta_slope)
-betamy(:,:)= (10.**beta_intercept)*(neffmy(:,:)**beta_slope)
-
+betamx(:,:)= beta_slope*(neffmx(:,:)**beta_expo)
+betamy(:,:)= beta_slope*(neffmy(:,:)**beta_expo)
 
 where (ilemx(:,:)) betamx(:,:) = betamx(:,:) * coef_ile
@@ -203 +195 @@
 where ( hwatmy(:,:) .lt. 0.5 ) betamy(:,:) = betamax
 
-! aurel, we add the neff threshold:
-!where ((ibase(:,:).ne.1).and.(.not.flot(:,:)).and.(H(:,:).gt.1.)) fleuve(:,:)=.true.
-!where ( (betamx(:,:).lt.betamax) .or. (betamy(:,:).lt. betamax) ) fleuve(:,:)=.true.
 !$OMP END WORKSHARE