Changeset 372

Timestamp:

03/16/23 19:55:42 (14 months ago)

Author:

dumas

Message:

Fixed a bug in openMP implementation in subroutine SIA_velocities

File:

• branches/GRISLIv3/SOURCES/velocities-polyn-0.3.f90 (modified) (5 diffs)

branches/GRISLIv3/SOURCES/velocities-polyn-0.3.f90

@@ -27 +27 @@
 !use deform_declar 
 USE module_choix
+
 implicit none
 
-REAL hdd
+real, dimension(nx,ny) :: hdd
+
 if (itracebug.eq.1)  call tracebug(' Entree dans routine SIA_velocity')
 
 !$OMP PARALLEL
-!$OMP DO COLLAPSE(2)    
+!$OMP DO COLLAPSE(2)
 do k=1,nz
    do j=2,ny-1
@@ -55 +57 @@
 
             do iglen=n1poly,n2poly
-
                ux(i,j,k)  = ux(i,j,k)+ddx(i,j,iglen)*sa_mx(i,j,k,iglen)
                sux(i,j,k) = sux(i,j,k)+ddx(i,j,iglen)*s2a_mx(i,j,k,iglen)
@@ -85 +86 @@
 
             do iglen=n1poly,n2poly
-               uy(i,j,k)=uy(i,j,k)+ddy(i,j,iglen)*sa_my(i,j,k,iglen)
-               suy(i,j,k)=suy(i,j,k)+ddy(i,j,iglen)*s2a_my(i,j,k,iglen)
+               uy(i,j,k)  = uy(i,j,k)+ddy(i,j,iglen)*sa_my(i,j,k,iglen)
+               suy(i,j,k) = suy(i,j,k)+ddy(i,j,iglen)*s2a_my(i,j,k,iglen)
             end do
             uy(i,j,k)  = uy(i,j,k)*(-sdy(i,j))
@@ -110 +111 @@
    do i=2,nx-1
 
-      divu(i,j)=((uxbar(i+1,j)*hmx(i+1,j)-uxbar(i,j)*hmx(i,j))  &          ! formulation explicite
+      divu(i,j)=((uxbar(i+1,j)*hmx(i+1,j)-uxbar(i,j)*hmx(i,j))  &    ! formulation explicite
            + (uybar(i,j+1)*hmy(i,j+1)-uybar(i,j)*hmy(i,j)))/dx
 
       uzr(i,j,nz)=bmelt(i,j)
       xx(i,j)=uzr(i,j,1)
-      hdd=bm(i,j)-bmelt(i,j)-divu(i,j)                                     ! formulation explicite de dH/dt
+      hdd(i,j)=bm(i,j)-bmelt(i,j)-divu(i,j)                          ! formulation explicite de dH/dt
 
 !     -------------------------------------------------------------------
@@ -127 +128 @@
                uzr(i,j,k)=uzr(i,j,nz)-((sux(i+1,j,k)-sux(i,j,k)) &
                 +(suy(i,j+1,k)-suy(i,j,k)))/dx
-               uzr(i,j,k)=uzr(i,j,k)+hdd*cde(k)
+               uzr(i,j,k)=uzr(i,j,k)+hdd(i,j)*cde(k)
 
             else