Changeset 4703 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Sep 20, 2023, 3:09:14 PM (17 months ago)

Author:

Laurent Fairhead

Message:

Moving around some variable declarations to their right place

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• phys_local_var_mod.F90 (modified) (3 diffs)
• phys_output_var_mod.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmdiso/phys_local_var_mod.F90

@@ -198 +198 @@
       REAL, SAVE, ALLOCATABLE :: tau3d_aero(:,:,:,:) 
       !$OMP THREADPRIVATE(tau3d_aero) 
-      REAL, SAVE, ALLOCATABLE :: scdnc(:,:)
-      !$OMP THREADPRIVATE(scdnc)
       REAL, SAVE, ALLOCATABLE :: dNovrN(:) 
       !$OMP THREADPRIVATE(dNovrN) 
-      REAL, SAVE, ALLOCATABLE :: cldncl(:)
-      !$OMP THREADPRIVATE(cldncl)
-      REAL, SAVE, ALLOCATABLE :: reffclwtop(:)
-      !$OMP THREADPRIVATE(reffclwtop)
-      REAL, SAVE, ALLOCATABLE :: lcc(:)
-      !$OMP THREADPRIVATE(lcc)
-      REAL, SAVE, ALLOCATABLE :: reffclws(:,:)
-      !$OMP THREADPRIVATE(reffclws)
-      REAL, SAVE, ALLOCATABLE :: reffclwc(:,:)
-      !$OMP THREADPRIVATE(reffclwc)
-      REAL, SAVE, ALLOCATABLE :: cldnvi(:) 
-      !$OMP THREADPRIVATE(cldnvi)
-      REAL, SAVE, ALLOCATABLE :: lcc3d(:,:)
-      !$OMP THREADPRIVATE(lcc3d)
-      REAL, SAVE, ALLOCATABLE :: lcc3dcon(:,:)
-      !$OMP THREADPRIVATE(lcc3dcon)
-      REAL, SAVE, ALLOCATABLE :: lcc3dstra(:,:)
-      !$OMP THREADPRIVATE(lcc3dstra)
-      REAL, SAVE, ALLOCATABLE :: icc3dcon(:,:)
-      !$OMP THREADPRIVATE(icc3dcon)
-      REAL, SAVE, ALLOCATABLE :: icc3dstra(:,:)
-      !$OMP THREADPRIVATE(icc3dstra)
       REAL, SAVE, ALLOCATABLE :: zfice(:,:)
       !$OMP THREADPRIVATE(zfice)
@@ -847 +823 @@
       ALLOCATE(drytausum_aero(klon,naero_tot))
       ALLOCATE(tau3d_aero(klon,klev,nwave,naero_tot)) 
-      ALLOCATE(scdnc(klon, klev))
       ALLOCATE(dNovrN(klon))
-      ALLOCATE(cldncl(klon))
-      ALLOCATE(reffclwtop(klon))
-      ALLOCATE(lcc(klon))
-      ALLOCATE(reffclws(klon, klev))
-      ALLOCATE(reffclwc(klon, klev))
-      ALLOCATE(cldnvi(klon))
-      ALLOCATE(lcc3d(klon, klev))
-      ALLOCATE(lcc3dcon(klon, klev))
-      ALLOCATE(lcc3dstra(klon, klev))
-      ALLOCATE(icc3dcon(klon, klev))
-      ALLOCATE(icc3dstra(klon, klev))
       ALLOCATE(zfice(klon, klev))
       ALLOCATE(od443aer(klon))
@@ -1241 +1205 @@
       DEALLOCATE(drytausum_aero) 
       DEALLOCATE(tau3d_aero) 
-      DEALLOCATE(scdnc)
       DEALLOCATE(dNovrN)
-      DEALLOCATE(cldncl)
-      DEALLOCATE(reffclwtop)
-      DEALLOCATE(lcc)
-      DEALLOCATE(reffclws)
-      DEALLOCATE(reffclwc)
-      DEALLOCATE(cldnvi)
-      DEALLOCATE(lcc3d)
-      DEALLOCATE(lcc3dcon)
-      DEALLOCATE(lcc3dstra)
-      DEALLOCATE(icc3dcon)
-      DEALLOCATE(icc3dstra)
       DEALLOCATE(zfice)
       DEALLOCATE(od443aer)

LMDZ6/trunk/libf/phylmdiso/phys_output_var_mod.F90

