Changeset 247

Timestamp:

01/23/19 11:47:56 (5 years ago)

Author:

aquiquet

Message:

In case of Tsai for the flux at the GL, the basal stress is proportional to the effective pressure (Coulomb friction) where we impose a flux

File:

• trunk/SOURCES/New-remplimat/diagno-L2_mod.f90 (modified) (1 diff)

trunk/SOURCES/New-remplimat/diagno-L2_mod.f90

@@ -288 +288 @@
   !    calcul de tobmx et tobmy (frottement basal) apres calcul des vitesses
   !    ---------------------------------------------------------------------
-  !$OMP DO
-  do j=1,ny
-     do i=1,nx
-        tobmx(i,j)=-betamx(i,j)*uxbar(i,j)
-        tobmy(i,j)=-betamy(i,j)*uybar(i,j)
-     enddo
-  enddo
-  !$OMP END DO
+
+  if (gr_select.eq.1) then !Tsai
+  !$OMP WORKSHARE
+     where(gr_line_schoof(:,:).gt.0)
+        tobmx(:,:) = sign( neffmx(:,:) * frot_coef , -uxbar(:,:))
+        tobmy(:,:) = sign( neffmy(:,:) * frot_coef , -uybar(:,:))
+     elsewhere
+        tobmx(:,:) = -betamx(:,:) * uxbar(:,:)
+        tobmy(:,:) = -betamy(:,:) * uybar(:,:)
+     end where
+  !$OMP END WORKSHARE
+  else
+  !$OMP WORKSHARE
+     tobmx(:,:) = -betamx(:,:) * uxbar(:,:)
+     tobmy(:,:) = -betamy(:,:) * uybar(:,:)
+  !$OMP END WORKSHARE
+  end if
   !$OMP BARRIER