Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/phys_output_var_mod.F90

Timestamp:

Nov 5, 2018, 3:24:59 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

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

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/phys_output_var_mod.F90

@@ -14 +14 @@
   REAL, SAVE, ALLOCATABLE :: snow_o(:), zfra_o(:)
   !$OMP THREADPRIVATE(snow_o, zfra_o)
-  REAL, SAVE, ALLOCATABLE :: sza_o(:) ! solar zenithal angle
-  !$OMP THREADPRIVATE(sza_o)
   INTEGER, SAVE, ALLOCATABLE ::  itau_con(:)       ! Nombre de pas ou rflag <= 1
   !$OMP THREADPRIVATE(itau_con)
@@ -88 +86 @@
 
   ! swaero_diag : flag indicates if it is necessary to do calculation for some aerosol diagnostics
-  ! swaerofree_diag : flag indicates if it is necessary to do calculation for some aerosol diagnostics
   ! dryaod_diag : flag indicates if it is necessary to do calculation for some aerosol diagnostics
   !--OB: this needs to be set to TRUE by default and changed back to FALSE after first radiation call
   !--    and corrected back to TRUE based on output requests
-  LOGICAL, SAVE                                :: swaerofree_diag=.TRUE.
   LOGICAL, SAVE                                :: swaero_diag=.TRUE.
   LOGICAL, SAVE                                :: dryaod_diag=.TRUE.
-  !$OMP THREADPRIVATE(swaerofree_diag, swaero_diag, dryaod_diag)
+  !$OMP THREADPRIVATE(swaero_diag, dryaod_diag)
   ! ok_4xCO2atm : flag indicates if it is necessary to do a second call of
   ! radiation code with a 4xCO2 or another different GES to assess SW/LW
@@ -102 +98 @@
   !--    changed back to FALSE after first radiation call and corrected back to TRUE 
   !--    based on output requests
-  LOGICAL, SAVE                                :: ok_4xCO2atm=.TRUE.
+  LOGICAL, SAVE                                :: ok_4xCO2atm=.FALSE.
   !$OMP THREADPRIVATE(ok_4xCO2atm)
 
@@ -146 +142 @@
 
     allocate(snow_o(klon), zfra_o(klon))
-    allocate(sza_o(klon) )
     allocate(itau_con(klon))
     allocate(sens_prec_liq_o(klon,2))
@@ -201 +196 @@
 
     deallocate(snow_o,zfra_o,itau_con)
-    deallocate(sza_o)
     deallocate (bils_ec,bils_ech,bils_tke,bils_diss,bils_kinetic,bils_enthalp,bils_latent)
     deallocate (d_qw_col, d_ql_col, d_qs_col, d_qt_col, d_ek_col, d_h_dair_col &