Changeset 558 for codes/icosagcm/devel/src/dynamics/caldyn_kernels_hevi.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_hevi.F90 (modified) (9 diffs)

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

@@ -125 +125 @@
 
 #ifdef CPP_DYSL
-!#if 0
 #include "../kernels/compute_NH_geopot.k90"
 #else
-
 !    FIXME : vertical OpenMP parallelism will not work
    
@@ -266 +264 @@
   END SUBROUTINE compute_NH_geopot
 
-  SUBROUTINE compute_caldyn_solver(tau,rhodz,theta,pk, geopot,W, dPhi,dW,du)
+  SUBROUTINE compute_caldyn_solver(tau,rhodz,theta,pk, geopot,W, m_il,pres, dPhi,dW,du)
     REAL(rstd),INTENT(IN) :: tau ! "solve" Phi-tau*dPhi/dt = Phi_rhs
     REAL(rstd),INTENT(IN)    :: rhodz(iim*jjm,llm)
@@ -273 +271 @@
     REAL(rstd),INTENT(INOUT) :: geopot(iim*jjm,llm+1)
     REAL(rstd),INTENT(INOUT) :: W(iim*jjm,llm+1) ! OUT if tau>0
+    REAL(rstd),INTENT(OUT)   :: m_il(iim*jjm,llm+1)        ! rhodz averaged to interfaces
+    REAL(rstd),INTENT(OUT)   :: pres(iim*jjm,llm)          ! pressure
     REAL(rstd),INTENT(OUT)   :: dW(iim*jjm,llm+1)
     REAL(rstd),INTENT(OUT)   :: dPhi(iim*jjm,llm+1)
     REAL(rstd),INTENT(OUT)   :: du(3*iim*jjm,llm)
 
-    REAL(rstd) :: m_il(iim*jjm,llm+1)        ! rhodz averaged to interfaces
-    REAL(rstd) :: pres(iim*jjm,llm)          ! pressure
-    REAL(rstd) :: berni(iim*jjm,llm)             ! (W/m_il)^2
+    REAL(rstd) :: berni(iim*jjm,llm)         ! (W/m_il)^2
     REAL(rstd) :: gamma, rho_ij, T_ij, X_ij, Y_ij, vreff, Rd, Cvd
     INTEGER    :: ij, l
@@ -288 +286 @@
 
 #ifdef CPP_DYSL
-!#if 0
+!$OMP BARRIER
 #include "../kernels/caldyn_solver.k90"
+!$OMP BARRIER
 #else
 #define BERNI(ij) berni(ij,1)
@@ -517 +516 @@
 
 #ifdef CPP_DYSL
-!#if 0
 #include "../kernels/coriolis.k90"
 #else
@@ -675 +673 @@
 
 #ifdef CPP_DYSL
-!#if 0
 #define BERNI(ij,l) berni(ij,l)
 #include "../kernels/caldyn_slow_hydro.k90"
@@ -733 +730 @@
   END SUBROUTINE compute_caldyn_slow_hydro
 
-  SUBROUTINE compute_caldyn_slow_NH(u,rhodz,Phi,W, hflux,du,dPhi,dW)
+  SUBROUTINE compute_caldyn_slow_NH(u,rhodz,Phi,W, F_el,gradPhi2,w_il, hflux,du,dPhi,dW)
     REAL(rstd),INTENT(IN)  :: u(3*iim*jjm,llm)    ! prognostic "velocity"
     REAL(rstd),INTENT(IN)  :: rhodz(iim*jjm,llm)  ! rho*dz
@@ -744 +741 @@
     REAL(rstd),INTENT(OUT) :: dPhi(iim*jjm,llm+1)
 
-    REAL(rstd) :: w_il(3*iim*jjm,llm+1) ! Wil/mil
+    REAL(rstd) :: w_il(iim*jjm,llm+1) ! Wil/mil
     REAL(rstd) :: F_el(3*iim*jjm,llm+1) ! NH mass flux
-    REAL(rstd) :: GradPhi2(3*iim*jjm,llm+1) ! grad_Phi**2
+    REAL(rstd) :: gradPhi2(iim*jjm,llm+1) ! grad_Phi**2
     REAL(rstd) :: DePhil(3*iim*jjm,llm+1) ! grad(Phi)
     
@@ -765 +762 @@
 
 #ifdef CPP_DYSL
+!$OMP BARRIER
 #include "../kernels/caldyn_slow_NH.k90"
+!$OMP BARRIER
 #else
     DO l=ll_begin, ll_endp1 ! compute on l levels (interfaces)