Changeset 4840

Timestamp:

Mar 2, 2024, 7:21:43 PM (2 months ago)

Author:

fhourdin

Message:

Suite nettoyage lmdz_wake

File:

• LMDZ6/trunk/libf/phylmd/lmdz_wake.F90 (modified) (5 diffs)

LMDZ6/trunk/libf/phylmd/lmdz_wake.F90

@@ -319 +319 @@
   REAL, DIMENSION (klon)                                :: h_zzz
 
- print*,'WAKE LJYFz'
+! print*,'WAKE LJYFzzzzz'
 
   ! -------------------------------------------------------------------------
@@ -2422 +2422 @@
 USE lmdz_wake_ini , ONLY : RG
 USE lmdz_wake_ini , ONLY : hwmin
+
 IMPLICIT NONE
 
-INTEGER,  INTENT(IN)                              :: klon,klev
-REAL,     INTENT(IN),   DIMENSION (klon,klev+1)   :: ph, p
-REAL,     INTENT(IN),   DIMENSION (klon,klev+1)   :: rho
-LOGICAL,  INTENT(IN),   DIMENSION (klon)          :: wk_adv
-REAL,     INTENT(IN),   DIMENSION (klon,klev+1)   :: dth
-
-REAL,     INTENT(OUT),   DIMENSION (klon)         :: hw_
-REAL,     INTENT(OUT),   DIMENSION (klon)         :: ptop
-INTEGER,  INTENT(OUT),   DIMENSION (klon)         :: Ktop 
-REAL,     INTENT(OUT),   DIMENSION (klon)         :: pupper
-INTEGER,  INTENT(OUT),   DIMENSION (klon)         :: kupper
-INTEGER                                           :: i,k
-
+INTEGER,                              INTENT(IN) :: klon,klev
+REAL,       DIMENSION (klon,klev+1) , INTENT(IN) :: ph, p
+REAL,       DIMENSION (klon,klev+1) , INTENT(IN) :: rho
+LOGICAL,    DIMENSION (klon)        , INTENT(IN) :: wk_adv
+REAL,       DIMENSION (klon,klev+1) , INTENT(IN) :: dth
 REAL,                                 INTENT(IN) :: delta_t_min
 
+REAL,       DIMENSION (klon)  , INTENT(OUT)        :: hw_
+REAL,       DIMENSION (klon)  , INTENT(OUT)        :: ptop
+INTEGER,    DIMENSION (klon)  , INTENT(OUT)        :: Ktop
+REAL,       DIMENSION (klon)  , INTENT(OUT)        :: pupper
+INTEGER,    DIMENSION (klon)  , INTENT(OUT)        :: kupper
 REAL,       DIMENSION (klon)  , INTENT(OUT)        :: h_zzz       !!
 REAL,       DIMENSION (klon)  , INTENT(OUT)        :: Ptop1      !!
 INTEGER,    DIMENSION (klon)  , INTENT(OUT)        :: ktop1      !!
 
+INTEGER :: i,k
 
 REAL,     DIMENSION (klon)         :: dthmin
@@ -2487 +2486 @@
     DO k = 2, klev
       DO i = 1, klon
-!       if (compte==92) then
-!            print*,'debug xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-!            print*,'debug i =',i
-!            print*,'debug k =',k
-!            print*,'debug wk_adv(i) =',wk_adv(i)
-!            print*,'debug ptop_provis(i) =',ptop_provis(i)
-!            print*,'debug ph(i,1) =',ph(i,1)
-!            print*,'debug dth(i,k) =',dth(i,k)
-!            print*,'debug delta_t_min =',delta_t_min
-!            print*,'debug p(i,k-1) =',p(i,k-1)
-!            print*,'debug dth(i,k-1) =',dth(i,k-1)
-!            print*,'debug p(i,k) =',p(i,k)
-!       endif
         IF (wk_adv(i) .AND. ptop_provis(i)==ph(i,1) .AND. &
 ! LJYF changer :           dth(i,k)>=-delta_t_min .AND. dth(i,k-1)<-delta_t_min) THEN
@@ -2597 +2583 @@
 !    PRINT *, 'wake-3, ktop(igout), kupper(igout) ', ktop(igout), kupper(igout)
 !  ENDIF
-
- kupper = 0
- 
-IF (wk_pupper<1.) THEN
- ! Choose an integration bound well above wake top
-  ! -----------------------------------------------------------------
-
-  ! Pupper = 50000.  ! melting level
-  ! Pupper = 60000.
-  ! Pupper = 80000.  ! essais pour case_e
-  DO i = 1, klon
-  !  pupper(i) = 0.6*ph(i, 1)
-    pupper(i) = wk_pupper*ph(i, 1)
-    pupper(i) = max(pupper(i), 45000.)
-    ! cc        Pupper(i) = 60000.
-  END DO
-
-ELSE
-  
-  DO i=1, klon
-     ! 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
- 
-  ! -5/ Determination de kupper
-
-  DO k = klev, 1, -1
-    DO i = 1, klon
-      IF (ph(i,k+1)<pupper(i)) kupper(i) = k
-    END DO
-  END DO
-
-  ! On evite kupper = 1 et kupper = klev
-  DO i = 1, klon
-    kupper(i) = max(kupper(i), 2)
-    kupper(i) = min(kupper(i), klev-1)
-  END DO 
 
     ! -----------------------------------------------------------------------
@@ -2729 +2677 @@
 
 endif
+
+ kupper = 0
+ 
+IF (wk_pupper<1.) THEN
+ ! Choose an integration bound well above wake top
+  ! -----------------------------------------------------------------
+
+  ! Pupper = 50000.  ! melting level
+  ! Pupper = 60000.
+  ! Pupper = 80000.  ! essais pour case_e
+  DO i = 1, klon
+  !  pupper(i) = 0.6*ph(i, 1)
+    pupper(i) = wk_pupper*ph(i, 1)
+    pupper(i) = max(pupper(i), 45000.)
+    ! cc        Pupper(i) = 60000.
+  END DO
+
+ELSE
+  
+  DO i=1, klon
+     ! 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
+ 
+  ! -5/ Determination de kupper
+
+  DO k = klev, 1, -1
+    DO i = 1, klon
+      IF (ph(i,k+1)<pupper(i)) kupper(i) = k
+    END DO
+  END DO
+
+  ! On evite kupper = 1 et kupper = klev
+  DO i = 1, klon
+    kupper(i) = max(kupper(i), 2)
+    kupper(i) = min(kupper(i), klev-1)
+  END DO 
   !---------- FIN nouveau calcul hw et ptop -------------------------------------