Merge 8ddc35a into b4dcd92

clawpack · May 27, 2013 · 1fbabf9 · 1fbabf9
2 parents b4dcd92 + 8ddc35a
commit 1fbabf9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/pyclaw/sharpclaw/reconstruct.f90 b/src/pyclaw/sharpclaw/reconstruct.f90
@@ -498,7 +498,7 @@ subroutine weno5_fwave(q,ql,qr,fwave,s)
       end forall
 
       ! loop over interfaces (i-1/2)
-      do i=2,mx2
+      do i=2,mx2+2
         ! Compute the part of the reconstruction that is
         !  stencil-independent
         do m=1,num_eqn

diff --git a/src/pyclaw/sharpclaw/solver.py b/src/pyclaw/sharpclaw/solver.py
@@ -66,8 +66,9 @@ def before_step(solver,solution)
 
         Type of WENO reconstruction.
         0: conservative variables WENO reconstruction (standard).
-        1: characteristic-wise WENO reconstruction.
-        2: transmission-based WENO reconstruction.
+        1: Wave-slope reconstruction.
+        2: characteristic-wise WENO reconstruction.
+        3: transmission-based WENO reconstruction.
         ``Default = 0``
 
     .. attribute:: tfluct_solver

diff --git a/src/pyclaw/solver.py b/src/pyclaw/solver.py
@@ -637,7 +637,7 @@ def evolve_to_time(self,solution,tend=None):
             if not take_one_step:
                 if solution.t + self.dt > tend and tstart < tend:
                     self.dt = tend - solution.t
-                if tend - solution.t - self.dt < 1.e-14:
+                if tend - solution.t - self.dt < 1.e-14*solution.t:
                     self.dt = tend - solution.t
 
             # Keep a backup in case we need to retake a time step