Changeset 4973

Timestamp:

Jun 7, 2024, 3:27:21 PM (6 months ago)

Author:

idelkadi

Message:

Moving the m_allaer variable from phys_local_var_mod.F90 to phys_state_var_mod.F90

Location:

LMDZ6/trunk/libf/phylmd

Files:

• phys_local_var_mod.F90 (modified) (3 diffs)
• phys_state_var_mod.F90 (modified) (3 diffs)
• radlwsw_m.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90

@@ -124 +124 @@
       !$OMP THREADPRIVATE(d_ts, d_tr)
 
-! aerosols
-      REAL, SAVE, ALLOCATABLE :: m_allaer (:,:,:)
-      !$OMP THREADPRIVATE(m_allaer)
 ! diagnostique pour le rayonnement
       REAL, SAVE, ALLOCATABLE :: topswad_aero(:),  solswad_aero(:)      ! diag
@@ -723 +720 @@
       ALLOCATE(d_ts(klon,nbsrf), d_tr(klon,klev,nbtr))
 
-! aerosols
-      ALLOCATE(m_allaer(klon,klev,naero_tot))
 ! Special RRTM
       ALLOCATE(ZLWFT0_i(klon,klev+1),ZSWFT0_i(klon,klev+1),ZFLDN0(klon,klev+1))
@@ -1136 +1131 @@
       DEALLOCATE(solsw_aerop, solsw0_aerop)
       DEALLOCATE(topswcf_aerop, solswcf_aerop)
-!AI Aerosols
-      DEALLOCATE(m_allaer)
 !CK LW diagnostics
       DEALLOCATE(toplwad_aerop, sollwad_aerop)

LMDZ6/trunk/libf/phylmd/phys_state_var_mod.F90

@@ -474 +474 @@
       REAL,SAVE,ALLOCATABLE :: ccm(:,:,:)
 !$OMP THREADPRIVATE(ccm)
+      REAL, SAVE, ALLOCATABLE :: m_allaer (:,:,:)
+!$OMP THREADPRIVATE(m_allaer)
 
       REAL,SAVE,ALLOCATABLE :: ale_bl_trig(:)
@@ -752 +754 @@
       ALLOCATE(cg_aero_lw_rrtm(klon,klev,2,nbands_lw_rrtm))
       ALLOCATE(ccm(klon,klev,nbands))
+      ALLOCATE(m_allaer(klon,klev,naero_tot))
 
 #ifdef ISO
@@ -936 +939 @@
       DEALLOCATE(tau_aero_lw_rrtm,piz_aero_lw_rrtm,cg_aero_lw_rrtm)
       DEALLOCATE(ccm)
+      DEALLOCATE(m_allaer)
       if (ok_gwd_rando) DEALLOCATE(du_gwd_rando)
       if (.not. ok_hines .and. ok_gwd_rando) DEALLOCATE(du_gwd_front)

LMDZ6/trunk/libf/phylmd/radlwsw_m.F90

@@ -80 +80 @@
     ! Besoin pour ECRAD de pctsrf, zmasq, longitude, altitude
 #ifdef CPP_ECRAD
-    USE phys_local_var_mod, ONLY: rhcl, m_allaer
     USE geometry_mod, ONLY: latitude, longitude
-    USE phys_state_var_mod, ONLY: pctsrf
+    USE phys_state_var_mod, ONLY: pctsrf, m_allaer
     USE indice_sol_mod
     USE time_phylmdz_mod, only: current_time