Merge pull request #303 from mandli/mv-b4step

Move `b4step` into `advanc` to solve `aux` array filling

Author: mandli

src/1d/advanc.f

@@ -26,7 +26,7 @@ subroutine advanc (level,nvar,dtlevnew,vtime,naux)
 c
 c  ::::::::::::::; ADVANC :::::::::::::::::::::::::::::::::::::::::::
 c  integrate all grids at the input  'level' by one step of its delta(t)
-c  this includes:  setting the ghost cells 
+c  this includes:  setting the ghost cells
 c                  advancing the solution on the grid
 c                  adjusting fluxes for flux conservation step later
 c :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@@ -78,7 +78,7 @@ subroutine advanc (level,nvar,dtlevnew,vtime,naux)
       call cpu_time(cpu_finishBound)
       timeBound = timeBound + clock_finishBound - clock_startBound
       timeBoundCPU=timeBoundCPU+cpu_finishBound-cpu_startBound
-      
+
 c
 c save coarse level values if there is a finer level for wave fixup
 
@@ -91,7 +91,7 @@ subroutine advanc (level,nvar,dtlevnew,vtime,naux)
       dtlevnew = rinfinity
       cfl_level = 0.d0    !# to keep track of max cfl seen on each level
 
-c 
+c
       call system_clock(clock_startStepgrid,clock_rate)
       call cpu_time(cpu_startStepgrid)
 
@@ -115,7 +115,7 @@ subroutine advanc (level,nvar,dtlevnew,vtime,naux)
 
 !$OMP CRITICAL (newdt)
           dtlevnew = dmin1(dtlevnew,dtnew)
-!$OMP END CRITICAL (newdt)    
+!$OMP END CRITICAL (newdt)
 
       end do
 !$OMP END PARALLEL DO
@@ -126,8 +126,8 @@ subroutine advanc (level,nvar,dtlevnew,vtime,naux)
       tvoll(level) = tvoll(level) + clock_finish - clock_start
       tvollCPU(level) = tvollCPU(level) + cpu_finish - cpu_start
       timeStepgrid = timeStepgrid +clock_finish-clock_startStepgrid
-      timeStepgridCPU=timeStepgridCPU+cpu_finish-cpu_startStepgrid      
-      
+      timeStepgridCPU=timeStepgridCPU+cpu_finish-cpu_startStepgrid
+
       cflmax = dmax1(cflmax, cfl_level)
 
 c
@@ -214,6 +214,9 @@ subroutine par_advanc (mptr,mitot,nvar,naux,dtnew)
 
 
          locaux = node(storeaux,mptr)
+         call b4step1(nghost, nx, nvar, alloc(locnew),
+     &                rnode(cornxlo,mptr), hx, time, dt, naux,
+     &                alloc(locaux))
 c
          if (node(ffluxptr,mptr) .ne. 0) then
 

src/1d/stepgrid.f

@@ -62,9 +62,9 @@ subroutine stepgrid(q,fm,fp,mitot,mbc,dt,dtnew,dx,
 c
       method(1) = 0
 c
-c
-      call b4step1(mbc,mx,nvar,q,
-     &             xlowmbc,dx,time,dt,maux,aux)
+c     This call has been moved out to advanc
+c      call b4step1(mbc,mx,nvar,q,
+c     &             xlowmbc,dx,time,dt,maux,aux)
 c
 c
 c     # take one step on the conservation law:

src/2d/advanc.f

@@ -198,6 +198,7 @@ subroutine par_advanc (mptr,mitot,mjtot,nvar,naux,dtnew)
       nx    = node(ndihi,mptr) - node(ndilo,mptr) + 1
       ny    = node(ndjhi,mptr) - node(ndjlo,mptr) + 1
       time  = rnode(timemult,mptr)
+      dt    = possk(level)
 
 !$    mythread = omp_get_thread_num()
 
@@ -212,7 +213,7 @@ subroutine par_advanc (mptr,mitot,mjtot,nvar,naux,dtnew)
 c
          if (level .lt. mxnest) then
              ntot   = mitot * mjtot * nvar
-cdir$ ivdep
+c dir$ ivdep
              do  i = 1, ntot
                alloc(locold + i - 1) = alloc(locnew + i - 1)
              end do
@@ -226,9 +227,12 @@ 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)
-c
+         call b4step2(nghost, nx, ny, nvar, alloc(locnew), 
+     &                rnode(cornxlo,mptr), rnode(cornylo,mptr), hx, hy, 
+     &                time, dt, naux, alloc(locaux))
+
          if (node(ffluxptr,mptr) .ne. 0) then
             lenbc  = 2*(nx/intratx(level-1)+ny/intraty(level-1))
             locsvf = node(ffluxptr,mptr)

src/2d/stepgrid.f

@@ -122,9 +122,9 @@ subroutine stepgrid(q,fm,fp,gm,gp,mitot,mjtot,mbc,dt,dtnew,dx,dy,
 C       mwork1 = mwork - mused              !# remaining space (passed to step2)
 
 c
-c
-      call b4step2(mbc,mx,my,nvar,q,
-     &             xlowmbc,ylowmbc,dx,dy,time,dt,maux,aux)
+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)
 c
 c
 c     # take one step on the conservation law:

src/3d/advanc.f

@@ -229,6 +229,10 @@ subroutine par_advanc (mptr,mitot,mjtot,mktot,nvar,naux,dtnew)
 
 
          locaux = node(storeaux,mptr)
+         call b4step3(nghost, nx, ny, nz, nvar, alloc(locnew), 
+     &                rnode(cornxlo,mptr), rnode(cornylo,mptr), 
+     &                rnode(cornzlo,mptr), hx, hy, hz, time, dt, naux,
+     &                alloc(locaux))
 c
          if (node(ffluxptr,mptr) .ne. 0) then
             lenbc  = 2*( (nx/intratx(level-1))*(nz/intratz(level-1))

src/3d/stepgrid.f

@@ -110,9 +110,9 @@ subroutine stepgrid(q,fm,fp,gm,gp,hm,hp,mitot,mjtot,mktot,
       mused  = i0next - 1                    !# space already used
       mwork1 = mwork - mused              !# remaining space (passed to step3)
 
-c 2/28/02 : Added call to b4step3.
-      call b4step3(mbc,mx,my,mz,nvar,q,
-     &             xlowmbc,ylowmbc,zlowmbc,dx,dy,dz,time,dt,maux,aux)
+c     Moved call to b4step to advanc
+c      call b4step3(mbc,mx,my,mz,nvar,q,
+c     &             xlowmbc,ylowmbc,zlowmbc,dx,dy,dz,time,dt,maux,aux)
 
 c
 c