Changeset 1712 for LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

Timestamp:

Jan 18, 2013, 3:07:29 PM (11 years ago)

Author:

idelkadi

Message:

Corrections dans newmicro.F pour completer les modifications de O. Boucher sur ok_ade/ok_aie avec correction des diagnostiques CMIP5 :
Rajout d'un nouveau flag ok_cdnc (ok cloud droplet number concentration)
Dans le cas sans aérosols, nous avons flag_aerosol=0, ok_cdnc=n, ok_ade=n et ok_aie=n
Dans le cas avec aérosols, nous avons flag_aerosol=6, ok_cdnc=y, ok_ade=y et ok_aie=y

File:

• LMDZ5/trunk/libf/phylmd/conf_phys_m.F90 (modified) (7 diffs)

LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

@@ -18 +18 @@
                        iflag_cldcon, &
                        iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
-                       ok_ade, ok_aie, aerosol_couple, &
+                       ok_ade, ok_aie, ok_cdnc, aerosol_couple, &
                        flag_aerosol, new_aod, &
                        bl95_b0, bl95_b1,&
@@ -60 +60 @@
 ! ok_instan:  sorties instantanees
 ! ok_ade, ok_aie: apply or not aerosol direct and indirect effects
+! ok_cdnc, ok cloud droplet number concentration
 ! bl95_b*: parameters in the formula to link CDNC to aerosol mass conc 
 !
@@ -70 +71 @@
   logical              :: ok_LES
   LOGICAL              :: callstats
-  LOGICAL              :: ok_ade, ok_aie, aerosol_couple
+  LOGICAL              :: ok_ade, ok_aie, ok_cdnc, aerosol_couple
   INTEGER              :: flag_aerosol
   LOGICAL              :: new_aod
@@ -84 +85 @@
   logical,SAVE        :: ok_LES_omp   
   LOGICAL,SAVE        :: callstats_omp
-  LOGICAL,SAVE        :: ok_ade_omp, ok_aie_omp, aerosol_couple_omp
+  LOGICAL,SAVE        :: ok_ade_omp, ok_aie_omp, ok_cdnc_omp, aerosol_couple_omp
   INTEGER, SAVE       :: flag_aerosol_omp
   LOGICAL, SAVE       :: new_aod_omp
@@ -272 +273 @@
   call getin('ok_aie', ok_aie_omp)
 
+!
+!Config Key  = ok_cdnc
+!Config Desc = ok cloud droplet number concentration
+!Config Def  = .false.
+!Config Help = Used in newmicro.F
+!
+  ok_cdnc_omp = .false.
+  call getin('ok_cdnc', ok_cdnc_omp)
 !
 !Config Key  = aerosol_couple
@@ -1677 +1686 @@
     ok_ade = ok_ade_omp
     ok_aie = ok_aie_omp
+    ok_cdnc = ok_cdnc_omp
     aerosol_couple = aerosol_couple_omp
     flag_aerosol=flag_aerosol_omp
@@ -1774 +1784 @@
        END IF
     END IF
+
+! ok_cdnc must be set to y if ok_aie is activated
+    IF (ok_aie .AND. .NOT. ok_cdnc) THEN
+       CALL abort_gcm('conf_phys', 'ok_cdnc must be set to y if ok_aie is activated',1)
+    ENDIF 
 
 !$OMP MASTER