diff --git a/Makefile b/Makefile
index 5bf4218017abc2930bf3385683f7c9790e60ed17..ffef59533bc0523680e92bc39cb4b6a33b0e29df 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ else ifeq ($(CMP),gcc)
FC = mpif90
#FFLAGS = -O3 -funroll-loops -floop-optimize -g -Warray-bounds -fcray-pointer -x f95-cpp-input
ifeq ($(BUILD),debug)
-FFLAGS = -cpp -g3 -Og
+FFLAGS = -cpp -g3 -Og -fexceptions -ftrapv
FFLAGS += -ffpe-trap=invalid,zero -fcheck=bounds -fimplicit-none
else
FFLAGS = -cpp -O3 -funroll-loops -floop-optimize -g
diff --git a/src/BC-Ellipsoid.f90 b/src/BC-Ellipsoid.f90
index 474331e1e596ceb802a38b15e38c607e84839829..106f12879ba57ac7143365b3dcf7c2cd40b39757 100644
--- a/src/BC-Ellipsoid.f90
+++ b/src/BC-Ellipsoid.f90
@@ -363,22 +363,25 @@ subroutine init_ellip (ux1,uy1,uz1,phi1)
if (iin.ne.0) then
call system_clock(count=code)
if (iin.eq.2) code=0
- call random_seed(size = ii)
- call random_seed(put = code+63946*(nrank+1)*(/ (i - 1, i = 1, ii) /))
-
- call random_number(ux1)
- call random_number(uy1)
- call random_number(uz1)
-
- do k=1,xsize(3)
- do j=1,xsize(2)
- do i=1,xsize(1)
- ux1(i,j,k)=init_noise*(ux1(i,j,k)-0.5)
- uy1(i,j,k)=init_noise*(uy1(i,j,k)-0.5)
- uz1(i,j,k)=init_noise*(uz1(i,j,k)-0.5)
- enddo
- enddo
- enddo
+
+ if (init_noise.gt.0.001) then
+ call random_seed(size = ii)
+ call random_seed(put = code+63946*(nrank+1)*(/ (i - 1, i = 1, ii) /))
+
+ call random_number(ux1)
+ call random_number(uy1)
+ call random_number(uz1)
+
+ do k=1,xsize(3)
+ do j=1,xsize(2)
+ do i=1,xsize(1)
+ ux1(i,j,k)=init_noise*(ux1(i,j,k)-0.5)
+ uy1(i,j,k)=init_noise*(uy1(i,j,k)-0.5)
+ uz1(i,j,k)=init_noise*(uz1(i,j,k)-0.5)
+ enddo
+ enddo
+ enddo
+ endif
!modulation of the random noise
do k=1,xsize(3)
@@ -532,4 +535,4 @@ subroutine visu_ellip(ux1, uy1, uz1, pp3, phi1, ep1, num)
end subroutine visu_ellip
end module ellip
-
\ No newline at end of file
+