Changeset 5791 for LMDZ6/branches/contrails/libf/phylmd/cv3p1_closure.f90

Timestamp:

Jul 28, 2025, 7:23:15 PM (6 days ago)

Author:

aborella

Message:

Merge with trunk r5789

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/cv3p1_closure.f90 (modified) (6 diffs)

LMDZ6/branches/contrails/libf/phylmd/cv3p1_closure.f90

@@ -1 +1 @@
 
 ! $Id$
+MODULE cv3p1_closure_mod
+PRIVATE
+PUBLIC cv3p1_closure
+CONTAINS
 
 SUBROUTINE cv3p1_closure(nloc, ncum, nd, icb, inb, pbase, plcl, p, ph, tv, &
@@ -24 +28 @@
   USE print_control_mod, ONLY: prt_level, lunout
   USE yomcst_mod_h
+  USE cv3_cine_mod, ONLY : cv3_cine
+  USE cv3_buoy_mod, ONLY : cv3_buoy
 IMPLICIT NONE
 
@@ -88 +94 @@
 !>jyg
 
-  REAL sigmax
-  PARAMETER (sigmax=0.1)
-
-  CHARACTER (LEN=20) :: modname = 'cv3p1_closure'
+  REAL,PARAMETER :: sigmax = 0.1
+
+  CHARACTER (LEN=20), PARAMETER :: modname = 'cv3p1_closure'
   CHARACTER (LEN=80) :: abort_message
 
@@ -149 +154 @@
   ! compute icbmax:
 
-  icbmax = 2
-  DO il = 1, ncum
-    icbmax = max(icbmax, icb(il))
-  END DO
+!ym break the column independance
+!ym  icbmax = 2
+!ym  DO il = 1, ncum
+!ym    icbmax = max(icbmax, icb(il))
+!ym  END DO
+
   ! if(prt.level.GE.20) print*,'cv3p1_param apres 200'
 
   ! update sig and w0 below cloud base:
-
-  DO k = 1, icbmax
-    DO il = 1, ncum
-      IF (k<=icb(il)) THEN
-        sig(il, k) = beta*sig(il, k) - 2.*alpha*buoy(il, icb(il))*buoy(il, &
-          icb(il))
-        sig(il, k) = amax1(sig(il,k), 0.0)
-        w0(il, k) = beta*w0(il, k)
-      END IF
+!ym column independance
+!ym  DO k = 1, icbmax
+  DO k = 1, nd
+    DO il = 1, ncum
+      IF (k<=MAX(2,icb(il))) THEN
+        IF (k<=icb(il)) THEN
+          sig(il, k) = beta*sig(il, k) - 2.*alpha*buoy(il, icb(il))*buoy(il, &
+            icb(il))
+          sig(il, k) = amax1(sig(il,k), 0.0)
+          w0(il, k) = beta*w0(il, k)
+        END IF
+      ENDIF
     END DO
   END DO
@@ -321 +331 @@
           supmax0(il) = ((p(il,i)-pzero(il))*asupmax(il,i-1)-(p(il, &
             i-1)-pzero(il))*asupmax(il,i))/(p(il,i)-p(il,i-1))
-          GO TO 425
+!ym WARNING : probably bad GOTO branching ===> to check !
+!ym          GO TO 425
         END IF ! end IF (P(i) ... )
       END IF ! end IF (icb+1 le i le inb)
     END DO
   END DO
-
-425 CONTINUE
+!ym bad branching
+!ym 425 CONTINUE
   IF (prt_level>=20) PRINT *, 'cv3p1_param apres 425.'
 
@@ -772 +783 @@
 END SUBROUTINE cv3p1_closure
 
-
+END MODULE cv3p1_closure_mod
+