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

Timestamp:

Nov 2, 2023, 10:09:59 AM (7 months ago)

Author:

jyg

Message:

Implementation of a two radii model for wake population dynamics.
It is activated with : iflag_wk_pop_dyn=3

File:

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

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -292 +292 @@
        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_a_wk,  d_dens_wk, &  ! due to wakes
+       d_s_wk, d_s_a_wk, d_dens_wk,  d_dens_a_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
@@ -2020 +2020 @@
              d_deltaq_ajs_cv(:,:) = 0.
              d_s_wk(:) = 0.
+             d_s_a_wk(:) = 0.
              d_dens_wk(:) = 0.
+             d_dens_a_wk(:) = 0.
           ENDIF  !  (iflag_wake>=1)
 
@@ -2894 +2896 @@
           d_deltaq_vdf(:,:) = d_q_vdf_w(:,:)-d_q_vdf_x(:,:)
           CALL add_wake_tend &
-             (d_deltat_vdf, d_deltaq_vdf, dsig0, ddens0, ddens0, wkoccur1, 'vdf', abortphy) 
+             (d_deltat_vdf, d_deltaq_vdf, dsig0, dsig0, ddens0, ddens0, wkoccur1, 'vdf', abortphy) 
        ELSE
           d_deltat_vdf(:,:) = 0.
@@ -3156 +3158 @@
              IF (iflag_adjwk == 2 .AND. OK_bug_ajs_cv) THEN
                CALL add_wake_tend &
-                 (d_deltat_ajs_cv, d_deltaq_ajs_cv, dsig0, ddens0, ddens0, wkoccur1, 'ajs_cv', abortphy) 
+                 (d_deltat_ajs_cv, d_deltaq_ajs_cv, dsig0, dsig0, ddens0, ddens0, wkoccur1, 'ajs_cv', abortphy) 
              ENDIF  ! (iflag_adjwk == 2 .AND. OK_bug_ajs_cv)
           ENDIF  ! (iflag_adjwk >= 1)
@@ -3531 +3533 @@
                dt_a, dq_a, cv_gen,  &
                sigd, cin,  &
-               wake_deltat, wake_deltaq, wake_s, awake_dens, wake_dens,  &
+               wake_deltat, wake_deltaq, wake_s, awake_s, wake_dens, awake_dens,  &
                wake_dth, wake_h,  &
 !!               wake_pe, wake_fip, wake_gfl,  &
@@ -3541 +3543 @@
                wake_omg, wake_dp_deltomg,  &
                wake_spread, wake_Cstar, d_deltat_wk_gw,  &
-               d_deltat_wk, d_deltaq_wk, d_s_wk, d_dens_a_wk, d_dens_wk)
+               d_deltat_wk, d_deltaq_wk, d_s_wk, d_s_a_wk, d_dens_wk, d_dens_a_wk)
           !
           !jyg    Reinitialize itapwk when wakes have been called
@@ -3560 +3562 @@
 
          CALL add_wake_tend &
-            (d_deltat_wk, d_deltaq_wk, d_s_wk, d_dens_a_wk, d_dens_wk, wake_k, &
+            (d_deltat_wk, d_deltaq_wk, d_s_wk, d_s_a_wk, d_dens_wk, d_dens_a_wk, wake_k, &
              'wake', abortphy) 
           CALL prt_enerbil('wake',itap)
@@ -3737 +3739 @@
              IF (ok_bug_split_th) THEN
                CALL add_wake_tend &
-                   (d_deltat_the, d_deltaq_the, dsig0, ddens0, ddens0, wkoccur1, 'the', abortphy) 
+                   (d_deltat_the, d_deltaq_the, dsig0, dsig0, ddens0, ddens0, wkoccur1, 'the', abortphy) 
              ELSE
                CALL add_wake_tend &
-                   (d_deltat_the, d_deltaq_the, dsig0, ddens0, ddens0, wake_k, 'the', abortphy) 
+                   (d_deltat_the, d_deltaq_the, dsig0, dsig0, ddens0, ddens0, wake_k, 'the', abortphy) 
              ENDIF
              CALL prt_enerbil('the',itap)