map z0m for all, for snow and forest z0t MIX- V7

srcF/sfx_surface.f90

@@ -98,20 +98,20 @@ module sfx_surface
 
     integer, public, parameter :: ocean_z0m_id = z0m_ch     !< ocean surface
     integer, public, parameter :: land_z0m_id = z0m_map_id        !< land surface
-    integer, public, parameter :: lake_z0m_id = z0m_map_id        !< lake surface
+    integer, public, parameter :: lake_z0m_id = z0m_ch        !< lake surface
     integer, public, parameter :: snow_z0m_id = z0m_map_id       !< snow covered surface    
     integer, public, parameter :: forest_z0m_id = z0m_map_id     !< forest csurface  
     integer, public, parameter :: usersf_z0m_id = z0m_ch      !< user surface  
-    integer, public, parameter :: ice_z0m_id = z0m_ow       !< ice surface  
+    integer, public, parameter :: ice_z0m_id = z0m_map_id       !< ice surface  
 
 
     integer, public, parameter :: ocean_z0t_id = z0t_kl_water     !< ocean surface
-    integer, public, parameter :: land_z0t_id = z0t_ot       !< land surface
+    integer, public, parameter :: land_z0t_id = z0t_kl_land       !< land surface
     integer, public, parameter :: lake_z0t_id = z0t_kl_water        !< lake surface
-    integer, public, parameter :: snow_z0t_id = z0t_kl_land         !< snow covered surface    
-    integer, public, parameter :: forest_z0t_id = z0t_ot      !< forest csurface  
+    integer, public, parameter :: snow_z0t_id = z0t_mix         !< snow covered surface    
+    integer, public, parameter :: forest_z0t_id = z0t_mix      !< forest csurface  
     integer, public, parameter :: usersf_z0t_id = z0t_kl_water      !< user surface  
-    integer, public, parameter :: ice_z0t_id = z0t_zi     !< user surface  
+    integer, public, parameter :: ice_z0t_id = z0t_kl_land     !< user surface  
     
     ! --------------------------------------------------------------------------------
     real, parameter, private :: kappa = 0.40         !< von Karman constant [n/d]