Changeset 2056 for LMDZ5/branches/testing/libf/dyn3dmem/call_calfis_mod.F90

Timestamp:

Jun 11, 2014, 3:46:46 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1997:2055 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/call_calfis_mod.F90 (modified) (5 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/call_calfis_mod.F90

@@ -12 +12 @@
 
     REAL,POINTER,SAVE :: p(:,:) 
-    REAL,POINTER,SAVE :: alpha(:,:) 
-    REAL,POINTER,SAVE :: beta(:,:) 
     REAL,POINTER,SAVE :: pks(:) 
     REAL,POINTER,SAVE :: pk(:,:) 
@@ -53 +51 @@
     CALL allocate_u(flxw,llm,d)
     CALL allocate_u(p,llmp1,d)
-    CALL allocate_u(alpha,llm,d)
-    CALL allocate_u(beta,llm,d)
     CALL allocate_u(pks,d)
     CALL allocate_u(pk,llm,d)
@@ -75 +71 @@
                          phis_dyn,q_dyn,flxw_dyn)
   USE dimensions_mod
+  use exner_hyb_loc_m, only: exner_hyb_loc
+  use exner_milieu_loc_m, only: exner_milieu_loc
   USE parallel_lmdz
   USE times
@@ -201 +199 @@
 
   !$OMP BARRIER
-    CALL exner_hyb_loc(  ip1jmp1, ps, p,alpha,beta, pks, pk, pkf )
+    CALL exner_hyb_loc(  ip1jmp1, ps, p, pks, pk, pkf )
   !$OMP BARRIER
     CALL geopot_loc  ( ip1jmp1, teta  , pk , pks,  phis  , phi   )
@@ -343 +341 @@
 !$OMP BARRIER
     if (pressure_exner) then
-      CALL exner_hyb_loc(ijnb_u,ps,p,alpha,beta,pks,pk,pkf)
+      CALL exner_hyb_loc(ijnb_u,ps,p,pks,pk,pkf)
     else 
-      CALL exner_milieu_loc(ijnb_u,ps,p,beta,pks,pk,pkf)
+      CALL exner_milieu_loc(ijnb_u,ps,p,pks,pk,pkf)
     endif
 !$OMP BARRIER