Changeset 2056 for LMDZ5/branches/testing/libf/phylmd/phys_output_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_mod.F90 (modified) (6 diffs)

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

@@ -26 +26 @@
 
   SUBROUTINE phys_output_open(rlon,rlat,pim,tabij,ipt,jpt,plon,plat, &
-       jjmp1,nlevSTD,clevSTD,rlevSTD,nbteta, &
-       ctetaSTD, dtime, ok_veget, &
+       jjmp1,nlevSTD,clevSTD,rlevSTD, dtime, ok_veget, &
        type_ocean, iflag_pbl,ok_mensuel,ok_journe, &
        ok_hf,ok_instan,ok_LES,ok_ade,ok_aie, read_climoz, &
@@ -82 +81 @@
 
     INTEGER                               :: jjmp1
-    INTEGER                               :: nbteta, nlevSTD, radpas
+    INTEGER                               :: nlevSTD, radpas
     LOGICAL                               :: ok_mensuel, ok_journe, ok_hf, ok_instan
     LOGICAL                               :: ok_LES,ok_ade,ok_aie,flag_aerosol_strat
@@ -106 +105 @@
     CHARACTER(LEN=2)                      :: bb3
     CHARACTER(LEN=6)                      :: type_ocean
-    CHARACTER(LEN=3)                      :: ctetaSTD(nbteta)
     INTEGER, DIMENSION(iim*jjmp1)         ::  ndex2d
     INTEGER, DIMENSION(iim*jjmp1*klev)    :: ndex3d
@@ -306 +304 @@
 #ifdef CPP_XIOS
 !!! Ouverture de chaque fichier XIOS !!!!!!!!!!!
+    if (prt_level >= 10) then
+      print*,'phys_output_open: call wxios_add_file with phys_out_filenames(iff)=',trim(phys_out_filenames(iff))                                                                        
+    endif
     CALL wxios_add_file(phys_out_filenames(iff),chtimestep(iff),lev_files(iff))  
-    print*,'wxios_add_file phys_out_filenames(iff)',phys_out_filenames(iff)                                                                        
 
 !!! Declaration des axes verticaux de chaque fichier:
-    print*,'Declaration des axes verticaux de chaque fichier '
+    if (prt_level >= 10) then
+      print*,'phys_output_open: Declare vertical axes for each file'
+    endif
    if (iff.le.6) then
-    CALL wxios_add_vaxis("presnivs", phys_out_filenames(iff), &
+    CALL wxios_add_vaxis("presnivs", &
             levmax(iff) - levmin(iff) + 1, presnivs(levmin(iff):levmax(iff)))
-    CALL wxios_add_vaxis("Ahyb", phys_out_filenames(iff), &
+    CALL wxios_add_vaxis("Ahyb", &
             levmax(iff) - levmin(iff) + 1, Ahyb)
-    CALL wxios_add_vaxis("Bhyb", phys_out_filenames(iff), &
+    CALL wxios_add_vaxis("Bhyb", &
             levmax(iff) - levmin(iff) + 1, Bhyb)
-    CALL wxios_add_vaxis("Ahyb", phys_out_filenames(iff), &
+    CALL wxios_add_vaxis("Alt", &
             levmax(iff) - levmin(iff) + 1, Alt)
    else
-    CALL wxios_add_vaxis("plev", phys_out_filenames(iff), &
+    ! NMC files
+    CALL wxios_add_vaxis("plev", &
             levmax(iff) - levmin(iff) + 1, rlevSTD(levmin(iff):levmax(iff)))
    endif
@@ -362 +365 @@
           else IF (clef_stations(iff)) THEN
 
-             WRITE(lunout,*)'phys_output_mod phys_out_filenames=',phys_out_filenames(iff)
-
+             if (prt_level >= 10) then
+             WRITE(lunout,*)'phys_output_open: iff=',iff,'  phys_out_filenames(iff)=',phys_out_filenames(iff)
+             endif
+             
              CALL histbeg_phy_all(rlon,rlat,pim,tabij,ipt,jpt,plon,plat,plon_bounds,plat_bounds, &
                   phys_out_filenames(iff), &
@@ -491 +496 @@
     ecrit_ins = ecrit_files(6)
 
-    WRITE(lunout,*)'swaero_diag=',swaero_diag
-    WRITE(lunout,*)'Fin phys_output_mod.F90'
+    if (prt_level >= 10) then
+      WRITE(lunout,*)'swaero_diag=',swaero_diag
+      WRITE(lunout,*)'phys_output_open: ends here'
+    endif
 
   end SUBROUTINE phys_output_open