Changeset 151 for codes/icosagcm/trunk/src/advect.f90

Timestamp:

05/13/13 14:30:31 (11 years ago)

Author:

ymipsl

Message:

Implementation of mixte parallelism MPI/OpenMP into src directory

YM

File:

• codes/icosagcm/trunk/src/advect.f90 (modified) (10 diffs)

codes/icosagcm/trunk/src/advect.f90

@@ -53 +53 @@
   SUBROUTINE compute_gradq3d(qi,one_over_sqrt_leng,gradq3d)
     USE trace
+    USE omp_para
     IMPLICIT NONE
     REAL(rstd),INTENT(IN)  :: qi(iim*jjm,llm)
@@ -72 +73 @@
     ! Compute gradient at triangles solving a linear system
     ! arr = area of triangle joining centroids of hexagons
-    Do l = 1,llm 
+     DO l = ll_begin,ll_end 
        DO j=jj_begin-1,jj_end+1
           DO i=ii_begin-1,ii_end+1
@@ -90 +91 @@
       
     DO k=1,3
-      DO l =1,llm
+      DO l =ll_begin,ll_end
         DO j=jj_begin,jj_end
            DO i=ii_begin,ii_end
@@ -103 +104 @@
 
     !============================================================================================= LIMITING 
-    ! GO TO 120 
-    DO l =1,llm
+    DO l =ll_begin,ll_end
        DO j=jj_begin,jj_end
           DO i=ii_begin,ii_end
@@ -110 +110 @@
              maggrd =  dot_product(gradq3d(n,l,:),gradq3d(n,l,:))
              maggrd = sqrt(maggrd) 
-!             leng = max(sum((xyz_v(n+z_up,:) - xyz_i(n,:))**2),sum((xyz_v(n+z_down,:) - xyz_i(n,:))**2), &
-!                  sum((xyz_v(n+z_rup,:) - xyz_i(n,:))**2),sum((xyz_v(n+z_rdown,:) - xyz_i(n,:))**2),  &
-!                  sum((xyz_v(n+z_lup,:) - xyz_i(n,:))**2),sum((xyz_v(n+z_ldown,:) - xyz_i(n,:))**2))
-!             maxq_c = qi(n,l) + maggrd*sqrt(leng(n))
-!             minq_c = qi(n,l) - maggrd*sqrt(leng(n))
              maxq_c = qi(n,l) + maggrd*one_over_sqrt_leng(n)
              minq_c = qi(n,l) - maggrd*one_over_sqrt_leng(n)
@@ -137 +132 @@
   SUBROUTINE compute_backward_traj(normal,tangent,ue,tau, cc)
     USE trace
+    USE omp_para
     IMPLICIT NONE
     REAL(rstd),INTENT(IN)    :: normal(3*iim*jjm,3)
@@ -152 +148 @@
     
     ! reconstruct tangential wind then 3D wind at edge then cc = edge midpoint - u*tau
-    DO l = 1,llm
+    DO l = ll_begin,ll_end
        DO j=jj_begin-1,jj_end+1
           DO i=ii_begin-1,ii_end+1
@@ -213 +209 @@
   SUBROUTINE compute_advect_horiz(update_mass,hfluxt,cc,gradq3d, mass,qi) 
     USE trace
+    USE omp_para
     IMPLICIT NONE
     LOGICAL, INTENT(IN)       :: update_mass
@@ -230 +227 @@
     ! q(cc)= q0 + gradq.(cc-xyz_i)  with xi centroid of hexagon
     ! ne*hfluxt>0 iff outgoing
-    DO l = 1,llm
+    DO l = ll_begin,ll_end
        DO j=jj_begin-1,jj_end+1
           DO i=ii_begin-1,ii_end+1
@@ -265 +262 @@
 
     ! update q and, if update_mass, update mass
-    DO l = 1,llm
+    DO l = ll_begin,ll_end
        DO j=jj_begin,jj_end
           DO i=ii_begin,ii_end