Changeset 4434

Timestamp:

Feb 13, 2023, 11:51:54 AM (23 months ago)

Author:

jyg

Message:

enabling replay of wake_popdyn2 alone

File:

• LMDZ6/trunk/libf/phylmd/wake.F90 (modified) (7 diffs)

LMDZ6/trunk/libf/phylmd/wake.F90

@@ -7 +7 @@
                 dtdwn, dqdwn, amdwn, amup, dta, dqa, wgen, &
                 sigd_con, Cin, &
-                deltatw, deltaqw, sigmaw, awdens, wdens, &           
+                deltatw, deltaqw, sigmaw, awdens, wdens, &                  ! state variables           
                 dth, hw, wape, fip, gfl, &
                 dtls, dqls, ktopw, omgbdth, dp_omgb, tu, qu, &
@@ -980 +980 @@
                              d_adens_death, d_adens_icol, d_adens_acol, d_adens_bnd )
      death_rate(:) = 0.
+sigmaw=sigmaw-d_sigmaw
+wdens=wdens-d_wdens
+awdens=awdens-d_awdens
    
-    ELSEIF (iflag_wk_pop_dyn == 0.) THEN
+    ELSEIF (iflag_wk_pop_dyn == 0) THEN
     
     ! cc nrlmd
@@ -1012 +1015 @@
       END DO
 
-    ENDIF   !  (iflag_wk_pop_dyn == 1)
+    ENDIF   !  (iflag_wk_pop_dyn >= 1)
 
 
@@ -2238 +2241 @@
     d_deltaqw, sigmaw, d_sigmaw, alpha)
   ! ------------------------------------------------------
-  ! D\'etermination du coefficient alpha tel que les tendances
+  ! Dtermination du coefficient alpha tel que les tendances
   ! corriges alpha*d_G, pour toutes les grandeurs G, correspondent
   ! a une humidite positive dans la zone (x) et dans la zone (w).
@@ -2546 +2549 @@
   REAL,                             INTENT(IN)          :: dtimesub
   REAL, DIMENSION (klon),           INTENT(IN)          :: wgen      !! B = birth rate of wakes
-  REAL, DIMENSION (klon),           INTENT(IN)          :: sigmaw    !! sigma = fractional area of wakes 
-  REAL, DIMENSION (klon),           INTENT(IN)          :: wdens     !! D = number of wakes per unit area 
-  REAL, DIMENSION (klon),           INTENT(IN)          :: awdens    !! A = number of active wakes per unit area
+  REAL, DIMENSION (klon),           INTENT(INOUT)       :: sigmaw    !! sigma = fractional area of wakes 
+  REAL, DIMENSION (klon),           INTENT(INOUT)       :: wdens     !! D = number of wakes per unit area 
+  REAL, DIMENSION (klon),           INTENT(INOUT)       :: awdens    !! A = number of active wakes per unit area
   REAL, DIMENSION (klon),           INTENT(IN)          :: gfl       !! Lg = gust front lenght per unit area
   REAL, DIMENSION (klon),           INTENT(IN)          :: cstar     !! C* = spreading velocity of wakes
-  REAL, DIMENSION (klon),           INTENT(IN)          :: cin, wape
+  REAL, DIMENSION (klon),           INTENT(IN)          :: cin, wape  ! RM : A Faire disparaitre
   REAL, DIMENSION (klon),           INTENT(IN)          :: rad_wk    !! r = wake radius
 
 !  
   REAL, DIMENSION (klon),           INTENT(OUT)         :: d_sigmaw, d_wdens, d_awdens
-  REAL, DIMENSION (klon),           INTENT(OUT)         :: cont_fact
+  REAL, DIMENSION (klon),           INTENT(OUT)         :: cont_fact  !! RM facteur de contact = 2 pi * rad * C*
   ! Some components of the tendencies of state variables  
   REAL, DIMENSION (klon),           INTENT(OUT)         :: d_sig_gen, d_sig_death, d_sig_col, d_sig_spread, d_sig_bnd
@@ -2589 +2592 @@
 !!          cont_fact(i) = 2.*(wgen(i)*(aa0-sigmaw(i)/wdens(i)) + gfl(i)*cstar(i)) / &
 !!                             (2.*(wdens(i)-awdens(i))**2*(2.*sigmaw(i)/wdens(i) - aa0) + wdens(i)*(1.-2.*sigmaw(i)))
-          cont_fact(i) = 2.*3.14*rad_wk(i)*cstar(i)
+!!          cont_fact(i) = 2.*3.14*rad_wk(i)*cstar(i)     ! bug
+!!          cont_fact(i) = 4.*3.14*rad_wk(i)*cstar(i)
+          cont_fact(i) = 2.*gfl(i)*cstar(i)/wdens(i)
 
           d_sig_gen(i) = wgen(i)*aa0
@@ -2654 +2659 @@
                        d_sig_gen(1), d_sig_death(1), d_sig_col(1), d_sigmaw(1)
       ENDIF
-    
+sigmaw=sigmaw+d_sigmaw
+wdens=wdens+d_wdens
+awdens=awdens+d_awdens
+
     RETURN 
     END SUBROUTINE wake_popdyn_2