/[lmdze]/trunk/phylmd/Interface_surf/clqh.f
ViewVC logotype

Diff of /trunk/phylmd/Interface_surf/clqh.f

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

revision 283 by guez, Fri Jul 20 17:08:44 2018 UTC revision 284 by guez, Fri Jul 20 17:35:43 2018 UTC
# Line 117  contains Line 117  contains
117    
118      REAL gamah(size(knindex), 2:klev) ! (knon, 2:klev)      REAL gamah(size(knindex), 2:klev) ! (knon, 2:klev)
119      real tsurf_new(size(knindex)) ! (knon)      real tsurf_new(size(knindex)) ! (knon)
     real zzpk  
120    
121      !----------------------------------------------------------------      !----------------------------------------------------------------
122    
# Line 142  contains Line 141  contains
141      ! Preparer les flux lies aux contre-gardients      ! Preparer les flux lies aux contre-gardients
142      forall (k = 2:klev) gamah(:, k) = gamt(:, k) * (RD * (t(:, k - 1) &      forall (k = 2:klev) gamah(:, k) = gamt(:, k) * (RD * (t(:, k - 1) &
143           + t(:, k)) / 2. / RG / paprs(:, k) * (pplay(:, k - 1) - pplay(:, k))) &           + t(:, k)) / 2. / RG / paprs(:, k) * (pplay(:, k - 1) - pplay(:, k))) &
144           * RCPD * (psref(:) / paprs(:, k))**RKAPPA           * RCPD * (psref / paprs(:, k))**RKAPPA
145    
146      DO i = 1, knon      DO i = 1, knon
147         buf1(i) = zx_coef(i, klev) + delp(i, klev)         buf1(i) = zx_coef(i, klev) + delp(i, klev)
148         cq(i, klev) = q(i, klev) * delp(i, klev) / buf1(i)         cq(i, klev) = q(i, klev) * delp(i, klev) / buf1(i)
149         dq(i, klev) = zx_coef(i, klev) / buf1(i)         dq(i, klev) = zx_coef(i, klev) / buf1(i)
150    
151         zzpk=(pplay(i, klev) / psref(i))**RKAPPA         buf2(i) = delp(i, klev) / pkf(i, klev) + zx_coef(i, klev)
152         buf2(i) = zzpk * delp(i, klev) + zx_coef(i, klev)         ch(i, klev) = (h(i, klev) / pkf(i, klev) * delp(i, klev) &
        ch(i, klev) = (h(i, klev) * zzpk * delp(i, klev) &  
153              - zx_coef(i, klev) * gamah(i, klev)) / buf2(i)              - zx_coef(i, klev) * gamah(i, klev)) / buf2(i)
154         dh(i, klev) = zx_coef(i, klev) / buf2(i)         dh(i, klev) = zx_coef(i, klev) / buf2(i)
155      ENDDO      ENDDO
# Line 164  contains Line 162  contains
162                 + zx_coef(i, k + 1) * cq(i, k + 1)) / buf1(i)                 + zx_coef(i, k + 1) * cq(i, k + 1)) / buf1(i)
163            dq(i, k) = zx_coef(i, k) / buf1(i)            dq(i, k) = zx_coef(i, k) / buf1(i)
164    
165            zzpk=(pplay(i, k) / psref(i))**RKAPPA            buf2(i) = delp(i, k) / pkf(i, k) + zx_coef(i, k) &
           buf2(i) = zzpk * delp(i, k) + zx_coef(i, k) &  
166                 + zx_coef(i, k + 1) * (1. - dh(i, k + 1))                 + zx_coef(i, k + 1) * (1. - dh(i, k + 1))
167            ch(i, k) = (h(i, k) * zzpk * delp(i, k) &            ch(i, k) = (h(i, k) / pkf(i, k) * delp(i, k) &
168                 + zx_coef(i, k + 1) * ch(i, k + 1) &                 + zx_coef(i, k + 1) * ch(i, k + 1) &
169                 + zx_coef(i, k + 1) * gamah(i, k + 1) &                 + zx_coef(i, k + 1) * gamah(i, k + 1) &
170                 - zx_coef(i, k) * gamah(i, k)) / buf2(i)                 - zx_coef(i, k) * gamah(i, k)) / buf2(i)
# Line 177  contains Line 174  contains
174    
175      DO i = 1, knon      DO i = 1, knon
176         buf1(i) = delp(i, 1) + zx_coef(i, 2) * (1. - dq(i, 2))         buf1(i) = delp(i, 1) + zx_coef(i, 2) * (1. - dq(i, 2))
177         cq(i, 1) = (q(i, 1) * delp(i, 1) &         cq(i, 1) = (q(i, 1) * delp(i, 1) + zx_coef(i, 2) * cq(i, 2)) / buf1(i)
             + zx_coef(i, 2) * cq(i, 2)) / buf1(i)  
178         dq(i, 1) = - 1. * RG / buf1(i)         dq(i, 1) = - 1. * RG / buf1(i)
179    
180         zzpk=(pplay(i, 1) / psref(i))**RKAPPA         buf2(i) = delp(i, 1) / pkf(i, 1) + zx_coef(i, 2) * (1. - dh(i, 2))
181         buf2(i) = zzpk * delp(i, 1) + zx_coef(i, 2) * (1. - dh(i, 2))         ch(i, 1) = (h(i, 1) / pkf(i, 1) * delp(i, 1) &
        ch(i, 1) = (h(i, 1) * zzpk * delp(i, 1) &  
182              + zx_coef(i, 2) * (gamah(i, 2) + ch(i, 2))) / buf2(i)              + zx_coef(i, 2) * (gamah(i, 2) + ch(i, 2))) / buf2(i)
183         dh(i, 1) = - 1. * RG / buf2(i)         dh(i, 1) = - 1. * RG / buf2(i)
184      ENDDO      ENDDO

Legend:
Removed from v.283  
changed lines
  Added in v.284

  ViewVC Help
Powered by ViewVC 1.1.21