Changeset 665 for codes/icosagcm/devel/src/unstructured/caldyn_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/caldyn_unstructured.F90 (modified) (4 diffs)

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

@@ -46 +46 @@
 SUBROUTINE compute_NH_geopot(tau, m_ik, m_il, theta, W_il, Phi_il)
   FIELD_MASS   :: m_ik, theta   ! IN*2
-  FIELD_GEOPOT :: m_il, W_il, Phi_il, Phi_star_il  ! IN,INOUT*2, LOCAL*5 
+  FIELD_GEOPOT :: m_il, W_il, Phi_il, Phi_star_il  ! IN,INOUT*2, LOCAL
   DBL :: tau, gamma, tau2_g, tau2_g2, g2, gm2, vreff, Rd_preff
   INTEGER :: iter
@@ -83 +83 @@
 END SUBROUTINE compute_NH_geopot
 
-SUBROUTINE compute_caldyn_slow_NH(u,rhodz,Phi,W, hflux,du,dPhi,dW)
+SUBROUTINE compute_caldyn_slow_NH(u,rhodz,Phi,W, w_il,berni,gradPhi2,DePhil,v_el,G_el,F_el, hflux,du,dPhi,dW)
   FIELD_U      :: u, hflux, du   ! IN, OUT, OUT
-  FIELD_MASS   :: rhodz, berni   ! IN, LOCAL
-  FIELD_GEOPOT :: Phi,W,dPhi,dW, w_il, gradPhi2  ! IN,IN, OUT,OUT, LOCAL 
-  FIELD_UL     :: DePhil, v_el, G_el, F_el ! LOCAL
+  FIELD_MASS   :: rhodz, berni   ! IN, BUF
+  FIELD_GEOPOT :: Phi,W,dPhi,dW, w_il, gradPhi2  ! IN,IN, OUT,OUT, BUF*2
+  FIELD_UL     :: DePhil, v_el, G_el, F_el ! BUF*4
   DECLARE_INDICES
   DECLARE_EDGES
@@ -96 +96 @@
 END SUBROUTINE compute_caldyn_slow_NH
 
-SUBROUTINE compute_caldyn_solver(tau,rhodz,theta,pk,geopot,W,dPhi,dW,du)
+SUBROUTINE compute_caldyn_solver(tau,rhodz,theta, berni,pres,m_il, pk,geopot,W,dPhi,dW,du)
   DBL, INTENT(IN) :: tau
-  FIELD_MASS   :: rhodz,pk,berni,pres    ! IN, OUT, LOCAL
+  FIELD_MASS   :: rhodz,pk,berni,pres    ! IN, OUT, BUF*2
   FIELD_THETA  :: theta                  ! IN
-  FIELD_GEOPOT :: geopot,W,dPhi,dW, m_il ! INOUT,INOUT, OUT,OUT, LOCAL 
+  FIELD_GEOPOT :: geopot,W,dPhi,dW, m_il ! INOUT,INOUT, OUT,OUT, BUF
   FIELD_U      :: du                     ! OUT
   DECLARE_INDICES
@@ -113 +113 @@
 END SUBROUTINE compute_caldyn_solver
 
-SUBROUTINE compute_caldyn_vert_NH(mass,geopot,W,wflux, du,dPhi,dW)
-  FIELD_MASS   :: mass, eta_dot, wcov, W_etadot
-  FIELD_GEOPOT :: geopot,W,wflux,dPhi,dW
-  FIELD_U      :: du
+SUBROUTINE compute_caldyn_vert_NH(mass,geopot,W,wflux, eta_dot,wcov,W_etadot, du,dPhi,dW)
+  FIELD_MASS   :: mass, eta_dot, wcov, W_etadot ! IN, BUF*3
+  FIELD_GEOPOT :: geopot,W,wflux,dPhi,dW ! IN*3, INOUT*2
+  FIELD_U      :: du ! INOUT
   DECLARE_INDICES
   DBL :: w_ij, wflux_ij