diff --git a/srcF/sfx_surface.f90 b/srcF/sfx_surface.f90
index ced62f49d5a3fea48c3e175d54cd31365c654d2d..6a0c08e87ed9187762a0e9d37beef7f3c5fa93da 100644
--- a/srcF/sfx_surface.f90
+++ b/srcF/sfx_surface.f90
@@ -92,16 +92,16 @@ 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_fe        !< lake surface
-    integer, public, parameter :: snow_z0m_id = z0m_map_id        !< snow covered surface    
+    integer, public, parameter :: snow_z0m_id = z0m_ow        !< snow covered surface    
     integer, public, parameter :: forest_z0m_id = z0m_map_id     !< forest csurface  
-    integer, public, parameter :: usersf_z0m_id = z0m_map_id       !< user surface  
+    integer, public, parameter :: usersf_z0m_id = z0m_fe       !< user surface  
 
     integer, public, parameter :: ocean_z0t_id = z0t_kl_water     !< ocean surface
-    integer, public, parameter :: land_z0t_id = z0t_kl_land        !< land surface
-    integer, public, parameter :: lake_z0t_id = z0t_br        !< lake surface
-    integer, public, parameter :: snow_z0t_id = z0t_kl_land         !< snow covered surface    
-    integer, public, parameter :: forest_z0t_id = z0t_du      !< forest csurface  
-    integer, public, parameter :: usersf_z0t_id = z0t_mix       !< user surface  
+    integer, public, parameter :: land_z0t_id = z0t_mix        !< land surface
+    integer, public, parameter :: lake_z0t_id = z0t_ca        !< lake surface
+    integer, public, parameter :: snow_z0t_id = z0t_zi         !< snow covered surface    
+    integer, public, parameter :: forest_z0t_id = z0t_ot      !< forest csurface  
+    integer, public, parameter :: usersf_z0t_id = z0t_ca      !< user surface  
     
     ! --------------------------------------------------------------------------------
     real, parameter, private :: kappa = 0.40         !< von Karman constant [n/d]
diff --git a/srcF/sfx_z0t_all_surface.f90 b/srcF/sfx_z0t_all_surface.f90
index 72fc0528b6c9a835328b0b7197c80d0529583df3..7db8d57478042679ef55ed26373ebb841329c2ad 100644
--- a/srcF/sfx_z0t_all_surface.f90
+++ b/srcF/sfx_z0t_all_surface.f90
@@ -157,11 +157,11 @@ module sfx_z0t_all_surface
         real, intent(in) :: z0_m                !< aerodynamic roughness [m]
         real, intent(in) :: Re                  !< roughness Reynolds number [n/d]
        
-       
+      
         
         
         B=2.46*(Re**0.25)-2.0       !Brutsaert
-       
+        
         ! --- define roughness [thermal]
         z0_t = z0_m / exp(B)