[Pomp-commits] r844 - in pkg/pomp: src tests

[noreply at r-forge.r-project.org]

Author: kingaa
Date: 2013-04-16 16:21:36 +0200 (Tue, 16 Apr 2013)
New Revision: 844

Modified:
   pkg/pomp/src/SSA.f
   pkg/pomp/tests/ou2-mif.Rout.save
Log:
- modify fortran code to eliminate (false positive) bounds violation error when -fbounds-check flag is given to gfortran.


Modified: pkg/pomp/src/SSA.f
===================================================================
--- pkg/pomp/src/SSA.f	2013-04-16 13:51:47 UTC (rev 843)
+++ pkg/pomp/src/SSA.f	2013-04-16 14:21:36 UTC (rev 844)
@@ -123,18 +123,20 @@
 c     
 c Recording output at required time points
 c     
-         do while((icount.le.ntimes).and.(t.ge.times(icount)))
-            do i=1,n
-               xout(i,irep,icount)=y(i)
-            enddo
+         if (icount.le.ntimes) then
+            do while((icount.le.ntimes).and.(t.ge.times(icount)))
+               do i=1,n
+                  xout(i,irep,icount)=y(i)
+               enddo
 c===============================
 c     Set appropriate states to zero
 c===============================
-            do i=1,nzero
-               y(izero(i)+1)=0.0d0
+               do i=1,nzero
+                  y(izero(i)+1)=0.0d0
+               enddo
+               icount=icount+1
             enddo
-            icount=icount+1
-         enddo
+         endif
 
          if((mcov.gt.0).and.(t.le.tmax))then
             call tlook(lcov,mcov,tcov,cov,t,covars)

Modified: pkg/pomp/tests/ou2-mif.Rout.save
===================================================================
--- pkg/pomp/tests/ou2-mif.Rout.save	2013-04-16 13:51:47 UTC (rev 843)
+++ pkg/pomp/tests/ou2-mif.Rout.save	2013-04-16 14:21:36 UTC (rev 844)
@@ -1,7 +1,6 @@
 
-R version 2.15.2 (2012-10-26) -- "Trick or Treat"
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
 Platform: x86_64-unknown-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -87,7 +86,7 @@
 > plot(mif1)
 > compare.mif(mif2)
 > try(compare.mif(mif1,mif2))
-Error in compare.mif(mif1, mif2) : unused argument(s) (mif2)
+Error in compare.mif(mif1, mif2) : unused argument (mif2)
 > compare.mif(list(mif1,mif2))
 > dev.off()
 null device 
@@ -283,4 +282,4 @@
 > 
 > proc.time()
    user  system elapsed 
- 11.384   0.072  11.591 
+ 12.416   0.084  12.654