Changeset 665 for codes/icosagcm/devel/src/unstructured/timestep_unstructured.F90

Timestamp:

01/20/18 18:46:10 (6 years ago)

Author:

dubos

Message:

devel/unstructured : OpenMP fixes

File:

• codes/icosagcm/devel/src/unstructured/timestep_unstructured.F90 (modified) (7 diffs)

codes/icosagcm/devel/src/unstructured/timestep_unstructured.F90

@@ -45 +45 @@
     FIELD_GEOPOT :: wflux, w, geopot, &               ! DIAG, INOUT
          dPhi_fast, dPhi_slow, dW_fast, dW_slow       ! OUT
-    FIELD_U      :: u,du_fast,du_slow,hflux,Ftheta,qu ! INOUT,OUT,OUT,DIAG
+    FIELD_U      :: u,du_fast,du_slow,hflux,qu        ! INOUT,OUT,OUT,DIAG
     FIELD_Z      :: qv                                ! DIAG
     FIELD_PS     :: ps,dmass_col,mass_col             ! OUT,OUT,IN (if eta_mass) or OUT,UNUSED,UNUSED (if eta_lag)
-    FIELD_UL     :: wwuu
+    ! buffers for fields that need to be shared among OpenMP threads
+    ! vertical size is allocated as llm+1 even if only llm is needed
+    FIELD_GEOPOT :: bufm1, bufm2, bufm3
+    FIELD_UL     :: bufu1, bufu2, bufu3,bufu4
+
     DBL          :: time1,time2
     INTEGER :: ij
     
-    CALL init_trace()
     !  CALL CPU_TIME(time1)
     time1=OMP_GET_WTIME()
@@ -72 +75 @@
        CALL compute_pvort_only(rhodz,u,qv,qu)
        CALL compute_caldyn_slow_hydro(rhodz,theta,u, berni,hflux,du_slow)
-       CALL compute_coriolis(hflux,theta,qu,Ftheta, drhodz,dtheta_rhodz,du_slow)
+       CALL compute_coriolis(hflux,theta,qu, bufu1, drhodz,dtheta_rhodz,du_slow)
        IF(caldyn_eta == eta_mass) THEN
-          CALL caldyn_vert(drhodz,rhodz,theta,u, dmass_col,wflux,dtheta_rhodz,du_slow,wwuu)
+          CALL caldyn_vert(drhodz,rhodz,theta,u, dmass_col,wflux,dtheta_rhodz,du_slow,bufu1)
        END IF
        !$OMP END PARALLEL
@@ -88 +91 @@
        END DO
        CALL compute_theta(mass_col,rhodz,theta_rhodz, theta)
-       CALL compute_caldyn_solver(tau,rhodz,theta,pk,geopot,W,dPhi_fast,dW_fast,du_fast)
+       CALL compute_caldyn_solver(tau,rhodz,theta, bufm1,bufm2,bufm3, pk,geopot,W,dPhi_fast,dW_fast,du_fast)
        CALL compute_caldyn_fast(tau, pk,berni,theta,geopot, du_fast,u)
        CALL compute_pvort_only(rhodz,u,qv,qu)
-       CALL compute_caldyn_slow_NH(u,rhodz,geopot,W, hflux,du_slow,dPhi_slow,dW_slow) 
-       CALL compute_coriolis(hflux,theta,qu,Ftheta, drhodz,dtheta_rhodz,du_slow)
+       CALL compute_caldyn_slow_NH(u,rhodz,geopot,W, bufm1,bufm2,bufm3,bufu1,bufu2,bufu3,bufu4, hflux,du_slow,dPhi_slow,dW_slow) 
+       CALL compute_coriolis(hflux,theta,qu, bufu1, drhodz,dtheta_rhodz,du_slow)
        IF(caldyn_eta == eta_mass) THEN
-          CALL caldyn_vert(drhodz,rhodz,theta,u, dmass_col,wflux,dtheta_rhodz,du_slow,wwuu)
-          CALL compute_caldyn_vert_NH(rhodz,geopot,W,wflux, du_slow,dPhi_slow,dW_slow)
+          CALL caldyn_vert(drhodz,rhodz,theta,u, dmass_col,wflux,dtheta_rhodz,du_slow,bufu1)
+          CALL compute_caldyn_vert_NH(rhodz,geopot,W,wflux, bufm1,bufm2,bufm3, du_slow,dPhi_slow,dW_slow)
        END IF
     END IF
@@ -117 +120 @@
     FIELD_MASS   :: rhodz, pk, berni                 ! IN, DIAG
     FIELD_THETA  :: theta_rhodz, theta               ! IN, DIAG
