Changeset 2236 for LMDZ5/trunk

Timestamp:

Mar 17, 2015, 12:04:12 PM (10 years ago)

Author:

fhourdin

Message:

Changement du drapeau iflag_cldth en iflag_cld_th
et du défaut de iflag_cld_cv pour le choix entre schema
de nuages convectifs

lognormal = 0
bigaussien = 1

Location:

LMDZ5/trunk/libf/phylmd

Files:

• calcratqs.F90 (modified) (7 diffs)
• conf_phys_m.F90 (modified) (6 diffs)
• fisrtilp.F90 (modified) (4 diffs)
• physiq.F90 (modified) (11 diffs)

LMDZ5/trunk/libf/phylmd/calcratqs.F90

@@ -1 +1 @@
 SUBROUTINE calcratqs(klon,klev,prt_level,lunout,       &
-           iflag_ratqs,iflag_con,iflag_cldth,pdtphys, &
+           iflag_ratqs,iflag_con,iflag_cld_th,pdtphys, &
            ratqsbas,ratqshaut,tau_ratqs,fact_cldcon,   &
            ptconv,ptconvth,clwcon0th, rnebcon0th,      &
@@ -19 +19 @@
 ! Input
 integer,intent(in) :: klon,klev,prt_level,lunout
-integer,intent(in) :: iflag_con,iflag_cldth,iflag_ratqs
+integer,intent(in) :: iflag_con,iflag_cld_th,iflag_ratqs
 real,intent(in) :: pdtphys,ratqsbas,ratqshaut,fact_cldcon,tau_ratqs
 real, dimension(klon,klev+1),intent(in) :: paprs
@@ -43 +43 @@
 !   ----------------
 !   on ecrase le tableau ratqsc calcule par clouds_gno
-      if (iflag_cldth.eq.1) then
+      if (iflag_cld_th.eq.1) then
          do k=1,klev
          do i=1,klon
@@ -58 +58 @@
 !  par nversion de la fonction log normale
 !-----------------------------------------------------------------------
-      else if (iflag_cldth.eq.4) then
+      else if (iflag_cld_th.eq.4) then
          ptconvth(:,:)=.false.
          ratqsc(:,:)=0.
@@ -136 +136 @@
 !  -----------
 
-      if (iflag_cldth.eq.1 .or.iflag_cldth.eq.2.or.iflag_cldth.eq.4) then
+      if (iflag_cld_th.eq.1 .or.iflag_cld_th.eq.2.or.iflag_cld_th.eq.4) then
 
 ! On ajoute une constante au ratqsc*2 pour tenir compte de 
@@ -165 +165 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
          ratqs(:,:)=max(ratqs(:,:),ratqss(:,:))
-      else if (iflag_cldth<=6) then
+      else if (iflag_cld_th<=6) then
 !   on ne prend que le ratqs stable pour fisrtilp
          ratqs(:,:)=ratqss(:,:)
@@ -174 +174 @@
              do i=1,klon
                 if (ratqsc(i,k).gt.1.e-10) then
-                   ratqs(i,k)=ratqs(i,k)*zfratqs2+(iflag_cldth/100.)*ratqsc(i,k)*(1.-zfratqs2)
+                   ratqs(i,k)=ratqs(i,k)*zfratqs2+(iflag_cld_th/100.)*ratqsc(i,k)*(1.-zfratqs2)
                 endif
                 ratqs(i,k)=min(ratqs(i,k)*zfratqs1+ratqss(i,k)*(1.-zfratqs1),0.5)

LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

@@ -15 +15 @@
        solarlong0,seuil_inversion, &
        fact_cldcon, facttemps,ok_newmicro,iflag_radia,&
-       iflag_cldth, &
+       iflag_cld_th, &
        iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
        ok_ade, ok_aie, ok_cdnc, aerosol_couple, &
@@ -81 +81 @@
     REAL                 :: bl95_b0, bl95_b1
     real                 :: fact_cldcon, facttemps,ratqsbas,ratqshaut,tau_ratqs
-    integer              :: iflag_cldth
+    integer              :: iflag_cld_th
     integer              :: iflag_ratqs
 
@@ -113 +113 @@
     logical,save        :: ok_chlorophyll_omp ! albedo SB  
     integer,SAVE        :: NSW_omp
-    integer,SAVE        :: iflag_cldth_omp, ip_ebil_phy_omp
+    integer,SAVE        :: iflag_cld_th_omp, ip_ebil_phy_omp
     integer,SAVE        :: iflag_ratqs_omp
 
@@ -900 +900 @@
 
     !
-    !Config Key  = iflag_cldth 
+    !Config Key  = iflag_cld_th 
     !Config Desc =  
     !Config Def  = 1
     !Config Help = 
     !
-    iflag_cldth_omp = 1
+    iflag_cld_th_omp = 1
 ! On lit deux fois avec l'ancien et le nouveau nom 
 ! pour assurer une retrocompatiblite.
 ! A abandonner un jour
-    call getin('iflag_cldcon',iflag_cldth_omp)
-    call getin('iflag_cldth',iflag_cldth_omp)
-
-    !
-    !Config Key  = iflag_cld_cv
-    !Config Desc =
-    !Config Def  = 1
-    !Config Help =
-    !
-    iflag_cld_cv_omp = 1
+    call getin('iflag_cldcon',iflag_cld_th_omp)
+    call getin('iflag_cld_th',iflag_cld_th_omp)
+    iflag_cld_cv_omp = 0 
     call getin('iflag_cld_cv',iflag_cld_cv_omp)
 
@@ -1982 +1975 @@
     iflag_rrtm = iflag_rrtm_omp
     NSW = NSW_omp
-    iflag_cldth = iflag_cldth_omp
+    iflag_cld_th = iflag_cld_th_omp
     iflag_cld_cv = iflag_cld_cv_omp
     tau_cld_cv = tau_cld_cv_omp
@@ -2137 +2130 @@
     write(lunout,*)' reevap_ice = ', reevap_ice
     write(lunout,*)' iflag_pdf = ', iflag_pdf
-    write(lunout,*)' iflag_cldth = ', iflag_cldth
+    write(lunout,*)' iflag_cld_th = ', iflag_cld_th
     write(lunout,*)' iflag_cld_cv = ', iflag_cld_cv
     write(lunout,*)' tau_cld_cv = ', tau_cld_cv

LMDZ5/trunk/libf/phylmd/fisrtilp.F90

@@ -8 +8 @@
      frac_impa, frac_nucl, beta,                        &
      prfl, psfl, rhcl, zqta, fraca,                     &
-     ztv, zpspsk, ztla, zthl, iflag_cldth,             &
+     ztv, zpspsk, ztla, zthl, iflag_cld_th,             &
      iflag_ice_thermo)
 
