Changeset 4453

Timestamp:

Mar 7, 2023, 1:18:39 PM (2 years ago)

Author:

fhourdin

Message:

Changement d'un nom de param

Location:

LMDZ6/trunk/libf/phylmd

Files:

• wake.F90 (modified) (5 diffs)
• wake_ini_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/wake.F90

@@ -27 +27 @@
   USE wake_ini_mod , ONLY : wake_ini
   USE wake_ini_mod , ONLY : prt_level,epsim1,RG,RD
-  USE wake_ini_mod , ONLY : stark, wdens_ref, coefgw, alpk, pupperbyphs
+  USE wake_ini_mod , ONLY : stark, wdens_ref, coefgw, alpk, wk_pupper
   USE wake_ini_mod , ONLY : crep_upper, crep_sol, tau_cv, rzero, aa0, flag_wk_check_trgl
   USE wake_ini_mod , ONLY : iflag_wk_act, iflag_wk_check_trgl, iflag_wk_pop_dyn, wdensmin
@@ -2313 +2313 @@
 SUBROUTINE pkupper (klon, klev, ptop, ph, pupper, kupper)
 
-USE wake_ini_mod , ONLY : pupperbyphs
+USE wake_ini_mod , ONLY : wk_pupper
 IMPLICIT NONE
 
@@ -2326 +2326 @@
  kupper = 0
  
-IF (pupperbyphs<1.) THEN
+IF (wk_pupper<1.) THEN
  ! Choose an integration bound well above wake top
   ! -----------------------------------------------------------------
@@ -2335 +2335 @@
   DO i = 1, klon
   !  pupper(i) = 0.6*ph(i, 1)
-    pupper(i) = pupperbyphs*ph(i, 1)
+    pupper(i) = wk_pupper*ph(i, 1)
     pupper(i) = max(pupper(i), 45000.)
     ! cc        Pupper(i) = 60000.
@@ -2343 +2343 @@
   
   DO i=1, klon
-     ! pupper(i) = pupperbyphs*ptop(i)+(1.-pupperbyphs)*ph(i, 1) 
-     pupper(i) = min( pupperbyphs*ptop(i)+(1.-pupperbyphs)*ph(i, 1) , ptop(i)-5000.) 
+     ! pupper(i) = wk_pupper*ptop(i)+(1.-wk_pupper)*ph(i, 1) 
+     pupper(i) = min( wk_pupper*ptop(i)+(1.-wk_pupper)*ph(i, 1) , ptop(i)-5000.) 
   END DO
 END IF

LMDZ6/trunk/libf/phylmd/wake_ini_mod.F90

@@ -25 +25 @@
   INTEGER, SAVE, PROTECTED                                         :: prt_level
   REAL, SAVE, PROTECTED, DIMENSION(2)                              :: wdens_ref
-  REAL, SAVE, PROTECTED                                            :: stark, coefgw, alpk, pupperbyphs
+  REAL, SAVE, PROTECTED                                            :: stark, coefgw, alpk, wk_pupper
 !>jyg
   REAL, SAVE, PROTECTED                                            :: crep_upper, crep_sol  
-  !$OMP THREADPRIVATE(stark, wdens_ref, coefgw, alpk, pupperbyphs, crep_upper, crep_sol)
+  !$OMP THREADPRIVATE(stark, wdens_ref, coefgw, alpk, wk_pupper, crep_upper, crep_sol)
 
   REAL, SAVE, PROTECTED                                            :: tau_cv
@@ -153 +153 @@
   CALL getin_p('alpk',alpk)
   
-  pupperbyphs=0.6
-  CALL getin_p('pupperbyphs',pupperbyphs)
+  wk_pupper=0.6
+  CALL getin_p('wk_pupper',wk_pupper)
 
 
@@ -195 +195 @@
   WRITE(*,*) 'stark=', stark
   WRITE(*,*) 'alpk=', alpk
-  WRITE(*,*) 'pupperbyphs=', pupperbyphs
+  WRITE(*,*) 'wk_pupper=', wk_pupper
 !jyg<
 !!  WRITE(*,*) 'wdens_ref=', wdens_ref