Changeset 4826

Timestamp:

Feb 16, 2024, 12:42:21 PM (11 months ago)

Author:

jyg

Message:

New flag in alpale_th.F90: multiply_proba_notrig; default=.FALSE.

File:

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

LMDZ6/trunk/libf/phylmd/alpale_th.F90

@@ -53 +53 @@
   INTEGER                                                    :: i
   LOGICAL, SAVE                                              :: first = .TRUE.
+  LOGICAL, SAVE                                              :: multiply_proba_notrig = .FALSE.
   REAL, SAVE                                                 :: random_notrig_max=1.
   REAL, SAVE                                                 :: cv_feed_area
@@ -59 +60 @@
   REAL, DIMENSION(klon)                                      :: tau_trig
 !
+    !$OMP THREADPRIVATE(multiply_proba_notrig) 
     !$OMP THREADPRIVATE(random_notrig_max) 
     !$OMP THREADPRIVATE(cv_feed_area) 
@@ -65 +67 @@
  REAL umexp  ! expression of (1.-exp(-x))/x valid for all x, especially when x->0
  REAL x
+!
      CHARACTER (LEN=20) :: modname='alpale_th'
      CHARACTER (LEN=80) :: abort_message
@@ -83 +86 @@
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 !
+
+    IF (first) THEN
+      CALL getin_p('multiply_proba_notrig',multiply_proba_notrig)
+      IF (iflag_clos_bl .LT. 3) THEN
+         random_notrig_max=1.
+         CALL getin_p('random_notrig_max',random_notrig_max)
+      ELSEIF (iflag_clos_bl .EQ. 3) THEN  ! (iflag_clos_bl .LT. 3)
+         cv_feed_area = 1.e10   ! m2
+         CALL getin_p('cv_feed_area', cv_feed_area)
+      ENDIF  !! (iflag_clos_bl .LT. 3)
+      first=.FALSE.
+    ENDIF
+
 !!
 !!  The following 3 lines should be commented if one wants to activate the 
@@ -88 +104 @@
 !! scheme.
 !!
-             do i=1,klon
+    IF (.NOT.multiply_proba_notrig) THEN
+             DO i=1,klon
                 proba_notrig(i)=1.
-             enddo
+             ENDDO
+    ENDIF  !! (.NOT.multiply_proba_notrig)
 !!
 !!
@@ -99 +117 @@
 !      Original code (Nicolas Rochetin)
 !     --------------------------------
-
-    IF (first) THEN
-       random_notrig_max=1.
-       CALL getin_p('random_notrig_max',random_notrig_max)
-       first=.FALSE.
-    ENDIF
           !cc nrlmd le 10/04/2012
           !-----------Stochastic triggering-----------
@@ -220 +232 @@
 !      New code with Effective Lifting Power
 !     -------------------------------------
-    IF (first) THEN
-       cv_feed_area = 1.e10   ! m2
-       CALL getin_p('cv_feed_area', cv_feed_area)
-       first=.FALSE.
-    ENDIF
 
           !-----------Stochastic triggering-----------