Changeset 6107 for LMDZ6/trunk/libf

Timestamp:

Mar 17, 2026, 1:41:15 AM (13 days ago)

Author:

fhourdin

Message:

Deplacement d'initialisations dans physiq_mod

Location:

LMDZ6/trunk/libf

Files:

• phylmd/lmdz_call_lscp.f90 (modified) (1 diff)
• phylmd/physiq_mod.F90 (modified) (8 diffs)
• phylmdiso/physiq_mod.F90 (modified) (7 diffs)

LMDZ6/trunk/libf/phylmd/lmdz_call_lscp.f90

@@ -305 +305 @@
       ELSE
 
-         ! old (pre-cmip7) code
-         !$gpum nocall
-         CALL fisrtilp_first(klon, klev, dtime, pfrac_impa, pfrac_nucl, pfrac_1nucl)
-
          CALL fisrtilp(klon, klev, dtime, paprs, pplay, &
                        temp, qt, ptconv, ratqs, sigma_qtherm, &

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -56 +56 @@
     USE assert_m, only: assert
     USE change_srf_frac_mod
+    USE lmdz_lscp_old, ONLY: fisrtilp_first
+
 
     USE conf_phys_m, ONLY : conf_phys
@@ -1179 +1181 @@
     !======================================================================!
     if (debut) then                                                        !
-       print*,'DEBUT PHYSIQ_MOD TRAVAIL DEBUT 2'
+       print*,'DEBUT PHYSIQ_MOD TRAVAIL DEBUT 5'
        iflag_physiq=0
        call getin_p('iflag_physiq', iflag_physiq)                          !
@@ -1722 +1724 @@
        CALL thermcell_ini(iflag_thermals,prt_level,tau_thermals,lunout, &
             &    RG,RD,RCPD,RKAPPA,RLVTT,RETV)
+       IF (iflag_thermals>=1) THEN
+          CALL alpale_th_first()
+       ENDIF
+
        CALL lscp_ini(pdtphys,klon,klev,iflag_thermals,iflag_cld_th,iflag_ice_thermo, & 
                   lunout,prt_level,ok_ice_supersat,fl_cor_ebil,                       &
                   RCPD,RLSTT,RLVTT,RLMLT,RVTMP2,RTT,RD,RV,RG,RPI,EPS_W)
+       IF (ok_new_lscp) THEN
+           ! old (pre-cmip7) code
+           !$gpum nocall
+           CALL fisrtilp_first(klon, klev, pdtphys, pfrac_impa, pfrac_nucl, pfrac_1nucl)
+       ENDIF
+
        CALL blosno_ini(RCPD, RLSTT, RLVTT, RLMLT, RVTMP2, RTT,RD,RG, RV, RPI)
        CALL gwd_ini(klon, klev, pplay, paprs, lunout, prt_level, RCPD, RD, RG, RPI, & 
@@ -1895 +1907 @@
              CALL ini_wake(0.,0.,it_wape_prescr,wape_prescr,fip_prescr &
                   ,alp_bl_prescr, ale_bl_prescr)
+             CALL calWAKE_first(phys_tstep)
              ! 11/09/06 rajout initialisation ALE et ALP du wake et PBL(YU)
              !        print*,'apres ini_wake iflag_cld_th=', iflag_cld_th
@@ -1914 +1927 @@
              d_dens_wk(:) = 0.
              d_dens_a_wk(:) = 0.
+
+             IF (iflag_alp_wk_cond .GT. 0.) THEN
+                CALL alpale_wk_first(cell_area)
+             ENDIF
+
           ENDIF  !  (iflag_wake>=1)
 
@@ -3500 +3518 @@
        IF (iflag_alp_wk_cond .GT. 0.) THEN
 
-          CALL alpale_wk_first(cell_area)
           CALL alpale_wk(phys_tstep, cell_area, wake_k, wake_s, wake_dens, wake_fip_0, &
                wake_fip)
@@ -3564 +3581 @@
        ENDDO
        !cc fin nrlmd le 10/04/2012
+
 
        IF (iflag_thermals>=1) THEN
@@ -3684 +3702 @@
           !
           !
-          CALL alpale_th_first()
           CALL alpale_th( phys_tstep, lmax_th, t_seri, cell_area,  &
                cin, s2, n2, strig, &

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -1258 +1258 @@
     !======================================================================!
     IF (debut) THEN                                                        !
+       print*,'DEBUT PHYSIQ_MOD ISO TRAVAIL DEBUT 5'
        iflag_physiq=0                                                      !
        CALL getin_p('iflag_physiq', iflag_physiq)                          !
@@ -1838 +1839 @@
        CALL thermcell_ini(iflag_thermals,prt_level,tau_thermals,lunout, &
             &    RG,RD,RCPD,RKAPPA,RLVTT,RETV)
+       IF (iflag_thermals>=1) THEN
+          CALL alpale_th_first()
+       ENDIF
+
        CALL lscp_ini(pdtphys,klon,klev,iflag_thermals,iflag_cld_th,iflag_ice_thermo, &
                   lunout,prt_level,ok_ice_supersat,fl_cor_ebil,                       &
                   RCPD,RLSTT,RLVTT,RLMLT,RVTMP2,RTT,RD,RV,RG,RPI,EPS_W)
+       IF (ok_new_lscp) THEN
+           ! old (pre-cmip7) code
+           !$gpum nocall
+           CALL fisrtilp_first(klon, klev, pdtphys, pfrac_impa, pfrac_nucl, pfrac_1nucl)
+       ENDIF
+
        CALL blosno_ini(RCPD, RLSTT, RLVTT, RLMLT, RVTMP2, RTT,RD,RG, RV, RPI)
        CALL gwd_ini(klon, klev, pplay, paprs, lunout, prt_level, RCPD, RD, RG, RPI, ROMEGA, RA, RKAPPA, RLVTT, ok_strato)
@@ -2028 +2039 @@
              CALL ini_wake(0.,0.,it_wape_prescr,wape_prescr,fip_prescr &
                   ,alp_bl_prescr, ale_bl_prescr)
+             CALL calWAKE_first(phys_tstep)
+
              ! 11/09/06 rajout initialisation ALE et ALP du wake et PBL(YU)
              !        print*,'apres ini_wake iflag_cld_th=', iflag_cld_th
@@ -2053 +2066 @@
              d_deltaxt_ajs_cv(:,:,:) = 0.
 #endif
+             IF (iflag_alp_wk_cond .GT. 0.) THEN
+                CALL alpale_wk_first(cell_area)
+             ENDIF
+
+
           ENDIF  !  (iflag_wake>=1)
 
@@ -4352 +4370 @@
         !
         !calcul caracteristiques de la poche froide
-        CALL calWAKE_first(phys_tstep)
         CALL calWAKE (iflag_wake_tend, paprs, pplay, phys_tstep, &
                t_seri, q_seri, omega,  &
@@ -4425 +4442 @@
       IF (iflag_alp_wk_cond .GT. 0.) THEN
 
-        CALL alpale_wk_first(cell_area)
         CALL alpale_wk(phys_tstep, cell_area, wake_k, wake_s, wake_dens, wake_fip_0, &
                         wake_fip)
@@ -4752 +4768 @@
           !
 !
-          CALL alpale_th_first()
           CALL alpale_th( phys_tstep, lmax_th, t_seri, cell_area,  &
                           cin, s2, n2, strig, &