@@ -82 +82 @@
   INTEGER ninter ! sous-intervals pour la precipitation
   INTEGER ncoreczq  
-  INTEGER iflag_cldth
+  INTEGER iflag_cld_th
   INTEGER iflag_ice_thermo
   PARAMETER (ninter=5)
@@ -545 +545 @@
            enddo
 
-           if (iflag_cldth>=5) then
+           if (iflag_cld_th>=5) then
 
               call cloudth(klon,klev,k,ztv, &
@@ -559 +559 @@
            endif
 
-           if (iflag_cldth <= 4) then
+           if (iflag_cld_th <= 4) then
               lognormale = .true.
-           elseif (iflag_cldth >= 6) then
+           elseif (iflag_cld_th >= 6) then
               ! lognormale en l'absence des thermiques
               lognormale = fraca(:,k) < 1e-10
            else
-              ! Dans le cas iflag_cldth=5, on prend systématiquement la
+              ! Dans le cas iflag_cld_th=5, on prend systématiquement la
               ! bi-gaussienne
               lognormale = .false.

LMDZ5/trunk/libf/phylmd/physiq.F90

@@ -639 +639 @@
   !$OMP THREADPRIVATE(fact_cldcon,facttemps)
 
-  integer iflag_cldth
-  save iflag_cldth
-  !$OMP THREADPRIVATE(iflag_cldth)
+  integer iflag_cld_th
+  save iflag_cld_th
+  !$OMP THREADPRIVATE(iflag_cld_th)
   logical ptconv(klon,klev)
   !IM cf. AM 081204 BEG
@@ -919 +919 @@
           solarlong0,seuil_inversion, &
           fact_cldcon, facttemps,ok_newmicro,iflag_radia, &
-          iflag_cldth,iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
+          iflag_cld_th,iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
           ok_ade, ok_aie, ok_cdnc, aerosol_couple,  &
           flag_aerosol, flag_aerosol_strat, new_aod, &
@@ -1027 +1027 @@
      print*,'CYCLE_DIURNE', cycle_diurne
      !
-     IF (iflag_con.EQ.2.AND.iflag_cldth.GT.-1) THEN
-        abort_message = 'Tiedtke needs iflag_cldth=-2 or -1'
+     IF (iflag_con.EQ.2.AND.iflag_cld_th.GT.-1) THEN
+        abort_message = 'Tiedtke needs iflag_cld_th=-2 or -1'
         CALL abort_gcm (modname,abort_message,1)
      ENDIF
@@ -1143 +1143 @@
                 ,alp_bl_prescr, ale_bl_prescr)
            ! 11/09/06 rajout initialisation ALE et ALP du wake et PBL(YU)
