Changeset 1065

Timestamp:

Dec 17, 2008, 1:33:00 PM (16 years ago)

Author:

Laurent Fairhead

Message:

Diverses corrections: variables locales pour region, choix niveaux verticaux,
variables private
LG/IM

Location:

LMDZ4/trunk/libf/phylmd

Files:

• phys_output_mod.F90 (modified) (10 diffs)
• physiq.F (modified) (2 diffs)

LMDZ4/trunk/libf/phylmd/phys_output_mod.F90

@@ -12 +12 @@
   IMPLICIT NONE
 
+  private histdef2d, histdef3d
+
    integer, parameter                           :: nfiles = 5
    logical, dimension(nfiles), save             :: clef_files
@@ -17 +19 @@
    integer, dimension(nfiles), save             :: nid_files
 
-   integer, dimension(nfiles), save             :: nhorim, nvertm
-   real, dimension(nfiles), save                :: zstophym, zoutm
-   CHARACTER(len=20), dimension(nfiles), save   :: type_ecri
+   integer, dimension(nfiles), private, save :: nhorim, nvertm
+   real, dimension(nfiles), private, save                :: zstophym, zoutm
+   CHARACTER(len=20), dimension(nfiles), private, save   :: type_ecri
 
 !   integer, save                     :: nid_hf3d 
-
-!!!!!!!!!! stockage dans une region limitee pour chaque fichier !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!                 entre [lonmin_reg,lonmax_reg] et [latmin_reg,latmax_reg]
-
-  logical, dimension(nfiles), save  :: ok_reglim         = (/ .false., .false., .false., .false., .true. /) 
-  real, dimension(nfiles), save     :: lonmin_reg        = (/ 0., -45., 0., 0., -162. /)
-  real, dimension(nfiles), save     :: lonmax_reg        = (/ 90., 45., 90., 90., -144. /)
-  real, dimension(nfiles), save     :: latmin_reg        = (/ 0., -45., 0., 0., 7. /)
-  real, dimension(nfiles), save     :: latmax_reg        = (/ 90., 90., 90., 90., 21. /)
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -36 +29 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!/ histmth, histday, histhf, histins /)!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+  integer, private:: levmin(nfiles) = 1
+  integer, private:: levmax(nfiles)
 
 !!! 1D
@@ -318 +314 @@
                               ctetaSTD,dtime, presnivs, ok_veget, &
                               ocean, iflag_pbl,ok_mensuel,ok_journe, &
-                              ok_hf,ok_instan,ok_LES, nid_fil)   
+                              ok_hf,ok_instan,ok_LES)   
 
   USE iophy 
@@ -349 +345 @@
   character(len=6)                      :: ocean
   CHARACTER(len=3)                      :: ctetaSTD(nbteta)
-  integer, dimension(nfiles)            :: nid_fil
   real, dimension(nfiles)               :: ecrit_files
   CHARACTER(len=20), dimension(nfiles)  :: name_files
@@ -356 +351 @@
   integer                               :: imin_ins, imax_ins
   integer                               :: jmin_ins, jmax_ins
-  integer, dimension(nfiles)            :: lvlmax_reg
-
-   lvlmax_reg = (/ klev, klev, klev, klev, 17 /)
+
+!!!!!!!!!! stockage dans une region limitee pour chaque fichier !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!                 entre [lonmin_reg,lonmax_reg] et [latmin_reg,latmax_reg]
+
+  logical, dimension(nfiles), save  :: ok_reglim         = (/ .false., .false., .false., .false., .true. /) 
+  real, dimension(nfiles), save     :: lonmin_reg        = (/ 0., -45., 0., 0., -162. /)
+  real, dimension(nfiles), save     :: lonmax_reg        = (/ 90., 45., 90., 90., -144. /)
+  real, dimension(nfiles), save     :: latmin_reg        = (/ 0., -45., 0., 0., 7. /)
+  real, dimension(nfiles), save     :: latmax_reg        = (/ 90., 90., 90., 90., 21. /)
+
+   levmax = (/ klev, klev, klev, klev, 17 /)
 
    name_files(1) = 'histmth'
@@ -409 +412 @@
      if (ok_reglim(iff)) then
 
-        klev = lvlmax_reg(iff)
-
         imin_ins=1
         imax_ins=iim
@@ -438 +439 @@
               imin_ins,imax_ins-imin_ins+1, &
               jmin_ins,jmax_ins-jmin_ins+1, &
-              itau_phy,zjulian,dtime,nhorim(iff),nid_fil(iff))
+              itau_phy,zjulian,dtime,nhorim(iff),nid_files(iff))
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
        else
- CALL histbeg_phy(name_files(iff),itau_phy,zjulian,dtime,nhorim(iff),nid_fil(iff))
+ CALL histbeg_phy(name_files(iff),itau_phy,zjulian,dtime,nhorim(iff),nid_files(iff))
        endif
  
-      nid_files(iff)=nid_fil(iff)
-
- CALL histvert(nid_files(iff),"presnivs","Vertical levels","mb",klev, presnivs/100., nvertm(iff))
+      CALL histvert(nid_files(iff), "presnivs", "Vertical levels", "mb", &
+           levmax(iff) - levmin(iff) + 1, &
+           presnivs(levmin(iff):levmax(iff))/100., nvertm(iff))
 
 !!!!!!!!!!!!! Traitement des champs 3D pour histhf !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -785 +786 @@
 
          ENDDO ! 
-      klev = lvlmax_reg(1)
-
       end subroutine phys_output_open
 
@@ -837 +836 @@
 
        if ( flag_var(iff)<=lev_files(iff) ) then
- call histdef (nid_files(iff),nomvar,titrevar,unitvar, &
-               iim,jj_nb,nhorim(iff), klev,1,klev,nvertm(iff), 32, &
-               type_ecri(iff), zstophym(iff),zoutm(iff))
+          call histdef (nid_files(iff), nomvar, titrevar, unitvar, &
+               iim, jj_nb, nhorim(iff), klev, levmin(iff), &
+               levmax(iff)-levmin(iff)+1, nvertm(iff), 32, type_ecri(iff), &
+               zstophym(iff), zoutm(iff))
        endif
       end subroutine histdef3d

LMDZ4/trunk/libf/phylmd/physiq.F

@@ -1 @@
-!
-! $Header$
-!
 c
 c#define IO_DEBUG
@@ -1535 +1532 @@
      &                        ctetaSTD,dtime,presnivs,ok_veget,
      &                        type_ocean,iflag_pbl,ok_mensuel,ok_journe,
-     &                        ok_hf,ok_instan,ok_LES,nid_files)
+     &                        ok_hf,ok_instan,ok_LES)
 c$OMP END MASTER
 c$OMP BARRIER