Changeset 5717 for LMDZ6/branches/contrails/libf/phylmdiso

Timestamp:

Jun 18, 2025, 5:12:20 PM (5 weeks ago)

Author:

aborella

Message:

Merge with trunk r5653

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmdiso/lmdz_cloudth.f90 (deleted)
• libf/phylmdiso/lmdz_cloudth_ini.f90 (deleted)
• libf/phylmdiso/lmdz_lscp.f90 (deleted)
• libf/phylmdiso/lmdz_lscp_main.f90 (copied) (copied from LMDZ6/trunk/libf/phylmdiso/lmdz_lscp_main.f90)
• libf/phylmdiso/lmdz_lscp_old.F90 (modified) (1 diff)
• libf/phylmdiso/lmdz_surf_wind.f90 (copied) (copied from LMDZ6/trunk/libf/phylmdiso/lmdz_surf_wind.f90)
• libf/phylmdiso/lmdz_surf_wind_ini.f90 (copied) (copied from LMDZ6/trunk/libf/phylmdiso/lmdz_surf_wind_ini.f90)
• libf/phylmdiso/phyaqua_mod.F90 (modified) (1 diff)
• libf/phylmdiso/phyetat0_mod.F90 (modified) (1 diff)
• libf/phylmdiso/phyredem.F90 (modified) (1 diff)
• libf/phylmdiso/physiq_mod.F90 (modified) (10 diffs)
• libf/phylmdiso/soil_hetero.F90 (copied) (copied from LMDZ6/trunk/libf/phylmdiso/soil_hetero.F90)
• libf/phylmdiso/surf_land_bucket_hetero_mod.F90 (copied) (copied from LMDZ6/trunk/libf/phylmdiso/surf_land_bucket_hetero_mod.F90)
• libf/phylmdiso/surf_param_mod.F90 (copied) (copied from LMDZ6/trunk/libf/phylmdiso/surf_param_mod.F90)

LMDZ6/branches/contrails/libf/phylmdiso/lmdz_lscp_old.F90

@@ -22 +22 @@
   USE icefrac_lsc_mod ! compute ice fraction (JBM 3/14)
   USE print_control_mod, ONLY: prt_level, lunout
-  USE lmdz_cloudth, only : cloudth, cloudth_v3, cloudth_v6
+  USE lmdz_lscp_condensation, only : cloudth, cloudth_v3, cloudth_v6
   USE ioipsl_getin_p_mod, ONLY : getin_p
   USE phys_local_var_mod, ONLY: ql_seri,qs_seri

LMDZ6/branches/contrails/libf/phylmdiso/phyaqua_mod.F90

@@ -294 +294 @@
     clesphy0(3) = 1. ! cycle_diurne
     clesphy0(4) = 1. ! soil_model
-    clesphy0(5) = 1. ! new_oliq
+    clesphy0(5) = 1. ! liqice_in_radocond
     clesphy0(6) = 0. ! ok_orodr
     clesphy0(7) = 0. ! ok_orolf

LMDZ6/branches/contrails/libf/phylmdiso/phyetat0_mod.F90

@@ -175 +175 @@
   IF (iflag_cycle_diurne.GE.1) tab_cntrl( 7) = iflag_cycle_diurne
   IF (soil_model) tab_cntrl( 8) =1.
-  IF (new_oliq) tab_cntrl( 9) =1.
+  IF (liqice_in_radocond) tab_cntrl( 9) =1.
   IF (ok_orodr) tab_cntrl(10) =1.
   IF (ok_orolf) tab_cntrl(11) =1.

LMDZ6/branches/contrails/libf/phylmdiso/phyredem.F90

@@ -121 +121 @@
   IF( iflag_cycle_diurne.GE.1 ) tab_cntrl( 7 ) = iflag_cycle_diurne
   IF(   soil_model ) tab_cntrl( 8 ) = 1.
-  IF(     new_oliq ) tab_cntrl( 9 ) = 1.
+  IF(     liqice_in_radocond ) tab_cntrl( 9 ) = 1.
   IF(     ok_orodr ) tab_cntrl(10 ) = 1.
   IF(     ok_orolf ) tab_cntrl(11 ) = 1.

