Changeset 4814

Timestamp:

Feb 12, 2024, 4:03:59 PM (3 months ago)

Author:

fhourdin

Message:

Nettoyage poches

File:

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

LMDZ6/trunk/libf/phylmd/lmdz_wake.F90

@@ -708 +708 @@
       ! IM v3JYG; ptop_provis(i).LT. ph(i,1)
 
+! LJYF : mettre cette ligne à la place de la suivante      IF (dth(i,k)>=-delta_t_min .AND. dth(i,k-1)<-delta_t_min .AND. &
       IF (dth(i,k)>-delta_t_min .AND. dth(i,k-1)<-delta_t_min .AND. &
           ptop_provis(i)==ph(i,1)) THEN
@@ -766 +767 @@
   ! -5/ Determination de ktop et kupper
 
-  CALL pkupper (klon, klev, ptop, ph, pupper, kupper)
-  
   DO k = klev, 1, -1
     DO i = 1, klon
@@ -785 +784 @@
     DO i = 1, klon
       IF (k<=ktop(i) .AND. ptop_new(i)==ptop(i) .AND. &
+! LJYF changer par cette ligne          dth(i,k)>=-delta_t_min .AND. dth(i,k-1)<-delta_t_min) THEN
           dth(i,k)>-delta_t_min .AND. dth(i,k-1)<-delta_t_min) THEN
         ptop_new(i) = ((dth(i,k)+delta_t_min)*p(i,k-1)-(dth(i, &
@@ -802 +802 @@
   END DO
 
+  CALL pkupper (klon, klev, ptop, ph, pupper, kupper)
+  
   IF (prt_level>=10) THEN
     PRINT *, 'wake-3, ktop(igout), kupper(igout) ', ktop(igout), kupper(igout)
@@ -989 +991 @@
   !
   ! ------------------------------------------------------------------------
-  !
-    CALL pkupper (klon, klev, ptop, ph, pupper, kupper)
- 
-    !print*, 'ptop, pupper, ktop, kupper', ptop, pupper, ktop, kupper
-
     ! wk_adv is the logical flag enabling wake evolution in the time advance
     ! loop
@@ -1843 +1840 @@
       DO i = 1, klon
         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
             dth(i,k)>-delta_t_min .AND. dth(i,k-1)<-delta_t_min) THEN
           ptop_provis(i) = ((dth(i,k)+delta_t_min)*p(i,k-1) - &
@@ -1916 +1914 @@
         ! IM v3JYG; IF (k .GE. ktop(i)
         IF (wk_adv(i) .AND. k<=ktop(i) .AND. ptop_new(i)==ptop(i) .AND. &
+! LJYF changer :           dth(i,k)>=-delta_t_min .AND. dth(i,k-1)<-delta_t_min) THEN
             dth(i,k)>-delta_t_min .AND. dth(i,k-1)<-delta_t_min) THEN
           ptop_new(i) = ((dth(i,k)+delta_t_min)*p(i,k-1) - &
@@ -1937 +1936 @@
       END DO
     END DO
+
+    CALL pkupper (klon, klev, ptop, ph, pupper, kupper)
+ 
 
     ! 5/ Set deltatw & deltaqw to 0 above kupper
@@ -2087 +2089 @@
   ! ------------------------------------------------------------------------
   !
-  END DO                  ! end sub-timestep loop
+  END DO   ! isubstep end sub-timestep loop
+
   !
   ! ------------------------------------------------------------------------