Changeset 251 for branches/iLoveclim/SOURCES/New-remplimat

Timestamp:

01/29/19 17:25:47 (5 years ago)

Author:

aquiquet

Message:

Grisli-iloveclim branch merged to trunk at revision 250

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/New-remplimat/diagno-L2_mod.f90 (modified) (2 diffs)

branches/iLoveclim/SOURCES/New-remplimat/diagno-L2_mod.f90

@@ -281 +281 @@
   !$OMP PARALLEL
   !$OMP WORKSHARE
-  uxbar(:,:)=uxb1(:,:)
-  uybar(:,:)=uyb1(:,:)
+  uxbar(:,:)=max(min(uxb1(:,:),V_limit),-V_limit)
+  uybar(:,:)=max(min(uyb1(:,:),V_limit),-V_limit)
   !$OMP END WORKSHARE
 
@@ -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