Changeset 2366 for LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

Timestamp:

Sep 21, 2015, 10:41:04 PM (9 years ago)

Author:

oboucher

Message:

Second batch of changes for diagnosing SW radiative
diagnostics at the physics timestep resolution
radsol is now computed in physiq.F90

File:

• LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90 (modified) (8 diffs)

LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -164 +164 @@
          SWdn200, SWdn200clr, LWup200, LWup200clr, &
          LWdn200, LWdn200clr, solsw, solsw0, sollw, &
-         radsol, sollw0, sollwdown, sollw, gustiness, &
+         radsol, swradcorr, sollw0, sollwdown, sollw, gustiness, &
          sollwdownclr, lwdn0, ftsol, ustar, u10m, &
          v10m, pbl_tke, wake_delta_pbl_TKE, &
@@ -424 +424 @@
        CALL histwrite_phy(o_fsnow, zfra_o)
        CALL histwrite_phy(o_evap, evap)
-       CALL histwrite_phy(o_tops, topsw)
-       CALL histwrite_phy(o_tops0, topsw0)
+       CALL histwrite_phy(o_tops, topsw*swradcorr)
+       CALL histwrite_phy(o_tops0, topsw0*swradcorr)
        CALL histwrite_phy(o_topl, toplw)
        CALL histwrite_phy(o_topl0, toplw0)
 
        IF (vars_defined) THEN
-          zx_tmp_fi2d(1 : klon) = swup ( 1 : klon, klevp1 )
+          zx_tmp_fi2d(:) = swup(:,klevp1)*swradcorr(:)
        ENDIF
        CALL histwrite_phy(o_SWupTOA, zx_tmp_fi2d)
 
        IF (vars_defined) THEN
-          zx_tmp_fi2d(1 : klon) = swup0 ( 1 : klon, klevp1 )
+          zx_tmp_fi2d(:) = swup0(:,klevp1)*swradcorr(:)
        ENDIF
        CALL histwrite_phy(o_SWupTOAclr, zx_tmp_fi2d)
 
        IF (vars_defined) THEN
-          zx_tmp_fi2d(1 : klon) = swdn ( 1 : klon, klevp1 )
+          zx_tmp_fi2d(:) = swdn(:,klevp1)*swradcorr(:)
        ENDIF
        CALL histwrite_phy(o_SWdnTOA, zx_tmp_fi2d)
 
        IF (vars_defined) THEN
-          zx_tmp_fi2d(1 : klon) = swdn0 ( 1 : klon, klevp1 )
+          zx_tmp_fi2d(:) = swdn0(:,klevp1)*swradcorr(:)
        ENDIF
        CALL histwrite_phy(o_SWdnTOAclr, zx_tmp_fi2d)
 
        IF (vars_defined) THEN
-          zx_tmp_fi2d(:) = topsw(:)-toplw(:)
+          zx_tmp_fi2d(:) = topsw(:)*swradcorr(:)-toplw(:)
        ENDIF
        CALL histwrite_phy(o_nettop, zx_tmp_fi2d)
-       CALL histwrite_phy(o_SWup200, SWup200)
-       CALL histwrite_phy(o_SWup200clr, SWup200clr)
-       CALL histwrite_phy(o_SWdn200, SWdn200)
-       CALL histwrite_phy(o_SWdn200clr, SWdn200clr)
+       CALL histwrite_phy(o_SWup200, SWup200*swradcorr)
+       CALL histwrite_phy(o_SWup200clr, SWup200clr*swradcorr)
+       CALL histwrite_phy(o_SWdn200, SWdn200*swradcorr)
+       CALL histwrite_phy(o_SWdn200clr, SWdn200clr*swradcorr)
        CALL histwrite_phy(o_LWup200, LWup200)
        CALL histwrite_phy(o_LWup200clr, LWup200clr)
        CALL histwrite_phy(o_LWdn200, LWdn200)
        CALL histwrite_phy(o_LWdn200clr, LWdn200clr)
-       CALL histwrite_phy(o_sols, solsw)
-       CALL histwrite_phy(o_sols0, solsw0)
+       CALL histwrite_phy(o_sols, solsw*swradcorr)
+       CALL histwrite_phy(o_sols0, solsw0*swradcorr)
        CALL histwrite_phy(o_soll, sollw)
