Changeset 3245 for LMDZ6/trunk
- Timestamp:
- Mar 9, 2018, 5:09:21 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/trunk/libf/phylmd/newmicro.F90
r3124 r3245 13 13 USE phys_state_var_mod, ONLY: rnebcon, clwcon 14 14 USE icefrac_lsc_mod ! computes ice fraction (JBM 3/14) 15 USE ioipsl_getin_p_mod, ONLY : getin_p 16 15 17 IMPLICIT NONE 16 18 ! ====================================================================== … … 161 163 REAL reliq_pi(klon, klev), reice_pi(klon, klev) 162 164 165 REAL,SAVE :: cdnc_min=-1. 166 REAL,SAVE :: cdnc_min_m3 167 !$OMP THREADPRIVATE(cdnc_min,cdnc_min_m3) 168 163 169 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 164 170 ! FH : 2011/05/24 … … 172 178 ! Pour retrouver les résultats numériques de la version d'origine, 173 179 ! on impose 0.71 quand on est proche de 0.71 180 181 if (first) THEN 182 call getin_p('cdnc_min',cdnc_min) 183 cdnc_min_m3=cdnc_min*1E6 184 IF (cdnc_min_m3<0.) cdnc_min_m3=20.E6 ! astuce pour retrocompatibilite 185 ENDIF 174 186 175 187 d_rei_dt = (rei_max-rei_min)/81.4 … … 239 251 cdnc(i, k) = 10.**(bl95_b0+bl95_b1*log(max(mass_solu_aero(i,k), & 240 252 1.E-4))/log(10.))*1.E6 !-m-3 241 cdnc(i, k) = min(1000.E6, max( 20.E6,cdnc(i,k)))253 cdnc(i, k) = min(1000.E6, max(cdnc_min_m3,cdnc(i,k))) 242 254 243 255 ! --pre-industrial case 244 256 cdnc_pi(i, k) = 10.**(bl95_b0+bl95_b1*log(max(mass_solu_aero_pi(i,k), & 245 257 1.E-4))/log(10.))*1.E6 !-m-3 246 cdnc_pi(i, k) = min(1000.E6, max( 20.E6,cdnc_pi(i,k)))258 cdnc_pi(i, k) = min(1000.E6, max(cdnc_min_m3,cdnc_pi(i,k))) 247 259 248 260 ! --present-day case … … 645 657 END IF !ok_cdnc 646 658 659 first=.false. !to be sure 660 647 661 RETURN 648 662
Note: See TracChangeset
for help on using the changeset viewer.