Changeset 1903

Timestamp:

Nov 19, 2013, 1:14:17 PM (11 years ago)

Author:

musat

Message:

Correction sorties dvlif, dtlif seulement si ok_orolf (comme pour dulif).
Ajout sorties tendances duthe, dvthe.
MPL/JY/FC
IM

Location:

LMDZ5/trunk/libf/phylmd

Files:

• phys_local_var_mod.F90 (modified) (3 diffs)
• phys_output_ctrlout_mod.F90 (modified) (1 diff)
• phys_output_write_mod.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/phylmd/phys_local_var_mod.F90

@@ -41 +41 @@
       REAL, SAVE, ALLOCATABLE :: d_u_ajs(:,:), d_v_ajs(:,:)
       !$OMP THREADPRIVATE(d_u_ajs, d_v_ajs)
+      REAL, SAVE, ALLOCATABLE :: d_u_ajsb(:,:), d_v_ajsb(:,:)
+      !$OMP THREADPRIVATE(d_u_ajsb, d_v_ajsb)
       REAL, SAVE, ALLOCATABLE :: d_t_eva(:,:),d_q_eva(:,:)
       !$OMP THREADPRIVATE(d_t_eva,d_q_eva)
@@ -297 +299 @@
       allocate(d_t_ajs(klon,klev),d_q_ajs(klon,klev))
       allocate(d_u_ajs(klon,klev),d_v_ajs(klon,klev))
+      allocate(d_u_ajsb(klon,klev),d_v_ajsb(klon,klev))
       allocate(d_t_eva(klon,klev),d_q_eva(klon,klev))
       allocate(d_t_lscst(klon,klev),d_q_lscst(klon,klev))
@@ -447 +450 @@
       deallocate(d_t_ajs,d_q_ajs)
       deallocate(d_u_ajs,d_v_ajs)
+      deallocate(d_u_ajsb,d_v_ajsb)
       deallocate(d_t_eva,d_q_eva)
       deallocate(d_t_lscst,d_q_lscst)

LMDZ5/trunk/libf/phylmd/phys_output_ctrlout_mod.F90

@@ -1012 +1012 @@
   TYPE(ctrl_out), SAVE :: o_dtthe = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
     'dtthe', 'Thermal dT', 'K/s', (/ ('', i=1, 9) /))
+  TYPE(ctrl_out), SAVE :: o_duthe = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
+    'duthe', 'Thermal du', 'm/s2', (/ ('', i=1, 9) /))
+  TYPE(ctrl_out), SAVE :: o_dvthe = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
+    'dvthe', 'Thermal dv', 'm/s2', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_f_th = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), &
     'f_th', 'Thermal plume mass flux', 'kg/(m2*s)', (/ ('', i=1, 9) /))

LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -119 +119 @@
          o_ptconvth, o_lmaxth, o_dtvdf, &
          o_dtdis, o_dqvdf, o_dteva, o_dqeva, &
-         o_ptconv, o_ratqs, o_dtthe, o_ftime_th, &
+         o_ptconv, o_ratqs, o_dtthe, & 
+         o_duthe, o_dvthe, o_ftime_th, &
          o_f_th, o_e_th, o_w_th, o_q_th, &
          o_a_th, o_d_th, o_f0_th, o_zmax_th, &
@@ -202 +203 @@
          rneb, zx_rh, frugs, agesno, d_t_dyn, d_q_dyn, &
          d_u_dyn, d_v_dyn, d_t_con, d_t_ajsb, d_t_ajs, &
+         d_u_ajsb, d_u_ajs, d_v_ajsb, d_v_ajs, &
          d_u_con, d_v_con, d_q_con, d_q_ajs, d_t_lsc, &
          d_t_eva, d_q_lsc, beta_prec, d_t_lscth, &
@@ -1026 +1028 @@
        ENDIF
        CALL histwrite_phy(o_dtthe, zx_tmp_fi3d)
+       IF (vars_defined) THEN
+          zx_tmp_fi3d(1:klon,1:klev)=d_u_ajs(1:klon,1:klev)/pdtphys - &
+               d_u_ajsb(1:klon,1:klev)/pdtphys
+       ENDIF
+       CALL histwrite_phy(o_duthe, zx_tmp_fi3d) 
+       IF (vars_defined) THEN
+          zx_tmp_fi3d(1:klon,1:klev)=d_v_ajs(1:klon,1:klev)/pdtphys - &
+               d_v_ajsb(1:klon,1:klev)/pdtphys
+       ENDIF
+       CALL histwrite_phy(o_dvthe, zx_tmp_fi3d)
+
        IF (iflag_thermals>=1) THEN
           ! Pour l instant 0 a y reflichir pour les thermiques
@@ -1073 +1086 @@
           IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_u_lif(1:klon,1:klev)/pdtphys
           CALL histwrite_phy(o_dulif, zx_tmp_fi3d)
-       ENDIF
-       IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_v_lif(1:klon,1:klev)/pdtphys
-       CALL histwrite_phy(o_dvlif, zx_tmp_fi3d)
-
-       IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_t_lif(1:klon,1:klev)/pdtphys
-       CALL histwrite_phy(o_dtlif, zx_tmp_fi3d)
+
+          IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_v_lif(1:klon,1:klev)/pdtphys
+          CALL histwrite_phy(o_dvlif, zx_tmp_fi3d)
+
+          IF(vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_t_lif(1:klon,1:klev)/pdtphys
+          CALL histwrite_phy(o_dtlif, zx_tmp_fi3d)
+       ENDIF
 
        IF (ok_hines) THEN