Changeset 4013 for LMDZ6/branches/Ocean_skin/libf/phylmd/phys_state_var_mod.F90

Timestamp:

Nov 19, 2021, 4:58:59 PM (3 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

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

LMDZ6/branches/Ocean_skin/libf/phylmd/phys_state_var_mod.F90

@@ -32 +32 @@
       REAL, ALLOCATABLE, SAVE :: ftsol(:,:)
 !$OMP THREADPRIVATE(ftsol)
+      REAL, ALLOCATABLE, SAVE :: beta_aridity(:,:)
+!$OMP THREADPRIVATE(beta_aridity)
       REAL,ALLOCATABLE,SAVE :: qsol(:),fevap(:,:),z0m(:,:),z0h(:,:),agesno(:,:)
 !$OMP THREADPRIVATE(qsol,fevap,z0m,z0h,agesno)
@@ -96 +98 @@
       REAL, ALLOCATABLE, SAVE :: coefm(:,:,:) ! Kz momentum
 !$OMP THREADPRIVATE(pbl_tke, coefh,coefm)
-!nrlmd<
-      REAL, ALLOCATABLE, SAVE :: delta_tsurf(:,:) ! Surface temperature difference inside-outside cold pool
-!$OMP THREADPRIVATE(delta_tsurf)
-!>nrlmd
       REAL, ALLOCATABLE, SAVE :: zmax0(:), f0(:) ! 
 !$OMP THREADPRIVATE(zmax0,f0)
@@ -251 +249 @@
 ! awake_dens  : number of active wakes per unit area
 ! wake_dens   : number of wakes per unit area
+! cv_gen      : birth rate of cumulonimbus per unit area.
 ! wake_occ    : occurence of wakes (= 1 if wakes occur, =0 otherwise)
 ! wake_Cstar  : vitesse d'etalement de la poche
@@ -263 +262 @@
       REAL,ALLOCATABLE,SAVE :: awake_dens(:), wake_dens(:)
 !$OMP THREADPRIVATE(awake_dens, wake_dens)
+      REAL,ALLOCATABLE,SAVE :: cv_gen(:)
+!$OMP THREADPRIVATE(cv_gen)
       REAL,ALLOCATABLE,SAVE :: wake_Cstar(:)
 !$OMP THREADPRIVATE(wake_Cstar)
@@ -276 +277 @@
       REAL,ALLOCATABLE,SAVE :: wake_delta_pbl_TKE(:,:,:)
 !$OMP THREADPRIVATE(wake_delta_pbl_TKE)
+!nrlmd<
+      REAL, ALLOCATABLE, SAVE :: delta_tsurf(:,:) ! Surface temperature difference inside-outside cold pool
+!$OMP THREADPRIVATE(delta_tsurf)
+!>nrlmd
 !>jyg
 !
@@ -418 +423 @@
 !$OMP THREADPRIVATE(ccm)
 
-!!! nrlmd le 10/04/2012
       REAL,SAVE,ALLOCATABLE :: ale_bl_trig(:)
 !$OMP THREADPRIVATE(ale_bl_trig)
-!!! fin nrlmd le 10/04/2012
+
+      REAL,SAVE,ALLOCATABLE :: ratqs_inter(:,:)
+!$OMP THREADPRIVATE(ratqs_inter)
 
       REAL, ALLOCATABLE, SAVE:: du_gwd_rando(:, :), du_gwd_front(:, :)
@@ -477 +483 @@
       ALLOCATE(pctsrf(klon,nbsrf))
       ALLOCATE(ftsol(klon,nbsrf))
+      ALLOCATE(beta_aridity(klon,nbsrf))
       ALLOCATE(qsol(klon),fevap(klon,nbsrf))
       ALLOCATE(z0m(klon,nbsrf+1),z0h(klon,nbsrf+1),agesno(klon,nbsrf))
@@ -486 +493 @@
       print*, 'allocate falb'
       ALLOCATE(falb_dir(klon,nsw,nbsrf),falb_dif(klon,nsw,nbsrf))
-      print*, 'allocate falb good', falb_dir(1,1,1)
+!!      print*, 'allocate falb good', falb_dir(1,1,1)
       ALLOCATE(chl_con(klon))
 !albedo SB <<<
@@ -584 +591 @@
       ALLOCATE(wake_deltat(klon,klev), wake_deltaq(klon,klev))
       ALLOCATE(wake_s(klon), awake_dens(klon), wake_dens(klon))
-      awake_dens = 0.
+!!      awake_dens = 0.  ! initialized in phyetat0
+      ALLOCATE(cv_gen(klon))
       ALLOCATE(wake_Cstar(klon))
       ALLOCATE(wake_pe(klon), wake_fip(klon))
@@ -648 +656 @@
       ALLOCATE(cg_aero_lw_rrtm(klon,klev,2,nbands_lw_rrtm))
       ALLOCATE(ccm(klon,klev,nbands))
-
-!!! nrlmd le 10/04/2012
       ALLOCATE(ale_bl_trig(klon))
-!!! fin nrlmd le 10/04/2012
+      ALLOCATE(ratqs_inter(klon,klev))
       IF (ok_gwd_rando) THEN
         ALLOCATE(du_gwd_rando(klon, klev))
@@ -675 +681 @@
 
       DEALLOCATE(pctsrf, ftsol, falb1, falb2)
+      DEALLOCATE(beta_aridity)
       DEALLOCATE(qsol,fevap,z0m,z0h,agesno)
 !FC
@@ -688 +695 @@
       DEALLOCATE(tr_ancien)                           !RomP
       DEALLOCATE(ratqs, pbl_tke,coefh,coefm)
-!nrlmd<
-      DEALLOCATE(delta_tsurf)
-!>nrlmd
       DEALLOCATE(zmax0, f0)
       DEALLOCATE(sig1, w01)
@@ -742 +746 @@
       DEALLOCATE(wake_deltat, wake_deltaq)
       DEALLOCATE(wake_s, awake_dens, wake_dens)
+      DEALLOCATE(cv_gen)
       DEALLOCATE(wake_Cstar, wake_pe, wake_fip)
 !jyg<
       DEALLOCATE(wake_delta_pbl_TKE)
+!nrlmd<
+      DEALLOCATE(delta_tsurf)
+!>nrlmd
 !>jyg
       DEALLOCATE(pfrac_impa, pfrac_nucl)
@@ -794 +802 @@
       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
       DEALLOCATE(ale_bl_trig)
-!!! fin nrlmd le 10/04/2012
+      DEALLOCATE(ratqs_inter)
 
       if (activate_ocean_skin >= 1) deALLOCATE(delta_sal, ds_ns, dt_ns, &