Ignore:
Timestamp:
Jan 17, 2025, 6:16:25 PM (13 days ago)
Author:
aborella
Message:

Merge with trunk

Location:
LMDZ6/branches/contrails
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/contrails

  • LMDZ6/branches/contrails/libf/phylmd/fonte_neige_mod.F90

    r5285 r5489  
    231231  SUBROUTINE fonte_neige( knon, nisurf, knindex, dtime, &
    232232       tsurf, precip_rain, precip_snow, &
    233        snow, qsol, tsurf_new, evap &
     233       snow, qsol, tsurf_new, evap, ice_sub &
    234234#ifdef ISO   
    235235     & ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag   &
     
    288288    REAL, DIMENSION(klon), INTENT(INOUT) :: evap
    289289
     290
     291    REAL, DIMENSION(klon), INTENT(OUT)   :: ice_sub
    290292#ifdef ISO   
    291293        ! sortie de quelques diagnostiques
     
    297299    REAL, DIMENSION(klon), INTENT(OUT) ::  runoff_diag   
    298300    REAL, DIMENSION(klon), INTENT(OUT) :: run_off_lic_diag 
    299     REAL,                  INTENT(OUT) :: coeff_rel_diag
    300 #endif
     301    REAL,                  INTENT(OUT) :: coeff_rel_diag   
     302#endif
     303
    301304
    302305! Local variables
     
    345348
    346349    snow_evap = 0.
     350    ice_sub(:) = 0.
    347351 
    348352    IF (.NOT. ok_lic_cond) THEN
     
    363367   
    364368    bil_eau_s(:) = (precip_rain(:) * dtime) - (evap(:) - snow_evap(:)) * dtime
     369
     370    IF (nisurf==is_lic) THEN
     371       DO i=1,knon
     372          ice_sub(i)=evap(i)-snow_evap(i)
     373       ENDDO
     374    ENDIF
     375
    365376#ifdef ISO
    366377    snow_evap_diag(:) = snow_evap(:)
Note: See TracChangeset for help on using the changeset viewer.