Changeset 1795 for LMDZ5/branches/testing/libf/phylmd/phys_output_var_mod.F90

Timestamp:

Jul 18, 2013, 10:20:28 AM (11 years ago)

Author:

Ehouarn Millour

Message:

Version testing basee sur la r1794

---

Testing release based on r1794

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_output_var_mod.F90 (modified) (3 diffs)

LMDZ5/branches/testing/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
+      REAL, ALLOCATABLE :: bils_tke(:) ! Contribution of energy conservation
+      REAL, ALLOCATABLE :: bils_diss(:) ! Contribution of energy conservation
+      REAL, ALLOCATABLE :: bils_kinetic(:) ! bilan de chaleur au sol, kinetic
+      REAL, ALLOCATABLE :: bils_enthalp(:) ! bilan de chaleur au sol
+      REAL, ALLOCATABLE :: bils_latent(:) ! bilan de chaleur au sol
+!$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
 
@@ -27 +67 @@
       allocate(snow_o(klon), zfra_o(klon))
       allocate(itau_con(klon))
+      allocate (bils_ec(klon),bils_tke(klon),bils_diss(klon),bils_kinetic(klon),bils_enthalp(klon),bils_latent(klon))
 
 END SUBROUTINE phys_output_var_init
@@ -36 +77 @@
 
       deallocate(snow_o,zfra_o,itau_con)
+      deallocate (bils_ec,bils_tke,bils_diss,bils_kinetic,bils_enthalp,bils_latent)
 
 END SUBROUTINE phys_output_var_end