Changeset 4743 for LMDZ6/branches/Portage_acc/libf/phylmd/pbl_surface_mod.F90

Timestamp:

Oct 30, 2023, 5:37:00 PM (7 months ago)

Author:

Laurent Fairhead

Message:

Merge of ACC branch with 4740 revision from trunk

Location:

LMDZ6/branches/Portage_acc

Files:

• . (modified) (1 prop)
• libf/phylmd/pbl_surface_mod.F90 (modified) (20 diffs)

LMDZ6/branches/Portage_acc/libf/phylmd/pbl_surface_mod.F90

@@ -24 +24 @@
   USE climb_wind_mod,      ONLY : climb_wind_down, climb_wind_up
   USE coef_diff_turb_mod,  ONLY : coef_diff_turb
-  USE call_atke_mod,       ONLY :  call_atke
+  USE lmdz_call_atke,      ONLY : call_atke
   USE ioipsl_getin_p_mod,  ONLY : getin_p
   USE cdrag_mod
@@ -184 +184 @@
        debut,     lafin,                              &
        rlon,      rlat,      rugoro,   rmu0,          &
-       lwdown_m,  cldt,          &
+       lwdown_m,  cldt,                               &
        rain_f,    snow_f,    bs_f, solsw_m,  solswfdiff_m, sollw_m,       &
        gustiness,                                     &
-       t,         q,        qbs,  u,        v,             &
+       t,         q,        qbs,  u,        v,        &
 !!! nrlmd+jyg le 02/05/2011 et le 20/02/2012
 !!       t_x,       q_x,       t_w,      q_w,           &
@@ -199 +199 @@
        beta, &
 !>jyg
-       alb_dir_m,    alb_dif_m,  zxsens,   zxevap,  zxsnowerosion,  &
+       alb_dir_m,    alb_dif_m,  zxsens,   zxevap,  zxsnowerosion,      &
        alb3_lic,  runoff,    snowhgt,   qsnow,     to_ice,    sissnow,  &
-       zxtsol,    zxfluxlat, zt2m,     qsat2m, zn2mout, &
-       d_t,       d_q,    d_qbs,    d_u,      d_v, d_t_diss, & 
+       zxtsol,    zxfluxlat, zt2m,     qsat2m, zn2mout,                 &
+       d_t,       d_q,    d_qbs,    d_u,      d_v, d_t_diss,            &
 !!! nrlmd+jyg le 02/05/2011 et le 20/02/2012
-       d_t_w,     d_q_w,                              &
-       d_t_x,     d_q_x,                              & 
+       d_t_w,     d_q_w,                             &
+       d_t_x,     d_q_x,                             & 
 !!       d_wake_dlt,d_wake_dlq,                         &
-       zxsens_x,  zxfluxlat_x,zxsens_w,zxfluxlat_w,   &
+       zxsens_x,  zxfluxlat_x,zxsens_w,zxfluxlat_w,  &
 !!!
 !!! nrlmd le 13/06/2011
-       delta_tsurf,wake_dens,cdragh_x,cdragh_w,       &
-       cdragm_x,cdragm_w,kh,kh_x,kh_w,                &
-!!!
-       zcoefh,    zcoefm,    slab_wfbils,             &
-       qsol,    zq2m,      s_pblh,   s_plcl,        &
+       delta_tsurf,wake_dens,cdragh_x,cdragh_w,      &
+       cdragm_x,cdragm_w,kh,kh_x,kh_w,               &
+!!!
+       zcoefh,    zcoefm,    slab_wfbils,            &
+       qsol,    zq2m,      s_pblh,   s_plcl,         &
 !!!
 !!! jyg le 08/02/2012
