Changeset 1648 for LMDZ5/trunk/libf/phylmd/phys_output_write.h

Timestamp:

Aug 9, 2012, 12:50:09 PM (12 years ago)

Author:

Ehouarn Millour

Message:

Bug correction: outputs (introduced in rev 1638) related to the stochastic triggering of convection should only be done if the later is used.
JYG

File:

• LMDZ5/trunk/libf/phylmd/phys_output_write.h (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/phys_output_write.h

@@ -901 +901 @@
 !!! nrlmd le 10/04/2012
 
-        IF (o_zlcl_th%flag(iff)<=lev_files(iff)) THEN
-        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
-     s                     o_zlcl_th%name,itau_w,zlcl_th)
-        ENDIF
-
-        IF (o_fraca0%flag(iff)<=lev_files(iff)) THEN
-        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
-     s                     o_fraca0%name,itau_w,fraca0)
-        ENDIF
-
-        IF (o_w0%flag(iff)<=lev_files(iff)) THEN
-        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
-     s                     o_w0%name,itau_w,w0)
-        ENDIF
-
-        IF (o_w_conv%flag(iff)<=lev_files(iff)) THEN
-        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
-     s                     o_w_conv%name,itau_w,w_conv)
-        ENDIF
-
-        IF (o_therm_tke_max0%flag(iff)<=lev_files(iff)) THEN
-        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
-     s                     o_therm_tke_max0%name,itau_w,therm_tke_max0)
-        ENDIF
-
-        IF (o_env_tke_max0%flag(iff)<=lev_files(iff)) THEN
-        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
-     s                     o_env_tke_max0%name,itau_w,env_tke_max0)
-        ENDIF
-
-        IF (o_n2%flag(iff)<=lev_files(iff)) THEN
-      CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+        IF (iflag_trig_bl>=1) THEN
+          IF (o_n2%flag(iff)<=lev_files(iff)) THEN
+        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
      s                     o_n2%name,itau_w,n2)
-       ENDIF
-
-       IF (o_s2%flag(iff)<=lev_files(iff)) THEN
-      CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+         ENDIF
+
+         IF (o_s2%flag(iff)<=lev_files(iff)) THEN
+        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
      s                     o_s2%name,itau_w,s2)
-       ENDIF
-
-        IF (o_proba_notrig%flag(iff)<=lev_files(iff)) THEN
-      CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+         ENDIF
+
+          IF (o_proba_notrig%flag(iff)<=lev_files(iff)) THEN
+        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
      s                     o_proba_notrig%name,itau_w,proba_notrig)
-       ENDIF
-
-       IF (o_random_notrig%flag(iff)<=lev_files(iff)) THEN
-      CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+         ENDIF
+
+         IF (o_random_notrig%flag(iff)<=lev_files(iff)) THEN
+        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
      s                     o_random_notrig%name,itau_w,random_notrig)
-       ENDIF
-
-       IF (o_ale_bl_stat%flag(iff)<=lev_files(iff)) THEN
-      CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+         ENDIF
+
+         IF (o_ale_bl_stat%flag(iff)<=lev_files(iff)) THEN
+        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
      s                     o_ale_bl_stat%name,itau_w,ale_bl_stat)
-       ENDIF
-
-       IF (o_ale_bl_trig%flag(iff)<=lev_files(iff)) THEN
-      CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+         ENDIF
+
+         IF (o_ale_bl_trig%flag(iff)<=lev_files(iff)) THEN
+        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
      s                     o_ale_bl_trig%name,itau_w,ale_bl_trig)
-       ENDIF
-
-       IF (o_therm_tke_max%flag(iff)<=lev_files(iff)) THEN
-        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
-     s                     o_therm_tke_max%name,itau_w,therm_tke_max)
-        ENDIF
-
-        IF (o_env_tke_max%flag(iff)<=lev_files(iff)) THEN
-        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
-     s                     o_env_tke_max%name,itau_w,env_tke_max)
-        ENDIF
-
-       IF (o_alp_bl_det%flag(iff)<=lev_files(iff)) THEN
-      CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+         ENDIF
+       ENDIF  !(iflag_trig_bl>=1)
+
+        IF (iflag_clos_bl>=1) THEN
+         IF (o_alp_bl_det%flag(iff)<=lev_files(iff)) THEN
+        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
      s                     o_alp_bl_det%name,itau_w,alp_bl_det)
-       ENDIF
-
-       IF (o_alp_bl_fluct_m%flag(iff)<=lev_files(iff)) THEN
-      CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+         ENDIF
+
+         IF (o_alp_bl_fluct_m%flag(iff)<=lev_files(iff)) THEN
+        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
      s                     o_alp_bl_fluct_m%name,itau_w,alp_bl_fluct_m)
-       ENDIF
-
-       IF (o_alp_bl_fluct_tke%flag(iff)<=lev_files(iff)) THEN
-      CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+         ENDIF
+
+         IF (o_alp_bl_fluct_tke%flag(iff)<=lev_files(iff)) THEN
+        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
      s                o_alp_bl_fluct_tke%name,itau_w,alp_bl_fluct_tke)
-       ENDIF
-
-       IF (o_alp_bl_conv%flag(iff)<=lev_files(iff)) THEN
-      CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+         ENDIF
+
+         IF (o_alp_bl_conv%flag(iff)<=lev_files(iff)) THEN
+        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
      s                     o_alp_bl_conv%name,itau_w,alp_bl_conv)
-       ENDIF
-
-       IF (o_alp_bl_stat%flag(iff)<=lev_files(iff)) THEN
-      CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+         ENDIF
+
+         IF (o_alp_bl_stat%flag(iff)<=lev_files(iff)) THEN
+        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
      s                     o_alp_bl_stat%name,itau_w,alp_bl_stat)
-       ENDIF
+         ENDIF
+       ENDIF  !(iflag_clos_bl>=1)
 
 !!! fin nrlmd le 10/04/2012