Changeset 558 for codes/icosagcm/devel/src/dynamics/caldyn_kernels_base.F90

Timestamp:

09/21/17 18:18:47 (7 years ago)

Author:

dubos

Message:

devel : Fix OpenMP for NH

File:

• codes/icosagcm/devel/src/dynamics/caldyn_kernels_base.F90 (modified) (4 diffs)

codes/icosagcm/devel/src/dynamics/caldyn_kernels_base.F90

@@ -14 +14 @@
 
   ! temporary shared variables for caldyn
-  TYPE(t_field),POINTER,PUBLIC :: f_pk(:),f_wwuu(:),f_planetvel(:)
+  TYPE(t_field),POINTER,PUBLIC :: f_pk(:),f_wwuu(:),f_planetvel(:), &
+                                  f_Fel(:), f_gradPhi2(:), f_wil(:), f_Wetadot(:)
 
   INTEGER, PUBLIC :: caldyn_conserv
@@ -295 +296 @@
   END SUBROUTINE compute_caldyn_vert
 
-  SUBROUTINE compute_caldyn_vert_NH(mass,geopot,W,wflux, du,dPhi,dW)
+  SUBROUTINE compute_caldyn_vert_NH(mass,geopot,W,wflux, W_etadot, du,dPhi,dW)
     REAL(rstd),INTENT(IN) :: mass(iim*jjm,llm)
     REAL(rstd),INTENT(IN) :: geopot(iim*jjm,llm+1)
@@ -303 +304 @@
     REAL(rstd),INTENT(INOUT) :: dPhi(iim*jjm,llm+1)
     REAL(rstd),INTENT(INOUT) :: dW(iim*jjm,llm+1)
+    REAL(rstd) :: W_etadot(iim*jjm,llm) ! vertical flux of vertical momentum
     ! local arrays
     REAL(rstd) :: eta_dot(iim*jjm, llm) ! eta_dot in full layers
     REAL(rstd) :: wcov(iim*jjm,llm) ! covariant vertical momentum in full layers
-    REAL(rstd) :: W_etadot(iim*jjm,llm) ! vertical flux of vertical momentum
     ! indices and temporary values
     INTEGER    :: ij, l
@@ -314 +315 @@
 
 #ifdef CPP_DYSL
-!#if 0
+!$OMP BARRIER
 #include "../kernels/caldyn_vert_NH.k90"
+!$OMP BARRIER
 #else
 #define ETA_DOT(ij) eta_dot(ij,1)