Ignore:
Timestamp:
Jul 28, 2025, 7:23:15 PM (7 days ago)
Author:
aborella
Message:

Merge with trunk r5789

Location:
LMDZ6/branches/contrails
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/contrails

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

    r5618 r5791  
    11! $Id$
     2!$gpum horizontal klon nlon
    23MODULE calwake_mod
    34  PRIVATE
     
    5758  USE indice_sol_mod, ONLY: is_oce
    5859  USE print_control_mod, ONLY: lunout, prt_level
    59   USE lmdz_wake, ONLY : wake
     60  USE lmdz_wake, ONLY : wake, wake2
     61  USE alpale_mod, ONLY: iflag_wake
    6062  USE yomcst_mod_h
    6163IMPLICIT NONE
     
    240242
    241243
    242   CALL wake(klon,klev,znatsurf, p, ph, pi, dtime, &
    243     te, qe, omgbe, &
    244     dtdwn, dqdwn, amdwn, amup, dta, dqa, wgen, &
    245     sigd0, Cin, &
    246     dtw, dqw, sigmaw, asigmaw, wdens, awdens, &                      ! state variables
    247     dth, hw, wape, fip, gfl, &
    248     dtls, dqls, ktopw, omgbdth, dp_omgb, tx, qx, &
    249     dtke, dqke, omg, dp_deltomg, spread, cstar, &
    250     d_deltat_gw, &
    251     d_deltatw, d_deltaqw, d_sigmaw, d_asigmaw, d_wdens, d_awdens)      ! tendencies
     244  IF (iflag_wake/10 == 0) THEN
     245    CALL wake(klon,klev,znatsurf, p, ph, pi, dtime, &
     246      te, qe, omgbe, &
     247      dtdwn, dqdwn, amdwn, amup, dta, dqa, wgen, &
     248      sigd0, Cin, &
     249      dtw, dqw, sigmaw, asigmaw, wdens, awdens, &                      ! state variables
     250      dth, hw, wape, fip, gfl, &
     251      dtls, dqls, ktopw, omgbdth, dp_omgb, tx, qx, &
     252      dtke, dqke, omg, dp_deltomg, spread, cstar, &
     253      d_deltat_gw, &
     254      d_deltatw, d_deltaqw, d_sigmaw, d_asigmaw, d_wdens, d_awdens)      ! tendencies
     255
     256  ELSE IF (iflag_wake/10 == 2) THEN
     257    CALL wake2(klon,klev,znatsurf, p, ph, pi, dtime, &
     258      te, qe, omgbe, &
     259      dtdwn, dqdwn, amdwn, amup, dta, dqa, wgen, &
     260      sigd0, Cin, &
     261      dtw, dqw, sigmaw, asigmaw, wdens, awdens, &                      ! state variables
     262      dth, hw, wape, fip, gfl, &
     263      dtls, dqls, ktopw, omgbdth, dp_omgb, tx, qx, &
     264      dtke, dqke, omg, dp_deltomg, spread, cstar, &
     265      d_deltat_gw, &
     266      d_deltatw, d_deltaqw, d_sigmaw, d_asigmaw, d_wdens, d_awdens)      ! tendencies
     267
     268  END IF  !(iflag_wake/10 == 0)
     269
    252270
    253271!
Note: See TracChangeset for help on using the changeset viewer.