Changeset 1123 for LMDZ4/branches/LMDZ4-dev/libf/phylmd/phys_output_write.h

Timestamp:

Mar 12, 2009, 11:03:07 AM (15 years ago)

Author:

idelkadi

Message:

Corrections dans phys_output_mod.F90 phys_output_write.h et conf_phys.F90

File:

• LMDZ4/branches/LMDZ4-dev/libf/phylmd/phys_output_write.h (modified) (7 diffs)

LMDZ4/branches/LMDZ4-dev/libf/phylmd/phys_output_write.h

@@ -511 +511 @@
       CALL histwrite_phy(nid_files(iff),o_prw%name,itau_w,prw)
         ENDIF
+
       IF (o_cape_max%flag(iff)<=lev_files(iff)) THEN
-       CALL histwrite_phy(nid_files(iff),o_cape_max%name,itau_w,cape)
-      ENDIF
-      IF (o_upwd%flag(iff)<=lev_files(iff)) THEN
-       CALL histwrite_phy(nid_files(iff),o_upwd%name,itau_w,upwd)
-      ENDIF
-      IF (o_Ma%flag(iff)<=lev_files(iff)) THEN
-       CALL histwrite_phy(nid_files(iff),o_Ma%name,itau_w,Ma)
-      ENDIF
-
-      IF (o_dnwd%flag(iff)<=lev_files(iff)) THEN
-       CALL histwrite_phy(nid_files(iff),o_dnwd%name,itau_w,dnwd)
-      ENDIF
-
-      IF (o_dnwd0%flag(iff)<=lev_files(iff)) THEN
-       CALL histwrite_phy(nid_files(iff),o_dnwd0%name,itau_w,dnwd0)
-      ENDIF
+      CALL histwrite_phy(nid_files(iff),o_cape_max%name,itau_w,cape)
+      ENDIF
+
+       IF (o_upwd%flag(iff)<=lev_files(iff)) THEN
+      CALL histwrite_phy(nid_files(iff),o_upwd%name,itau_w,upwd)
+       ENDIF
+
+       IF (o_Ma%flag(iff)<=lev_files(iff)) THEN
+      CALL histwrite_phy(nid_files(iff),o_Ma%name,itau_w,Ma)
+       ENDIF
+
+       IF (o_dnwd%flag(iff)<=lev_files(iff)) THEN
+      CALL histwrite_phy(nid_files(iff),o_dnwd%name,itau_w,dnwd)
+       ENDIF
+
+       IF (o_dnwd0%flag(iff)<=lev_files(iff)) THEN
+      CALL histwrite_phy(nid_files(iff),o_dnwd0%name,itau_w,dnwd0)
+       ENDIF
+
       ENDIF !iflag_con .GE. 3
 
@@ -634 +638 @@
       ENDIF
 
-      IF (type_ocean=='force ') THEN
-
-      IF (iflag_con.EQ.3) THEN
-       IF (o_ale%flag(iff)<=lev_files(iff)) THEN
-       CALL histwrite_phy(nid_files(iff),o_ale%name,itau_w,ale)
-       ENDIF
-       IF (o_alp%flag(iff)<=lev_files(iff)) THEN
-       CALL histwrite_phy(nid_files(iff),o_alp%name,itau_w,alp)
-       ENDIF
-       IF (o_cin%flag(iff)<=lev_files(iff)) THEN
-       CALL histwrite_phy(nid_files(iff),o_cin%name,itau_w,cin)
-       ENDIF
+! Couplage convection-couche limite
+      IF (iflag_con.GE.3) THEN
       IF (iflag_coupl.EQ.1) THEN
        IF (o_ale_bl%flag(iff)<=lev_files(iff)) THEN
@@ -654 +648 @@
        ENDIF
       ENDIF !iflag_coupl.EQ.1
-
+      ENDIF !(iflag_con.GE.3)
+
+! Wakes
+      IF (iflag_con.EQ.3) THEN
       IF (iflag_wake.EQ.1) THEN
        IF (o_ale_wk%flag(iff)<=lev_files(iff)) THEN
@@ -663 +660 @@
        ENDIF
 
