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

Timestamp:

Apr 16, 2025, 9:25:21 PM (8 weeks ago)

Author:

evignon

Message:

commission pour la conservation de l'eau dans la convection profonde.
1/ integre les corrections apportees par JYG dans cv3routines.
2/ par defaut, conserve dx*masse quand on appelle la convection tous les n pas de temps
Cette commission conduit à une perte de convergence

File:

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

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -155 +155 @@
        d_q_dyn2d,d_ql_dyn2d,d_qs_dyn2d,d_qbs_dyn2d, &
        ! Physic tendencies
-       d_t_con,d_q_con,d_q_con_zmasse,d_u_con,d_v_con, &
+       d_t_con,d_q_con,d_u_con,d_v_con, &
+       d_t_con_zmasse,d_q_con_zmasse,d_u_con_zmasse,d_v_con_zmasse, &        
        d_tr, &                              !! to be removed?? (jyg)
        d_t_wake,d_q_wake, &
@@ -1253 +1254 @@
     REAL qql1(klon),qql2(klon),corrqql
 
-    !--OB flag to activate better conservation of water tendency when convection is not called every timestep
-    LOGICAL, PARAMETER :: ok_conserv_d_q_con=.FALSE.
-
     REAL, dimension(klon,klev) :: t_env,q_env
 
@@ -3416 +3414 @@
     ENDIF
 
-    !--saving d_q_con * zmass for next timestep if convection is not called every timestep
-    IF (ok_conserv_d_q_con) THEN
+    !--saving d_X_con * zmass for next timestep if convection is not called every timestep
+    IF (ok_mass_dqcon) THEN
       d_q_con_zmasse(:,:) = d_q_con(:,:) * zmasse(:,:)
     ENDIF
+
+    IF (ok_mass_dtcon) THEN
+      d_t_con_zmasse(:,:) = d_t_con(:,:) * zmasse(:,:)
+    ENDIF
+
+    IF (ok_mass_duvcon) THEN
+      d_u_con_zmasse(:,:) = d_u_con(:,:) * zmasse(:,:)
+      d_v_con_zmasse(:,:) = d_v_con(:,:) * zmasse(:,:)
+    ENDIF
+
 
     !     CALL homogene(paprs, q_seri, d_q_con, u_seri,v_seri,
@@ -3451 +3459 @@
 !!
 
-    !--recompute d_q_con with zmasse from new timestep
-    IF (ok_conserv_d_q_con) THEN
+    !--recompute d_X_con with zmasse from new timestep
+    IF (ok_mass_dqcon) THEN
       d_q_con(:,:)=d_q_con_zmasse(:,:)/zmasse(:,:)
     ENDIF
+
+    IF (ok_mass_dtcon) THEN
+      d_t_con(:,:)=d_t_con_zmasse(:,:)/zmasse(:,:)
+    ENDIF
+
+    IF (ok_mass_duvcon) THEN
+      d_u_con(:,:)=d_u_con_zmasse(:,:)/zmasse(:,:)
+      d_v_con(:,:)=d_v_con_zmasse(:,:)/zmasse(:,:)
+    ENDIF
+
+
 
     CALL add_phys_tend(d_u_con, d_v_con, d_t_con, d_q_con, dql0, dqi0, dqbs0, paprs, &