Changeset 73 for trunk/SOURCES/resol_adv_diff_2D-sept2009.f90

Timestamp:

06/22/16 15:43:40 (8 years ago)

Author:

dumas

Message:

OpenMP parallelization in Temperature-routines, deformation_mod_2lois and resol_adv_diff_2D-sept2009

File:

• trunk/SOURCES/resol_adv_diff_2D-sept2009.f90 (modified) (11 diffs)

trunk/SOURCES/resol_adv_diff_2D-sept2009.f90

@@ -101 +101 @@
 subroutine resol_adv_diff_2D_vect(Dfx,Dfy,advx,advy,H_presc,i_Hpresc,bil,vieuxH,newH)
 
+!$ USE OMP_LIB
 implicit none
 
@@ -148 +149 @@
 if (itracebug.eq.1)  call tracebug(' Entree dans routine resolution_diffusion')
 
-
+!$OMP PARALLEL
+!$OMP WORKSHARE
 ! calcul de bdx et hdx
 hdx(:,:)=dx1*(vieuxH(:,:)-eoshift(vieuxH(:,:),shift=-1,boundary=0.,dim=1))
@@ -164 +166 @@
 Frelax(:,:)=0.
 DeltaH(:,:)=0.
-
+!$OMP END WORKSHARE
 
 ! schema spatial
 
 if (upwind.eq.1.) then                 !schema amont
-
+!$OMP WORKSHARE
    where (Advx(:,:).ge.0.)
       c_west(:,:)=1.
@@ -185 +187 @@
       c_north(:,:)=1.
    end where
-
+!$OMP END WORKSHARE
 else if (upwind.lt.1.) then             ! schema centre
+!$OMP WORKSHARE
       c_west(:,:)=0.5
       c_east(:,:)=0.5
       c_south(:,:)=0.5
       c_north(:,:)=0.5
+!$OMP END WORKSHARE      
 end if
 
+
 ! attribution des elements des diagonales
+!$OMP DO PRIVATE(frdx,frdy,fraxw,fraxe,frays,frayn)
 do j=2,ny-1
   do i=2,nx-1
@@ -254 +260 @@
      end do
   end do
-
-
+!$OMP END DO
+
+!$OMP WORKSHARE
 where (i_hpresc(:,:) .eq.1)          ! thickness prescribed
    frelax(:,:) = H_presc(:,:)
@@ -264 +271 @@
    erelax(:,:) = 0.
 end where
+!$OMP END WORKSHARE
+!$OMP END PARALLEL
 
 stopp = .false.
 ntour=0
 
-
-
 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
@@ -281 +288 @@
            + 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))
+!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))
 
 
@@ -290 +297 @@
    end do
 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 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
 
 
@@ -310 +318 @@
 delh=0
 
-
+!$OMP PARALLEL
+!$OMP DO REDUCTION(+:delh)
 do j=2,ny-1
    do i=2,nx-1
@@ -316 +325 @@
    end do
 end do
+!$OMP END DO
+!$OMP END PARALLEL
 
 if (delh.gt.0.) then
@@ -330 +341 @@
 
 ! 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')
+!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