Changeset 3282

Timestamp:

Mar 16, 2018, 7:28:53 PM (6 years ago)

Author:

musat

Message:

Seuil maximum nombre de noyaux de condensation cdnc_max
passe a physiq.def (utile pour l'experience de type aquaplanete)

File:

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

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

@@ -166 +166 @@
   REAL,SAVE :: cdnc_min_m3 
   !$OMP THREADPRIVATE(cdnc_min,cdnc_min_m3) 
+  REAL,SAVE :: cdnc_max=-1. 
+  REAL,SAVE :: cdnc_max_m3 
+  !$OMP THREADPRIVATE(cdnc_max,cdnc_max_m3) 
  
   ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -183 +186 @@
     cdnc_min_m3=cdnc_min*1E6 
     IF (cdnc_min_m3<0.) cdnc_min_m3=20.E6 ! astuce pour retrocompatibilite 
+    write(lunout,*)'cdnc_min=', cdnc_min_m3/1.E6
+    call getin_p('cdnc_max',cdnc_max) 
+    cdnc_max_m3=cdnc_max*1E6 
+    IF (cdnc_max_m3<0.) cdnc_max_m3=1000.E6 ! astuce pour retrocompatibilite 
+    write(lunout,*)'cdnc_max=', cdnc_max_m3/1.E6
   ENDIF
 
@@ -251 +259 @@
         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(1000.E6, max(cdnc_min_m3,cdnc(i,k)))
+        cdnc(i, k) = min(cdnc_max_m3, max(cdnc_min_m3,cdnc(i,k)))
 
         ! --pre-industrial case
         cdnc_pi(i, k) = 10.**(bl95_b0+bl95_b1*log(max(mass_solu_aero_pi(i,k), &
           1.E-4))/log(10.))*1.E6 !-m-3
-        cdnc_pi(i, k) = min(1000.E6, max(cdnc_min_m3,cdnc_pi(i,k)))
+        cdnc_pi(i, k) = min(cdnc_max_m3, max(cdnc_min_m3,cdnc_pi(i,k)))
 
         ! --present-day case