Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/phys_state_var_mod.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_state_var_mod.F90 (modified) (8 diffs)

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

@@ -48 +48 @@
       REAL, ALLOCATABLE, SAVE :: radsol(:)
 !$OMP THREADPRIVATE(radsol)
+      REAL, ALLOCATABLE, SAVE :: swradcorr(:)
+!$OMP THREADPRIVATE(swradcorr)
 
 !clesphy0 param physiq
@@ -395 +397 @@
 !!! fin nrlmd le 10/04/2012
 
-      REAL, ALLOCATABLE, SAVE:: du_gwd_rando(:, :), dv_gwd_rando(:, :)
-      !$OMP THREADPRIVATE(du_gwd_rando, dv_gwd_rando)
+      REAL, ALLOCATABLE, SAVE:: du_gwd_rando(:, :), du_gwd_front(:, :)
+      !$OMP THREADPRIVATE(du_gwd_rando, du_gwd_front)
       ! tendencies on wind due to gravity waves
 
@@ -404 +406 @@
 SUBROUTINE phys_state_var_init(read_climoz)
 USE dimphy
-USE control_mod
 USE aero_mod
-USE infotrac, ONLY : nbtr
+USE infotrac_phy, ONLY : nbtr
 USE indice_sol_mod
 IMPLICIT NONE
@@ -434 +435 @@
       ALLOCATE(solsw(klon), sollw(klon))
       ALLOCATE(radsol(klon))
+      ALLOCATE(swradcorr(klon))
       ALLOCATE(zmea(klon), zstd(klon), zsig(klon), zgam(klon))
       ALLOCATE(zthe(klon), zpic(klon), zval(klon))
@@ -581 +583 @@
       ALLOCATE(ale_bl_trig(klon))
 !!! fin nrlmd le 10/04/2012
-      if (ok_gwd_rando) allocate(du_gwd_rando(klon, klev), &
-           dv_gwd_rando(klon, klev))
+      if (ok_gwd_rando) allocate(du_gwd_rando(klon, klev))
+      if (.not. ok_hines .and. ok_gwd_rando) allocate(du_gwd_front(klon, klev))
 
 END SUBROUTINE phys_state_var_init
@@ -589 +591 @@
 SUBROUTINE phys_state_var_end
 USE dimphy
-USE control_mod
 USE indice_sol_mod
 IMPLICIT NONE
@@ -596 +597 @@
       deallocate(rlat, rlon, pctsrf, ftsol, falb1, falb2)
       deallocate(qsol,fevap,z0m,z0h,agesno)
-      deallocate(rain_fall, snow_fall, solsw, sollw, radsol)
+      deallocate(rain_fall, snow_fall, solsw, sollw, radsol, swradcorr)
       deallocate(zmea, zstd, zsig, zgam)
       deallocate(zthe, zpic, zval)
@@ -705 +706 @@
       deallocate(tau_aero_lw_rrtm,piz_aero_lw_rrtm,cg_aero_lw_rrtm)
       deallocate(ccm)
-      if (ok_gwd_rando) deallocate(du_gwd_rando, dv_gwd_rando)
+      if (ok_gwd_rando) deallocate(du_gwd_rando)
+      if (.not. ok_hines .and. ok_gwd_rando) deallocate(du_gwd_front)
        
 !!! nrlmd le 10/04/2012