+       CALL histwrite_phy(o_soll0, sollw0)
        CALL histwrite_phy(o_radsol, radsol)
-       CALL histwrite_phy(o_soll0, sollw0)
-
-       IF (vars_defined) THEN
-          zx_tmp_fi2d(1 : klon) = swup ( 1 : klon, 1 )
+
+       IF (vars_defined) THEN
+          zx_tmp_fi2d(:) = swup(:,1)*swradcorr(:)
        ENDIF
        CALL histwrite_phy(o_SWupSFC, zx_tmp_fi2d)
 
        IF (vars_defined) THEN
-          zx_tmp_fi2d(1 : klon) = swup0 ( 1 : klon, 1 )
+          zx_tmp_fi2d(:) = swup0(:,1)*swradcorr(:)
        ENDIF
        CALL histwrite_phy(o_SWupSFCclr, zx_tmp_fi2d)
 
        IF (vars_defined) THEN
-          zx_tmp_fi2d(1 : klon) = swdn ( 1 : klon, 1 )
+          zx_tmp_fi2d(:) = swdn(:,1)*swradcorr(:)
        ENDIF
        CALL histwrite_phy(o_SWdnSFC, zx_tmp_fi2d)
 
        IF (vars_defined) THEN
-          zx_tmp_fi2d(1 : klon) = swdn0 ( 1 : klon, 1 )
+          zx_tmp_fi2d(:) = swdn0(:,1)*swradcorr(:)
        ENDIF
        CALL histwrite_phy(o_SWdnSFCclr, zx_tmp_fi2d)
 
        IF (vars_defined) THEN
-          zx_tmp_fi2d(1:klon)=sollwdown(1:klon)-sollw(1:klon)
+          zx_tmp_fi2d(:)=sollwdown(:)-sollw(:)
        ENDIF
        CALL histwrite_phy(o_LWupSFC, zx_tmp_fi2d)
@@ -901 +901 @@
        ENDIF
        IF (ok_ade) THEN
-          CALL histwrite_phy(o_topswad, topswad_aero)
-          CALL histwrite_phy(o_topswad0, topswad0_aero)
-          CALL histwrite_phy(o_solswad, solswad_aero)
-          CALL histwrite_phy(o_solswad0, solswad0_aero)
+          CALL histwrite_phy(o_topswad, topswad_aero*swradcorr)
+          CALL histwrite_phy(o_topswad0, topswad0_aero*swradcorr)
+          CALL histwrite_phy(o_solswad, solswad_aero*swradcorr)
+          CALL histwrite_phy(o_solswad0, solswad0_aero*swradcorr)
           CALL histwrite_phy(o_toplwad, toplwad_aero)
           CALL histwrite_phy(o_toplwad0, toplwad0_aero)
@@ -911 +911 @@
           !====MS forcing diagnostics
           if (new_aod) then
-             CALL histwrite_phy(o_swtoaas_nat, topsw_aero(:,1))
-             CALL histwrite_phy(o_swsrfas_nat, solsw_aero(:,1))
-             CALL histwrite_phy(o_swtoacs_nat, topsw0_aero(:,1))
-             CALL histwrite_phy(o_swsrfcs_nat, solsw0_aero(:,1))
+             zx_tmp_fi2d(:)=topsw_aero(:,1)*swradcorr(:)
+             CALL histwrite_phy(o_swtoaas_nat,zx_tmp_fi2d)
+             zx_tmp_fi2d(:)=solsw_aero(:,1)*swradcorr(:)
+             CALL histwrite_phy(o_swsrfas_nat,zx_tmp_fi2d)
+             zx_tmp_fi2d(:)=topsw0_aero(:,1)*swradcorr(:)
+             CALL histwrite_phy(o_swtoacs_nat,zx_tmp_fi2d)
+             zx_tmp_fi2d(:)=solsw0_aero(:,1)*swradcorr(:)
+             CALL histwrite_phy(o_swsrfcs_nat,zx_tmp_fi2d)
              !ant
