Changeset 2496 for LMDZ5/trunk/libf/phylmd/physiq_mod.F90

Timestamp:

Apr 14, 2016, 9:42:23 PM (8 years ago)

Author:

oboucher

Message:

Adding more diagnostics for water conservation
dqlphys, dqldyn, dqsphys, dqsdyn, prlw, prsw

File:

• LMDZ5/trunk/libf/phylmd/physiq_mod.F90 (modified) (6 diffs)

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -115 +115 @@
     !! d_t_dyn-input-R-tendance dynamique pour "t" (K/s)
     !! d_q_dyn-input-R-tendance dynamique pour "q" (kg/kg/s)
+    !! d_ql_dyn-input-R-tendance dynamique pour "ql" (kg/kg/s)
+    !! d_qs_dyn-input-R-tendance dynamique pour "qs" (kg/kg/s)
     !! flxmass_w -input-R- flux de masse verticale
     !! d_u-----output-R-tendance physique de "u" (m/s/s)
@@ -1660 +1662 @@
              d_t_dyn(i,k) = (t_seri(i,k)-t_ancien(i,k))/dtime
              d_q_dyn(i,k) = (q_seri(i,k)-q_ancien(i,k))/dtime
+             d_ql_dyn(i,k) = (ql_seri(i,k)-ql_ancien(i,k))/dtime
+             d_qs_dyn(i,k) = (qs_seri(i,k)-qs_ancien(i,k))/dtime
           ENDDO
        ENDDO
@@ -1688 +1692 @@
              d_t_dyn(i,k) = 0.0
              d_q_dyn(i,k) = 0.0
+             d_ql_dyn(i,k) = 0.0
+             d_qs_dyn(i,k) = 0.0
           ENDDO
        ENDDO
@@ -4297 +4303 @@
     CALL diag_slp(klon,t_seri,paprs,pplay,pphis,ptstar,pt0,slp)
     !
-    !cc prw = eau precipitable
+    !cc prw  = eau precipitable
+    !   prlw = colonne eau liquide 
+    !   prlw = colonne eau solide
     DO i = 1, klon
        prw(i) = 0.
+       prlw(i) = 0.
+       prsw(i) = 0.
        DO k = 1, klev
           prw(i) = prw(i) + &
                q_seri(i,k)*(paprs(i,k)-paprs(i,k+1))/RG
+          prlw(i) = prlw(i) + &
+               ql_seri(i,k)*(paprs(i,k)-paprs(i,k+1))/RG
+          prsw(i) = prsw(i) + &
+               qs_seri(i,k)*(paprs(i,k)-paprs(i,k+1))/RG
        ENDDO
     ENDDO
@@ -4405 +4419 @@
           t_ancien(i,k) = t_seri(i,k)
           q_ancien(i,k) = q_seri(i,k)
+          ql_ancien(i,k) = ql_seri(i,k)
+          qs_ancien(i,k) = qs_seri(i,k)
        ENDDO
     ENDDO
@@ -4541 +4557 @@
     CALL phys_output_write(itap, pdtphys, paprs, pphis,  &
          pplay, lmax_th, aerosol_couple,                 &
-         ok_ade, ok_aie, ivap, new_aod, ok_sync,         &
-         ptconv, read_climoz, clevSTD,                   &
+         ok_ade, ok_aie, ivap, iliq, isol, new_aod,      & 
+         ok_sync, ptconv, read_climoz, clevSTD,          &
          ptconvth, d_t, qx, d_qx, zmasse,                &
          flag_aerosol, flag_aerosol_strat, ok_cdnc)