LMDZ6/branches/contrails/libf/phylmdiso/physiq_mod.F90

@@ -75 +75 @@
     USE write_field_phy
     use wxios_mod, ONLY: g_ctx, wxios_set_context
-    USE lmdz_lscp, ONLY : lscp
+    USE lmdz_lscp_main, ONLY : lscp
     USE lmdz_call_cloud_optics_prop, ONLY : call_cloud_optics_prop
     USE lmdz_lscp_old, ONLY : fisrtilp
     USE lmdz_call_blowing_snow, ONLY : call_blowing_snow_sublim_sedim
     USE lmdz_wake_ini, ONLY : wake_ini
+    USE lmdz_surf_wind_ini, ONLY : surf_wind_ini
+    USE lmdz_surf_wind, ONLY : surf_wind
     USE yamada_ini_mod, ONLY : yamada_ini
     USE lmdz_atke_turbulence_ini, ONLY : atke_ini
@@ -365 +367 @@
        rneblsvol, &
        pfraclr, pfracld, cldfraliq, sigma2_icefracturb, mean_icefracturb,  &
+       cldfraliqth, sigma2_icefracturbth, mean_icefracturbth,  &
        distcltop, temp_cltop,  &
        !-- LSCP - condensation and ice supersaturation variables
@@ -525 +528 @@
     !cc      PARAMETER (soil_model=.FALSE.)
     !======================================================================
-    ! Dans les versions precedentes, l'eau liquide nuageuse utilisee dans
-    ! le calcul du rayonnement est celle apres la precipitation des nuages.
-    ! Si cette cle new_oliq est activee, ce sera une valeur moyenne entre
-    ! la condensation et la precipitation. Cette cle augmente les impacts
-    ! radiatifs des nuages.
-    !cc      LOGICAL new_oliq
-    !cc      PARAMETER (new_oliq=.FALSE.)
-    !======================================================================
     ! Clefs controlant deux parametrisations de l'orographie:
     !c      LOGICAL ok_orodr
@@ -1370 +1365 @@
     !AI namelist pour gerer le double appel de Ecrad
     CHARACTER(len=512) :: namelist_ecrad_file
+
+    ! Subgrid scale wind :
+    ! Need to be allocatable/save because the number of bin is not known (provided by surf_wind_ini)
+    integer, save :: nsurfwind=1 
+    real, dimension(:,:), allocatable, save :: surf_wind_value, surf_wind_proba ! module and probability of sugrdi wind wind sample
+    !$OMP THREADPRIVATE(nsurfwind,surf_wind_value, surf_wind_proba)
 
     !======================================================================!
@@ -1973 +1974 @@
 
        CALL iniradia(klon,klev,paprs(1,1:klev+1))
+
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+       CALL surf_wind_ini(klon,lunout)
+       CALL getin_p('nsurfwind',nsurfwind)
+       allocate(surf_wind_value(klon,nsurfwind),surf_wind_proba(klon,nsurfwind))
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -3341 +3348 @@
                                 !>nrlmd+jyg
              treedrg &            
+!AM 
+            , tsurf_tersrf, tsoil_tersrf, qsurf_tersrf, tsurf_new_tersrf, &
+            cdragm_tersrf, cdragh_tersrf, &
+            swnet_tersrf, lwnet_tersrf, fluxsens_tersrf, fluxlat_tersrf &
 #ifdef ISO
      &   ,xtrain_fall, xtsnow_fall,xt_seri, &
@@ -4944 +4955 @@
 
     ENDIF
+
+    !
+    !===================================================================
+    ! Computation of subrgid scale near-surface wind distribution
+    ! Developed for dust lifting. Could be extended to coupling with ocean and others
+    ! by default : 1 bin equal to the mean wind
+       
+     call surf_wind(klon,nsurfwind,zu10m,zv10m,wake_s,wake_Cstar,zustar,ale_bl,surf_wind_value,surf_wind_proba)
+    
+
     !
     !===================================================================
@@ -5081 +5102 @@
          t_seri, q_seri, ql_seri_lscp, qi_seri_lscp, ptconv, ratqs, sigma_qtherm, &
          d_t_lsc, d_q_lsc, d_ql_lsc, d_qi_lsc, rneb, rneblsvol, &