-             CALL histwrite_phy(o_swtoaas_ant, topsw_aero(:,2))
-             CALL histwrite_phy(o_swsrfas_ant, solsw_aero(:,2))
-             CALL histwrite_phy(o_swtoacs_ant, topsw0_aero(:,2))
-             CALL histwrite_phy(o_swsrfcs_ant, solsw0_aero(:,2))
+             zx_tmp_fi2d(:)=topsw_aero(:,2)*swradcorr(:)
+             CALL histwrite_phy(o_swtoaas_ant,zx_tmp_fi2d)
+             zx_tmp_fi2d(:)=solsw_aero(:,2)*swradcorr(:)
+             CALL histwrite_phy(o_swsrfas_ant,zx_tmp_fi2d)
+             zx_tmp_fi2d(:)=topsw0_aero(:,2)*swradcorr(:)
+             CALL histwrite_phy(o_swtoacs_ant,zx_tmp_fi2d)
+             zx_tmp_fi2d(:)=solsw0_aero(:,2)*swradcorr(:)
+             CALL histwrite_phy(o_swsrfcs_ant,zx_tmp_fi2d)
              !cf
              if (.not. aerosol_couple) then
-                CALL histwrite_phy(o_swtoacf_nat, topswcf_aero(:,1))
-                CALL histwrite_phy(o_swsrfcf_nat, solswcf_aero(:,1))
-                CALL histwrite_phy(o_swtoacf_ant, topswcf_aero(:,2))
-                CALL histwrite_phy(o_swsrfcf_ant, solswcf_aero(:,2))
-                CALL histwrite_phy(o_swtoacf_zero,topswcf_aero(:,3))
-                CALL histwrite_phy(o_swsrfcf_zero,solswcf_aero(:,3))
+                zx_tmp_fi2d(:)=topswcf_aero(:,1)*swradcorr(:)
+                CALL histwrite_phy(o_swtoacf_nat,zx_tmp_fi2d)
+                zx_tmp_fi2d(:)=solswcf_aero(:,1)*swradcorr(:)
+                CALL histwrite_phy(o_swsrfcf_nat,zx_tmp_fi2d)
+                zx_tmp_fi2d(:)=topswcf_aero(:,2)*swradcorr(:)
+                CALL histwrite_phy(o_swtoacf_ant,zx_tmp_fi2d)
+                zx_tmp_fi2d(:)=solswcf_aero(:,2)*swradcorr(:)
+                CALL histwrite_phy(o_swsrfcf_ant,zx_tmp_fi2d)
+                zx_tmp_fi2d(:)=topswcf_aero(:,3)*swradcorr(:)
+                CALL histwrite_phy(o_swtoacf_zero,zx_tmp_fi2d)
+                zx_tmp_fi2d(:)=solswcf_aero(:,3)*swradcorr(:)
+                CALL histwrite_phy(o_swsrfcf_zero,zx_tmp_fi2d)
              endif
           endif ! new_aod
@@ -933 +947 @@
        ENDIF
        IF (ok_aie) THEN
-          CALL histwrite_phy(o_topswai, topswai_aero)
-          CALL histwrite_phy(o_solswai, solswai_aero)
+          CALL histwrite_phy(o_topswai, topswai_aero*swradcorr)
+          CALL histwrite_phy(o_solswai, solswai_aero*swradcorr)
        ENDIF
        IF (flag_aerosol.GT.0.AND.ok_cdnc) THEN
@@ -1250 +1264 @@
        ENDIF
 
-       CALL histwrite_phy(o_rsu, swup)
-       CALL histwrite_phy(o_rsd, swdn)
+       DO k=1, klevp1
+         zx_tmp_fi3d1(:,k)=swup(:,k)*swradcorr(:)
+       ENDDO
+       CALL histwrite_phy(o_rsu, zx_tmp_fi3d1)
+       DO k=1, klevp1
+         zx_tmp_fi3d1(:,k)=swdn(:,k)*swradcorr(:)
+       ENDDO
+       CALL histwrite_phy(o_rsd, zx_tmp_fi3d1)
+       DO k=1, klevp1
+         zx_tmp_fi3d1(:,k)=swup0(:,k)*swradcorr(:)
+       ENDDO
+       CALL histwrite_phy(o_rsucs, zx_tmp_fi3d1)
+       DO k=1, klevp1
+         zx_tmp_fi3d1(:,k)=swdn0(:,k)*swradcorr(:)
+       ENDDO
+       CALL histwrite_phy(o_rsdcs, zx_tmp_fi3d1)
+
        CALL histwrite_phy(o_rlu, lwup)
        CALL histwrite_phy(o_rld, lwdn)
