Changeset 4482 for LMDZ6/branches/LMDZ_ECRad/libf/phylmd/wake_ini_mod.F90

Timestamp:

Mar 29, 2023, 3:14:27 PM (15 months ago)

Author:

lguez

Message:

Sync latest trunk changes to branch LMDZ_ECRad

Location:

LMDZ6/branches/LMDZ_ECRad

Files:

• . (modified) (1 prop)
• libf/phylmd/wake_ini_mod.F90 (modified) (6 diffs)

LMDZ6/branches/LMDZ_ECRad/libf/phylmd/wake_ini_mod.F90

@@ -17 +17 @@
 
   ! -------------------------------------------------------------------------
-  ! Déclaration de variables
-  ! -------------------------------------------------------------------------
-
-  ! Variables à fixer
+  ! Declaration de variables
+  ! -------------------------------------------------------------------------
+
+  ! Variables a fixer
 !jyg<
 !!  REAL, SAVE                                            :: stark, wdens_ref, coefgw, alpk
   INTEGER, SAVE, PROTECTED                                         :: prt_level
   REAL, SAVE, PROTECTED, DIMENSION(2)                              :: wdens_ref
-  REAL, SAVE, PROTECTED                                            :: stark, coefgw, alpk
+  REAL, SAVE, PROTECTED                                            :: stark, coefgw, alpk, wk_pupper
 !>jyg
   REAL, SAVE, PROTECTED                                            :: crep_upper, crep_sol  
-  !$OMP THREADPRIVATE(stark, wdens_ref, coefgw, alpk, crep_upper, crep_sol)
+  !$OMP THREADPRIVATE(stark, wdens_ref, coefgw, alpk, wk_pupper, crep_upper, crep_sol)
 
   REAL, SAVE, PROTECTED                                            :: tau_cv
@@ -44 +44 @@
   INTEGER, SAVE, PROTECTED                                         :: iflag_wk_pop_dyn
   !$OMP THREADPRIVATE(iflag_wk_pop_dyn)
+
+  INTEGER, SAVE, PROTECTED                                         :: iflag_wk_profile
+  !$OMP THREADPRIVATE(iflag_wk_profile)
 
   REAL, SAVE, PROTECTED                                            :: wdensmin
@@ -111 +114 @@
   ! Configuration de coefgw,stark,wdens (22/02/06 by YU Jingmei)
 
-  ! coefgw : Coefficient pour les ondes de gravité
+  ! coefgw : Coefficient pour les ondes de gravite
   ! stark : Coefficient k dans Cstar=k*sqrt(2*WAPE)
-  ! wdens : Densité surfacique de poche froide
+  ! wdens : Densite surfacique de poche froide
   ! -------------------------------------------------------------------------
 
@@ -149 +152 @@
   alpk=0.25
   CALL getin_p('alpk',alpk)
+  
+  wk_pupper=0.6
+  CALL getin_p('wk_pupper',wk_pupper)
+
+
 !jyg<
 !!  wdens_ref=8.E-12
@@ -170 +178 @@
                                             ! 2: act(:)=f(Wape)
 
+  iflag_wk_profile = 0
+  CALL getin_p('iflag_wk_profile',iflag_wk_profile) ! switch between wdens prescribed 
+                                                    ! and wdens prognostic
   rzero = 5000.
   CALL getin_p('rzero_wk', rzero)
@@ -184 +195 @@
   WRITE(*,*) 'stark=', stark
   WRITE(*,*) 'alpk=', alpk
+  WRITE(*,*) 'wk_pupper=', wk_pupper
 !jyg<
 !!  WRITE(*,*) 'wdens_ref=', wdens_ref