Changeset 63

Timestamp:

05/17/16 17:10:23 (8 years ago)

Author:

aquiquet

Message:

Function of slope for betamax in dragging_neff_slope

File:

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

trunk/SOURCES/dragging_neff_slope_mod.f90

@@ -127 +127 @@
 ! from slopes, we create an index between 0 & 1
 ! 1 is very mountainous, 0 is flat
-hires_slope(:,:)=(max(min(hires_slope(:,:),2000.),500.)-500.)/1500.
+hires_slope(:,:)=(max(min(hires_slope(:,:),5000.),500.)-500.)/4500.
 ! now we compute the actual betamax used by the remplimat routines
 ! /!\ the slope is used to modify the beta where we have a temperate base,
 ! but NO ice stream... -> Slow SSA zone (SSA used to compute Ub)
-betamax_2d(:,:)=max ( tostick * (1. - (1 - betamax / tostick ) * hires_slope(:,:)) , betamax )
+betamax_2d(:,:)=max ( tostick * (1. - (1 - betamax / tostick ) * hires_slope(:,:)**(1/10.)) , betamax )
 do j=1,ny
    do i=1,nx
@@ -328 +328 @@
             if (cf*neffmx(i,j).gt.betamax*2.) then  ! a stream that's becoming grounded...
                if (slowssamx(i,j)) then
-                  
+                  betamx(i,j)=betamax_2d(i,j)
                else
                   gzmx(i,j)=.false.
-                  betamx(i,j)=betamax_2d(i,j) !tostick
+                  betamx(i,j)=tostick
                endif
             endif
@@ -345 +345 @@
          betamx(i,j)=0.
       else                                         ! grounded, SIA
-         betamx(i,j)=betamax_2d(i,j) !tostick                       ! frottement glace posee (1 bar)
+         betamx(i,j)=tostick                       ! frottement glace posee (1 bar)
       endif
 
@@ -373 +373 @@
             if (cf*neffmy(i,j).gt.betamax*2.) then  ! a stream that's becoming grounded...
                if (slowssamy(i,j)) then
-                  
+                  betamy(i,j)=betamax_2d(i,j)
                else
                   gzmy(i,j)=.false.
-                  betamy(i,j)=betamax_2d(i,j) !tostick
+                  betamy(i,j)=tostick
                endif
             endif
@@ -390 +390 @@
          betamy(i,j)=0.
       else                                         ! grounded, SIA
-         betamy(i,j)=betamax_2d(i,j) !tostick                       ! frottement glace posee (1 bar)
+         betamy(i,j)=tostick                       ! frottement glace posee (1 bar)
       endif