Changeset 3630 for LMDZ6/trunk/libf/phylmd/physiq_mod.F90

Timestamp:

Feb 10, 2020, 11:04:40 AM (4 years ago)

Author:

Laurent Fairhead

Message:

Parameter new_aod is not needed anymore as it is assumed to be true
all the time. This means that we cannot replay AR4 simulations with new
LMDZ sources (we probably couldn't anyway)
LF, OB

File:

• LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (modified) (11 diffs)

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -1065 +1065 @@
     LOGICAL, SAVE :: flag_bc_internal_mixture
     !$OMP THREADPRIVATE(flag_bc_internal_mixture)
-    LOGICAL, SAVE :: new_aod
-    !$OMP THREADPRIVATE(new_aod) 
     !
     !--STRAT AEROSOL
@@ -1249 +1247 @@
             ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan, aerosol_couple, &
             chemistry_couple, &
-            flag_aerosol, flag_aerosol_strat, flag_aer_feedback, new_aod, &
+            flag_aerosol, flag_aerosol_strat, flag_aer_feedback, &
             flag_bc_internal_mixture, bl95_b0, bl95_b1, &
                                 ! nv flags pour la convection et les
@@ -1575 +1573 @@
             ok_hf,ok_instan,ok_LES,ok_ade,ok_aie, &
             read_climoz, phys_out_filestations, &
-            new_aod, aerosol_couple, &
+            aerosol_couple, &
             flag_aerosol_strat, pdtphys, paprs, pphis,  &
             pplay, lmax_th, ptconv, ptconvth, ivap,  &
@@ -1688 +1686 @@
        CALL phys_output_write(itap, pdtphys, paprs, pphis,                    &
                               pplay, lmax_th, aerosol_couple,                 &
-                              ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, new_aod, ok_sync,&
+                              ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, ok_sync,&
                               ptconv, read_climoz, clevSTD,                   &
                               ptconvth, d_u, d_t, qx, d_qx, zmasse,           &
@@ -3771 +3769 @@
                 !
                 CALL readaerosol_optic( &
-                     debut, new_aod, flag_aerosol, itap, jD_cur-jD_ref, &
+                     debut, flag_aerosol, itap, jD_cur-jD_ref, &
                      pdtphys, pplay, paprs, t_seri, rhcl, presnivs,  &
                      mass_solu_aero, mass_solu_aero_pi,  &
@@ -3796 +3794 @@
                    !--climatologies or INCA aerosols
                    CALL readaerosol_optic_rrtm( debut, aerosol_couple, ok_alw, ok_volcan, &
-                        new_aod, flag_aerosol, flag_bc_internal_mixture, itap, jD_cur-jD_ref, &
+                        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,  &
@@ -3813 +3811 @@
                    !
                    CALL readaerosol_optic( &
-                        debut, new_aod, flag_aerosol, itap, jD_cur-jD_ref, &
+                        debut, flag_aerosol, itap, jD_cur-jD_ref, &
                         pdtphys, pplay, paprs, t_seri, rhcl, presnivs,  &
                         mass_solu_aero, mass_solu_aero_pi,  &
@@ -4102 +4100 @@
                ! Rajoute par OB pour RRTM
                tau_aero_lw_rrtm, & 
-               cldtaupirad,new_aod, &
+               cldtaupirad, &
 !              zqsat, flwcrad, fiwcrad, &
                zqsat, flwc, fiwc, &
@@ -4189 +4187 @@
                                 ! Rajoute par OB pour RRTM
                      tau_aero_lw_rrtm, &
-                     cldtaupi,new_aod, &
+                     cldtaupi, &
 !                    zqsat, flwcrad, fiwcrad, &
                      zqsat, flwc, fiwc, &
@@ -5072 +5070 @@
   CALL phys_output_write_spl(itap, pdtphys, paprs, pphis,  &
        pplay, lmax_th, aerosol_couple,                 &
-       ok_ade, ok_aie, ivap, new_aod, ok_sync,         &
+       ok_ade, ok_aie, ivap, ok_sync,         &
        ptconv, read_climoz, clevSTD,                   &
        ptconvth, d_t, qx, d_qx, d_tr_dyn, zmasse,      &
@@ -5079 +5077 @@
     CALL phys_output_write(itap, pdtphys, paprs, pphis,  &
          pplay, lmax_th, aerosol_couple,                 &
-         ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, new_aod,      & 
+         ok_ade, ok_aie, ok_volcan, ivap, iliq, isol,    & 
          ok_sync, ptconv, read_climoz, clevSTD,          &
          ptconvth, d_u, d_t, qx, d_qx, zmasse,           &