Changeset 2953 for LMDZ5

Timestamp:

Jul 14, 2017, 11:55:59 PM (7 years ago)

Author:

oboucher

Message:

Correcting an issue with the aerosol load diagnostics
that was introduced with revision 2823 in a failed attempt
to save a bit of memory... This is bit convergent with
previous version as it affects only diagnostics.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• phys_local_var_mod.F90 (modified) (3 diffs)
• readaerosol_optic.F90 (modified) (3 diffs)
• rrtm/readaerosol_optic_rrtm.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/phylmd/phys_local_var_mod.F90

@@ -219 +219 @@
       REAL, SAVE, ALLOCATABLE :: loadno3(:) 
       !$OMP THREADPRIVATE(loadno3) 
-      REAL, SAVE, ALLOCATABLE :: load_tmp1(:) 
-      !$OMP THREADPRIVATE(load_tmp1) 
-      REAL, SAVE, ALLOCATABLE :: load_tmp2(:) 
-      !$OMP THREADPRIVATE(load_tmp2) 
-      REAL, SAVE, ALLOCATABLE :: load_tmp3(:) 
-      !$OMP THREADPRIVATE(load_tmp3) 
+      REAL, SAVE, ALLOCATABLE :: load_tmp1(:), load_tmp2(:)
+      !$OMP THREADPRIVATE(load_tmp1, load_tmp2) 
+      REAL, SAVE, ALLOCATABLE :: load_tmp3(:), load_tmp4(:)
+      !$OMP THREADPRIVATE(load_tmp3, load_tmp4) 
+      REAL, SAVE, ALLOCATABLE :: load_tmp5(:), load_tmp6(:)
+      !$OMP THREADPRIVATE(load_tmp5, load_tmp6) 
+      REAL, SAVE, ALLOCATABLE :: load_tmp7(:), load_tmp8(:)
+      !$OMP THREADPRIVATE(load_tmp7, load_tmp8) 
+      REAL, SAVE, ALLOCATABLE :: load_tmp9(:), load_tmp10(:)
+      !$OMP THREADPRIVATE(load_tmp9, load_tmp10) 
 
 !IM ajout variables CFMIP2/CMIP5
@@ -614 +618 @@
       ALLOCATE(load_tmp2(klon))
       ALLOCATE(load_tmp3(klon))
+      ALLOCATE(load_tmp4(klon))
+      ALLOCATE(load_tmp5(klon))
+      ALLOCATE(load_tmp6(klon))
+      ALLOCATE(load_tmp7(klon))
+      ALLOCATE(load_tmp8(klon))
+      ALLOCATE(load_tmp9(klon))
+      ALLOCATE(load_tmp10(klon))
 
 !IM ajout variables CFMIP2/CMIP5
@@ -877 +888 @@
       DEALLOCATE(load_tmp2)
       DEALLOCATE(load_tmp3)
+      DEALLOCATE(load_tmp4)
+      DEALLOCATE(load_tmp5)
+      DEALLOCATE(load_tmp6)
+      DEALLOCATE(load_tmp7)
+      DEALLOCATE(load_tmp8)
+      DEALLOCATE(load_tmp9)
+      DEALLOCATE(load_tmp10)
       DEALLOCATE(du_gwd_hines,dv_gwd_hines,d_t_hin)
       DEALLOCATE(d_q_ch4)

LMDZ5/trunk/libf/phylmd/readaerosol_optic.F90

@@ -16 +16 @@
   USE phys_local_var_mod, only: sconcso4,sconcno3,sconcoa,sconcbc,sconcss,sconcdust, &
       concso4,concno3,concoa,concbc,concss,concdust,loadso4,loadoa,loadbc,loadss,loaddust, &
-      load_tmp1,load_tmp2,load_tmp3
+      load_tmp1,load_tmp2,load_tmp3,load_tmp4,load_tmp5,load_tmp6,load_tmp7
   IMPLICIT NONE
 
@@ -107 +107 @@
        flag_aerosol .EQ. 6 ) THEN
 
-     CALL readaerosol_interp(id_ASPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomsol, pomsol_pi, load_tmp1)
-     CALL readaerosol_interp(id_AIPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomins, pomins_pi, load_tmp2)
-     loadoa(:)=load_tmp1(:)+load_tmp2(:)
+     CALL readaerosol_interp(id_ASPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomsol, pomsol_pi, load_tmp3)
+     CALL readaerosol_interp(id_AIPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomins, pomins_pi, load_tmp4)
+     loadoa(:)=load_tmp3(:)+load_tmp4(:)
   ELSE
      pomsol(:,:) = 0. ; pomsol_pi(:,:) = 0.
@@ -121 +121 @@
       flag_aerosol .EQ. 6 ) THEN 
 