-         pfraclr, pfracld, cldfraliq, sigma2_icefracturb, mean_icefracturb,  &
+         pfraclr, pfracld, cldfraliq, cldfraliqth, &
+         sigma2_icefracturb, sigma2_icefracturbth, &
+         mean_icefracturb, mean_icefracturbth,     &
          radocond, picefra, rain_lsc, snow_lsc, &
          frac_impa, frac_nucl, beta_prec_fisrt, &
          prfl, psfl, rhcl,  &
-         zqasc, fraca,ztv,zpspsk,ztla,zthl,iflag_cld_th, &
+         zqasc, fraca,ztv,zpspsk,ztla,zthl,zw2,iflag_cld_th, &
          iflag_ice_thermo, distcltop, temp_cltop,   &
          pbl_tke(:,:,is_ave), pbl_eps(:,:,is_ave), &
+         entr_therm, detr_therm, &
          cell_area, &
          cf_seri, rvc_seri, u_seri, v_seri, &
@@ -5195 +5219 @@
        DO i = 1, klon
           cldfra(i,k) = rneb(i,k)
-          !CR: a quoi ca sert? Faut-il ajouter qs_seri?
-          !EV: en effet etrange, j'ajouterais aussi qs_seri
-          !    plus largement, je nettoierais (enleverrais) ces lignes
-          IF (.NOT.new_oliq) radocond(i,k) = ql_seri(i,k)
+          ! keep only liquid droplets in radocond if not liqice_in_radocond
+          IF (.NOT.liqice_in_radocond) radocond(i,k) = ql_seri(i,k)
        ENDDO
     ENDDO
@@ -6901 +6923 @@
 IF (CPPKEY_DUST) THEN
     !  Avec SPLA, iflag_phytrac est forcé =1 
-    CALL       phytracr_spl ( debut,lafin , jD_cur,jH_cur,iflag_con,       &  ! I
-                      pdtphys,ftsol,                                   &  ! I
-                      t,q_seri,paprs,pplay,RHcl,                  &  ! I
-                      pmfu, pmfd, pen_u, pde_u, pen_d, pde_d,          &  ! I
-                      coefh(1:klon,1:klev,is_ave), cdragh, cdragm, u1, v1,                 &  ! I
-                      u_seri, v_seri, latitude_deg, longitude_deg,  &
-                      pphis,pctsrf,pmflxr,pmflxs,prfl,psfl,            &  ! I
-                      da,phi,phi2,d1a,dam,mp,ep,sigd,sij,clw,elij,     &  ! I
-                      epmlmMm,eplaMm,upwd,dnwd,itop_con,ibas_con,      &  ! I
-                      ev,wdtrainA,  wdtrainM,wght_cvfd,              &  ! I
-                      fm_therm, entr_therm, rneb,                      &  ! I
-                      beta_prec_fisrt,beta_prec, & !I
-                      zu10m,zv10m,wstar,ale_bl,ale_wake,               &  ! I
+    CALL       phytracr_spl ( debut,lafin , jD_cur,jH_cur,iflag_con,       &
+                      pdtphys,ftsol,                                       &
+                      t,q_seri,paprs,pplay,RHcl,                           &
+                      pmfu, pmfd, pen_u, pde_u, pen_d, pde_d,              &
+                      coefh(1:klon,1:klev,is_ave), cdragh, cdragm, u1, v1, &
+                      u_seri, v_seri, latitude_deg, longitude_deg,         &
+                      pphis,pctsrf,pmflxr,pmflxs,prfl,psfl,                &
+                      da,phi,phi2,d1a,dam,mp,ep,sigd,sij,clw,elij,         &
+                      epmlmMm,eplaMm,upwd,dnwd,itop_con,ibas_con,          &
+                      ev,wdtrainA,  wdtrainM,wght_cvfd,                    &
+                      fm_therm, entr_therm, rneb,                          &
+                      beta_prec_fisrt,beta_prec,                           &
+                      zu10m,zv10m,wstar,ale_bl,ale_wake,                   &
+                      nsurfwind,surf_wind_value, surf_wind_proba,          &
                       d_tr_dyn,tr_seri)