Changeset 2220 for LMDZ5/branches/testing/libf/phylmd/physiq.F90

Timestamp:

Mar 3, 2015, 2:41:13 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2186:2216 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/physiq.F90 (modified) (18 diffs)

LMDZ5/branches/testing/libf/phylmd/physiq.F90

@@ -636 +636 @@
   !$OMP THREADPRIVATE(fact_cldcon,facttemps)
 
-  integer iflag_cldcon
-  save iflag_cldcon
-  !$OMP THREADPRIVATE(iflag_cldcon)
+  integer iflag_cldth
+  save iflag_cldth
+  !$OMP THREADPRIVATE(iflag_cldth)
   logical ptconv(klon,klev)
   !IM cf. AM 081204 BEG
@@ -913 +913 @@
           solarlong0,seuil_inversion, &
           fact_cldcon, facttemps,ok_newmicro,iflag_radia, &
-          iflag_cldcon,iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
+          iflag_cldth,iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
           ok_ade, ok_aie, ok_cdnc, aerosol_couple,  &
           flag_aerosol, flag_aerosol_strat, new_aod, &
@@ -1014 +1014 @@
      print*,'CYCLE_DIURNE', cycle_diurne
      !
-     IF (iflag_con.EQ.2.AND.iflag_cldcon.GT.-1) THEN
-        abort_message = 'Tiedtke needs iflag_cldcon=-2 or -1'
+     IF (iflag_con.EQ.2.AND.iflag_cldth.GT.-1) THEN
+        abort_message = 'Tiedtke needs iflag_cldth=-2 or -1'
         CALL abort_gcm (modname,abort_message,1)
      ENDIF
@@ -1130 +1130 @@
                 ,alp_bl_prescr, ale_bl_prescr)
            ! 11/09/06 rajout initialisation ALE et ALP du wake et PBL(YU)
-           !        print*,'apres ini_wake iflag_cldcon=', iflag_cldcon
+           !        print*,'apres ini_wake iflag_cldth=', iflag_cldth
         endif
 
@@ -1308 +1308 @@
              annee_ref, &
              day_ref,  &
+             day_ini, &
+             start_time, &
              itau_phy, &
              io_lon, &
@@ -1811 +1813 @@
 !>nrlmd+jyg
           pplay,     paprs,     pctsrf,             &
-          ftsol,falb1,falb2,ustar,u10m,v10m,wstar, &
-          sollwdown, cdragh,    cdragm,  u1,    v1, &
-          albsol1,   albsol2,   sens,    evap,   &
+          ftsol,falb1,falb2,ustar,u10m,v10m,wstar,  &
+          cdragh,    cdragm,  u1,    v1,            &
+          albsol1,   albsol2,   sens,    evap,      &
           albsol3_lic,runoff,   snowhgt,   qsnow, to_ice, sissnow, &
           zxtsol,    zxfluxlat, zt2m,    qsat2m,  &
@@ -2168 +2170 @@
              ftd,fqd,lalim_conv,wght_th, &
              ev, ep,epmlmMm,eplaMm, &
-             wdtrainA,wdtrainM,wght_cvfd)
+             wdtrainA,wdtrainM,wght_cvfd,qtc_cv,sigt_cv, &
+             tau_cld_cv,coefw_cld_cv)
         ! RomP <<<
 
@@ -2218 +2221 @@
      !   calcul des proprietes des nuages convectifs
      clwcon0(:,:)=fact_cldcon*clwcon0(:,:)
+     IF (iflag_cld_cv <= 1) THEN
      call clouds_gno &
           (klon,klev,q_seri,zqsat,clwcon0,ptconv,ratqsc,rnebcon0)
+     ELSE
+     call clouds_bigauss &
+          (klon,klev,q_seri,zqsat,qtc_cv,sigt_cv,ptconv,ratqsc,rnebcon0)
+     ENDIF
+
 
      ! =================================================================== c
@@ -2452 +2461 @@
   END IF
 
-  !      print*,'apres callwake iflag_cldcon=', iflag_cldcon
+  !      print*,'apres callwake iflag_cldth=', iflag_cldth
   !
   !===================================================================
@@ -2622 +2631 @@
               enddo
 
-           ELSE IF (iflag_trig_bl.eq.2) then
+           ELSE IF (iflag_trig_bl.ge.2) then
 
               do i=1,klon
@@ -2773 +2782 @@
   ! water distribution
   CALL  calcratqs(klon,klev,prt_level,lunout,        &
-       iflag_ratqs,iflag_con,iflag_cldcon,pdtphys,  &
+       iflag_ratqs,iflag_con,iflag_cldth,pdtphys,  &
        ratqsbas,ratqshaut,tau_ratqs,fact_cldcon,   &
        ptconv,ptconvth,clwcon0th, rnebcon0th,     &
@@ -2795 +2804 @@
        frac_impa, frac_nucl, beta_prec_fisrt, &
        prfl, psfl, rhcl,  &
-       zqasc, fraca,ztv,zpspsk,ztla,zthl,iflag_cldcon, &
+       zqasc, fraca,ztv,zpspsk,ztla,zthl,iflag_cldth, &
        iflag_ice_thermo)
   !
@@ -2851 +2860 @@
   !
   !IM cf FH
-  !     IF (iflag_cldcon.eq.-1) THEN ! seulement pour Tiedtke
-  IF (iflag_cldcon.le.-1) THEN ! seulement pour Tiedtke
+  !     IF (iflag_cldth.eq.-1) THEN ! seulement pour Tiedtke
+  IF (iflag_cldth.le.-1) THEN ! seulement pour Tiedtke
      snow_tiedtke=0.
      !     print*,'avant calcul de la pseudo precip '
-     !     print*,'iflag_cldcon',iflag_cldcon
-     if (iflag_cldcon.eq.-1) then
+     !     print*,'iflag_cldth',iflag_cldth
+     if (iflag_cldth.eq.-1) then
         rain_tiedtke=rain_con
      else
@@ -2889 +2898 @@
      ENDDO
 
-  ELSE IF (iflag_cldcon.ge.3) THEN
+  ELSE IF (iflag_cldth.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
@@ -2932 +2941 @@
              tau_aero_sw_rrtm, piz_aero_sw_rrtm, cg_aero_sw_rrtm,  &
              tausum_aero, tau3d_aero)
+
+             CALL aeropt_lw_rrtm
 #else
 
@@ -2976 +2987 @@
      !   On prend la somme des fractions nuageuses et des contenus en eau
 
-     if (iflag_cldcon>=5) then
+     if (iflag_cldth>=5) then
 
         do k=1,klev
@@ -3132 +3143 @@
      calday = REAL(days_elapsed + 1) + jH_cur
 
-     call chemtime(itap+itau_phy-1, date0, dtime)
+     call chemtime(itap+itau_phy-1, date0, dtime, itap)
      IF (config_inca == 'aero' .OR. config_inca == 'aeNP') THEN
         CALL AEROSOL_METEO_CALC( &
@@ -3455 +3466 @@
   ! Ajouter la tendance des rayonnements (tous les pas)
   !
-  DO k = 1, klev
-     DO i = 1, klon
-        t_seri(i,k) = t_seri(i,k) &
-             + (heat(i,k)-cool(i,k)) * dtime/RDAY
-     ENDDO
-  ENDDO
+  d_t_swr(:,:)=heat(:,:)*dtime/RDAY
+  d_t_lwr(:,:)=-cool(:,:)*dtime/RDAY
+  d_t_sw0(:,:)=heat0(:,:)*dtime/RDAY
+  d_t_lw0(:,:)=-cool0(:,:)*dtime/RDAY
+  CALL add_phys_tend(du0,dv0,d_t_swr,dq0,dql0,dqi0,paprs,'SW')
+  CALL add_phys_tend(du0,dv0,d_t_lwr,dq0,dql0,dqi0,paprs,'LW')
+
   !
   if (mydebug) then