Changeset 3208 for LMDZ6/trunk/libf/phylmd/physiq_mod.F90

Timestamp:

Feb 16, 2018, 12:42:18 PM (6 years ago)

Author:

jyg

Message:

Implementation of a first crude model of the
dynamic of wake population.

File:

• LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (modified) (9 diffs)

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -151 +151 @@
        d_deltat_ajs_cv, d_deltaq_ajs_cv, & ! due to dry adjustment of (w) before convection
                        ! tendencies of wake fractional area and wake number per unit area:
-       d_s_wk,  d_dens_wk, &             ! due to wakes
-!!!       d_s_vdf, d_dens_vdf, &            ! due to vertical diffusion
-!!!       d_s_the, d_dens_the, &            ! due to thermals
+       d_s_wk,  d_dens_a_wk,  d_dens_wk, &  ! due to wakes
+!!!       d_s_vdf, d_dens_a_vdf, d_dens_vdf, & ! due to vertical diffusion
+!!!       d_s_the, d_dens_a_the, d_dens_the, & ! due to thermals
        !                                  
        ptconv, ratqsc, &
@@ -162 +162 @@
        alp_bl_stat, n2, s2,  &
        proba_notrig, random_notrig,  &
+       cv_gen,  &
        !
        dnwd0,  &
@@ -2363 +2364 @@
           d_deltaq_vdf(:,:) = d_q_vdf_w(:,:)-d_q_vdf_x(:,:)
           CALL add_wake_tend &
-             (d_deltat_vdf, d_deltaq_vdf, dsig0, ddens0, wkoccur1, 'vdf', abortphy) 
+             (d_deltat_vdf, d_deltaq_vdf, dsig0, ddens0, ddens0, wkoccur1, 'vdf', abortphy) 
        ELSE
           d_deltat_vdf(:,:) = 0.
@@ -2606 +2607 @@
              IF (iflag_adjwk == 2) THEN
                CALL add_wake_tend &
-                 (d_deltat_ajs_cv, d_deltaq_ajs_cv, dsig0, ddens0, wkoccur1, 'ajs_cv', abortphy) 
+                 (d_deltat_ajs_cv, d_deltaq_ajs_cv, dsig0, ddens0, ddens0, wkoccur1, 'ajs_cv', abortphy) 
              ENDIF  ! (iflag_adjwk == 2)
           ENDIF  ! (iflag_adjwk >= 1)
@@ -2960 +2961 @@
                t_seri, q_seri, omega,  &
                dt_dwn, dq_dwn, M_dwn, M_up,  &
-               dt_a, dq_a,  &
-               sigd,  &
-               wake_deltat, wake_deltaq, wake_s, wake_dens,  &
+               dt_a, dq_a, cv_gen,  &
+               sigd, cin,  &
+               wake_deltat, wake_deltaq, wake_s, awake_dens, wake_dens,  &
                wake_dth, wake_h,  &
 !!               wake_pe, wake_fip, wake_gfl,  &
@@ -2972 +2973 @@
                wake_omg, wake_dp_deltomg,  &
                wake_spread, wake_Cstar, d_deltat_wk_gw,  &
-               d_deltat_wk, d_deltaq_wk, d_s_wk, d_dens_wk)
+               d_deltat_wk, d_deltaq_wk, d_s_wk, d_dens_a_wk, d_dens_wk)
           !
           !jyg    Reinitialize itapwk when wakes have been called
@@ -2991 +2992 @@
 
          CALL add_wake_tend &
-            (d_deltat_wk, d_deltaq_wk, d_s_wk, d_dens_wk, wake_k, &
+            (d_deltat_wk, d_deltaq_wk, d_s_wk, d_dens_a_wk, d_dens_wk, wake_k, &
              'wake', abortphy) 
           call prt_enerbil('wake',itap)
@@ -3130 +3131 @@
              IF (ok_bug_split_th) THEN
                CALL add_wake_tend &
-                   (d_deltat_the, d_deltaq_the, dsig0, ddens0, wkoccur1, 'the', abortphy) 
+                   (d_deltat_the, d_deltaq_the, dsig0, ddens0, ddens0, wkoccur1, 'the', abortphy) 
              ELSE
                CALL add_wake_tend &
-                   (d_deltat_the, d_deltaq_the, dsig0, ddens0, wake_k, 'the', abortphy) 
+                   (d_deltat_the, d_deltaq_the, dsig0, ddens0, ddens0, wake_k, 'the', abortphy) 
              ENDIF
              call prt_enerbil('the',itap)
@@ -3148 +3149 @@
                           ale_bl_trig, ale_bl_stat, ale_bl,  &
                           alp_bl, alp_bl_stat, &
-                          proba_notrig, random_notrig)
+                          proba_notrig, random_notrig, cv_gen)
           !>jyg