Changeset 5791 for LMDZ6/branches/contrails/libf/phylmd/phys_output_write_mod.F90

Timestamp:

Jul 28, 2025, 7:23:15 PM (6 days ago)

Author:

aborella

Message:

Merge with trunk r5789

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_output_write_mod.F90 (modified) (20 diffs)

LMDZ6/branches/contrails/libf/phylmd/phys_output_write_mod.F90

@@ -78 +78 @@
          o_tke_srf, o_tke_max_srf,o_dltpbltke_srf, o_wstar, &
          o_l_mixmin,o_l_mix, &
+!GG
+         o_hice, o_tice, o_bilg_cumul,&
+!GG
          o_cdrm, o_cdrh, o_cldl, o_cldm, o_cldh, &
          o_cldt, o_JrNt, o_cldljn, o_cldmjn, &
@@ -153 +156 @@
          o_dqsphy, o_dqsphy2d, o_dqbsphy, o_dqbsphy2d, o_albe_srf, o_z0m_srf, o_z0h_srf, &
          o_ages_srf, o_snow_srf, o_alb1, o_alb2, o_tke, o_tke_dissip, &
-         o_tke_max, o_kz, o_kz_max, o_clwcon, o_tke_shear, o_tke_buoy, o_tke_trans,  &
+         o_tke_max, o_kz, o_kz_max, o_clwcon, o_tke_shear, o_tke_buoy, o_tke_trans, o_tke_adv, &
          o_dtdyn, o_dqdyn, o_dqdyn2d, o_dqldyn, o_dqldyn2d, & 
          o_dqsdyn, o_dqsdyn2d, o_dqbsdyn, o_dqbsdyn2d, o_dudyn, o_dvdyn, &
@@ -257 +260 @@
          o_delta_sst, o_delta_sal, o_ds_ns, o_dt_ns, o_dter, o_dser, o_tkt, &
          o_tks, o_taur, o_sss, &
+         o_zxfluxt,o_zxfluxq, &
+         o_lwtoab130, o_lwtoab375 ,o_lwtoab565, o_lwtoab665, &
+         o_lwtoab760, o_lwtoab900, o_lwtoab1030, o_lwtoab1130, &  ! les 16 canaux FC
+         o_lwtoab1285, o_lwtoab1435, o_lwtoab1640, o_lwtoab1940, &
+         o_lwtoab2165, o_lwtoab2315, o_lwtoab2490, o_lwtoab2800, &
+         o_lwtoa0b130, o_lwtoa0b375 ,o_lwtoa0b565, o_lwtoa0b665, &
+         o_lwtoa0b760, o_lwtoa0b900, o_lwtoa0b1030, o_lwtoa0b1130, &  ! les 16 canaux FC
+         o_lwtoa0b1285, o_lwtoa0b1435, o_lwtoa0b1640, o_lwtoa0b1940, &
+         o_lwtoa0b2165, o_lwtoa0b2315, o_lwtoa0b2490, o_lwtoa0b2800, &
+         o_lwtoabtot, o_lwtoa0btot, &  !Somme de tous les canaux
+         o_lwtoa0b, &  ! les 16 canaux FC
+         o_lwtoab4co2,o_lwtoacsb4co2,                            &   ! les 16 canaux FC
 !FC
-         o_zxfluxt,o_zxfluxq
+!GG         o_zxfluxt,o_zxfluxq
+         o_fcds, o_fcdi, o_dh_basal_growth, o_dh_basal_melt, &
+         o_dh_top_melt, o_dh_snow2sic, &
+         o_dtice_melt, o_dtice_snow2sic
+!GG
+
 
 #ifdef CPP_ECRAD
@@ -270 +290 @@
          o_LWupSFC_s2, o_LWdnSFC_s2, o_rlu_s2, o_rld_s2, &
          o_rlucs_s2, o_rldcs_s2, o_rsu_s2, o_rsd_s2, &
-         o_rsucs_s2, o_rsdcs_s2   
+         o_rsucs_s2, o_rsdcs_s2, o_ZFLUX_DIR, o_ZFLUX_DIR_s2, &
+         o_ZFLUX_DIR_CLEAR, o_ZFLUX_DIR_CLEAR_s2, &
+         o_ZFLUX_DIR_SUN, o_ZFLUX_DIR_SUN_s2   
 #endif
 
