Differential_equations: remove intg() warning

Related to bug #5728. The removed warning was not of substantial interest and messed with integrate()

Change-Id: I61ec534c3c344ce84b3e5aaebbee87c5b2cf350c

diff --git a/scilab/modules/differential_equations/src/fortran/dqagse.f b/scilab/modules/differential_equations/src/fortran/dqagse.f
index ca5362d..e96e728 100644 (file)
--- a/scilab/modules/differential_equations/src/fortran/dqagse.f
+++ b/scilab/modules/differential_equations/src/fortran/dqagse.f
@@ -144,13 +144,6 @@ c                     subdivision process
 c
 c***references  (none)
 c***routines called  d1mach,dqelg,dqk21,dqpsrt
-c***Scilab Enterprises input
-c        2013 - Paul Bignier
-c        internal parameter nbisect is the number of bisections carried out.
-c        if this parameter exceeds two, then a warning is issued to
-c        suggest the user to reduce the integration interval if he thinks
-c        edges have been missed.
-c***end prologue  dqagse
 c
       double precision a,abseps,abserr,alist,area,area1,area12,area2,a1,
      *  a2,b,blist,b1,b2,correc,dabs,defabs,defab1,defab2,d1mach,dmax1,
@@ -159,9 +152,6 @@ c
      *  res3la,rlist,rlist2,small,uflow
       integer id,ier,ierro,iord,iroff1,iroff2,iroff3,jupbnd,k,ksgn,
      *  ktmin,last,limit,maxerr,neval,nres,nrmax,numrl2
-c     /* Scilab Enterprises input
-      integer nbisect
-c     */
       logical extrap,noext
 c
       dimension alist(limit),blist(limit),elist(limit),iord(limit),
@@ -246,9 +236,6 @@ c
       uflow = d1mach(1)
       oflow = d1mach(2)
       ierro = 0
-c     /* Scilab Enterprises input
-      nbisect = 0
-c     */
       call dqk21(f,a,b,result,abserr,defabs,resabs)
 c
 c           test on accuracy.
@@ -293,9 +280,6 @@ c
 c           bisect the subinterval with the nrmax-th largest error
 c           estimate.
 c
-c       /* Scilab Enterprises input
-        nbisect = nbisect + 1
-c       */
         a1 = alist(maxerr)
         b1 = 0.5d+00*(alist(maxerr)+blist(maxerr))
         a2 = b1
@@ -455,13 +439,5 @@ c
       abserr = errsum
   130 if(ier.gt.2) ier = ier-1
   140 neval = 42*last-21
-c     /* Scilab Enterprises input
-      if (nbisect.le.1) then
-         call msgstxt('Warning: argument function is detected to be '//
-     &      'very smooth.')
-         call msgstxt('Reduce integration interval if you think '//
-     &      'edges have been missed.')
-      endif
-c     */
   999 return
       end

diff --git a/scilab/modules/differential_equations/tests/unit_tests/integrate.dia.ref b/scilab/modules/differential_equations/tests/unit_tests/integrate.dia.ref
index d29b6fa..37165a2 100644 (file)
--- a/scilab/modules/differential_equations/tests/unit_tests/integrate.dia.ref
+++ b/scilab/modules/differential_equations/tests/unit_tests/integrate.dia.ref
@@ -11,131 +11,5 @@
 x0 = 0;
 x1=0:0.1:2*%pi;
 computed = integrate('sin(x)','x',x0,x1);
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
 expected = 1 - cos(x1);
 if (norm(computed-expected) > 10* %eps) then bugmes();quit;end

diff --git a/scilab/modules/differential_equations/tests/unit_tests/intg.dia.ref b/scilab/modules/differential_equations/tests/unit_tests/intg.dia.ref
index 99eb60c..ef36fc7 100644 (file)
--- a/scilab/modules/differential_equations/tests/unit_tests/intg.dia.ref
+++ b/scilab/modules/differential_equations/tests/unit_tests/intg.dia.ref
@@ -76,8 +76,6 @@ function y = f(x), y = cos(x); endfunction
 Warning : redefining function: f                       . Use funcprot(0) to avoid this message
 
 [i, err, ierr] = intg(0, %pi, f);
-Warning: argument function is detected to be very smooth.
-Reduce integration interval if you think edges have been missed.
 Warning: Round-off error detected, the requested tolerance (or default) cannot be achieved. Try using bigger tolerances.
 if abs(ierr) <> 2 then bugmes();quit;end
 // IEEE compatibility