Changeset 146 for branches/iLoveclim/SOURCES/resol_adv_diff_2D-sept2009.f90

Timestamp:

10/20/17 09:31:39 (7 years ago)

Author:

aquiquet

Message:

Grisli-iLoveclim branch: merged to trunk at revision 145

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/resol_adv_diff_2D-sept2009.f90 (modified) (1 diff)

branches/iLoveclim/SOURCES/resol_adv_diff_2D-sept2009.f90

@@ -278 +278 @@
 
 relax_loop: do while(.not.stopp)
-ntour=ntour+1
-!$OMP PARALLEL
-!$OMP DO PRIVATE(reste)
-do j=2,ny-1
-   do i=2,nx-1
-
-      reste = (((arelax(i,j)*newH(i-1,j) +drelax(i,j)*newH(i,j-1)) &
-           + (brelax(i,j)*newH(i+1,j) + erelax(i,j)*newH(i,j+1))) &
-           + crelax(i,j)*newH(i,j))- frelax(i,j)
-
-!if (ntour.eq.1)  debug_3D(i,j,49)=(((arelax(i,j)*newH(i-1,j) +drelax(i,j)*newH(i,j-1)) &
-!           + (brelax(i,j)*newH(i+1,j) + erelax(i,j)*newH(i,j+1))) &
-!           + crelax(i,j)*newH(i,j))
-
-
-      deltaH(i,j) = reste/crelax(i,j)
-
+   ntour=ntour+1
+   !$OMP PARALLEL
+   !$OMP DO PRIVATE(reste)
+   do j=2,ny-1
+      do i=2,nx-1
+         reste = (((arelax(i,j)*newH(i-1,j) +drelax(i,j)*newH(i,j-1)) &
+               + (brelax(i,j)*newH(i+1,j) + erelax(i,j)*newH(i,j+1))) &
+               + crelax(i,j)*newH(i,j))- frelax(i,j)
+
+         deltaH(i,j) = reste/crelax(i,j)
+      end do
    end do
-end do
-!$OMP END DO
-
-!debug_3D(:,:,50)=arelax(:,:)
-!debug_3D(:,:,51)=brelax(:,:)
-!debug_3D(:,:,52)=crelax(:,:)
-!debug_3D(:,:,53)=drelax(:,:)
-!debug_3D(:,:,54)=erelax(:,:)
-!debug_3D(:,:,55)=frelax(:,:)
-
-
-!$OMP WORKSHARE
-newH(:,:)=newH(:,:)-deltaH(:,:)
-!$OMP END WORKSHARE
-!$OMP END PARALLEL
+   !$OMP END DO
+
+   !$OMP WORKSHARE
+   newH(:,:)=newH(:,:)-deltaH(:,:)
+   !$OMP END WORKSHARE
+   !$OMP END PARALLEL
 
 
 ! critere d'arret:
 ! ----------------         
-
-delh=0
-
-!$OMP PARALLEL
-!$OMP DO REDUCTION(+:delh)
-do j=2,ny-1
-   do i=2,nx-1
-      delh=delh+deltaH(i,j)**2
+   delh=0
+
+   !$OMP PARALLEL
+   !$OMP DO REDUCTION(+:delh)
+   do j=2,ny-1
+      do i=2,nx-1
+         delh=delh+deltaH(i,j)**2
+      end do
    end do
-end do
-!$OMP END DO
-!$OMP END PARALLEL
-
-if (delh.gt.0.) then
-   testh=sqrt(delh)/((nx-2)*(ny-2))
-else
-   testh=0.
-endif
-stopp = (testh.lt.1.e-4).or.(ntour.gt.100)
-
-
+   !$OMP END DO
+   !$OMP END PARALLEL
+
+   if (delh.gt.0.) then
+      testh=sqrt(delh)/((nx-2)*(ny-2))
+   else
+      testh=0.
+   endif
+   stopp = (testh.lt.1.e-4).or.(ntour.gt.100)
 
 end do relax_loop
 
-
-! thickness at the upwind node
-!do j = 1, ny
-!   do i = 2, nx
-!      debug_3D(i,j,92) = c_west(i,j) * newH(i-1,j) + c_east(i,j) * newH(i,j)
-!   end do
-!end do
-!do j = 2, ny
-!   do i = 1, nx
-!      debug_3D(i,j,93) = c_south(i,j) * newH(i,j-1) + c_north(i,j) * newH(i,j)
-!   end do
-!end do
-
 if (itracebug.eq.1)  call tracebug(' fin routine resolution_diffusion')
-
  
 return