Ignore:
Timestamp:
Jul 28, 2025, 7:23:15 PM (9 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/surf_seaice_mod.F90

    r5285 r5791  
    2121       z0m, z0h, SFRWL, alb_dir_new, alb_dif_new, evap, fluxsens, fluxlat, & 
    2222       tsurf_new, dflux_s, dflux_l, &
    23        flux_u1, flux_v1 &
     23!GG       flux_u1, flux_v1)
     24       flux_u1, flux_v1, hice, tice,bilg_cumul, &
     25       fcds, fcdi, dh_basal_growth, dh_basal_melt, dh_top_melt, dh_snow2sic, &
     26       dtice_melt, dtice_snow2sic &
     27!GG
    2428#ifdef ISO
    2529         &      ,xtprecip_rain, xtprecip_snow,xtspechum,Roce, &
     
    101105    REAL, DIMENSION(klon), INTENT(OUT)       :: dflux_s, dflux_l     
    102106    REAL, DIMENSION(klon), INTENT(OUT)       :: flux_u1, flux_v1
     107!GG
     108    REAL, DIMENSION(klon), INTENT(INOUT)       :: hice, tice, bilg_cumul
     109    REAL, DIMENSION(klon), INTENT(INOUT)       :: fcds,fcdi, dh_basal_growth,dh_basal_melt
     110    REAL, DIMENSION(klon), INTENT(INOUT)       :: dh_top_melt, dh_snow2sic, dtice_melt, dtice_snow2sic
     111!GG
    103112#ifdef ISO
    104113    REAL, DIMENSION(ntiso,klon), INTENT(OUT) :: xtevap
     
    169178            AcoefH, AcoefQ, BcoefH, BcoefQ, &
    170179            AcoefU, AcoefV, BcoefU, BcoefV, &
    171             ps, u1, v1, gustiness, &
     180!GG            ps, u1, v1, gustiness, &
     181            ps, u1, v1, gustiness,pctsrf, &
     182!GG
    172183            radsol, snow, qsol, agesno, tsoil, &
    173184            qsurf, alb1_new, alb2_new, evap, fluxsens, fluxlat, flux_u1, flux_v1, &
    174             tsurf_new, dflux_s, dflux_l, rhoa &
     185!GG            tsurf_new, dflux_s, dflux_l, rhoa)
     186            tsurf_new, dflux_s, dflux_l,rhoa,swnet,hice, tice, bilg_cumul, &
     187            fcds, fcdi, dh_basal_growth, dh_basal_melt, dh_top_melt, dh_snow2sic, &
     188            dtice_melt, dtice_snow2sic &
     189!GG
    175190#ifdef ISO
    176191            ,xtprecip_rain, xtprecip_snow, xtspechum,Roce, &
Note: See TracChangeset for help on using the changeset viewer.