Changeset 2839 for LMDZ5/branches/testing/libf/phylmd/phys_output_mod.F90

Timestamp:

Mar 30, 2017, 4:16:38 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2785:2838 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -5 +5 @@
   USE indice_sol_mod
   USE phys_output_var_mod
-  USE aero_mod, only : naero_spc,name_aero
   USE phys_output_write_mod, ONLY : phys_output_write
   REAL, DIMENSION(nfiles),SAVE :: ecrit_files
@@ -40 +39 @@
     USE phys_cal_mod, only : hour, calend
     USE mod_phys_lmdz_para
-    USE aero_mod, only : naero_spc,name_aero
     !Martin
     USE surface_data, ONLY : ok_snow
@@ -46 +44 @@
     USE mod_grid_phy_lmdz, only: klon_glo,nbp_lon,nbp_lat
     USE print_control_mod, ONLY: prt_level,lunout
-    USE vertical_layers_mod, ONLY: ap,bp,preff,presnivs
+    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 CPP_XIOS
@@ -95 +93 @@
     INTEGER                               :: idayref
     REAL                                  :: zjulian_start, zjulian
-    REAL, DIMENSION(klev)                 :: Ahyb, Bhyb, Alt
     CHARACTER(LEN=4), DIMENSION(nlevSTD)  :: clevSTD
     REAL, DIMENSION(nlevSTD)              :: rlevSTD
@@ -293 +290 @@
     zdtime_moy = dtime         ! Frequence ou l on moyenne
 
-    ! Calcul des Ahyb, Bhyb et Alt
-    DO k=1,klev
-       Ahyb(k)=(ap(k)+ap(k+1))/2.
-       Bhyb(k)=(bp(k)+bp(k+1))/2.
-       Alt(k)=log(preff/presnivs(k))*8.
-    ENDDO
-    !          if(prt_level.ge.1) then
-    WRITE(lunout,*)'Ap Hybrid = ',Ahyb(1:klev)
-    WRITE(lunout,*)'Bp Hybrid = ',Bhyb(1:klev)
-    WRITE(lunout,*)'Alt approx des couches pour une haut d echelle de 8km = ',Alt(1:klev)
-    !          ENDIF
 
   ecrit_files(7) = ecrit_files(1)
@@ -345 +331 @@
             levmax(iff) - levmin(iff) + 1, presnivs(levmin(iff):levmax(iff)))
     CALL wxios_add_vaxis("Ahyb", &
-            levmax(iff) - levmin(iff) + 1, Ahyb)
+            levmax(iff) - levmin(iff) + 1, aps)
     CALL wxios_add_vaxis("Bhyb", &
-            levmax(iff) - levmin(iff) + 1, Bhyb)
+            levmax(iff) - levmin(iff) + 1, bps)
     CALL wxios_add_vaxis("Alt", &
-            levmax(iff) - levmin(iff) + 1, Alt)
+            levmax(iff) - levmin(iff) + 1, pseudoalt)
    ELSE
     ! NMC files
@@ -418 +404 @@
 !!!! Composantes de la coordonnee sigma-hybride 
           CALL histvert(nid_files(iff), "Ahyb","Ahyb comp of Hyb Cord ", "Pa", &
-               levmax(iff) - levmin(iff) + 1,Ahyb,nvertap(iff))
+               levmax(iff) - levmin(iff) + 1,aps,nvertap(iff))
 
           CALL histvert(nid_files(iff), "Bhyb","Bhyb comp of Hyb Cord", " ", &
-               levmax(iff) - levmin(iff) + 1,Bhyb,nvertbp(iff))
+               levmax(iff) - levmin(iff) + 1,bps,nvertbp(iff))
 
           CALL histvert(nid_files(iff), "Alt","Height approx for scale heigh of 8km at levels", "Km", &                       
-               levmax(iff) - levmin(iff) + 1,Alt,nvertAlt(iff))
+               levmax(iff) - levmin(iff) + 1,pseudoalt,nvertAlt(iff))
 
           ELSE