Changeset 2936 for LMDZ5

Timestamp:

Jul 7, 2017, 12:02:31 PM (7 years ago)

Author:

fcheruy

Message:

corrected restart for drgtree
Cd_frein is read from physiq.def

Location:

LMDZ5/branches/LMDZ_tree_FC/libf/phylmd

Files:

• conf_phys_m.F90 (modified) (1 diff)
• dimpft.h (added)
• pbl_surface_mod.F90 (modified) (3 diffs)
• phyetat0.F90 (modified) (1 diff)

LMDZ5/branches/LMDZ_tree_FC/libf/phylmd/conf_phys_m.F90

@@ -2578 +2578 @@
 !FC
     write(lunout,*)' ifl_pbltree = ', ifl_pbltree
+    write(lunout,*)' Cd_frein = ', Cd_frein
     write(lunout,*)' iflag_pbl_split = ', iflag_pbl_split
     write(lunout,*)' iflag_order2_sollw = ', iflag_order2_sollw

LMDZ5/branches/LMDZ_tree_FC/libf/phylmd/pbl_surface_mod.F90

@@ -1822 +1822 @@
 !FC quid qd yveget ylai yheight ne sont pas definit
 !FC  yveget,ylai,yheight, &
-            if (ifl_pbltree .eq. 1) then
+            if (ifl_pbltree .ge. 1) then
             CALL   freinage(knon, yu, yv, yt, &
 !              yveget,ylai, yheight,ypaprs,ypplay,y_d_u_frein,y_d_v_frein)
@@ -2235 +2235 @@
              y_d_v(j,k)  = y_d_v(j,k) * ypct(j)
 !FC
-              if  (nsrf .EQ. is_ter .and. ifl_pbltree .eq. 1  ) then
+              if  (nsrf .EQ. is_ter .and. ifl_pbltree .ge. 1  ) then
 !            if (y_d_u_frein(j,k).ne.0. ) then
 !        print*, nsrf,'IS_TER ++', y_d_u_frein(j,k)*ypct(j),y_d_u(j,k),j,k
@@ -2242 +2242 @@
              y_d_v(j,k) =y_d_v(j,k) + y_d_v_frein(j,k)*ypct(j)
              treedrg(i,k,nsrf)=y_treedrg(j,k)
+             else 
+             treedrg(i,k,nsrf)=0.
                endif
 !FC

LMDZ5/branches/LMDZ_tree_FC/libf/phylmd/phyetat0.F90

@@ -321 +321 @@
   ENDIF
 !FC
+     IF (ifl_pbltree>1) then
+  found=phyetat0_srf(1,treedrg,"treedrg","drag from vegetation" , 0.)
   !lecture du profile de freinage des arbres
    IF (.not. found ) then
      treedrg(:,1:klev,1:nbsrf)= 0.0
    else
-  found=phyetat0_srf(klev,treedrg,"treedrg","freinage arbres",0.)
+     found=phyetat0_srf(klev,treedrg,"treedrg","freinage arbres",0.)
    ENDIF
+      endif