Changeset 1646 for LMDZ5

Timestamp:

Jul 31, 2012, 5:38:35 PM (12 years ago)

Author:

lguez

Message:

When "iflag_con == 2", write :

-- "pmfd" (instead of "- dnwd - dnwd0" with "dnwd" undefined) into

NetCDF variable "mcd";

-- "pmfu + pmfd" (instead of "upwd + dnwd + dnwd0" with "upwd" and

"dnwd" undefined) into NetCDF variable "dmc".

When "iflag_con < 2", do no write anything into "mcd" and "dmc". No
change when "iflag_con >= 3".

File:

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

LMDZ5/trunk/libf/phylmd/phys_output_write.h

@@ -2159 +2159 @@
        ENDIF
 
-       IF (o_mcd%flag(iff)<=lev_files(iff)) THEN
-      zx_tmp_fi3d(1:klon,1:klev)=-1 * (dnwd(1:klon,1:klev)+
-     $                                 dnwd0(1:klon,1:klev)) 
-      CALL histwrite_phy(nid_files(iff),clef_stations(iff),
-     $o_mcd%name,itau_w,zx_tmp_fi3d)
-       ENDIF
-
-       IF (o_dmc%flag(iff)<=lev_files(iff)) THEN
-      zx_tmp_fi3d(1:klon,1:klev)=upwd(1:klon,1:klev) +
-     $  dnwd(1:klon,1:klev)+ dnwd0(1:klon,1:klev) 
-      CALL histwrite_phy(nid_files(iff),clef_stations(iff),
-     $o_dmc%name,itau_w,zx_tmp_fi3d)
-       ENDIF
+       if (iflag_con >= 3) then
+          IF (o_mcd%flag(iff)<=lev_files(iff)) THEN
+             zx_tmp_fi3d(1:klon,1:klev)=-1 * (dnwd(1:klon,1:klev)+
+     $            dnwd0(1:klon,1:klev)) 
+             CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+     $            o_mcd%name,itau_w,zx_tmp_fi3d)
+          ENDIF
+
+          IF (o_dmc%flag(iff)<=lev_files(iff)) THEN
+             zx_tmp_fi3d(1:klon,1:klev)=upwd(1:klon,1:klev) +
+     $            dnwd(1:klon,1:klev)+ dnwd0(1:klon,1:klev) 
+             CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+     $            o_dmc%name,itau_w,zx_tmp_fi3d)
+          ENDIF
+       else if (iflag_con == 2) then
+          IF (o_mcd%flag(iff) <= lev_files(iff)) THEN
+             CALL histwrite_phy(nid_files(iff), clef_stations(iff),
+     $            o_mcd%name, itau_w, pmfd)
+          ENDIF
+
+          IF (o_dmc%flag(iff) <= lev_files(iff)) THEN
+             CALL histwrite_phy(nid_files(iff), clef_stations(iff),
+     $            o_dmc%name, itau_w, pmfu + pmfd)
+          ENDIF
+       end if
 
        IF (o_ref_liq%flag(iff)<=lev_files(iff)) THEN