Changeset 3798 for LMDZ6/branches/Ocean_skin/libf/phylmd/phys_output_mod.F90

Timestamp:

Jan 11, 2021, 11:24:08 PM (3 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_output_mod.F90 (modified) (6 diffs)

LMDZ6/branches/Ocean_skin/libf/phylmd/phys_output_mod.F90

@@ -29 +29 @@
        ok_hf,ok_instan,ok_LES,ok_ade,ok_aie, read_climoz, &
        phys_out_filestations, &
-       new_aod, aerosol_couple, flag_aerosol_strat, &
+       aerosol_couple, flag_aerosol_strat, &
        pdtphys, paprs, pphis, pplay, lmax_th, ptconv, ptconvth, ivap, &
        d_u, d_t, qx, d_qx, zmasse, ok_sync)   
@@ -40 +40 @@
     USE mod_phys_lmdz_para
     !Martin
-    USE surface_data, ONLY : ok_snow
+    USE surface_data, ONLY : landice_opt
     USE phys_output_ctrlout_mod
     USE mod_grid_phy_lmdz, only: klon_glo,nbp_lon,nbp_lat
@@ -46 +46 @@
     USE vertical_layers_mod, ONLY: ap,bp,preff,presnivs, aps, bps, pseudoalt
     USE time_phylmdz_mod, ONLY: day_ini, itau_phy, start_time, annee_ref, day_ref
-#ifdef REPROBUS
-    USE chem_rep, ONLY: nbnas, tnamenas, ttextnas
-#endif
 #ifdef CPP_XIOS
     ! ug Pour les sorties XIOS
@@ -85 +82 @@
     LOGICAL                               :: ok_LES,ok_ade,ok_aie
     INTEGER                               :: flag_aerosol_strat
-    LOGICAL                               :: new_aod, aerosol_couple
+    LOGICAL                               :: aerosol_couple
     INTEGER, INTENT(IN)::  read_climoz ! read ozone climatology
     !     Allowed values are 0, 1 and 2
@@ -160 +157 @@
     IF (.NOT. ALLOCATED(o_trac)) ALLOCATE(o_trac(nqtot))
     IF (.NOT. ALLOCATED(o_trac_cum)) ALLOCATE(o_trac_cum(nqtot))
-#ifdef REPROBUS
-    IF (.NOT. ALLOCATED(o_nas)) ALLOCATE(o_nas(nbnas))
-#endif
     ALLOCATE(o_dtr_the(nqtot),o_dtr_con(nqtot),o_dtr_lessi_impa(nqtot))
     ALLOCATE(o_dtr_lessi_nucl(nqtot),o_dtr_insc(nqtot),o_dtr_bcscav(nqtot))
@@ -581 +575 @@
             ENDDO
       ENDIF
-      IF (type_trac=='repr') THEN
-#ifdef REPROBUS
-         DO iiq=1,nbnas
-            o_nas(iiq) = ctrl_out((/ 4, 5, 5, 5, 10, 10, 11, 11, 11, 11 /), &
-                 tnamenas(iiq),ttextnas(iiq), "-", &
-                 (/ '', '', '', '', '', '', '', '', '', '' /))
-         ENDDO
-#endif
-      ENDIF
 
    ENDDO !  iff