Changeset 2298 for LMDZ5/branches/testing/libf/dyn3dmem/vlz_mod.F90

Timestamp:

Jun 14, 2015, 9:13:32 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2237:2291 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/vlz_mod.F90 (modified) (4 diffs)

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

@@ -1 +1 @@
 MODULE vlz_mod
 
-  REAL,POINTER,SAVE :: wq(:,:)
+  REAL,POINTER,SAVE :: wq(:,:,:)
   REAL,POINTER,SAVE :: dzq(:,:)
   REAL,POINTER,SAVE :: dzqw(:,:)
   REAL,POINTER,SAVE :: adzqw(:,:)
+  ! CRisi: pour les traceurs:  
+  !REAL,POINTER,SAVE :: masseq(:,:,:)
+  REAL,POINTER,SAVE :: Ratio(:,:,:)
   
 CONTAINS
@@ -18 +21 @@
     
     d=>distrib_vanleer
-    CALL allocate_u(wq,llm+1,d)
+    CALL allocate_u(wq,llm+1,nqtot,d)
     CALL allocate_u(dzq,llm,d)
     CALL allocate_u(dzqw,llm,d)
     CALL allocate_u(adzqw,llm,d)
+    if (nqdesc_tot.gt.0) then
+    !CALL allocate_u(masseq,llm,nqtot,d)
+    CALL allocate_u(Ratio,llm,nqtot,d)
+    endif !if (nqdesc_tot.gt.0) then
 
   END SUBROUTINE vlz_allocate
@@ -29 +36 @@
   USE bands
   USE parallel_lmdz
+  USE infotrac
   IMPLICIT NONE
     TYPE(distrib),INTENT(IN) :: dist
@@ -36 +44 @@
     CALL switch_u(dzqw,distrib_vanleer,dist)
     CALL switch_u(adzqw,distrib_vanleer,dist)
+    ! CRisi:
+    if (nqdesc_tot.gt.0) then    
+    !CALL switch_u(masseq,distrib_vanleer,dist)
+    CALL switch_u(Ratio,distrib_vanleer,dist)
+    endif !if (nqdesc_tot.gt.0) then     
 
   END SUBROUTINE vlz_switch_vanleer