-           !        print*,'apres ini_wake iflag_cldth=', iflag_cldth
+           !        print*,'apres ini_wake iflag_cld_th=', iflag_cld_th
         endif
 
@@ -2298 +2298 @@
      !   calcul des proprietes des nuages convectifs
      clwcon0(:,:)=fact_cldcon*clwcon0(:,:)
-     IF (iflag_cld_cv <= 1) THEN
+     IF (iflag_cld_cv == 0) THEN
      call clouds_gno &
           (klon,klev,q_seri,zqsat,clwcon0,ptconv,ratqsc,rnebcon0)
@@ -2539 +2539 @@
   END IF
 
-  !      print*,'apres callwake iflag_cldth=', iflag_cldth
+  !      print*,'apres callwake iflag_cld_th=', iflag_cld_th
   !
   !===================================================================
@@ -2860 +2860 @@
   ! water distribution
   CALL  calcratqs(klon,klev,prt_level,lunout,        &
-       iflag_ratqs,iflag_con,iflag_cldth,pdtphys,  &
+       iflag_ratqs,iflag_con,iflag_cld_th,pdtphys,  &
        ratqsbas,ratqshaut,tau_ratqs,fact_cldcon,   &
        ptconv,ptconvth,clwcon0th, rnebcon0th,     &
@@ -2882 +2882 @@
        frac_impa, frac_nucl, beta_prec_fisrt, &
        prfl, psfl, rhcl,  &
-       zqasc, fraca,ztv,zpspsk,ztla,zthl,iflag_cldth, &
+       zqasc, fraca,ztv,zpspsk,ztla,zthl,iflag_cld_th, &
        iflag_ice_thermo)
   !
@@ -2938 +2938 @@
   !
   !IM cf FH
-  !     IF (iflag_cldth.eq.-1) THEN ! seulement pour Tiedtke
-  IF (iflag_cldth.le.-1) THEN ! seulement pour Tiedtke
+  !     IF (iflag_cld_th.eq.-1) THEN ! seulement pour Tiedtke
+  IF (iflag_cld_th.le.-1) THEN ! seulement pour Tiedtke
      snow_tiedtke=0.
      !     print*,'avant calcul de la pseudo precip '
-     !     print*,'iflag_cldth',iflag_cldth
-     if (iflag_cldth.eq.-1) then
+     !     print*,'iflag_cld_th',iflag_cld_th
+     if (iflag_cld_th.eq.-1) then
         rain_tiedtke=rain_con
      else
@@ -2976 +2976 @@
      ENDDO
 
-  ELSE IF (iflag_cldth.ge.3) THEN
+  ELSE IF (iflag_cld_th.ge.3) THEN
      !  On prend pour les nuages convectifs le max du calcul de la
      !  convection et du calcul du pas de temps precedent diminue d'un facteur
@@ -3066 +3066 @@
      !   On prend la somme des fractions nuageuses et des contenus en eau
 
-     if (iflag_cldth>=5) then
+     if (iflag_cld_th>=5) then
 
         do k=1,klev