Changeset 4013 for LMDZ6/branches/Ocean_skin/libf/phylmd/dyn1d

Timestamp:

Nov 19, 2021, 4:58:59 PM (4 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phylmd/dyn1d/compar1d.h (modified) (2 diffs)
• libf/phylmd/dyn1d/old_lmdz1d.F90 (modified) (8 diffs)
• libf/phylmd/dyn1d/scm.F90 (modified) (7 diffs)

LMDZ6/branches/Ocean_skin/libf/phylmd/dyn1d/compar1d.h

@@ -8 +8 @@
       real :: nat_surf
       real :: tsurf
+      real :: beta_surf
       real :: rugos
       real :: rugosh
@@ -45 +46 @@
       real    :: p_nudging_u, p_nudging_v, p_nudging_w, p_nudging_t, p_nudging_qv
       common/com_par1d/                                                 &
-     & nat_surf,tsurf,rugos,rugosh,                                     &
+     & nat_surf,tsurf,beta_surf,rugos,rugosh,                           &
      & xqsol,qsurf,psurf,zsurf,albedo,time,time_ini,xlat,xlon,airefi,   &
      & wtsurf,wqsurf,restart_runoff,xagesno,qsolinp,zpicinp,            &

LMDZ6/branches/Ocean_skin/libf/phylmd/dyn1d/old_lmdz1d.F90

@@ -11 +11 @@
        du_gwd_rando, du_gwd_front, entr_therm, f0, fm_therm, &
        falb_dir, falb_dif, &
-       ftsol, pbl_tke, pctsrf, radsol, rain_fall, snow_fall, ratqs, &
+       ftsol, beta_aridity, pbl_tke, pctsrf, radsol, rain_fall, snow_fall, ratqs, &
        rnebcon, rugoro, sig1, w01, solaire_etat0, sollw, sollwdown, &
-       solsw, t_ancien, q_ancien, u_ancien, v_ancien, wake_cstar, &
+       solsw, solswfdiff, t_ancien, q_ancien, u_ancien, v_ancien, &
        wake_delta_pbl_TKE, delta_tsurf, wake_fip, wake_pe, &
        wake_deltaq, wake_deltat, wake_s, wake_dens, &
+       awake_dens, cv_gen, wake_cstar, &
        zgam, zmax0, zmea, zpic, zsig, &
        zstd, zthe, zval, ale_bl, ale_bl_trig, alp_bl, ql_ancien, qs_ancien, &
@@ -656 +657 @@
       qsol = qsolinp
       qsurf = fq_sat(tsurf,psurf/100.)
+      beta_surf = 1.
+      beta_aridity(:,:) = beta_surf
       day1= day_ini
       time=daytime-day
@@ -795 +798 @@
 
         fder=0.
+        snsrf(1,:)=snowmass ! masse de neige des sous surface
         print *, 'snsrf', snsrf
-        snsrf(1,:)=snowmass ! masse de neige des sous surface
         qsurfsrf(1,:)=qsurf ! humidite de l'air des sous surface
         fevap=0.
@@ -878 +881 @@
         snow_fall=0.
         solsw=0.
+        solswfdiff=0.
         sollw=0.
         sollwdown=rsigma*tsurf**4
@@ -893 +897 @@
         sig1=0.
         w01=0.
-        wake_cstar = 0.
+!
         wake_deltaq = 0.
         wake_deltat = 0.
@@ -902 +906 @@
         wake_s = 0.
         wake_dens = 0.
+        awake_dens = 0.
+        cv_gen = 0.
+        wake_cstar = 0.
         ale_bl = 0.
         ale_bl_trig = 0.
@@ -926 +933 @@
 ! pctsrf(:,is_sic),ftsol(:,nsrf),tsoil(:,isoil,nsrf),qsurf(:,nsrf)
 ! qsol,falb_dir(:,nsrf),falb_dif(:,nsrf),evap(:,nsrf),snow(:,nsrf)
-! radsol,solsw,sollw, sollwdown,fder,rain_fall,snow_fall,frugs(:,nsrf)
+! radsol,solsw,solswfdiff,sollw, sollwdown,fder,rain_fall,snow_fall,frugs(:,nsrf)
 ! agesno(:,nsrf),zmea,zstd,zsig,zgam,zthe,zpic,zval,rugoro
 ! t_ancien,q_ancien,,frugs(:,is_oce),clwcon(:,1),rnebcon(:,1),ratqs(:,1)
 ! run_off_lic_0,pbl_tke(:,1:klev,nsrf), zmax0,f0,sig1,w01
-! wake_deltat,wake_deltaq,wake_s,wake_dens,wake_cstar,
+! wake_deltat,wake_deltaq,wake_s,wake_dens,awake_dens,cv_gen,wake_cstar,
 ! wake_fip,wake_delta_pbl_tke(:,1:klev,nsrf)
 !
@@ -1026 +1033 @@
 !
 !=====================================================================
-       CALL iophys_ini
+       CALL iophys_ini(timestep)
 ! START OF THE TEMPORAL LOOP :
 !=====================================================================

LMDZ6/branches/Ocean_skin/libf/phylmd/dyn1d/scm.F90

@@ -7 +7 @@
        du_gwd_rando, du_gwd_front, entr_therm, f0, fm_therm, &
        falb_dir, falb_dif, &
-       ftsol, pbl_tke, pctsrf, radsol, rain_fall, snow_fall, ratqs, &
+       ftsol, beta_aridity, pbl_tke, pctsrf, radsol, rain_fall, snow_fall, ratqs, &
        rnebcon, rugoro, sig1, w01, solaire_etat0, sollw, sollwdown, &
-       solsw, t_ancien, q_ancien, u_ancien, v_ancien, wake_cstar, &
+       solsw, solswfdiff, t_ancien, q_ancien, u_ancien, v_ancien, &
        wake_delta_pbl_TKE, delta_tsurf, wake_fip, wake_pe, &
        wake_deltaq, wake_deltat, wake_s, wake_dens, &
+       awake_dens, cv_gen, wake_cstar, &
        zgam, zmax0, zmea, zpic, zsig, &
        zstd, zthe, zval, ale_bl, ale_bl_trig, alp_bl, ql_ancien, qs_ancien, &
@@ -429 +430 @@
       qsol = qsolinp
       qsurf = fq_sat(tsurf,psurf/100.)
+      beta_aridity(:,:) = beta_surf
       day1= day_ini
       time=daytime-day
@@ -644 +646 @@
         snow_fall=0.
         solsw=0.
+        solswfdiff=0.
         sollw=0.
         sollwdown=rsigma*tsurf**4
@@ -659 +662 @@
         sig1=0.
         w01=0.
-        wake_cstar = 0.
+!
         wake_deltaq = 0.
         wake_deltat = 0.
@@ -668 +671 @@
         wake_s = 0.
         wake_dens = 0.
+        awake_dens = 0.
+        cv_gen = 0.
+        wake_cstar = 0.
         ale_bl = 0.
         ale_bl_trig = 0.
@@ -692 +698 @@
 ! pctsrf(:,is_sic),ftsol(:,nsrf),tsoil(:,isoil,nsrf),qsurf(:,nsrf)
 ! qsol,falb_dir(:,nsrf),falb_dif(:,nsrf),evap(:,nsrf),snow(:,nsrf)
-! radsol,solsw,sollw, sollwdown,fder,rain_fall,snow_fall,frugs(:,nsrf)
+! radsol,solsw,solswfdiff,sollw, sollwdown,fder,rain_fall,snow_fall,frugs(:,nsrf)
 ! agesno(:,nsrf),zmea,zstd,zsig,zgam,zthe,zpic,zval,rugoro
 ! t_ancien,q_ancien,,frugs(:,is_oce),clwcon(:,1),rnebcon(:,1),ratqs(:,1)
 ! run_off_lic_0,pbl_tke(:,1:klev,nsrf), zmax0,f0,sig1,w01
-! wake_deltat,wake_deltaq,wake_s,wake_dens,wake_cstar,
+! wake_deltat,wake_deltaq,wake_s,wake_dens,awake_dens,cv_gen,wake_cstar,
 ! wake_fip,wake_delta_pbl_tke(:,1:klev,nsrf)
 !
@@ -783 +789 @@
 !=====================================================================
 #ifdef OUTPUT_PHYS_SCM
-       CALL iophys_ini
+       CALL iophys_ini(timestep)
 #endif