-       s_pblh_x, s_plcl_x,   s_pblh_w, s_plcl_w,      &
-!!!
-       s_capCL,   s_oliqCL,  s_cteiCL, s_pblT,        &
-       s_therm,   s_trmb1,   s_trmb2,  s_trmb3,       &
-       zustar,zu10m,  zv10m,    fder_print,    &
-       zxqsurf, delta_qsurf,                       &
-       rh2m,      zxfluxu,  zxfluxv,               &
+       s_pblh_x, s_plcl_x,   s_pblh_w, s_plcl_w,     &
+!!!
+       s_capCL,   s_oliqCL,  s_cteiCL, s_pblT,       &
+       s_therm,   s_trmb1,   s_trmb2,  s_trmb3,      &
+       zustar,zu10m,  zv10m,    fder_print,          &
+       zxqsurf, delta_qsurf,                         &
+       rh2m,      zxfluxu,  zxfluxv,                 &
        z0m, z0h,   agesno,  sollw,    solsw,         &
        d_ts,      evap,    fluxlat,   t2m,           &
-       wfbils,    wfbilo, wfevap, wfrain, wfsnow,   & 
-       flux_t,   flux_u, flux_v,                    &
-       dflux_t,   dflux_q,   zxsnow,                  &
+       wfbils,    wfevap,                            & 
+       flux_t,   flux_u, flux_v,                     &
+       dflux_t,   dflux_q,   zxsnow,                 &
 !jyg<
 !!       zxfluxt,   zxfluxq,   q2m,      flux_q, tke,   &
@@ -235 +235 @@
 !!! nrlmd+jyg le 02/05/2011 et le 20/02/2012
 !!        tke_x,     tke_w                              &
-       wake_dltke,                                     &
-        treedrg                                   &
+       wake_dltke,                                   &
+        treedrg                                      &
 !FC
 !!!
@@ -318 +318 @@
          dser, dt_ds, zsig, zmea
     use phys_output_var_mod, only: tkt, tks, taur, sss
-    use blowing_snow_ini_mod, only : zeta_bs
-#ifdef CPP_XIOS
-    USE wxios, ONLY: missing_val
-#else
-    use netcdf, only: missing_val => nf90_fill_real
-#endif
+    use lmdz_blowing_snow_ini, only : zeta_bs
+    USE wxios, ONLY: missing_val_xios => missing_val, using_xios
+    USE netcdf, only: missing_val_netcdf => nf90_fill_real
 
      
@@ -506 +503 @@
     REAL, DIMENSION(klon, nbsrf), INTENT(OUT)       :: t2m        ! temperature at 2 meter height
     REAL, DIMENSION(klon, nbsrf), INTENT(OUT)       :: wfbils     ! heat balance at surface
-    REAL, DIMENSION(klon, nbsrf), INTENT(OUT)       :: wfbilo     ! water balance at surface weighted by srf
     REAL, DIMENSION(klon, nbsrf), INTENT(OUT)       :: wfevap     ! water balance (evap) at surface weighted by srf
-    REAL, DIMENSION(klon, nbsrf), INTENT(OUT)       :: wfrain     ! water balance (rain) at surface weighted by srf
-    REAL, DIMENSION(klon, nbsrf), INTENT(OUT)       :: wfsnow     ! water balance (snow) at surface weighted by srf
     REAL, DIMENSION(klon, klev, nbsrf), INTENT(OUT) :: flux_t     ! sensible heat flux (CpT) J/m**2/s (W/m**2)
                                                                   ! positve orientation downwards
@@ -899 +893 @@
     ! compression of delta_sst, delta_sal, ds_ns, dt_ns, dter, dser,
     ! dt_ds, tkt, tks, taur, sss on ocean points
-
+    REAL :: missing_val
 !****************************************************************************************
 ! End of declarations
 !****************************************************************************************
+      IF (using_xios) THEN
+        missing_val=missing_val_xios
+      ELSE
+        missing_val=missing_val_netcdf
+      ENDIF
 
       IF (prt_level >=10) print *,' -> pbl_surface, itap ',itap
@@ -1025 +1024 @@
  snowerosion(:,:)=0. 
  fluxlat(:,:)=0.
