Changeset 5618 for LMDZ6/branches/contrails/libf/phylmd/lmdz_wake.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/lmdz_wake.f90 (modified) (3 diffs)

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

@@ -4 +4 @@
 
   IMPLICIT NONE; PRIVATE
-  PUBLIC wake
+  
+  LOGICAL, PARAMETER :: phys_sub=.false.
+  LOGICAL            :: first_call=.true.
+  !$OMP THREADPRIVATE(first_call)
+
+  PUBLIC wake, wake_first
 
 CONTAINS
+
+SUBROUTINE wake_first(klev, dtime)            
+USE lmdz_wake_ini , ONLY : wk_nsub
+IMPLICIT NONE  
+  INTEGER, INTENT(IN) :: klev
+  REAL, INTENT(IN)    :: dtime
+  REAL                :: dtimesub
+
+  dtimesub = dtime/wk_nsub
+  !
+  IF (first_call) THEN
+    IF (CPPKEY_IOPHYS_WK) THEN
+      IF (phys_sub) THEN
+        call iophys_ini(dtimesub,klev)
+      ELSE
+        call iophys_ini(dtime,klev)
+      ENDIF
+    END IF
+    first_call = .false.
+  ENDIF   !(first_call)
+
+END SUBROUTINE wake_first
 
 SUBROUTINE wake(klon,klev,znatsurf, p, ph, pi, dtime, &
@@ -306 +333 @@
   REAL, DIMENSION(klon)                                 :: wdens_in, awdens_in   ! pour les prints
 
-!!!  LOGICAL                                               :: phys_sub=.true.
-  LOGICAL                                               :: phys_sub=.false.
-
-  LOGICAL                                               :: first_call=.true.
-
-
   !!-- variables liees au nouveau calcul de ptop et hw
   REAL, DIMENSION (klon, klev)                          :: int_dth
@@ -350 +371 @@
   ! alpk = 0.05
 !
- igout = klon/2+1/klon
+ igout = klon/2+1/klon  
 !
 !   sub-time-stepping parameters
   dtimesub = dtime/wk_nsub
 !
-IF (first_call) THEN
-IF (CPPKEY_IOPHYS_WK) THEN
-  IF (phys_sub) THEN
-    call iophys_ini(dtimesub)
-  ELSE
-    call iophys_ini(dtime)
-  ENDIF
-END IF
-  first_call = .false.
-ENDIF   !(first_call)
-
  IF (iflag_wk_pop_dyn == 0) THEN
   ! Initialisation de toutes des densites a wdens_ref.