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

Timestamp:

Jun 11, 2014, 3:46:46 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1997:2055 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -19 +19 @@
        ok_ade, ok_aie, ivap, new_aod, ok_sync, &
        ptconv, read_climoz, clevSTD, ptconvth, &
-       d_t, qx, d_qx, zmasse, flag_aerosol_strat)
+       d_t, qx, d_qx, zmasse, flag_aerosol, flag_aerosol_strat, ok_cdnc)
 
     ! This subroutine does the actual writing of diagnostics that were
@@ -45 +45 @@
          o_LWupSFC, o_LWdnSFC, o_LWupSFCclr, &
          o_LWdnSFCclr, o_bils, o_bils_diss, &
-         o_bils_ec, o_bils_tke, o_bils_kinetic, &
+         o_bils_ec,o_bils_ech, o_bils_tke, o_bils_kinetic, &
          o_bils_latent, o_bils_enthalp, o_sens, &
          o_fder, o_ffonte, o_fqcalving, o_fqfonte, &
@@ -217 +217 @@
 
     USE phys_output_var_mod, only: vars_defined, snow_o, zfra_o, bils_diss, &
-         bils_ec, bils_tke, bils_kinetic, bils_latent, bils_enthalp, &
+         bils_ec,bils_ech, bils_tke, bils_kinetic, bils_latent, bils_enthalp, &
          itau_con, nfiles, clef_files, nid_files, zvstr_gwd_rando
     USE indice_sol_mod, only: nbsrf
@@ -223 +223 @@
     USE comgeomphy, only: airephy
     USE surface_data, only: type_ocean, ok_veget, ok_snow
-    USE aero_mod, only: naero_spc
+!    USE aero_mod, only: naero_spc
+    USE aero_mod, only: naero_tot
     USE ioipsl, only: histend, histsync
     USE iophy, only: set_itau_iophy, histwrite_phy
@@ -230 +231 @@
 #ifdef CPP_XIOS
     ! ug Pour les sorties XIOS
-    USE wxios, only: wxios_update_calendar, wxios_closedef
+    USE xios, ONLY: xios_update_calendar
+    USE wxios, only: wxios_closedef
 #endif
     USE phys_cal_mod, only : mth_len
@@ -259 +261 @@
     REAL, DIMENSION(klon, llm) :: zmasse
     LOGICAL :: flag_aerosol_strat
+    INTEGER :: flag_aerosol 
+    LOGICAL :: ok_cdnc
     REAL, DIMENSION(3) :: freq_moyNMC
 
@@ -292 +296 @@
        IF (vars_defined) THEN
           if (prt_level >= 10) then
-             write(lunout,*)"phys_output_write: call wxios_update_calendar, itau_w=",itau_w
+             write(lunout,*)"phys_output_write: call xios_update_calendar, itau_w=",itau_w
           endif
-          CALL wxios_update_calendar(itau_w)
+          CALL xios_update_calendar(itau_w)
        END IF
        !$OMP END MASTER
@@ -463 +467 @@
        CALL histwrite_phy(o_bils_diss, bils_diss)
        CALL histwrite_phy(o_bils_ec, bils_ec)
+       IF (iflag_ener_conserv>=1) THEN
+         CALL histwrite_phy(o_bils_ech, bils_ech)
+       ENDIF
        CALL histwrite_phy(o_bils_tke, bils_tke)
        CALL histwrite_phy(o_bils_kinetic, bils_kinetic)
@@ -770 +777 @@
        ! OD550 per species
        IF (new_aod .and. (.not. aerosol_couple)) THEN
-          IF (ok_ade.OR.ok_aie) THEN
+          IF (flag_aerosol.GT.0) THEN
              CALL histwrite_phy(o_od550aer, od550aer)
              CALL histwrite_phy(o_od865aer, od865aer)
@@ -792 +799 @@
              !--STRAT AER
           ENDIF
-          IF (ok_ade.OR.ok_aie.OR.flag_aerosol_strat) THEN
-             DO naero = 1, naero_spc
+          IF (flag_aerosol.GT.0.OR.flag_aerosol_strat) THEN
+!             DO naero = 1, naero_spc
+!--correction mini bug OB
+             DO naero = 1, naero_tot
                 CALL histwrite_phy(o_tausumaero(naero), &
                      tausum_aero(:,2,naero) )
@@ -830 +839 @@
           CALL histwrite_phy(o_topswai, topswai_aero)
           CALL histwrite_phy(o_solswai, solswai_aero)
+       ENDIF
+       IF (flag_aerosol.GT.0.AND.ok_cdnc) THEN
           CALL histwrite_phy(o_scdnc, scdnc)
           CALL histwrite_phy(o_cldncl, cldncl)