Changeset 3318 for LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/newmicro.F90

Timestamp:

Apr 16, 2018, 6:30:59 PM (6 years ago)

Author:

jghattas

Message:

Integration des developpements fait sur la trunk par O. Boucher concernant le MACspV2 aerosol plume climatology(nouveau option flag_aersol=7). Les commits suivants fait sur le trunk sont ici merge : [3274], [3279], [3287], [3288], [3290], [3295], [3296], [3297].
Tout les modifications dans newmicro.f90 ne sont pas retenu mais les changemnets lie au flag_aerosol=7 sont prise.

File:

• LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/newmicro.F90 (modified) (5 diffs)

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/newmicro.F90

@@ -3 +3 @@
 
 
-SUBROUTINE newmicro(ok_cdnc, bl95_b0, bl95_b1, paprs, pplay, t, pqlwp, pclc, &
+SUBROUTINE newmicro(flag_aerosol, ok_cdnc, bl95_b0, bl95_b1, paprs, pplay, t, pqlwp, pclc, &
     pcltau, pclemi, pch, pcl, pcm, pct, pctlwp, xflwp, xfiwp, xflwc, xfiwc, &
     mass_solu_aero, mass_solu_aero_pi, pcldtaupi, re, fl, reliq, reice, &
@@ -10 +10 @@
   USE dimphy
   USE phys_local_var_mod, ONLY: scdnc, cldncl, reffclwtop, lcc, reffclws, &
-    reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra, zfice
+    reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra, &
+    zfice, dNovrN
   USE phys_state_var_mod, ONLY: rnebcon, clwcon
   USE icefrac_lsc_mod ! computes ice fraction (JBM 3/14)
@@ -142 +143 @@
   ! within the grid cell)
 
+  INTEGER flag_aerosol
   LOGICAL ok_cdnc
   REAL bl95_b0, bl95_b1 ! Parameter in B&L 95-Formula
@@ -257 +259 @@
         ! to be within [20, 1000 cm^3]
 
-        ! --present-day case
-        cdnc(i, k) = 10.**(bl95_b0+bl95_b1*log(max(mass_solu_aero(i,k), &
-          1.E-4))/log(10.))*1.E6 !-m-3
-        cdnc(i, k) = min(cdnc_max_m3, max(cdnc_min_m3,cdnc(i,k)))
 
         ! --pre-industrial case
@@ -266 +264 @@
           1.E-4))/log(10.))*1.E6 !-m-3
         cdnc_pi(i, k) = min(cdnc_max_m3, max(cdnc_min_m3,cdnc_pi(i,k)))
+
+        ! --present-day case
+        ! --flag_aerosol=7 => MACv2SP climatology  
+        ! in this case there is an enhancement factor 
+        IF (flag_aerosol .EQ. 7) THEN
+           cdnc(i, k) = cdnc_pi(i,k)*dNovrN(i)
+        ELSE
+           !--standard case, present day
+           cdnc(i, k) = 10.**(bl95_b0+bl95_b1*log(max(mass_solu_aero(i,k), &
+                1.E-4))/log(10.))*1.E6 !-m-3
+           cdnc(i, k) = min(cdnc_max_m3, max(cdnc_min_m3,cdnc(i,k)))
+        END IF
+
+
 
         ! --present-day case