@@ -305 +327 @@
          v10m, pbl_tke, wake_delta_pbl_TKE, &
          delta_tsurf, &
+!GG
+         hice, tice, bilg_cumul,&
+!GG
          wstar, cape, ema_pcb, ema_pct, &
          ema_cbmf, Mipsh, Ma, fm_therm, ale_bl, alp_bl, ale, &
@@ -313 +338 @@
          ratqs, entr_therm, zqasc, detr_therm, f0, &
          lwup, lwdn, lwupc0, lwup0, coefm, &
+         lwtoab, lwtoa0b, &
+         lwtoabp, lwtoa0bp, &
          swupp, lwupp, swupc0p, swup0p, lwupc0p, lwup0p, swdnp, lwdnp, &
          swdnc0p, swdn0p, lwdnc0p, lwdn0p, tnondef, O3sumSTD, uvsumSTD, &
@@ -335 +362 @@
         toplw0_s2,toplw_s2,topsw0_s2,topsw_s2, &
         swup0_s2,swup_s2,swdn_s2,swdn0_s2,sollwdownclr_s2, &
+        lwtoab_s2, lwtoa0b_s2, &
         sollwdown_s2,lwdn0_s2,lwup_s2,lwdn_s2,lwup0_s2,lwdn0_s2
     USE phys_output_var_mod, ONLY: cloud_cover_sw, &
-        cloud_cover_sw_s2
+        cloud_cover_sw_s2, ZFLUX_DIR, ZFLUX_DIR_s2, &
+        ZFLUX_DIR_CLEAR, ZFLUX_DIR_CLEAR_s2, ZFLUX_DIR_SUN, ZFLUX_DIR_SUN_s2
 #endif
 
@@ -370 +399 @@
          wdtrainA, wdtrainS, wdtrainM, n2, s2, strig, zcong, zlcl_th, proba_notrig, &
          random_notrig, &
-         cf_seri, d_cf_dyn, qvc_seri, d_qvc_dyn, &
+         cf_seri, d_cf_dyn, qvc_seri, d_qvc_dyn, d_tke_dyn, &
          qsub, qissr, qcld, subfra, issrfra, gamma_cond, &
          dcf_sub, dcf_con, dcf_mix, &
@@ -447 +476 @@
          zxfluxt,zxfluxq, &
 ! offline 
-         da, mp, phi, wght_cvfd
+!GG         da, mp, phi, wght_cvfd
+         da, mp, phi, wght_cvfd, &
+         fcds, fcdi, dh_basal_growth, dh_basal_melt, &
+         dh_top_melt, dh_snow2sic, &
+         dtice_melt, dtice_snow2sic
+!GG
     USE phys_output_var_mod, ONLY: scdnc, cldncl, reffclwtop, lcc, reffclws, &
          reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra
@@ -490 +524 @@
          ok_4xCO2atm, tkt, tks, taur, sss
 
-    USE ocean_slab_mod, ONLY: nslay, tslab, slab_bilg, tice, seaice, &
+!GG    USE ocean_slab_mod, ONLY: nslay, tslab, slab_bilg, tice, seaice, &
+    USE ocean_slab_mod, ONLY: nslay, tslab, slab_bilg, tice_slab, seaice, &
         slab_ekman,slab_hdiff,slab_gm,dt_ekman, dt_hdiff, dt_gm, dt_qflux
     USE pbl_surface_mod, ONLY: snow, ftsoil
@@ -498 +533 @@
 #endif
     USE geometry_mod, ONLY: cell_area, latitude_deg, longitude_deg
-    USE surface_data, ONLY: type_ocean, version_ocean, ok_veget, landice_opt
+!GG    USE surface_data, ONLY: type_ocean, version_ocean, ok_veget, landice_opt
+    USE surface_data, ONLY: type_ocean, version_ocean, ok_veget, landice_opt, &
+        iflag_seaice, iflag_seaice_alb
+    !GG
     USE aero_mod, ONLY: naero_tot, id_STRAT_phy
     USE ioipsl, ONLY: histend, histsync
@@ -509 +547 @@
     USE phys_cal_mod, ONLY : mth_len
 
+    USE YOERAD, ONLY: NLW
 #ifdef CPP_RRTM
+    USE FREQUENCES_LW_DATA, ONLY: deltanu ,wl1_lw, wl2_lw!FC
     USE YOESW, ONLY : RSUN
 #endif
