diff --git a/src/calculate_lsf.f90 b/src/calculate_lsf.f90
index fa0cd5bcd06bde595945193b806fb180730670c3..15f95de9b5bb008e8177c786c69d945bacd74722 100644
--- a/src/calculate_lsf.f90
+++ b/src/calculate_lsf.f90
@@ -16,9 +16,9 @@
 !------------------------------------------------------------------------------|
 !------------------------------------------------------------------------------|
 
-subroutine calculate_lsf (lsf,octree_lsf,noctree_lsf,icon_lsf, &
-                          nleaves_lsf,na_lsf,xl,yl,zl,xln,yln,zln, &
-                          icon,nelem,na,levelmax_oct,normaladvect,iis)
+subroutine calculate_lsf (lsf,octree_lsf,noctree_lsf,icon_lsf,nleaves_lsf,     &
+                         na_lsf,xl,yl,zl,xln,yln,zln,icon,nelem,na,            &
+                         levelmax_oct,normaladvect)
 
 !------------------------------------------------------------------------------|
 !(((((((((((((((( Purpose of the routine  ))))))))))))))))))))))))))))))))))))))
@@ -61,7 +61,7 @@ include 'mpif.h'
 
 double precision lsf(na_lsf)
 integer octree_lsf(noctree_lsf) 
-integer noctree_lsf,iis
+integer noctree_lsf
 integer icon_lsf(8,nleaves_lsf)
 integer nleaves_lsf
 integer na_lsf
@@ -76,15 +76,15 @@ logical normaladvect
 !(((((((((((((((( declaration of the subroutine internal variables )))))))))))))
 !------------------------------------------------------------------------------|
 
-integer ierr,iproc,nproc,ii,jj,kk,iii,istart,ijk,iend,itest,i,j,k,leaf_lsf,ite
+integer ierr,iproc,nproc,ii,jj,kk,iii,istart,ijk,iend,itest,i,j,k,leaf_lsf
 integer i1,i2,j1,j2,k1,k2,it,inode,niter,iinc,num_lsf,level,loc,nleaf_test,err
 integer,dimension(:),allocatable::leaf_test
 integer,dimension(:),allocatable::done_el,done_nd,norm
-double precision x0,y0,z0,dxyz,sum_lsf,test,xyzn
-double precision x0_loc,y0_loc,z0_loc,lsf_loc
-double precision x,y,z,x1,x2,x3,y1,y2,y3,z1,z2,z3,xn,yn,zn
+double precision x0,y0,z0,dxyz,sum_lsf,test
+double precision x0_loc,y0_loc,z0_loc
+double precision x,y,z,x1,x2,x3,y1,y2,y3,z1,z2,z3
 double precision x1n,x2n,x3n,y1n,y2n,y3n,z1n,z2n,z3n
-double precision xx1,xx2,yy1,yy2,zz1,zz2,lsf8(8),dmin
+double precision lsf8(8)
 double precision,dimension(:),allocatable::distmin
 double precision,dimension(:),allocatable::xxln,yyln,zzln
 
@@ -294,7 +294,7 @@ double precision x(4),y(4),z(4)
 double precision xxn(4),yyn(4),zzn(4)
 double precision xn,yn,zn,xyzn
 double precision xc,yc,zc
-double precision alpha,beta,ddmin
+double precision alpha,beta
 double precision xnp(3),ynp(3),znp(3),alphap(3),dd(3)
 double precision xp,yp,zp,xpp,ypp,zpp
 double precision xxxn,yyyn,zzzn
diff --git a/src/embed_surface_in_octree.f90 b/src/embed_surface_in_octree.f90
index 54859164869fa78a2501af0361516f330e83492a..e6e3e4fabc148426c9eca012da2e628007ae6137 100644
--- a/src/embed_surface_in_octree.f90
+++ b/src/embed_surface_in_octree.f90
@@ -16,7 +16,8 @@
 !------------------------------------------------------------------------------|
 !------------------------------------------------------------------------------|
 
-subroutine embed_surface_in_octree (osolve,params,surface,is,istep,iter,threadinfo)
+subroutine embed_surface_in_octree (osolve,params,surface,is,istep,iter,       &
+                                   threadinfo)
 
 !------------------------------------------------------------------------------|
 !(((((((((((((((( Purpose of the routine  ))))))))))))))))))))))))))))))))))))))
@@ -111,12 +112,10 @@ if (params%debug.gt.1) call heap (threadinfo,'olsf%lsf', 'embed_surf...',size(ol
 
 ! we then calculate the lsf on the olsf octree
 
-call calculate_lsf (olsf%lsf,olsf%octree,olsf%noctree, &
-                    olsf%icon,olsf%nleaves,olsf%nnode, &
-                    surface%x,surface%y,surface%z, &
-                    surface%xn,surface%yn,surface%zn, &
-                    surface%icon,surface%nt,surface%nsurface, &
-                    params%levelmax_oct,params%normaladvect,is)
+call calculate_lsf (olsf%lsf,olsf%octree,olsf%noctree,olsf%icon,olsf%nleaves,  &
+                   olsf%nnode,surface%x,surface%y,surface%z,surface%xn,        &
+                   surface%yn,surface%zn,surface%icon,surface%nt,              &
+                   surface%nsurface,params%levelmax_oct,params%normaladvect)
 
 if (params%debug>=2) call output_octree_lsf (olsf,surface,is,istep,iter)