Changeset 1791 for LMDZ5/trunk/libf/phylmd/phys_output_var_mod.F90

Timestamp:

Jul 17, 2013, 12:20:19 PM (11 years ago)

Author:

Ehouarn Millour

Message:

Enrichissement et organisation en module de la structure ctrl_out des variables de sortie: ajout des champs description, unité et type_ecrit. Adaptation en conséquence des routines histdef et histwrite.
UG
...................................................

Improvement and transformation into a module of the ctrl_out structure describing output vars. New fields: description, unit and type_ecrit. Creation of new routines histwrite and histdef to take advantage of this structure.
UG

File:

• LMDZ5/trunk/libf/phylmd/phys_output_var_mod.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/phys_output_var_mod.F90

@@ -14 +14 @@
       REAL, SAVE, ALLOCATABLE :: snow_o(:), zfra_o(:)
 !$OMP THREADPRIVATE(snow_o, zfra_o)
-      INTEGER, save, ALLOCATABLE ::  itau_con(:)       ! Nombre de pas ou rflag <= 1
+      INTEGER, SAVE, ALLOCATABLE ::  itau_con(:)       ! Nombre de pas ou rflag <= 1
 !$OMP THREADPRIVATE(itau_con)
       REAL, ALLOCATABLE :: bils_ec(:) ! Contribution of energy conservation
@@ -24 +24 @@
 !$OMP THREADPRIVATE(bils_ec,bils_tke,bils_diss,bils_kinetic,bils_enthalp,bils_latent)
 
+! ug Plein de variables venues de phys_output_mod
+      INTEGER, PARAMETER                           :: nfiles = 6
+      LOGICAL, DIMENSION(nfiles), SAVE             :: clef_files
+      LOGICAL, DIMENSION(nfiles), SAVE             :: clef_stations
+      INTEGER, DIMENSION(nfiles), SAVE             :: lev_files
+      INTEGER, DIMENSION(nfiles), SAVE             :: nid_files
+      INTEGER, DIMENSION(nfiles), SAVE  :: nnid_files
+!$OMP THREADPRIVATE(clef_files, clef_stations, lev_files,nid_files,nnid_files)
+      INTEGER, DIMENSION(nfiles), SAVE :: nnhorim
 
+      INTEGER, DIMENSION(nfiles), SAVE :: nhorim, nvertm
+      INTEGER, DIMENSION(nfiles), SAVE :: nvertap, nvertbp, nvertAlt
+      REAL, DIMENSION(nfiles), SAVE                :: zoutm
+      CHARACTER(LEN=20), DIMENSION(nfiles), SAVE   :: type_ecri
+!$OMP THREADPRIVATE(nnhorim, nhorim, nvertm, zoutm,type_ecri)
+      CHARACTER(LEN=20), DIMENSION(nfiles), SAVE  :: type_ecri_files, phys_out_filetypes
+!$OMP THREADPRIVATE(type_ecri_files, phys_out_filetypes)
+
+ ! swaero_diag : flag indicates if it is necessary to do calculation for some aerosol diagnostics
+      LOGICAL, SAVE                                :: swaero_diag=.FALSE.
+!$OMP THREADPRIVATE(swaero_diag)
+
+      INTEGER, SAVE:: levmin(nfiles) = 1
+      INTEGER, SAVE:: levmax(nfiles)
+!$OMP THREADPRIVATE(levmin, levmax)
+
+  TYPE ctrl_out
+     INTEGER,DIMENSION(nfiles)            :: flag
+     CHARACTER(len=20)                    :: name
+     CHARACTER(len=150)                   :: description
+     CHARACTER(len=20)                    :: unit
+     CHARACTER(len=20),DIMENSION(nfiles)  :: type_ecrit
+  END TYPE ctrl_out
 CONTAINS