@@ -556 +596 @@
     REAL, DIMENSION (klon,klev+1) :: zx_tmp_fi3d1
     REAL, DIMENSION (klon,NSW) :: zx_tmp_fi3dsp
+    REAL, DIMENSION (klon,16) :: zx_tmp_fi3dsplw  !FC
+
     CHARACTER (LEN=4)              :: bb2
     INTEGER, DIMENSION(nbp_lon*nbp_lat)  :: ndex2d
@@ -978 +1020 @@
        CALL histwrite_phy(o_topl0, toplw0)
 
+!FC
+      IF (vars_defined) THEN
+                DO i=1, klon
+             zx_tmp_fi2d(i)=0.
+          DO ll=1,nlw
+!             zx_tmp_fi2d(i)=zx_tmp_fi2d(i)+lwtoab(i,ll)*deltanu(ll)
+             zx_tmp_fi2d(i)=zx_tmp_fi2d(i)+lwtoab(i,ll)
+          ENDDO
+          ENDDO
+       ENDIF
+       CALL histwrite_phy(o_lwtoabtot, zx_tmp_fi2d)
+           IF (vars_defined) THEN
+                DO i=1, klon
+             zx_tmp_fi2d(i)=0.
+          DO ll=1,nlw
+             zx_tmp_fi2d(i)=zx_tmp_fi2d(i)+lwtoa0b(i,ll)
+          ENDDO
+          ENDDO
+       ENDIF
+       CALL histwrite_phy(o_lwtoa0btot, zx_tmp_fi2d)
+
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,1)
+!       CALL histwrite_phy(o_lwtoab, zx_tmp_fi3dsplw)
+       CALL histwrite_phy(o_lwtoab130, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,2)
+       CALL histwrite_phy(o_lwtoab375, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,3)
+       CALL histwrite_phy(o_lwtoab565, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,4)
+       CALL histwrite_phy(o_lwtoab665, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,5)
+       CALL histwrite_phy(o_lwtoab760, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,6)
+       CALL histwrite_phy(o_lwtoab900, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,7)
+       CALL histwrite_phy(o_lwtoab1030, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,8)
+       CALL histwrite_phy(o_lwtoab1130, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,9)
+       CALL histwrite_phy(o_lwtoab1285, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,10)
+       CALL histwrite_phy(o_lwtoab1435, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,11)
+       CALL histwrite_phy(o_lwtoab1640, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,12)
+       CALL histwrite_phy(o_lwtoab1940, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,13)
+       CALL histwrite_phy(o_lwtoab2165, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,14)
+       CALL histwrite_phy(o_lwtoab2315, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,15)
+       CALL histwrite_phy(o_lwtoab2490, zx_tmp_fi2d)
+
+       IF (vars_defined) zx_tmp_fi2d=lwtoab(:,16)
+       CALL histwrite_phy(o_lwtoab2800, zx_tmp_fi2d)
+
+!FC
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,1)
+       CALL histwrite_phy(o_lwtoa0b130, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,2)
+       CALL histwrite_phy(o_lwtoa0b375, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,3)
+       CALL histwrite_phy(o_lwtoa0b565, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,4)
+       CALL histwrite_phy(o_lwtoa0b665, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,5)
+       CALL histwrite_phy(o_lwtoa0b760, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,6)
+       CALL histwrite_phy(o_lwtoa0b900, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,7)
+       CALL histwrite_phy(o_lwtoa0b1030, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,8)
+       CALL histwrite_phy(o_lwtoa0b1130, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,9)
+       CALL histwrite_phy(o_lwtoa0b1285, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,10)
+       CALL histwrite_phy(o_lwtoa0b1435, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,11)
+       CALL histwrite_phy(o_lwtoa0b1640, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,12)
+       CALL histwrite_phy(o_lwtoa0b1940, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,13)
+       CALL histwrite_phy(o_lwtoa0b2165, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,14)
+       CALL histwrite_phy(o_lwtoa0b2315, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,15)
+       CALL histwrite_phy(o_lwtoa0b2490, zx_tmp_fi2d)
+
+        zx_tmp_fi2d(:)=0.
+       IF (vars_defined) zx_tmp_fi2d=lwtoa0b(:,16)
+       CALL histwrite_phy(o_lwtoa0b2800, zx_tmp_fi2d)
+
+
+!       IF (vars_defined) zx_tmp_fi3dsplw=lwtoa0b
+!       CALL histwrite_phy(o_lwtoa0b, zx_tmp_fi3dsplw)
+
+
        !AM heterogeneous continental sub-surfaces
        IF (iflag_hetero_surf .EQ. 2) THEN