- wfbils(:,:)=0. ; wfbilo(:,:)=0.
- wfevap(:,:)=0. ; wfrain(:,:)=0. ; wfsnow(:,:)=0.
+ wfbils(:,:)=0. ; wfevap(:,:)=0. ;
  flux_t(:,:,:)=0. ; flux_q(:,:,:)=0. ; flux_u(:,:,:)=0. ; flux_v(:,:,:)=0.
  flux_qbs(:,:,:)=0.
@@ -1069 +1067 @@
 !albedo SB <<<
     yrain_f = 0.0 ; ysnow_f = 0.0  ; ybs_f=0.0  ; yfder = 0.0     ; ysolsw = 0.0
-    ysollw = 0.0  ; yz0m = 0.0 ; yz0h = 0.0    ; yu1 = 0.0    
+    ysollw = 0.0  ; yz0m = 0.0 ; yz0h = 0.0    ; yz0h_oupas = 0.0 ; yu1 = 0.0    
     yv1 = 0.0     ; ypaprs = 0.0     ; ypplay = 0.0     ; yqbs1 = 0.0
     ydelp = 0.0   ; yu = 0.0         ; yv = 0.0        ; yt = 0.0         
@@ -1596 +1594 @@
         ENDDO
         CALL cdrag(knon, nsrf, &
-            speed, yt(:,1), yq(:,1), zgeo1, ypaprs(:,1),&
+            speed, yt(:,1), yq(:,1), zgeo1, ypaprs(:,1), s_pblh, &
             yts, yqsurf, yz0m, yz0h, yri0, 0, &
-            ycdragm, ycdragh, zri1, pref )
+            ycdragm, ycdragh, zri1, pref, rain_f, zxtsol, ypplay(:,1))
 
 ! --- special Dice: on force cdragm ( a defaut de forcer ustar) MPL 05082013
@@ -1630 +1628 @@
 
             CALL cdrag(knon, nsrf, &
-            speed_x, yt_x(:,1), yq_x(:,1), zgeo1_x, ypaprs(:,1),&
+            speed_x, yt_x(:,1), yq_x(:,1), zgeo1_x, ypaprs(:,1),s_pblh_x,&
             yts_x, yqsurf_x, yz0m, yz0h, yri0, 0, &
-            ycdragm_x, ycdragh_x, zri1_x, pref_x )
+            ycdragm_x, ycdragh_x, zri1_x, pref_x, rain_f, zxtsol, ypplay(:,1) )
 
 ! --- special Dice. JYG+MPL 25112013
@@ -1657 +1655 @@
         ENDDO
         CALL cdrag(knon, nsrf, &
-            speed_w, yt_w(:,1), yq_w(:,1), zgeo1_w, ypaprs(:,1),&
+            speed_w, yt_w(:,1), yq_w(:,1), zgeo1_w, ypaprs(:,1),s_pblh_w,&
             yts_w, yqsurf_w, yz0m, yz0h, yri0, 0, &
-            ycdragm_w, ycdragh_w, zri1_w, pref_w )
+            ycdragm_w, ycdragh_w, zri1_w, pref_w, rain_f, zxtsol, ypplay(:,1) )
 !
 !!!bug !!        zgeo1(:) = wake_s(:)*zgeo1_w(:) + (1.-wake_s(:))*zgeo1_x(:)
@@ -1702 +1700 @@
         IF (iflag_pbl>=50) THEN
 
