Changeset 76 for trunk/SOURCES/dragging_neff_slope_mod.f90

Timestamp:

06/29/16 16:21:13 (8 years ago)

Author:

dumas

Message:

OpenMP parallelization in conserv-mass-adv-diff_sept2009_mod.f90, diffusiv-polyn-0.6.f90, dragging_neff_slope_mod.f90, eaubasale-0.5_mod.f90 and relaxation_water_diffusion.f90

File:

• trunk/SOURCES/dragging_neff_slope_mod.f90 (modified) (12 diffs)

trunk/SOURCES/dragging_neff_slope_mod.f90

@@ -168 +168 @@
 !-------------------------------------------------------------------------
 subroutine dragging   ! defini la localisation des streams et le frottement basal
-
+!$ USE OMP_LIB
 
 !         les iles n'ont pas de condition neff mais ont la condition toblim
 !         (ce bloc etait avant dans flottab)
 
-
+!$OMP PARALLEL
+!$OMP DO
 do j=2,ny
    do i=2,nx
@@ -180 +181 @@
    end do
 end do
+!$OMP END DO
 
 ! le calcul des fleuves se fait sur les mailles majeures en partant de la cote
@@ -193 +195 @@
 ! Attention : ce systeme ne permet pas d'avoir des fleuves convergents
 !             et les fleuves n'ont une épaisseur que de 1 noeud.
-
+!$OMP WORKSHARE
 fleuvemx(:,:)=.false.
 fleuvemy(:,:)=.false.
 fleuve(:,:)=.false.
 cote(:,:)=.false.
+!$OMP END WORKSHARE
 
 ! detection des cotes
+!$OMP DO
 do  j=2,ny-1  
    do i=2,nx-1  
@@ -208 +212 @@
    end do
 end do
+!$OMP END DO
 
 ! calcul de neff (pression effective sur noeuds majeurs)
+!$OMP DO
 do j=1,ny-1
    do i=1,nx-1
@@ -215 +221 @@
    enddo
 enddo
+!$OMP END DO
 !aurel, for the borders:
+!$OMP WORKSHARE
 neff(:,ny)=1.e5
 neff(nx,:)=1.e5
+
 
 !!$
@@ -277 +286 @@
 ! aurel, we add the neff threshold:
 where ((neff(:,:).le.seuil_neff).and.(.not.flot(:,:)).and.(H(:,:).gt.1.)) fleuve(:,:)=.true.
-
+!$OMP END WORKSHARE
+
+!$OMP DO
 do j=1,ny-1
    do i=1,nx-1
@@ -288 +299 @@
    end do
 end do
+!$OMP END DO
 
 ! we look for the warm based points that will not be treated as stream (ub from SSA):
+!$OMP WORKSHARE
 slowssa(:,:)=.false.
 slowssamx(:,:)=.false.
 slowssamy(:,:)=.false.
+!$OMP END WORKSHARE
+!$OMP DO
 do  j=1,ny
    do i=1,nx
@@ -299 +314 @@
    end do
 end do
+!$OMP END DO
+!$OMP DO
 do j=1,ny-1
    do i=1,nx-1
@@ -309 +326 @@
    end do
 end do
-
+!$OMP END DO
+!$OMP DO
 do j=1,ny
    do i=1,nx
@@ -354 +372 @@
    end do
 end do
-
+!$OMP END DO
+
+!$OMP DO
 do j=1,ny
    do i=1,nx
@@ -399 +419 @@
    end do
 end do
-
-
+!$OMP END DO
+
+!$OMP DO
 do j=2,ny-1
    do i=2,nx-1
@@ -407 +428 @@
    end do
 end do
-
-
-where (fleuve(:,:))
-   debug_3D(:,:,1)=1
-elsewhere (flot(:,:))
-   debug_3D(:,:,1)=2
-elsewhere
-   debug_3D(:,:,1)=0
-endwhere
-
-where (cote(:,:))
-   debug_3D(:,:,2)=1
-elsewhere
-   debug_3D(:,:,2)=0
-endwhere
-
-where (fleuvemx(:,:))
-   debug_3D(:,:,3)=1
-elsewhere
-   debug_3D(:,:,3)=0
-endwhere
-
-where (flotmx(:,:))
-   debug_3D(:,:,3)=-1
-endwhere
+!$OMP END DO
+!$OMP END PARALLEL
+
+!~ where (fleuve(:,:))
+!~    debug_3D(:,:,1)=1
+!~ elsewhere (flot(:,:))
+!~    debug_3D(:,:,1)=2
+!~ elsewhere
+!~    debug_3D(:,:,1)=0
+!~ endwhere
+!~ 
+!~ where (cote(:,:))
+!~    debug_3D(:,:,2)=1
+!~ elsewhere
+!~    debug_3D(:,:,2)=0
+!~ endwhere
+!~ 
+!~ where (fleuvemx(:,:))
+!~    debug_3D(:,:,3)=1
+!~ elsewhere
+!~    debug_3D(:,:,3)=0
+!~ endwhere
+!~ 
+!~ where (flotmx(:,:))
+!~    debug_3D(:,:,3)=-1
+!~ endwhere
 
 !_____________________
 
 
-where (fleuvemy(:,:))
-   debug_3D(:,:,4)=1
-elsewhere
-   debug_3D(:,:,4)=0
-endwhere
-
-where (flotmy(:,:))
-   debug_3D(:,:,4)=-1
-end where
-
-debug_3D(:,:,23)= abs(RO*G*HMX(:,:)*sdx(:,:)*1.e-5) 
-debug_3D(:,:,24)= abs(RO*G*HMY(:,:)*sdy(:,:)*1.e-5) 
+!~ where (fleuvemy(:,:))
+!~    debug_3D(:,:,4)=1
+!~ elsewhere
+!~    debug_3D(:,:,4)=0
+!~ endwhere
+!~ 
+!~ where (flotmy(:,:))
+!~    debug_3D(:,:,4)=-1
+!~ end where
+!~ 
+!~ debug_3D(:,:,23)= abs(RO*G*HMX(:,:)*sdx(:,:)*1.e-5) 
+!~ debug_3D(:,:,24)= abs(RO*G*HMY(:,:)*sdy(:,:)*1.e-5) 
 
 return