@@ -1308 +1491 @@
        CALL histwrite_phy(o_rlucs_s2, lwup0_s2)
        CALL histwrite_phy(o_rldcs_s2, lwdn0_s2)
+       CALL histwrite_phy(o_ZFLUX_DIR, ZFLUX_DIR)
+       CALL histwrite_phy(o_ZFLUX_DIR_s2, ZFLUX_DIR_s2)
+       CALL histwrite_phy(o_ZFLUX_DIR_CLEAR, ZFLUX_DIR_CLEAR)
+       CALL histwrite_phy(o_ZFLUX_DIR_CLEAR_s2, ZFLUX_DIR_CLEAR_s2)
+       CALL histwrite_phy(o_ZFLUX_DIR_SUN, ZFLUX_DIR_SUN)
+       CALL histwrite_phy(o_ZFLUX_DIR_SUN_s2, ZFLUX_DIR_SUN_s2)
     ENDIF !ok_3Deffect
 #endif       
@@ -1459 +1648 @@
 
           CALL histwrite_phy(o_tke_trans, zx_tmp_fi3d)
+
+          IF (ok_advtke) THEN
+             CALL histwrite_phy(o_tke_adv, d_tke_dyn(:,1 : klev))
+          ENDIF
 
        ENDIF
@@ -1756 +1949 @@
           CALL histwrite_phy(o_alp_bl_stat, alp_bl_stat)
        ENDIF  !(iflag_clos_bl>=1)
+!GG
+       IF (iflag_seaice>0 ) THEN
+       !IF (ok_hice ) THEN
+          CALL histwrite_phy(o_hice, hice)
+          CALL histwrite_phy(o_tice, tice)
+          CALL histwrite_phy(o_bilg_cumul, bilg_cumul)
+          CALL histwrite_phy(o_fcds, fcds)
+          CALL histwrite_phy(o_fcdi, fcdi)
+          CALL histwrite_phy(o_dh_basal_growth, dh_basal_growth)
+          CALL histwrite_phy(o_dh_basal_melt, dh_basal_melt)
+          CALL histwrite_phy(o_dh_top_melt, dh_top_melt)
+          CALL histwrite_phy(o_dh_snow2sic, dh_snow2sic)
+          CALL histwrite_phy(o_dtice_melt, dtice_melt)
+          CALL histwrite_phy(o_dtice_snow2sic, dtice_snow2sic)
+       END IF
+!GG
 !!! fin nrlmd le 10/04/2012
        ! Output of slab ocean variables
@@ -1771 +1980 @@
           IF (version_ocean=='sicINT') THEN
               CALL histwrite_phy(o_slab_bilg, slab_bilg)
-              CALL histwrite_phy(o_slab_tice, tice)
+              CALL histwrite_phy(o_slab_tice, tice_slab)
+      !GG        CALL histwrite_phy(o_slab_tice, tice)
               CALL histwrite_phy(o_slab_sic, seaice)
           ENDIF
@@ -2410 +2620 @@
           ENDIF
           CALL histwrite_phy(o_tntc, zx_tmp_fi3d)
-       ELSE IF(iflag_thermals.GE.1.AND.iflag_wake.EQ.1) THEN
+       ELSE IF(iflag_thermals.GE.1.AND.iflag_wake.GE.1) THEN
           IF (vars_defined) THEN
              zx_tmp_fi3d(1:klon,1:klev)=d_t_con(1:klon,1:klev)/pdtphys + &
@@ -2430 +2640 @@
           IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_q_con(1:klon,1:klev)/pdtphys
           CALL histwrite_phy(o_tnhusc, zx_tmp_fi3d)
-       ELSE IF (iflag_thermals.GE.1.AND.iflag_wake.EQ.1) THEN
+       ELSE IF (iflag_thermals.GE.1.AND.iflag_wake.GE.1) THEN
           IF (vars_defined) THEN
              zx_tmp_fi3d(1:klon,1:klev)=d_q_con(1:klon,1:klev)/pdtphys + &