Changeset 5618 for LMDZ6/branches/contrails/libf/phylmd/calwake.f90

Timestamp:

Apr 15, 2025, 11:56:45 AM (2 months ago)

Author:

aborella

Message:

Merge with trunk testing r5597. We have convergence in prod and debug in NPv7.0.1c

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/calwake.f90 (modified) (5 diffs)

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

@@ -1 @@
-
 ! $Id$
+MODULE calwake_mod
+  PRIVATE
+
+  LOGICAL, SAVE, ALLOCATABLE :: first(:) ! first(klon) : first calwake computation on columns
+  !$OMP THREADPRIVATE(first)
+
+  LOGICAL, SAVE :: first_first=.TRUE.  ! fisrt call to calwake
+  !$OMP THREADPRIVATE(first_first)  
+
+  PUBLIC calwake_first, calwake
+
+CONTAINS  
+
+SUBROUTINE calwake_first(dtime)
+USE dimphy, ONLY : klon,klev
+USE lmdz_wake, ONLY : wake_first
+  REAL, INTENT(IN)  :: dtime 
+  
+  IF (first_first) THEN
+    ALLOCATE(first(klon))
+    first(:)=.TRUE.
+    
+    CALL wake_first(klev, dtime)
+
+    first_first=.FALSE.
+  ENDIF
+
+END SUBROUTINE calwake_first
+
 
 SUBROUTINE calwake(iflag_wake_tend, paprs, pplay, dtime, &
@@ -28 +56 @@
   USE phys_state_var_mod, ONLY: pctsrf
   USE indice_sol_mod, ONLY: is_oce
-  USE print_control_mod, ONLY: mydebug=>debug , lunout, prt_level
+  USE print_control_mod, ONLY: lunout, prt_level
   USE lmdz_wake, ONLY : wake
   USE yomcst_mod_h
@@ -76 +104 @@
   ! Variable internes
   ! -----------------
-  LOGICAL, SAVE                                      :: first = .TRUE.
-  !$OMP THREADPRIVATE(first)
   INTEGER                                            :: i, l
   INTEGER, DIMENSION(klon)                           :: znatsurf    ! 0 if pctsrf(is_oce)>0.1; 1 else.
@@ -318 +344 @@
   ENDIF  ! (iflag_wake_tend .EQ. 0)
 !
-  IF (first) THEN
-    DO i = 1,klon
+  DO i = 1,klon
+    IF (first(i)) THEN
       IF (wake_dens(i) < -1.) THEN
         wake_dens(i) = wdens(i)
       ENDIF
-    ENDDO
-    first=.false.
-  ENDIF  ! (first)
+      first(i)=.FALSE.
+    ENDIF  
+  ENDDO
+    
 !>jyg
   IF (prt_level >= 10) THEN
@@ -334 +361 @@
 END SUBROUTINE calwake
 
-
+END MODULE calwake_mod