Changeset 2669 for LMDZ5/branches/testing/libf/phylmd/phys_output_write_mod.F90

Timestamp:

Oct 14, 2016, 2:57:28 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2640:2664 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

LMDZ5/branches/testing/libf/phylmd/phys_output_write_mod.F90

@@ -24 +24 @@
     ! defined and initialised in phys_output_mod.F90
 
-    USE dimphy, only: klon, klev, klevp1, nslay
+    USE dimphy, only: klon, klev, klevp1
     USE mod_phys_lmdz_para, ONLY: is_north_pole_phy,is_south_pole_phy
     USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
@@ -89 +89 @@
          o_slab_qflux, o_tslab, o_slab_bils, &
          o_slab_bilg, o_slab_sic, o_slab_tice, &
+         o_slab_hdiff, o_slab_ekman, &
          o_weakinv, o_dthmin, o_cldtau, &
          o_cldemi, o_pr_con_l, o_pr_con_i, &
@@ -291 +292 @@
   
 
-    USE ocean_slab_mod, only: tslab, slab_bils, slab_bilg, tice, seaice
+    USE ocean_slab_mod, only: nslay, tslab, slab_bils, slab_bilg, tice, &
+        seaice, slab_ekman,slab_hdiff, dt_ekman, dt_hdiff
     USE pbl_surface_mod, only: snow
     USE indice_sol_mod, only: nbsrf
@@ -312 +314 @@
     USE phys_cal_mod, only : mth_len
 
+#ifdef CPP_RRTM
+    USE YOESW, ONLY : RSUN
+#endif
 
     IMPLICIT NONE
@@ -355 +360 @@
 #endif
     REAL, PARAMETER :: un_jour=86400.
+    INTEGER ISW
+    CHARACTER*1 ch1
 
     ! On calcul le nouveau tau:
@@ -403 +410 @@
        CALL histwrite_phy(o_contfracOR, pctsrf(:,is_ter))
        CALL histwrite_phy(o_aireTER, paire_ter)
+!
+#ifdef CPP_XIOS
+       CALL histwrite_phy("R_ecc",R_ecc)
+       CALL histwrite_phy("R_peri",R_peri)
+       CALL histwrite_phy("R_incl",R_incl)
+       CALL histwrite_phy("solaire",solaire)
+!
+#ifdef CPP_RRTM
+      IF (iflag_rrtm.EQ.1) THEN
+        DO ISW=1, NSW
+          WRITE(ch1,'(i1)') ISW
+!         zx_tmp_0d=RSUN(ISW)
+!         CALL histwrite_phy("rsun"//ch1,zx_tmp_0d)
+          CALL histwrite_phy("rsun"//ch1,RSUN(ISW))
+        ENDDO
+      ENDIF
+#endif
+!
+       CALL histwrite_phy("co2_ppm",co2_ppm)
+       CALL histwrite_phy("CH4_ppb",CH4_ppb)
+       CALL histwrite_phy("N2O_ppb",N2O_ppb)
+       CALL histwrite_phy("CFC11_ppt",CFC11_ppt)
+       CALL histwrite_phy("CFC12_ppt",CFC12_ppt)
+!
+#endif
+
 !!! Champs 2D !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Simulateur AIRS
@@ -951 +984 @@
               CALL histwrite_phy(o_tslab, zx_tmp_fi2d)
           ELSE
-              CALL histwrite_phy(o_tslab, tslab)
+              CALL histwrite_phy(o_tslab, tslab(:,1:nslay))
           END IF
           IF (version_ocean=='sicINT') THEN
@@ -957 +990 @@
               CALL histwrite_phy(o_slab_tice, tice)
               CALL histwrite_phy(o_slab_sic, seaice)
+          END IF
+          IF (slab_hdiff) THEN
+            IF (nslay.EQ.1) THEN
+                zx_tmp_fi2d(:)=dt_hdiff(:,1)
+                CALL histwrite_phy(o_slab_hdiff, zx_tmp_fi2d)
+            ELSE
+                CALL histwrite_phy(o_slab_hdiff, dt_hdiff(:,1:nslay))
+            END IF
+          END IF
+          IF (slab_ekman.GT.0) THEN
+            IF (nslay.EQ.1) THEN
+                zx_tmp_fi2d(:)=dt_ekman(:,1)
+                CALL histwrite_phy(o_slab_ekman, zx_tmp_fi2d)
+            ELSE
+                CALL histwrite_phy(o_slab_ekman, dt_ekman(:,1:nslay))
+            END IF
           END IF
        ENDIF !type_ocean == force/slab