-      CALL readaerosol_interp(id_SSSSM_phy ,itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, sssupco, sssupco_pi,  load_tmp1) 
-      CALL readaerosol_interp(id_CSSSM_phy ,itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, sscoarse,sscoarse_pi, load_tmp2) 
-      CALL readaerosol_interp(id_ASSSM_phy ,itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, ssacu,   ssacu_pi,    load_tmp3) 
-      loadss(:)=load_tmp1(:)+load_tmp2(:)+load_tmp3(:)
+      CALL readaerosol_interp(id_SSSSM_phy ,itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, sssupco, sssupco_pi,  load_tmp5) 
+      CALL readaerosol_interp(id_CSSSM_phy ,itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, sscoarse,sscoarse_pi, load_tmp6) 
+      CALL readaerosol_interp(id_ASSSM_phy ,itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, ssacu,   ssacu_pi,    load_tmp7) 
+      loadss(:)=load_tmp5(:)+load_tmp6(:)+load_tmp7(:)
   ELSE
       sscoarse(:,:) = 0. ; sscoarse_pi(:,:) = 0. 

LMDZ5/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90

@@ -17 +17 @@
   USE phys_local_var_mod, only: sconcso4,sconcno3,sconcoa,sconcbc,sconcss,sconcdust, &
        concso4,concno3,concoa,concbc,concss,concdust,loadso4,loadoa,loadbc,loadss,loaddust, &
-       loadno3, load_tmp1,load_tmp2,load_tmp3
+       loadno3,load_tmp1,load_tmp2,load_tmp3,load_tmp4,load_tmp5,load_tmp6,load_tmp7, & 
+       load_tmp8,load_tmp9,load_tmp10
 
   USE infotrac_phy
@@ -196 +197 @@
      IF ( flag_aerosol .EQ. 3 .OR. flag_aerosol .EQ. 6 ) THEN
 
-        CALL readaerosol_interp(id_ASPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomsol, pomsol_pi, load_tmp1)
-        CALL readaerosol_interp(id_AIPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomins, pomins_pi, load_tmp2)
-        loadoa(:)=load_tmp1(:)+load_tmp2(:)
+        CALL readaerosol_interp(id_ASPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomsol, pomsol_pi, load_tmp3)
+        CALL readaerosol_interp(id_AIPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomins, pomins_pi, load_tmp4)
+        loadoa(:)=load_tmp3(:)+load_tmp4(:)
      ELSE
         pomsol(:,:) = 0. ; pomsol_pi(:,:) = 0.
@@ -209 +210 @@
 
         CALL readaerosol_interp(id_SSSSM_phy ,itap, pdtphys,rjourvrai, &
-        debut, pplay, paprs, t_seri, sssupco, sssupco_pi, load_tmp1) 
+        debut, pplay, paprs, t_seri, sssupco, sssupco_pi, load_tmp5) 
         CALL readaerosol_interp(id_CSSSM_phy ,itap, pdtphys,rjourvrai, &
-        debut, pplay, paprs, t_seri, sscoarse,sscoarse_pi, load_tmp2) 
+        debut, pplay, paprs, t_seri, sscoarse,sscoarse_pi, load_tmp6) 
         CALL readaerosol_interp(id_ASSSM_phy ,itap, pdtphys,rjourvrai, &
-        debut, pplay, paprs, t_seri, ssacu, ssacu_pi, load_tmp3) 
-        loadss(:)=load_tmp1(:)+load_tmp2(:)+load_tmp3(:)
+        debut, pplay, paprs, t_seri, ssacu, ssacu_pi, load_tmp7) 
+        loadss(:)=load_tmp5(:)+load_tmp6(:)+load_tmp7(:)
      ELSE
         sscoarse(:,:) = 0. ; sscoarse_pi(:,:) = 0. 
@@ -236 +237 @@
 
         CALL readaerosol_interp(id_ASNO3M_phy, itap, pdtphys, rjourvrai, & 
-        debut, pplay, paprs, t_seri, nitracc, nitracc_pi, load_tmp1) 
+        debut, pplay, paprs, t_seri, nitracc, nitracc_pi, load_tmp8) 
         CALL readaerosol_interp(id_CSNO3M_phy, itap, pdtphys, rjourvrai, & 
-        debut, pplay, paprs, t_seri, nitrcoarse, nitrcoarse_pi, load_tmp2) 
+        debut, pplay, paprs, t_seri, nitrcoarse, nitrcoarse_pi, load_tmp9) 
         CALL readaerosol_interp(id_CINO3M_phy, itap, pdtphys, rjourvrai, & 
-        debut, pplay, paprs, t_seri, nitrinscoarse, nitrinscoarse_pi, load_tmp3) 
-        loadno3(:)=load_tmp1(:)+load_tmp2(:)+load_tmp3(:)
+        debut, pplay, paprs, t_seri, nitrinscoarse, nitrinscoarse_pi, load_tmp10) 
+        loadno3(:)=load_tmp8(:)+load_tmp9(:)+load_tmp10(:)
 
      ELSE