-    FIELD_U      :: u,hflux,qu,Ftheta                ! INOUT,DIAG*3
-    FIELD_GEOPOT :: geopot, w, wflux, w_il           ! IN, INOUT, DIAG, DIAG
+    FIELD_U      :: u,hflux,qu                       ! INOUT,DIAG*2
+    FIELD_GEOPOT :: geopot, w, wflux                 ! IN, INOUT, DIAG
     FIELD_Z      :: qv                               ! DIAG
     DOUBLE2(       primal_num, max_nb_stage) :: dmass_col    ! OUT
@@ -126 +129 @@
     DOUBLE3(llm+1, primal_num, max_nb_stage) :: &
          dPhi_fast, dPhi_slow, dW_fast, dW_slow      ! OUT
-    FIELD_UL     :: DePhil, v_el, G_el, wwuu         ! DIAG*4
+    ! buffers for fields that need to be shared among OpenMP threads
+    ! vertical size is allocated as llm+1 even if only llm is needed
+    FIELD_GEOPOT :: bufm1, bufm2, bufm3
+    FIELD_UL     :: bufu1, bufu2, bufu3,bufu4
     DBL       :: time1,time2
     INTEGER :: step, stage, ij
     
-    CALL init_trace()
     !CALL CPU_TIME(time1)
     time1=OMP_GET_WTIME()
@@ -154 +159 @@
              CALL compute_pvort_only(rhodz,u,qv,qu)
              CALL compute_caldyn_slow_hydro(rhodz,theta,u, berni,hflux,du_slow(:,:,stage))
-             CALL compute_coriolis(hflux,theta,qu,Ftheta, drhodz(:,:,stage), dtheta_rhodz(:,:,:,stage),du_slow(:,:,stage))
+             CALL compute_coriolis(hflux,theta,qu, bufu1, drhodz(:,:,stage), dtheta_rhodz(:,:,:,stage),du_slow(:,:,stage))
              IF(caldyn_eta == eta_mass) THEN
                 CALL caldyn_vert(drhodz(:,:,stage),rhodz,theta,u, &
-                     dmass_col(:,stage),wflux,dtheta_rhodz(:,:,:,stage),du_slow(:,:,stage),wwuu)
+                     dmass_col(:,stage),wflux,dtheta_rhodz(:,:,:,stage),du_slow(:,:,stage),bufu1)
              END IF
              
@@ -168 +173 @@
              !$OMP END DO
              CALL compute_theta(mass_col,rhodz,theta_rhodz, theta)
-             CALL compute_caldyn_solver(tauj(stage),rhodz,theta,pk,geopot,W, &
+             CALL compute_caldyn_solver(tauj(stage),rhodz,theta, bufm1,bufm2,bufm3, pk,geopot,W, &
                   dPhi_fast(:,:,stage), dW_fast(:,:,stage), du_fast(:,:,stage))
              CALL compute_caldyn_fast(tauj(stage), pk,berni,theta,geopot, du_fast(:,:,stage),u)
              CALL compute_pvort_only(rhodz,u,qv,qu)
-             CALL compute_caldyn_slow_NH(u,rhodz,geopot,W, hflux, du_slow(:,:,stage), dPhi_slow(:,:,stage), dW_slow(:,:,stage))
-             CALL compute_coriolis(hflux,theta,qu,Ftheta, drhodz(:,:,stage),dtheta_rhodz(:,:,:,stage), du_slow(:,:,stage))
+             CALL compute_caldyn_slow_NH(u,rhodz,geopot,W, bufm1,bufm2,bufm3,bufu1,bufu2,bufu3,bufu4, hflux, &
+                  du_slow(:,:,stage), dPhi_slow(:,:,stage), dW_slow(:,:,stage))
+             CALL compute_coriolis(hflux,theta,qu, bufu1, drhodz(:,:,stage),dtheta_rhodz(:,:,:,stage), du_slow(:,:,stage))
              IF(caldyn_eta == eta_mass) THEN
                 CALL caldyn_vert(drhodz(:,:,stage),rhodz,theta,u, &
-                     dmass_col(:,stage),wflux,dtheta_rhodz(:,:,:,stage), du_slow(:,:,stage), wwuu)
-                CALL compute_caldyn_vert_NH(rhodz,geopot,W,wflux, du_slow(:,:,stage), dPhi_slow(:,:,stage), dW_slow(:,:,stage) )
+                     dmass_col(:,stage),wflux,dtheta_rhodz(:,:,:,stage), du_slow(:,:,stage), bufu1)
+                CALL compute_caldyn_vert_NH(rhodz,geopot,W,wflux, bufm1,bufm2,bufm3, &
+                     du_slow(:,:,stage), dPhi_slow(:,:,stage), dW_slow(:,:,stage) )
              END IF
           END IF ! NH