Changeset 3167 for LMDZ6/trunk/libf

Timestamp:

Jan 29, 2018, 4:07:49 PM (7 years ago)

Author:

jyg

Message:

Bug fix for output field "mc"
New way of computing output field "ftime_con"

Location:

LMDZ6/trunk/libf/phylmd

Files:

• phys_output_ctrlout_mod.F90 (modified) (1 diff)
• phys_output_write_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/phys_output_ctrlout_mod.F90

@@ -1506 +1506 @@
     'mc', 'Convective mass flux', 'kg/m2/s', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_ftime_con = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11, 11/), &
-    'ftime_con', 'Fraction of time convection Occurs', ' ',                 &
-      (/ 'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)', & 
-         'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)' /))
+    'ftime_con', 'Fraction of time convection Occurs', ' ', (/ ('', i=1, 10) /))
+!!jyg    'ftime_con', 'Fraction of time convection Occurs', ' ',                 &
+!!jyg      (/ 'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)', & 
+!!jyg         'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)', 'inst(X)' /))
   TYPE(ctrl_out), SAVE :: o_dtdyn = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11, 11/), &
     'dtdyn', 'Dynamics dT', 'K/s', (/ ('', i=1, 10) /))

LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -977 +977 @@
           CALL histwrite_phy(o_dnwd, dnwd)
           CALL histwrite_phy(o_dnwd0, dnwd0)
-          IF (vars_defined)         zx_tmp_fi2d=float(itau_con)/float(itap)
+!!          IF (vars_defined)         zx_tmp_fi2d=float(itau_con)/float(itap)
+!!          CALL histwrite_phy(o_ftime_con, zx_tmp_fi2d)
+          IF (vars_defined) THEN
+             zx_tmp_fi2d(:) = 0.
+             DO k=1,klev
+               WHERE (ptconv(:,k)) zx_tmp_fi2d(:) = 1.
+             ENDDO
+          ENDIF
           CALL histwrite_phy(o_ftime_con, zx_tmp_fi2d)
           IF (vars_defined) THEN
              IF (iflag_thermals>=1)THEN
-                zx_tmp_fi3d=dnwd+dnwd0+upwd+fm_therm(:,1:klev)
+                zx_tmp_fi3d=-dnwd+dnwd0+upwd+fm_therm(:,1:klev)
              ELSE
-                zx_tmp_fi3d=dnwd+dnwd0+upwd
+                zx_tmp_fi3d=-dnwd+dnwd0+upwd
              ENDIF
           ENDIF