@@ -66 +66 @@
   !$OMP THREADPRIVATE(map_emis_Cb,map_pcld_Cb,map_tcld_Cb,map_emis_ThCi)
   REAL, SAVE, ALLOCATABLE :: map_emis_Anv(:),map_pcld_Anv(:),map_tcld_Anv(:)
-  !$OMP THREADPRIVATE(map_pcld_ThCi,map_tcld_ThCi,map_emis_Anv,map_pcld_Anv,map_tcld_Anv)              
+  !$OMP THREADPRIVATE(map_pcld_ThCi,map_tcld_ThCi,map_emis_Anv,map_pcld_Anv,map_tcld_Anv)
+
+  ! variables deplacees de phys_local_var_mod
+  REAL, SAVE, ALLOCATABLE :: scdnc(:,:)
+  !$OMP THREADPRIVATE(scdnc)
+  REAL, SAVE, ALLOCATABLE :: cldncl(:)
+  !$OMP THREADPRIVATE(cldncl)
+  REAL, SAVE, ALLOCATABLE :: reffclwtop(:)
+  !$OMP THREADPRIVATE(reffclwtop)
+  REAL, SAVE, ALLOCATABLE :: lcc(:)
+  !$OMP THREADPRIVATE(lcc)
+  REAL, SAVE, ALLOCATABLE :: reffclws(:,:)
+  !$OMP THREADPRIVATE(reffclws)
+  REAL, SAVE, ALLOCATABLE :: reffclwc(:,:)
+  !$OMP THREADPRIVATE(reffclwc)
+  REAL, SAVE, ALLOCATABLE :: cldnvi(:) 
+  !$OMP THREADPRIVATE(cldnvi)
+  REAL, SAVE, ALLOCATABLE :: lcc3d(:,:)
+  !$OMP THREADPRIVATE(lcc3d)
+  REAL, SAVE, ALLOCATABLE :: lcc3dcon(:,:)
+  !$OMP THREADPRIVATE(lcc3dcon)
+  REAL, SAVE, ALLOCATABLE :: lcc3dstra(:,:)
+  !$OMP THREADPRIVATE(lcc3dstra)
+  REAL, SAVE, ALLOCATABLE :: icc3dcon(:,:)
+  !$OMP THREADPRIVATE(icc3dcon)
+  REAL, SAVE, ALLOCATABLE :: icc3dstra(:,:)
+  !$OMP THREADPRIVATE(icc3dstra)  
    
 
@@ -213 +239 @@
          sss(klon))
 
+! Sorties de lmdz_cloud_optics_pro
+    ALLOCATE(scdnc(klon, klev))
+    ALLOCATE(cldncl(klon))
+    ALLOCATE(reffclwtop(klon))
+    ALLOCATE(lcc(klon))
+    ALLOCATE(reffclws(klon, klev))
+    ALLOCATE(reffclwc(klon, klev))
+    ALLOCATE(cldnvi(klon))
+    ALLOCATE(lcc3d(klon, klev))
+    ALLOCATE(lcc3dcon(klon, klev))
+    ALLOCATE(lcc3dstra(klon, klev))
+    ALLOCATE(icc3dcon(klon, klev))
+    ALLOCATE(icc3dstra(klon, klev))
+
   END SUBROUTINE phys_output_var_init
 
@@ -251 +291 @@
   !   endif
 
+    DEALLOCATE(scdnc)
+    DEALLOCATE(cldncl)
+    DEALLOCATE(reffclwtop)
+    DEALLOCATE(lcc)
+    DEALLOCATE(reffclws)
+    DEALLOCATE(reffclwc)
+    DEALLOCATE(cldnvi)
+    DEALLOCATE(lcc3d)
+    DEALLOCATE(lcc3dcon)
+    DEALLOCATE(lcc3dstra)
+    DEALLOCATE(icc3dcon)
+    DEALLOCATE(icc3dstra)
+
   END SUBROUTINE phys_output_var_end
 

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -397 +397 @@
 #endif
        !
-       USE phys_local_var_mod, ONLY: scdnc, cldncl, reffclwtop, lcc, reffclws, &
-       reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra,  & 
-       zfice, dNovrN, ptconv
+       USE phys_local_var_mod, ONLY: zfice, dNovrN, ptconv
+       USE phys_output_var_mod, ONLY: scdnc, cldncl, reffclwtop, lcc, reffclws, &
+       reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra