/[lmdze]/trunk/phylmd/physiq.f
ViewVC logotype

Diff of /trunk/phylmd/physiq.f

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 102 by guez, Mon Jul 7 17:45:21 2014 UTC revision 103 by guez, Fri Aug 29 13:00:05 2014 UTC
# Line 396  contains Line 396  contains
396      real zlongi      real zlongi
397      REAL z_avant(klon), z_apres(klon), z_factor(klon)      REAL z_avant(klon), z_apres(klon), z_factor(klon)
398      REAL za, zb      REAL za, zb
399      REAL zx_t, zx_qs, zdelta, zcor      REAL zx_t, zx_qs, zcor
400      real zqsat(klon, llm)      real zqsat(klon, llm)
401      INTEGER i, k, iq, nsrf      INTEGER i, k, iq, nsrf
402      REAL, PARAMETER:: t_coup = 234.      REAL, PARAMETER:: t_coup = 234.
# Line 743  contains Line 743  contains
743      julien = MOD(NINT(rdayvrai), 360)      julien = MOD(NINT(rdayvrai), 360)
744      if (julien == 0) julien = 360      if (julien == 0) julien = 360
745    
746      forall (k = 1: llm) zmasse(:, k) = (paprs(:, k)-paprs(:, k + 1)) / rg      forall (k = 1: llm) zmasse(:, k) = (paprs(:, k) - paprs(:, k + 1)) / rg
747    
748      ! Prescrire l'ozone :      ! Prescrire l'ozone :
749      wo = ozonecm(REAL(julien), paprs)      wo = ozonecm(REAL(julien), paprs)
# Line 931  contains Line 931  contains
931         dlw(i) = - 4. * RSIGMA * zxtsol(i)**3         dlw(i) = - 4. * RSIGMA * zxtsol(i)**3
932      ENDDO      ENDDO
933    
     ! Appeler la convection (au choix)  
   
     DO k = 1, llm  
        DO i = 1, klon  
           conv_q(i, k) = d_q_dyn(i, k) + d_q_vdf(i, k) / dtphys  
           conv_t(i, k) = d_t_dyn(i, k) + d_t_vdf(i, k) / dtphys  
        ENDDO  
     ENDDO  
   
934      IF (check) print *, "avantcon = ", qcheck(paprs, q_seri, ql_seri)      IF (check) print *, "avantcon = ", qcheck(paprs, q_seri, ql_seri)
935    
936        ! Appeler la convection (au choix)
937    
938      if (iflag_con == 2) then      if (iflag_con == 2) then
939           conv_q = d_q_dyn + d_q_vdf / dtphys
940           conv_t = d_t_dyn + d_t_vdf / dtphys
941         z_avant = sum((q_seri + ql_seri) * zmasse, dim=2)         z_avant = sum((q_seri + ql_seri) * zmasse, dim=2)
942         CALL conflx(dtphys, paprs, play, t_seri(:, llm:1:-1), &         CALL conflx(dtphys, paprs, play, t_seri(:, llm:1:-1), &
943              q_seri(:, llm:1:-1), conv_t, conv_q, zxfluxq(:, 1), omega, &              q_seri(:, llm:1:-1), conv_t, conv_q, zxfluxq(:, 1), omega, &
# Line 967  contains Line 962  contains
962         mfu = upwd + dnwd         mfu = upwd + dnwd
963         IF (.NOT. ok_gust) wd = 0.         IF (.NOT. ok_gust) wd = 0.
964    
965         ! Calcul des propri\'et\'es des nuages convectifs         IF (thermcep) THEN
966              zqsat = MIN(0.5, r2es * FOEEW(t_seri, rtt >= t_seri) / play)
967         DO k = 1, llm            zqsat = zqsat / (1. - retv * zqsat)
968            DO i = 1, klon         ELSE
969               IF (thermcep) THEN            zqsat = merge(qsats(t_seri), qsatl(t_seri), t_seri < t_coup) / play
970                  zdelta = MAX(0., SIGN(1., rtt - t_seri(i, k)))         ENDIF
                 zqsat(i, k) = r2es * FOEEW(t_seri(i, k), zdelta) / play(i, k)  
                 zqsat(i, k) = MIN(0.5, zqsat(i, k))  
                 zqsat(i, k) = zqsat(i, k) / (1.-retv*zqsat(i, k))  
              ELSE  
                 IF (t_seri(i, k) < t_coup) THEN  
                    zqsat(i, k) = qsats(t_seri(i, k))/play(i, k)  
                 ELSE  
                    zqsat(i, k) = qsatl(t_seri(i, k))/play(i, k)  
                 ENDIF  
              ENDIF  
           ENDDO  
        ENDDO  
971    
972         ! calcul des proprietes des nuages convectifs         ! Properties of convective clouds
973         clwcon0 = fact_cldcon * clwcon0         clwcon0 = fact_cldcon * clwcon0
974         call clouds_gno(klon, llm, q_seri, zqsat, clwcon0, ptconv, ratqsc, &         call clouds_gno(klon, llm, q_seri, zqsat, clwcon0, ptconv, ratqsc, &
975              rnebcon0)              rnebcon0)
# Line 1225  contains Line 1208  contains
1208         DO i = 1, klon         DO i = 1, klon
1209            zx_t = t_seri(i, k)            zx_t = t_seri(i, k)
1210            IF (thermcep) THEN            IF (thermcep) THEN
1211               zdelta = MAX(0., SIGN(1., rtt-zx_t))               zx_qs = r2es * FOEEW(zx_t, rtt >= zx_t)/play(i, k)
              zx_qs = r2es * FOEEW(zx_t, zdelta)/play(i, k)  
1212               zx_qs = MIN(0.5, zx_qs)               zx_qs = MIN(0.5, zx_qs)
1213               zcor = 1./(1.-retv*zx_qs)               zcor = 1./(1.-retv*zx_qs)
1214               zx_qs = zx_qs*zcor               zx_qs = zx_qs*zcor
Legend:
Removed from v.102  
changed lines
  Added in v.103
  ViewVC Help
Powered by ViewVC 1.1.21