Merge pull request #660 from mandli/mv-b4step

Move `b4step` call out of `stepgrid` and into `advanc`

Author: rjleveque

src/2d/bouss/advanc_splitRev2Calls.f

@@ -311,8 +311,11 @@ subroutine par_advanc (mptr,mitot,mjtot,nvar,naux,dtnew)
       rvoll(level) = rvoll(level) + nx * ny
 !$OMP END CRITICAL(rv)
 
-
+c     Call b4step2 here so that time dependent arrays can be filled properly
       locaux = node(storeaux,mptr)
+      call b4step2(nghost, nx, ny, nvar, alloc(locnew), 
+     &             rnode(cornxlo,mptr), rnode(cornylo,mptr), hx, hy, 
+     &             time, dt, naux, alloc(locaux))
 c
       if (node(ffluxptr,mptr) .ne. 0) then
          lenbc  = 2*(nx/intratx(level-1)+ny/intraty(level-1))

src/2d/bouss/stepgrid.f

@@ -157,8 +157,9 @@ subroutine stepgrid(q,fm,fp,gm,gp,mitot,mjtot,mbc,dt,dtnew,dx,dy,
 c     finest level.  No need to check on each patch separately.
 c::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
-       call b4step2(mbc,mx,my,nvar,q,
-     &             xlowmbc,ylowmbc,dx,dy,time,dt,maux,aux,actualstep)
+c      This call has been moved out to advanc
+c       call b4step2(mbc,mx,my,nvar,q,
+c     &             xlowmbc,ylowmbc,dx,dy,time,dt,maux,aux,actualstep)
 
 c::::::::::::::::::::::::FGOUT DATA before step:::::::::::::::::::::::
 c     # fill in values at fgout points affected at time tc0

src/2d/shallow/advanc.f

@@ -221,8 +221,11 @@ subroutine par_advanc (mptr,mitot,mjtot,nvar,naux,dtnew)
       rvoll(level) = rvoll(level) + nx * ny
 !$OMP END CRITICAL(rv)
 
-
+c     Call b4step2 here so that time dependent arrays can be filled properly
       locaux = node(storeaux,mptr)
+      call b4step2(nghost, nx, ny, nvar, alloc(locnew), 
+     &             rnode(cornxlo,mptr), rnode(cornylo,mptr), hx, hy, 
+     &             time, dt, naux, alloc(locaux))
 c
       if (node(ffluxptr,mptr) .ne. 0) then
          lenbc  = 2*(nx/intratx(level-1)+ny/intraty(level-1))

src/2d/shallow/stepgrid.f

@@ -149,8 +149,9 @@ subroutine stepgrid(q,fm,fp,gm,gp,mitot,mjtot,mbc,dt,dtnew,dx,dy,
 c     finest level.  No need to check on each patch separately.
 c::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
-       call b4step2(mbc,mx,my,nvar,q,
-     &             xlowmbc,ylowmbc,dx,dy,time,dt,maux,aux,actualstep)
+c      This call has been moved out to advanc
+c       call b4step2(mbc,mx,my,nvar,q,
+c     &              xlowmbc,ylowmbc,dx,dy,time,dt,maux,aux,actualstep)
 
 c::::::::::::::::::::::::FGOUT DATA before step:::::::::::::::::::::::
 c     # fill in values at fgout points affected at time tc0