Changeset 5489 for LMDZ6/branches/contrails/libf/phylmd/surf_landice_mod.F90

Timestamp:

Jan 17, 2025, 6:16:25 PM (13 days ago)

Author:

aborella

Message:

Merge with trunk

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/surf_landice_mod.F90 (modified) (11 diffs)

LMDZ6/branches/contrails/libf/phylmd/surf_landice_mod.F90

@@ -18 +18 @@
        ps, u1, v1, gustiness, rugoro, pctsrf, &
        snow, qsurf, qsol, qbs1, agesno, &
-       tsoil, z0m, z0h, SFRWL, alb_dir, alb_dif, evap, fluxsens, fluxlat, fluxbs, &
+       tsoil, z0m, z0h, SFRWL, alb_dir, alb_dif, evap, icesub_lic, fluxsens, fluxlat, fluxbs, &
        tsurf_new, dflux_s, dflux_l, &
        alt, slope, cloudf, &
@@ -48 +48 @@
 #endif
  
-!FC
     USE clesphys_mod_h
     USE yomcst_mod_h
-USE ioipsl_getin_p_mod, ONLY : getin_p
+    USE ioipsl_getin_p_mod, ONLY : getin_p
     USE lmdz_blowing_snow_ini, ONLY : c_esalt_bs, zeta_bs, pbst_bs, prt_bs, rhoice_bs, rhohard_bs
     USE lmdz_blowing_snow_ini, ONLY : rhofresh_bs, tau_eqsalt_bs, tau_dens0_bs, tau_densmin_bs
@@ -60 +59 @@
     USE dimsoil_mod_h, ONLY: nsoilmx
 
-!    INCLUDE "indicesol.h"
 
 
@@ -121 +119 @@
     REAL, DIMENSION(klon,nsw), INTENT(OUT)        :: alb_dir,alb_dif
 !albedo SB <<<
-    REAL, DIMENSION(klon), INTENT(OUT)            :: evap, fluxsens, fluxlat
+    REAL, DIMENSION(klon), INTENT(OUT)            :: evap, fluxsens, fluxlat, icesub_lic
     REAL, DIMENSION(klon), INTENT(OUT)            :: fluxbs
     REAL, DIMENSION(klon), INTENT(OUT)            :: tsurf_new
@@ -135 +133 @@
 #ifdef ISO
     REAL, DIMENSION(ntiso,klon), INTENT(OUT)     :: xtevap     
-!    real, DIMENSION(niso,klon) :: xtrun_off_lic_0_diag ! est une variable globale de
-!    fonte_neige
 #endif
  
@@ -163 +159 @@
     REAL, DIMENSION(niso,klon) :: xtsnow_prec,xtsol_prec
     REAL, DIMENSION(klon) :: snow_prec,qsol_prec
-!    real, DIMENSION(klon) :: run_off_lic_0_diag
 #endif
 
@@ -257 +252 @@
 !  landice_opt = 0 : soil_model, calcul_flux, fonte_neige, ...  
 !  landice_opt = 1  : prepare and call INterace Lmdz SISvat (INLANDSIS)
+!  landice_opt = 2  : skip surf_landice and use orchidee over all land surfaces 
 !****************************************************************************************
 
@@ -375 +371 @@
 !
 !****************************************************************************************
-!    beta(:) = 1.0
-!    dif_grnd(:) = 0.0
 
 ! Suppose zero surface speed
@@ -393 +387 @@
 #ifdef ISO
 #ifdef ISOVERIF
-     !write(*,*) 'surf_land_ice 1499'   
      DO i=1,knon
        IF (iso_eau > 0) THEN
@@ -427 +420 @@
 !
 !****************************************************************************************
-
-!
-!IM: plusieurs choix/tests sur l'albedo des "glaciers continentaux"
-!       alb1(1 : knon)  = 0.6 !IM cf FH/GK 
-!       alb1(1 : knon)  = 0.82
-!       alb1(1 : knon)  = 0.77 !211003 Ksta0.77
-!       alb1(1 : knon)  = 0.8 !KstaTER0.8 & LMD_ARMIP5
-!IM: KstaTER0.77 & LMD_ARMIP6    
 
 ! Attantion: alb1 and alb2 are not the same!
@@ -622 +607 @@
     CALL fonte_neige(knon, is_lic, knindex, dtime, &
          tsurf, precip_rain, precip_totsnow, &
-         snow, qsol, tsurf_new, evap_totsnow &
+         snow, qsol, tsurf_new, evap_totsnow, icesub_lic &
 #ifdef ISO    
      &  ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag     &