Changeset 4845

Timestamp:

Mar 5, 2024, 9:48:28 PM (2 months ago)

Author:

fhourdin

Message:

Suite travail sur les poches

Location:

LMDZ6/trunk/libf/phylmd

Files:

• lmdz_wake.F90 (modified) (13 diffs)
• lmdz_wake_ini.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/lmdz_wake.F90

@@ -395 +395 @@
   ! -------------------------------------------------------------------------
 
-  delta_t_min = 0.2
-! delta_t_min = 0.001
+   delta_t_min = 0.2
 
   ! 1. - Save initial values, initialize tendencies, initialize output fields
@@ -2416 +2415 @@
 
 SUBROUTINE pkupper (klon, klev, ptop, ph, p, pupper, kupper, &
-                    dth, hw_, rho, delta_t_min, &
+                    dth, hw_, rho, delta_t_min_in, &
                     ktop, wk_adv, h_zzz, ptop1, ktop1)
 
@@ -2422 +2421 @@
 USE lmdz_wake_ini , ONLY : RG
 USE lmdz_wake_ini , ONLY : hwmin
-USE lmdz_wake_ini , ONLY : iflag_wk_new_ptop
+USE lmdz_wake_ini , ONLY : iflag_wk_new_ptop, wk_delta_t_min, wk_frac_int_delta_t
 
 IMPLICIT NONE
@@ -2431 +2430 @@
 LOGICAL,    DIMENSION (klon)        , INTENT(IN) :: wk_adv
 REAL,       DIMENSION (klon,klev+1) , INTENT(IN) :: dth
-REAL,                                 INTENT(IN) :: delta_t_min
+REAL,                                 INTENT(IN) :: delta_t_min_in
+
 
 REAL,       DIMENSION (klon)  , INTENT(OUT)        :: hw_
@@ -2444 +2444 @@
 INTEGER :: i,k
 
+REAL                               :: delta_t_min
 REAL,     DIMENSION (klon)         :: dthmin
 REAL,     DIMENSION (klon)         :: ptop_provis,ptop_new
@@ -2455 +2456 @@
 REAL,     DIMENSION (klon,klev+1)                 :: zzz          !!
 REAL,     DIMENSION (klon)                 :: frac_int_dth          !!
-REAL                                              :: epsil        !!
 REAL                                              :: ddd!!
 
@@ -2476 +2476 @@
     ! -     1/ Pressure of the level where dth changes sign.
     !print*,'WAKE LJYF'
+
+
+if (iflag_wk_new_ptop==0) then
+    delta_t_min=delta_t_min_in
+else
+    delta_t_min=wk_delta_t_min
+endif
 
     DO i = 1, klon
@@ -2493 +2500 @@
       END DO
     END DO
+
 
     ! -     2/ dth integral
@@ -2586 +2594 @@
     ! nouveau calcul de hw et ptop
     ! -----------------------------------------------------------------------
-if (iflag_wk_new_ptop>0) then
+!if (iflag_wk_new_ptop>0) then
     
-    epsil = 0.05                            ! 5 pour cent
-   !  epsil = 0.20
+IF (iflag_wk_new_ptop/=0) THEN
+
     
        DO i = 1, klon
@@ -2603 +2611 @@
           IF (wk_adv(i)) THEN
              if (k<=k_ptop_provis(i)) then
-                  ddd=dth(i,k-1)*(ph(i,k-1) - min(ptop_provis(i),ph(i,k)))
+                !  ddd=dth(i,k-1)*(ph(i,k-1) - min(ptop_provis(i),ph(i,k)))
+                  ddd=dth(i,k-1)*(ph(i,k-1) - ph(i,k))
              else
                   ddd=0.
@@ -2619 +2628 @@
     DO i=1,klon
        IF (wk_adv(i)) THEN
-        frac_int_dth(i)=(1.-epsil)*int_dth(i,k_ptop_provis(i))
+        frac_int_dth(i)=wk_frac_int_delta_t*int_dth(i,k_ptop_provis(i))
        !ELSE
        ! frac_int_dth(i)=0.
@@ -2681 +2690 @@
     END DO
 
-endif
-
-if (iflag_wk_new_ptop==2) then
+ENDIF
+
+!if (iflag_wk_new_ptop==2) then
+IF (iflag_wk_new_ptop>0) THEN 
    do i=1,klon
       ptop(i)=ptop1(i)
@@ -2689 +2699 @@
       hw_(i)=h_zzz(i)
    enddo
-endif
-
+
+!endif
+ENDIF
 
  kupper = 0

LMDZ6/trunk/libf/phylmd/lmdz_wake_ini.F90

@@ -31 +31 @@
   REAL, SAVE, PROTECTED                                       :: tau_cv
   !$OMP THREADPRIVATE(tau_cv)
+
+   REAL, SAVE, PROTECTED                                       :: wk_delta_t_min
+  !$OMP THREADPRIVATE(wk_delta_t_min)
+
+   REAL, SAVE, PROTECTED                                       :: wk_frac_int_delta_t
+  !$OMP THREADPRIVATE(wk_frac_int_delta_t)
+
   REAL, SAVE, PROTECTED                                       :: rzero, aa0 ! minimal wake radius and area
   !$OMP THREADPRIVATE(rzero, aa0)
@@ -215 +222 @@
   CALL getin_p('iflag_wk_profile',iflag_wk_profile) ! switch between wdens prescribed 
                                                     ! and wdens prognostic
-  iflag_wk_profile = 0
+ ! iflag_wk_profile = 0
+  iflag_wk_new_ptop = 0
   CALL getin_p('iflag_wk_new_ptop',iflag_wk_new_ptop)
 
   tau_cv = 4000.
   CALL getin_p('tau_cv', tau_cv)
+  
+  wk_delta_t_min = 0.
+  CALL getin_p('wk_delta_t_min', wk_delta_t_min)
+  
+  wk_frac_int_delta_t = 0.9
+  CALL getin_p('wk_frac_int_delta_t', wk_frac_int_delta_t)
+
 
 !------------------------------------------------------------------------ 
@@ -245 +260 @@
   CALL getin_p('iflag_wk_check_trgl ', iflag_wk_check_trgl)
   WRITE(*,*) 'iflag_wk_check_trgl=', iflag_wk_check_trgl
+  
+  WRITE(*,*) 'wk_delta_t_min=', wk_delta_t_min
+  WRITE(*,*) 'wk_frac_int_delta_t=', wk_frac_int_delta_t
+  WRITE(*,*) 'iflag_wk_new_ptop=', iflag_wk_new_ptop
 
  RETURN