-       CALL histwrite_phy(o_rsucs, swup0)
-       CALL histwrite_phy(o_rsdcs, swdn0)
        CALL histwrite_phy(o_rlucs, lwup0)
        CALL histwrite_phy(o_rldcs, lwdn0)
+
        IF(vars_defined) THEN
           zx_tmp_fi3d(1:klon,1:klev)=d_t(1:klon,1:klev)+ &
@@ -1263 +1291 @@
        ENDIF
        CALL histwrite_phy(o_tnt, zx_tmp_fi3d)
+
        IF(vars_defined) THEN
           zx_tmp_fi3d(1:klon,1:klev)=d_t_swr(1:klon,1:klev)/pdtphys + &
@@ -1310 +1339 @@
             RN2O_per.NE.RN2O_act.OR.RCFC11_per.NE.RCFC11_act.OR. &
             RCFC12_per.NE.RCFC12_act) THEN
-          IF(vars_defined) zx_tmp_fi2d(1 : klon) = swupp ( 1 : klon, klevp1 )
+          IF(vars_defined) zx_tmp_fi2d(:) = swupp(:,klevp1)*swradcorr(:)
           CALL histwrite_phy(o_rsut4co2, zx_tmp_fi2d)
-          IF(vars_defined) zx_tmp_fi2d(1 : klon) = lwupp ( 1 : klon, klevp1 )
+          IF(vars_defined) zx_tmp_fi2d(:) = lwupp(:,klevp1)
           CALL histwrite_phy(o_rlut4co2, zx_tmp_fi2d)
-          IF(vars_defined) zx_tmp_fi2d(1 : klon) = swup0p ( 1 : klon, klevp1 )
+          IF(vars_defined) zx_tmp_fi2d(:) = swup0p(:,klevp1)*swradcorr(:)
           CALL histwrite_phy(o_rsutcs4co2, zx_tmp_fi2d)
-          IF(vars_defined) zx_tmp_fi2d(1 : klon) = lwup0p ( 1 : klon, klevp1 )
+          IF(vars_defined) zx_tmp_fi2d(:) = lwup0p(:,klevp1)
           CALL histwrite_phy(o_rlutcs4co2, zx_tmp_fi2d)
-          CALL histwrite_phy(o_rsu4co2, swupp)
+          DO k=1, klevp1
+            zx_tmp_fi3d1(:,k)=swupp(:,k)*swradcorr(:)
+          ENDDO
+          CALL histwrite_phy(o_rsu4co2, zx_tmp_fi3d1)
+          DO k=1, klevp1
+            zx_tmp_fi3d1(:,k)=swup0p(:,k)*swradcorr(:)
+          ENDDO
+          CALL histwrite_phy(o_rsucs4co2, zx_tmp_fi3d1)
+          DO k=1, klevp1
+            zx_tmp_fi3d1(:,k)=swdnp(:,k)*swradcorr(:)
+          ENDDO
+          CALL histwrite_phy(o_rsd4co2, zx_tmp_fi3d1)
+          DO k=1, klevp1
+            zx_tmp_fi3d1(:,k)=swdn0p(:,k)*swradcorr(:)
+          ENDDO
+          CALL histwrite_phy(o_rsdcs4co2, zx_tmp_fi3d1)
           CALL histwrite_phy(o_rlu4co2, lwupp)
-          CALL histwrite_phy(o_rsucs4co2, swup0p)
           CALL histwrite_phy(o_rlucs4co2, lwup0p)
-          CALL histwrite_phy(o_rsd4co2, swdnp)
           CALL histwrite_phy(o_rld4co2, lwdnp)
-          CALL histwrite_phy(o_rsdcs4co2, swdn0p)
           CALL histwrite_phy(o_rldcs4co2, lwdn0p)
        ENDIF