+       IF (o_ale%flag(iff)<=lev_files(iff)) THEN
+       CALL histwrite_phy(nid_files(iff),o_ale%name,itau_w,ale)
+       ENDIF
+       IF (o_alp%flag(iff)<=lev_files(iff)) THEN
+       CALL histwrite_phy(nid_files(iff),o_alp%name,itau_w,alp)
+       ENDIF
+       IF (o_cin%flag(iff)<=lev_files(iff)) THEN
+       CALL histwrite_phy(nid_files(iff),o_cin%name,itau_w,cin)
+       ENDIF
        IF (o_wape%flag(iff)<=lev_files(iff)) THEN
        CALL histwrite_phy(nid_files(iff),o_WAPE%name,itau_w,wake_pe)
@@ -685 +691 @@
 
         IF (o_wake_omg%flag(iff)<=lev_files(iff)) THEN
-       CALL histwrite_phy(nid_files(iff),o_wake_omg%name,itau_w,
-     .wake_omg)
-        ENDIF
-        IF (o_dtwak%flag(iff)<=lev_files(iff)) THEN
-          zx_tmp_fi3d(1:klon,1:klev)=d_t_wake(1:klon,1:klev)
+       CALL histwrite_phy(nid_files(iff),
+     s                    o_wake_omg%name,itau_w,wake_omg)
+        ENDIF
+
+         IF (o_dtwak%flag(iff)<=lev_files(iff)) THEN
+           zx_tmp_fi3d(1:klon,1:klev)=d_t_wake(1:klon,1:klev)
      &                                        /pdtphys
-          CALL histwrite_phy(nid_files(iff),o_dtwak%name,itau_w,
-     .zx_tmp_fi3d)
-        ENDIF
+           CALL histwrite_phy(nid_files(iff),
+     &                       o_dtwak%name,itau_w,zx_tmp_fi3d)
+         ENDIF
 
         IF (o_dqwak%flag(iff)<=lev_files(iff)) THEN
-         zx_tmp_fi3d(1:klon,1:klev)=d_q_wake(1:klon,1:klev)/pdtphys
-         CALL histwrite_phy(nid_files(iff),o_dqwak%name,itau_w,
-     .zx_tmp_fi3d)
+        zx_tmp_fi3d(1:klon,1:klev)=d_q_wake(1:klon,1:klev)/pdtphys
+        CALL histwrite_phy(nid_files(iff),
+     &                     o_dqwak%name,itau_w,zx_tmp_fi3d)
+        ENDIF
+      ENDIF ! iflag_wake.EQ.1
+
+        IF (o_Vprecip%flag(iff)<=lev_files(iff)) THEN
+       CALL histwrite_phy(nid_files(iff),o_Vprecip%name,itau_w,Vprecip)
         ENDIF
 
@@ -708 +720 @@
        CALL histwrite_phy(nid_files(iff),o_fqd%name,itau_w,fqd)
         ENDIF
-      ENDIF
-
-       IF (o_Vprecip%flag(iff)<=lev_files(iff)) THEN
-        CALL histwrite_phy(nid_files(iff),o_Vprecip%name,itau_w,Vprecip)
-       ENDIF
-
       ENDIF !(iflag_con.EQ.3) 
  
-      ELSE IF (type_ocean=='slab  ') THEN
-
-       IF ( o_slab_bils%flag(iff)<=lev_files(iff))
+      IF (type_ocean=='slab ') THEN
+      IF ( o_slab_bils%flag(iff)<=lev_files(iff)) 
      $     CALL histwrite_phy(
      $     nid_files(iff),o_slab_bils%name,itau_w,slab_wfbils)
-      
+
       ENDIF !type_ocean == force/slab
 
@@ -863 +868 @@
        IF (o_ovap%flag(iff)<=lev_files(iff)) THEN
       CALL histwrite_phy(nid_files(iff),o_ovap%name,itau_w,qx(:,:,ivap))
+       ENDIF
+
+       IF (o_ovapinit%flag(iff)<=lev_files(iff)) THEN
+      CALL histwrite_phy(nid_files(iff),
+     $                   o_ovapinit%name,itau_w,q_seri)
        ENDIF