Changeset 4976 for LMDZ6/trunk/libf/phylmd

Timestamp:

Jun 7, 2024, 6:24:38 PM (8 months ago)

Author:

idelkadi

Message:

Error correction introduced in previous version

Location:

LMDZ6/trunk/libf/phylmd

Files:

• ecrad/lmdz/readaerosol_optic_ecrad.F90 (modified) (4 diffs)
• phys_state_var_mod.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (5 diffs)
• radlwsw_m.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/ecrad/lmdz/readaerosol_optic_ecrad.F90

@@ -4 +4 @@
      flag_aerosol, flag_bc_internal_mixture, itap, rjourvrai, &
      pdtphys, pplay, paprs, t_seri, rhcl, presnivs, &
-     tr_seri, mass_solu_aero, mass_solu_aero_pi) 
+     tr_seri, mass_solu_aero, mass_solu_aero_pi, m_allaer) 
 !     tau_aero, piz_aero, cg_aero, &
 !     tausum_aero, drytausum_aero, tau3d_aero )
@@ -18 +18 @@
        concso4,concno3,concoa,concbc,concss,concdust,loadso4,loadoa,loadbc,loadss,loaddust, &
        loadno3,load_tmp1,load_tmp2,load_tmp3,load_tmp4,load_tmp5,load_tmp6,load_tmp7, & 
-       load_tmp8,load_tmp9,load_tmp10,m_allaer
+       load_tmp8,load_tmp9,load_tmp10
 
   USE infotrac_phy, ONLY: tracers, nqtot, nbtr
@@ -49 +49 @@
   REAL, DIMENSION(klon,klev), INTENT(OUT)     :: mass_solu_aero    ! Total mass for all soluble aerosols
   REAL, DIMENSION(klon,klev), INTENT(OUT)     :: mass_solu_aero_pi !     -"-     preindustrial values
+  REAL, DIMENSION(klon,klev,naero_tot), INTENT(OUT) :: m_allaer
+  REAL, DIMENSION(klon,klev,naero_tot), INTENT(OUT) :: m_allaer_pi !RAF
 !  REAL, DIMENSION(klon,klev,2,NSW), INTENT(OUT) :: tau_aero    ! Aerosol optical thickness
 !  REAL, DIMENSION(klon,klev,2,NSW), INTENT(OUT) :: piz_aero    ! Single scattering albedo aerosol
@@ -86 +88 @@
   REAL, DIMENSION(klon,klev)   :: nitrinscoarse_pi
   REAL, DIMENSION(klon,klev)   :: pdel, zrho
-!  REAL, DIMENSION(klon,klev,naero_tot) :: m_allaer
-  REAL, DIMENSION(klon,klev,naero_tot) :: m_allaer_pi !RAF  
 
   integer :: id_ASBCM, id_ASPOMM, id_ASSO4M, id_ASMSAM, id_CSSO4M, id_CSMSAM, id_SSSSM

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(:)
@@ -754 +752 @@
       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
@@ -939 +936 @@
       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/physiq_mod.F90

@@ -1127 +1127 @@
     REAL, DIMENSION(klon,klev)     :: mass_solu_aero_pi
     ! - " - (pre-industrial value)
+    REAL, DIMENSION(klon,klev,naero_tot) :: m_allaer
 
     ! Parameters
@@ -4375 +4376 @@
                   flag_aerosol, flag_bc_internal_mixture, itap, jD_cur-jD_ref, &
                   pdtphys, pplay, paprs, t_seri, rhcl, presnivs,  &
-                  tr_seri, mass_solu_aero, mass_solu_aero_pi)  
+                  tr_seri, mass_solu_aero, mass_solu_aero_pi, m_allaer)  
 #else
                 abort_message='You should compile with -rad ecrad if running with iflag_rrtm=2'
@@ -4621 +4622 @@
                ! Rajoute par OB pour RRTM
                tau_aero_lw_rrtm, & 
-               cldtaupirad, &
+               cldtaupirad, m_allaer, &
 !              zqsat, flwcrad, fiwcrad, &
                zqsat, flwc, fiwc, &
@@ -4699 +4700 @@
                                 ! Rajoute par OB pour RRTM
                      tau_aero_lw_rrtm, &
-                     cldtaupi, &
+                     cldtaupi, m_allaer, &
 !                    zqsat, flwcrad, fiwcrad, &
                      zqsat, flwc, fiwc, &
@@ -4745 +4746 @@
                      tau_aero_sw_rrtm, piz_aero_sw_rrtm, cg_aero_sw_rrtm, &
                      tau_aero_lw_rrtm, &
-                     cldtaupi, &
+                     cldtaupi, m_allaer, &
                      zqsat, flwc, fiwc, &
                      ref_liq, ref_ice, ref_liq_pi, ref_ice_pi, &

LMDZ6/trunk/libf/phylmd/radlwsw_m.F90

@@ -21 +21 @@
        tau_aero_sw_rrtm, piz_aero_sw_rrtm, cg_aero_sw_rrtm,& ! rajoute par OB RRTM
        tau_aero_lw_rrtm, &              ! rajoute par C.Kleinschmitt pour RRTM
-       cldtaupi, &
+       cldtaupi, m_allaer, &
        qsat, flwc, fiwc, &
        ref_liq, ref_ice, ref_liq_pi, ref_ice_pi, &
@@ -81 +81 @@
 #ifdef CPP_ECRAD
     USE geometry_mod, ONLY: latitude, longitude
-    USE phys_state_var_mod, ONLY: pctsrf, m_allaer
+    USE phys_state_var_mod, ONLY: pctsrf
     USE indice_sol_mod
     USE time_phylmdz_mod, only: current_time
@@ -246 +246 @@
     REAL,    INTENT(in)  :: ref_liq_pi(klon,klev) ! cloud droplet radius pre-industrial from newmicro
     REAL,    INTENT(in)  :: ref_ice_pi(klon,klev) ! ice crystal radius   pre-industrial from newmicro
+    REAL,    INTENT(in)  :: m_allaer(klon,klev,naero_tot) ! mass aero
 
     CHARACTER(len=512), INTENT(in) :: namelist_ecrad_file