-        CALL call_atke(dtime,knon,klev,ycdragm, ycdragh,yus0,yvs0,yts,yu,yv,yt, &
+        CALL call_atke(dtime,knon,klev,ycdragm, ycdragh,yus0,yvs0,yts,yu,yv,yt,yq, &
              ypplay,ypaprs,ytke,ycoefm, ycoefh)
 
@@ -1746 +1744 @@
         IF (iflag_pbl>=50) THEN
      
-        CALL call_atke(dtime,knon,klev,ycdragm_x,ycdragh_x,yus0,yvs0,yts_x,yu_x,yv_x,yt_x, &
+        CALL call_atke(dtime,knon,klev,ycdragm_x,ycdragh_x,yus0,yvs0,yts_x,yu_x,yv_x,yt_x,yq_x, &
              ypplay,ypaprs,ytke_x,ycoefm_x, ycoefh_x)
 
@@ -1785 +1783 @@
         IF (iflag_pbl>=50) THEN
         
-        CALL call_atke(dtime,knon,klev,ycdragm_w,ycdragh_w,yus0,yvs0,yts_w,yu_w,yv_w,yt_w, &
+        CALL call_atke(dtime,knon,klev,ycdragm_w,ycdragh_w,yus0,yvs0,yts_w,yu_w,yv_w,yt_w,yq_w, &
              ypplay,ypaprs,ytke_w,ycoefm_w, ycoefh_w)
 
@@ -2084 +2082 @@
                yu(:,1), yv(:,1), yt(:,1), yq(:,1), zgeo1, &
                yts, yqsurf, yz0m, yz0h, ypaprs(:,1), ypplay(:,1), &
-               yt2m, yq2m, yt10m, yq10m, yu10m, yustar)
+               yt2m, yq2m, yt10m, yq10m, yu10m, yustar, ypblh, rain_f, zxtsol)
           ENDIF
           
@@ -3070 +3068 @@
        IF (iflag_split .eq.0) THEN
         IF (iflag_new_t2mq2m==1) THEN
-         CALL stdlevvarn(klon, knon, nsrf, zxli, &
+           CALL stdlevvarn(klon, knon, nsrf, zxli, &
             uzon, vmer, tair1, qair1, zgeo1, &
             tairsol, qairsol, yz0m, yz0h_oupas, psfce, patm, &
@@ -3079 +3077 @@
             uzon, vmer, tair1, qair1, zgeo1, &
             tairsol, qairsol, yz0m, yz0h_oupas, psfce, patm, &
-            yt2m, yq2m, yt10m, yq10m, yu10m, yustar)
+            yt2m, yq2m, yt10m, yq10m, yu10m, yustar, ypblh, rain_f, zxtsol)
         ENDIF
        ELSE  !(iflag_split .eq.0)
@@ -3097 +3095 @@
             uzon_x, vmer_x, tair1_x, qair1_x, zgeo1_x, &
             tairsol_x, qairsol, yz0m, yz0h_oupas, psfce, patm, &
-            yt2m_x, yq2m_x, yt10m_x, yq10m_x, yu10m_x, yustar_x)
+            yt2m_x, yq2m_x, yt10m_x, yq10m_x, yu10m_x, yustar_x, ypblh_x, rain_f, zxtsol)
         CALL stdlevvar(klon, knon, nsrf, zxli, &
             uzon_w, vmer_w, tair1_w, qair1_w, zgeo1_w, &
             tairsol_w, qairsol, yz0m, yz0h_oupas, psfce, patm, &
-            yt2m_w, yq2m_w, yt10m_w, yq10m_w, yu10m_w, yustar_w)
+            yt2m_w, yq2m_w, yt10m_w, yq10m_w, yu10m_w, yustar_w, ypblh_w, rain_f, zxtsol)
         ENDIF
 !!!
@@ -3456 +3454 @@
           wfbils(i,nsrf) = ( solsw(i,nsrf) + sollw(i,nsrf) &
                + flux_t(i,1,nsrf) + fluxlat(i,nsrf) ) * pctsrf(i,nsrf)
-          wfbilo(i,nsrf) = (evap(i,nsrf)-(rain_f(i)+snow_f(i)))*pctsrf(i,nsrf)
+
           wfevap(i,nsrf) = evap(i,nsrf)*pctsrf(i,nsrf)
-          wfrain(i,nsrf) = rain_f(i)*pctsrf(i,nsrf)
-          wfsnow(i,nsrf) = snow_f(i)*pctsrf(i,nsrf)
 
           zxtsol(i)    = zxtsol(i)    + ts(i,nsrf)      * pctsrf(i,nsrf)